This commit was manufactured by cvs2svn to create tag 'v20050928_2330'.
diff --git a/bundles/org.eclipse.wst.css.core/.classpath b/bundles/org.eclipse.wst.css.core/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.wst.css.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.css.core/.cvsignore b/bundles/org.eclipse.wst.css.core/.cvsignore
deleted file mode 100644
index 922d387..0000000
--- a/bundles/org.eclipse.wst.css.core/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-cssmodel.jar
-build.xml
-dev.properties
-@dot
diff --git a/bundles/org.eclipse.wst.css.core/.options b/bundles/org.eclipse.wst.css.core/.options
deleted file mode 100644
index 490975b..0000000
--- a/bundles/org.eclipse.wst.css.core/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-org.eclipse.wst.css.core/debug=true
-org.eclipse.wst.css.core/debug/tracefilter=
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/.project b/bundles/org.eclipse.wst.css.core/.project
deleted file mode 100644
index bb046e9..0000000
--- a/bundles/org.eclipse.wst.css.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.css.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.css.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.css.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2e1acf0..0000000
--- a/bundles/org.eclipse.wst.css.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Mon May 30 17:56:59 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.wst.css.core/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.css.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 42fb716..0000000
--- a/bundles/org.eclipse.wst.css.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,14 +0,0 @@
-#Fri May 27 23:56:32 EDT 2005
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF
deleted file mode 100644
index f051559..0000000
--- a/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,41 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.css.core; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.wst.css.core.internal.CSSCorePlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.css.core.internal,
- org.eclipse.wst.css.core.internal.cleanup,
- org.eclipse.wst.css.core.internal.contentmodel,
- org.eclipse.wst.css.core.internal.contenttype,
- org.eclipse.wst.css.core.internal.document,
- org.eclipse.wst.css.core.internal.encoding,
- org.eclipse.wst.css.core.internal.event,
- org.eclipse.wst.css.core.internal.eventimpl,
- org.eclipse.wst.css.core.internal.format,
- org.eclipse.wst.css.core.internal.formatter,
- org.eclipse.wst.css.core.internal.metamodel,
- org.eclipse.wst.css.core.internal.metamodel.util,
- org.eclipse.wst.css.core.internal.metamodelimpl,
- org.eclipse.wst.css.core.internal.modelhandler,
- org.eclipse.wst.css.core.internal.parser,
- org.eclipse.wst.css.core.internal.parser.regions,
- org.eclipse.wst.css.core.internal.parserz,
- org.eclipse.wst.css.core.internal.preferences,
- org.eclipse.wst.css.core.internal.provisional.adapters,
- org.eclipse.wst.css.core.internal.provisional.contenttype,
- org.eclipse.wst.css.core.internal.provisional.document,
- org.eclipse.wst.css.core.internal.provisional.preferences,
- org.eclipse.wst.css.core.internal.provisional.text,
- org.eclipse.wst.css.core.internal.tasks,
- org.eclipse.wst.css.core.internal.text,
- org.eclipse.wst.css.core.internal.util,
- org.eclipse.wst.css.core.internal.util.declaration
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core
-Eclipse-AutoStart: true; exceptions="org.eclipse.wst.css.core.internal.contenttype"
diff --git a/bundles/org.eclipse.wst.css.core/about.html b/bundles/org.eclipse.wst.css.core/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.wst.css.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/build.properties b/bundles/org.eclipse.wst.css.core/build.properties
deleted file mode 100644
index 411f804..0000000
--- a/bundles/org.eclipse.wst.css.core/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               cssprofile/,\
-               .options,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               about.html
-bin.excludes = bin/**,\
-               @dot/**,\
-               temp.folder/**
-src.includes = component.xml,\
-               build.properties
-source.. = src/
-               
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/component.xml b/bundles/org.eclipse.wst.css.core/component.xml
deleted file mode 100644
index 277b26f..0000000
--- a/bundles/org.eclipse.wst.css.core/component.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model"
-        name="org.eclipse.wst.css">
-        <component-depends unrestricted="true"></component-depends>
-        <plugin id="org.eclipse.wst.css.core" />
-        <plugin id="org.eclipse.wst.css.ui" />
-
-</component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/cssprofile/css-profile.dtd b/bundles/org.eclipse.wst.css.core/cssprofile/css-profile.dtd
deleted file mode 100644
index 35535a8..0000000
--- a/bundles/org.eclipse.wst.css.core/cssprofile/css-profile.dtd
+++ /dev/null
@@ -1,132 +0,0 @@
-<!-- DTD for CSS Meta Model Profile -->
-
-<!-- Entities -->
-
-<!-- name-definition	: In defining meta model object, object name -->
-<!-- is given by using this attribute. -->
-
-<!ENTITY % name-definition 'name CDATA #REQUIRED' >
-
-<!-- name-reference		: used to refer meta model object that defined -->
-<!-- by name-definition -->
-
-<!ENTITY % name-reference 'name CDATA #REQUIRED' >
-
-<!-- availability		: CSS Meta Model Profile permit importing -->
-<!-- other profile and describe difference for it. -->
-
-<!ENTITY % availability 'enabled (true | false) "true"' >
-<!ENTITY % overwrite 'overwrite (true | false) "false"' >
-
-<!-- ******************** -->
-<!--  elments/attributes  -->
-<!-- ******************** -->
-
-<!ELEMENT css-profile (profile-import? , (stylesheet-def | charset-rule-def | import-rule-def | page-rule-def | media-rule-def | fontface-rule-def | style-rule-def | property-def | descriptor-def | container-def | function-def | number-def | unit-def | keyword-def | category-def | pseudo-element-def | pseudo-class-def)*) >
-
-<!-- a profile can include other profile -->
-
-<!ELEMENT profile-import EMPTY >
-<!ATTLIST profile-import name CDATA #REQUIRED >
-
-<!-- which type of rule can be used? -->
-
-<!ELEMENT stylesheet-def (description? , (charset-rule | import-rule | page-rule | media-rule | fontface-rule | style-rule)*) >
-<!ATTLIST stylesheet-def %overwrite; >
-
-<!ELEMENT charset-rule EMPTY >
-<!ATTLIST charset-rule %availability; >
-<!ELEMENT import-rule EMPTY >
-<!ATTLIST import-rule %availability; >
-<!ELEMENT page-rule EMPTY >
-<!ATTLIST page-rule %availability; >
-<!ELEMENT media-rule EMPTY >
-<!ATTLIST media-rule %availability; >
-<!ELEMENT fontface-rule EMPTY >
-<!ATTLIST fontface-rule %availability; >
-<!ELEMENT style-rule EMPTY >
-<!ATTLIST style-rule %availability; >
-
-<!ELEMENT charset-rule-def (description?) >
-<!ATTLIST charset-rule-def %overwrite; >
-
-<!ELEMENT import-rule-def (description?) >
-<!ATTLIST import-rule-def %overwrite; >
-
-<!ELEMENT page-rule-def (description? , (property | pseudo-class)*) >
-<!ATTLIST page-rule-def %overwrite; >
-
-<!ELEMENT media-rule-def (description?) >
-<!ATTLIST media-rule-def %overwrite; >
-
-<!ELEMENT fontface-rule-def (description? , descriptor*) >
-<!ATTLIST fontface-rule-def %overwrite; >
-
-<!ELEMENT style-rule-def (description? , (property | selector-expression | pseudo-class | pseudo-element)*) >
-<!ATTLIST style-rule-def %overwrite; >
-
-<!ELEMENT selector-expression EMPTY >
-<!ATTLIST selector-expression name (descendant | child | adjacent | universal | attribute) #REQUIRED %availability; >
-
-<!ELEMENT pseudo-class EMPTY >
-<!ATTLIST pseudo-class %name-reference; %availability; >
-
-<!ELEMENT pseudo-element EMPTY >
-<!ATTLIST pseudo-element %name-reference; %availability; >
-
-<!ELEMENT pseudo-class-def (description?, selector-value) >
-<!ATTLIST pseudo-class-def %name-definition; %overwrite; >
-<!ELEMENT selector-value (#PCDATA) >
-
-<!ELEMENT pseudo-element-def (description?, selector-value) >
-<!ATTLIST pseudo-element-def %name-definition; %overwrite; >
-
-<!ELEMENT keyword-def (description? , keyword-value) >
-<!ATTLIST keyword-def %name-definition; %overwrite; >
-<!ELEMENT keyword-value (#PCDATA) >
-<!ELEMENT description (#PCDATA) >
-
-<!ELEMENT function-def (description? , function-value) >
-<!ATTLIST function-def %name-definition; %overwrite; >
-<!ELEMENT function-value (#PCDATA) >
-
-<!ELEMENT number-def (description? , unit*) >
-<!ATTLIST number-def %name-definition; %overwrite; >
-<!ELEMENT unit EMPTY >
-<!ATTLIST unit %name-reference; %availability; >
-
-<!ELEMENT unit-def (description? , unit-value) >
-<!ATTLIST unit-def %name-definition; %overwrite; >
-<!ELEMENT unit-value (#PCDATA) >
-
-<!ELEMENT container-def (description? , (number | keyword | function | container)*) >
-<!ATTLIST container-def %name-definition; %overwrite; >
-
-<!ELEMENT category-def (description?, caption) >
-<!ATTLIST category-def %name-definition; %overwrite; >
-<!ELEMENT caption (#PCDATA) >
-
-<!ELEMENT property-def (description? , (number | keyword | function | container | string | separator | property)*) >
-<!ATTLIST property-def %name-definition; %overwrite;
-					   inherited (yes | no | na) "na"
-					   mediagroup CDATA #IMPLIED
-					   category CDATA #IMPLIED >
-<!ELEMENT descriptor-def (description?, (number | keyword | function | container | string | separator | property)*) >
-<!ATTLIST descriptor-def %name-definition; %overwrite; >
-
-<!ELEMENT number EMPTY >
-<!ATTLIST number %name-reference; %availability; > 
-<!ELEMENT keyword EMPTY >
-<!ATTLIST keyword %name-reference; %availability; > 
-<!ELEMENT function EMPTY >
-<!ATTLIST function %name-reference; %availability; >
-<!ELEMENT container EMPTY >
-<!ATTLIST container %name-reference; %availability; > 
-<!ELEMENT string EMPTY >
-<!ATTLIST string %name-reference; %availability; >
-<!ELEMENT separator EMPTY >
-<!ATTLIST separator name (comma | slash) #REQUIRED %availability; >
-<!ELEMENT property EMPTY >
-<!ATTLIST property %name-reference; %availability; > 
-<!ELEMENT descriptor EMPTY >
-<!ATTLIST descriptor %name-reference; %availability; >
diff --git a/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-css1.xml b/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-css1.xml
deleted file mode 100644
index 6b0b175..0000000
--- a/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-css1.xml
+++ /dev/null
@@ -1,826 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--<!DOCTYPE css-profile SYSTEM "css-profile.dtd" >-->
-<css-profile>
-	<stylesheet-def>
-		<description>%css1.stylesheet-def.description</description>
-		<import-rule/>
-		<style-rule/>
-	</stylesheet-def>
-
-	<import-rule-def>
-	</import-rule-def>
-
-	<style-rule-def>
-		<selector-expression name="descendant"/>
-		<pseudo-element name="first-line"/>
-		<pseudo-element name="first-letter"/>
-		<pseudo-class name="link"/>
-		<pseudo-class name="visited"/>
-		<pseudo-class name="active"/>
-		<property name="background"/>
-		<property name="background-attachment"/>
-		<property name="background-color"/>
-		<property name="background-image"/>
-		<property name="background-position"/>
-		<property name="background-repeat"/>
-		<property name="border"/>
-		<property name="border-bottom"/>
-		<property name="border-bottom-width"/>
-		<property name="border-color"/>
-		<property name="border-left"/>
-		<property name="border-left-width"/>
-		<property name="border-right"/>
-		<property name="border-right-width"/>
-		<property name="border-style"/>
-		<property name="border-top"/>
-		<property name="border-top-width"/>
-		<property name="border-width"/>
-		<property name="clear"/>
-		<property name="color"/>
-		<property name="display"/>
-		<property name="float"/>
-		<property name="font"/>
-		<property name="font-family"/>
-		<property name="font-size"/>
-		<property name="font-style"/>
-		<property name="font-variant"/>
-		<property name="font-weight"/>
-		<property name="height"/>
-		<property name="letter-spacing"/>
-		<property name="line-height"/>
-		<property name="list-style"/>
-		<property name="list-style-image"/>
-		<property name="list-style-position"/>
-		<property name="list-style-type"/>
-		<property name="margin"/>
-		<property name="margin-bottom"/>
-		<property name="margin-left"/>
-		<property name="margin-right"/>
-		<property name="margin-top"/>
-		<property name="padding"/>
-		<property name="padding-bottom"/>
-		<property name="padding-left"/>
-		<property name="padding-right"/>
-		<property name="padding-top"/>
-		<property name="text-align"/>
-		<property name="text-decoration"/>
-		<property name="text-indent"/>
-		<property name="text-transform"/>
-		<property name="vertical-align"/>
-		<property name="white-space"/>
-		<property name="width"/>
-		<property name="word-spacing"/>
-	</style-rule-def>
-
-	<pseudo-class-def name="link">
-		<selector-value>link</selector-value>
-	</pseudo-class-def>
-	<pseudo-class-def name="visited">
-		<selector-value>visited</selector-value>
-	</pseudo-class-def>
-	<pseudo-class-def name="active">
-		<selector-value>active</selector-value>
-	</pseudo-class-def>
-
-	<pseudo-element-def name="first-line">
-		<selector-value>first-line</selector-value>
-	</pseudo-element-def>
-	<pseudo-element-def name="first-letter">
-		<selector-value>first-letter</selector-value>
-	</pseudo-element-def>
-
-	<!-- property definition -->
-
-    <property-def name="background" inherited="no" category="colorandbackground">
-        <property name="background-color"/>
-        <property name="background-image"/>
-        <property name="background-repeat"/>
-        <property name="background-attachment"/>
-        <property name="background-position"/>
-    </property-def>
-    <property-def name="background-attachment" inherited="no" category="colorandbackground">
-        <keyword name="scroll"/>
-        <keyword name="fixed"/>
-    </property-def>
-    <property-def name="background-color" inherited="no" category="colorandbackground">
-        <container name="color"/>
-        <keyword name="transparent"/>
-    </property-def>
-    <property-def name="background-image" inherited="no" category="colorandbackground">
-        <function name="uri"/>
-        <keyword name="none"/>
-    </property-def>
-	<property-def name="background-position" inherited="no" category="colorandbackground">
-		<number name="percentage"/>
-		<number name="length"/>
-		<keyword name="top"/>
-		<keyword name="center"/>
-		<keyword name="bottom"/>
-		<keyword name="left"/>
-		<keyword name="right"/>
-	</property-def>
-	<property-def name="background-repeat" inherited="no" category="colorandbackground">
-		<keyword name="repeat"/>
-		<keyword name="repeat-x"/>
-		<keyword name="repeat-y"/>
-		<keyword name="no-repeat"/>
-	</property-def>
-	<property-def name="border" inherited="no" category="box">
-		<property name="border-width"/>
-		<property name="border-style"/>
-		<container name="color"/>
-	</property-def>
-	<property-def name="border-color" inherited="no" category="box">
-		<container name="color"/>
-	</property-def>
-	<property-def name="border-style" inherited="no" category="box">
-		<keyword name="none"/>
-		<keyword name="dotted"/>
-		<keyword name="dashed"/>
-		<keyword name="solid"/>
-		<keyword name="double"/>
-		<keyword name="groove"/>
-		<keyword name="ridge"/>
-		<keyword name="inset"/>
-		<keyword name="outset"/>
-	</property-def>
-	<property-def name="border-top" inherited="no" category="box">
-		<property name="border-top-width"/>
-		<property name="border-style"/>
-		<container name="color"/>
-	</property-def>
-	<property-def name="border-right" inherited="no" category="box">
-		<property name="border-right-width"/>
-		<property name="border-style"/>
-		<container name="color"/>
-	</property-def>
-	<property-def name="border-bottom" inherited="no" category="box">
-		<property name="border-bottom-width"/>
-		<property name="border-style"/>
-		<container name="color"/>
-	</property-def>
-	<property-def name="border-left" inherited="no" category="box">
-		<property name="border-left-width"/>
-		<property name="border-style"/>
-		<container name="color"/>
-	</property-def>
-	<property-def name="border-top-width" inherited="no" category="box">
-		<keyword name="thin"/>
-		<keyword name="medium"/>
-		<keyword name="thick"/>
-		<number name="length"/>
-	</property-def>
-	<property-def name="border-right-width" inherited="no" category="box">
-		<keyword name="thin"/>
-		<keyword name="medium"/>
-		<keyword name="thick"/>
-		<number name="length"/>
-	</property-def>
-	<property-def name="border-bottom-width" inherited="no" category="box">
-		<keyword name="thin"/>
-		<keyword name="medium"/>
-		<keyword name="thick"/>
-		<number name="length"/>
-	</property-def>
-	<property-def name="border-left-width" inherited="no" category="box">
-		<keyword name="thin"/>
-		<keyword name="medium"/>
-		<keyword name="thick"/>
-		<number name="length"/>
-	</property-def>
-	<property-def name="border-width" inherited="no" category="box">
-		<keyword name="thin"/>
-		<keyword name="medium"/>
-		<keyword name="thick"/>
-		<number name="length"/>
-	</property-def>
-	<property-def name="clear" inherited="no" category="box">
-		<keyword name="none"/>
-		<keyword name="left"/>
-		<keyword name="right"/>
-		<keyword name="both"/>
-	</property-def>
-	<property-def name="color" inherited="yes" category="colorandbackground">
-		<container name="color"/>
-	</property-def>
-	<property-def name="display" inherited="no" category="classification">
-		<keyword name="block"/>
-		<keyword name="inline"/>
-		<keyword name="list-item"/>
-		<keyword name="none"/>
-	</property-def>
-	<property-def name="float" inherited="no" category="box">
-		<keyword name="left"/>
-		<keyword name="right"/>
-		<keyword name="none"/>
-	</property-def>
-	<property-def name="font"
-		inherited="yes" category="font">
-		<property name="font-style"/>
-		<property name="font-variant"/>
-		<property name="font-weight"/>
-		<property name="font-size"/>
-		<property name="line-height"/>
-		<property name="font-family"/>
-		<separator name="slash"/>
-	</property-def>
-	<property-def name="font-family" inherited="yes" category="font">
-		<string name="family-name"/>
-		<container name="generic-family"/>
-		<separator name="comma"/>
-	</property-def>
-	<property-def name="font-size" inherited="yes" category="font">
-		<container name="absolute-size"/>
-		<container name="relative-size"/>
-		<number name="length"/>
-		<number name="percentage"/>
-	</property-def>
-	<property-def name="font-style" inherited="yes" category="font">
-		<keyword name="normal"/>
-		<keyword name="italic"/>
-		<keyword name="oblique"/>
-	</property-def>
-	<property-def name="font-variant" inherited="yes" category="font">
-		<keyword name="normal"/>
-		<keyword name="small-caps"/>
-	</property-def>
-	<property-def name="font-weight" inherited="yes" category="font">
-		<keyword name="normal"/>
-		<keyword name="bold"/>
-		<keyword name="bolder"/>
-		<keyword name="lighter"/>
-		<keyword name="100"/>
-		<keyword name="200"/>
-		<keyword name="300"/>
-		<keyword name="400"/>
-		<keyword name="500"/>
-		<keyword name="600"/>
-		<keyword name="700"/>
-		<keyword name="800"/>
-		<keyword name="900"/>
-	</property-def>
-	<property-def name="height" inherited="no" category="box">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="auto"/>
-	</property-def>
-	<property-def name="letter-spacing" inherited="yes" category="text">
-		<keyword name="normal"/>
-		<number name="length"/>
-	</property-def>
-	<property-def name="line-height" inherited="yes" category="text">
-		<keyword name="normal"/>
-		<number name="number"/>
-		<number name="length"/>
-		<number name="percentage"/>
-	</property-def>
-	<property-def name="list-style" inherited="yes" category="classification">
-		<keyword name="disc"/>
-		<keyword name="circle"/>
-		<keyword name="square"/>
-		<keyword name="decimal"/>
-		<keyword name="lower-roman"/>
-		<keyword name="upper-roman"/>
-		<keyword name="lower-alpha"/>
-		<keyword name="upper-alpha"/>
-		<keyword name="none"/>
-		<keyword name="inside"/>
-		<keyword name="outside"/>
-		<function name="uri"/>
-		<keyword name="none"/>
-	</property-def>
-	<property-def name="list-style-image" inherited="yes" category="classification">
-		<function name="uri"/>
-		<keyword name="none"/>
-	</property-def>
-	<property-def name="list-style-position" inherited="yes" category="classification">
-		<keyword name="inside"/>
-		<keyword name="outside"/>
-	</property-def>
-	<property-def name="list-style-type" inherited="yes" category="classification">
-		<keyword name="disc"/>
-		<keyword name="circle"/>
-		<keyword name="square"/>
-		<keyword name="decimal"/>
-		<keyword name="lower-roman"/>
-		<keyword name="upper-roman"/>
-		<keyword name="lower-alpha"/>
-		<keyword name="upper-alpha"/>
-		<keyword name="none"/>
-	</property-def>
-	<property-def name="margin" inherited="no" category="box">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="auto"/>
-	</property-def>
-	<property-def name="margin-top" inherited="no" category="box">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="auto"/>
-	</property-def>
-	<property-def name="margin-right" inherited="no" category="box">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="auto"/>
-	</property-def>
-	<property-def name="margin-bottom" inherited="no" category="box">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="auto"/>
-	</property-def>
-	<property-def name="margin-left" inherited="no" category="box">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="auto"/>
-	</property-def>
-	<property-def name="padding" inherited="no" category="box">
-		<number name="length"/>
-		<number name="percentage"/>
-	</property-def>
-	<property-def name="padding-top" inherited="no" category="box">
-		<number name="length"/>
-		<number name="percentage"/>
-	</property-def>
-	<property-def name="padding-right" inherited="no" category="box">
-		<number name="length"/>
-		<number name="percentage"/>
-	</property-def>
-	<property-def name="padding-bottom" inherited="no" category="box">
-		<number name="length"/>
-		<number name="percentage"/>
-	</property-def>
-	<property-def name="padding-left" inherited="no" category="box">
-		<number name="length"/>
-		<number name="percentage"/>
-	</property-def>
-	<property-def name="text-align" inherited="yes" category="text">
-		<keyword name="left"/>
-		<keyword name="right"/>
-		<keyword name="center"/>
-		<keyword name="justify"/>
-	</property-def>
-	<property-def name="text-decoration" inherited="no" category="text">
-		<keyword name="none"/>
-		<keyword name="underline"/>
-		<keyword name="overline"/>
-		<keyword name="line-through"/>
-		<keyword name="blink"/>
-	</property-def>
-	<property-def name="text-indent" inherited="yes" category="text">
-		<number name="length"/>
-		<number name="percentage"/>
-	</property-def>
-	<property-def name="text-transform" inherited="yes" category="text">
-		<keyword name="capitalize"/>
-		<keyword name="uppercase"/>
-		<keyword name="lowercase"/>
-		<keyword name="none"/>
-	</property-def>
-	<property-def name="vertical-align" inherited="no" category="text">
-		<keyword name="baseline"/>
-		<keyword name="sub"/>
-		<keyword name="super"/>
-		<keyword name="top"/>
-		<keyword name="text-top"/>
-		<keyword name="middle"/>
-		<keyword name="bottom"/>
-		<keyword name="text-bottom"/>
-		<number name="percentage"/>
-	</property-def>
-	<property-def name="white-space" inherited="yes" category="classification">
-		<keyword name="normal"/>
-		<keyword name="pre"/>
-		<keyword name="nowrap"/>
-	</property-def>
-	<property-def name="width" inherited="no" category="box">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="auto"/>
-	</property-def>
-	<property-def name="word-spacing" inherited="yes" category="text">
-		<keyword name="normal"/>
-		<number name="length"/>
-	</property-def>
-
-	<!-- container definition : Container is the lump of values.
-	It can be used like macros. -->
-    <container-def name="absolute-size">
-        <keyword name="xx-small"/>
-        <keyword name="x-small"/>
-        <keyword name="small"/>
-        <keyword name="medium"/>
-        <keyword name="large"/>
-        <keyword name="x-large"/>
-        <keyword name="xx-large"/>
-    </container-def>
-	<container-def name="color">
-		<keyword name="aqua"/>
-		<keyword name="black"/>
-		<keyword name="blue"/>
-		<keyword name="fuchsia"/>
-		<keyword name="gray"/>
-		<keyword name="green"/>
-		<keyword name="lime"/>
-		<keyword name="maroon"/>
-		<keyword name="navy"/>
-		<keyword name="olive"/>
-		<keyword name="purple"/>
-		<keyword name="red"/>
-		<keyword name="silver"/>
-		<keyword name="teal"/>
-		<keyword name="white"/>
-		<keyword name="yellow"/>
-		<function name="rgb"/>
-		<number name="hash"/>
-	</container-def>
-	<container-def name="generic-family">
-		<keyword name="serif"/>
-		<keyword name="sans-serif"/>
-		<keyword name="cursive"/>
-		<keyword name="fantasy"/>
-		<keyword name="monospace"/>
-	</container-def>
-	<container-def name="relative-size">
-		<keyword name="smaller"/>
-		<keyword name="larger"/>
-	</container-def>
-
-	<!-- category definition : This is used to categorize properties
-	in Properties View. -->
-	<category-def name="box">
-		<caption>%css1.category-def.box.caption</caption>
-	</category-def>
-	<category-def name="colorandbackground">
-		<caption>%css1.category-def.colorandbackground.caption</caption>
-	</category-def>
-	<category-def name="classification">
-		<caption>%css1.category-def.classification.caption</caption>
-	</category-def>
-	<category-def name="font">
-		<caption>%css1.category-def.font.caption</caption>
-	</category-def>
-	<category-def name="text">
-		<caption>%css1.category-def.text.caption</caption>
-	</category-def>
-
-	<function-def name="rgb">
-		<function-value>rgb</function-value>
-	</function-def>
-	<function-def name="uri">
-		<function-value>url</function-value>
-	</function-def>
-	
-	<!-- number definition : What unit types be acceptable for each
-	number type? -->
-    <number-def name="hash">
-        <unit name="hash"/>
-    </number-def>
-    <number-def name="length">
-        <unit name="em"/>
-        <unit name="ex"/>
-        <unit name="px"/>
-        <unit name="in"/>
-        <unit name="cm"/>
-        <unit name="mm"/>
-        <unit name="pt"/>
-        <unit name="pc"/>
-    </number-def>
-	<number-def name="number">
-	</number-def>
-	<number-def name="percentage">
-		<unit name="percentage"/>
-	</number-def>
-
-	<unit-def name="cm">
-		<unit-value>cm</unit-value>
-	</unit-def>
-	<unit-def name="em">
-		<unit-value>em</unit-value>
-	</unit-def>
-	<unit-def name="ex">
-		<unit-value>ex</unit-value>
-	</unit-def>
-	<unit-def name="hash">
-		<unit-value>#</unit-value>
-	</unit-def>
-	<unit-def name="in">
-		<unit-value>in</unit-value>
-	</unit-def>
-	<unit-def name="mm">
-		<unit-value>mm</unit-value>
-	</unit-def>
-	<unit-def name="pc">
-		<unit-value>pc</unit-value>
-	</unit-def>
-	<unit-def name="percentage">
-		<unit-value>%</unit-value>
-	</unit-def>
-	<unit-def name="pt">
-		<unit-value>pt</unit-value>
-	</unit-def>
-	<unit-def name="px">
-		<unit-value>px</unit-value>
-	</unit-def>
-
-    <!-- keywords : string constants (this is last part..) -->
-    <keyword-def name="100">
-        <keyword-value>100</keyword-value>
-    </keyword-def>
-    <keyword-def name="200">
-        <keyword-value>200</keyword-value>
-    </keyword-def>
-    <keyword-def name="300">
-        <keyword-value>300</keyword-value>
-    </keyword-def>
-    <keyword-def name="400">
-        <keyword-value>400</keyword-value>
-    </keyword-def>
-    <keyword-def name="500">
-        <keyword-value>500</keyword-value>
-    </keyword-def>
-    <keyword-def name="600">
-        <keyword-value>600</keyword-value>
-    </keyword-def>
-    <keyword-def name="700">
-        <keyword-value>700</keyword-value>
-    </keyword-def>
-    <keyword-def name="800">
-        <keyword-value>800</keyword-value>
-    </keyword-def>
-    <keyword-def name="900">
-        <keyword-value>900</keyword-value>
-    </keyword-def>
-    <keyword-def name="aqua">
-        <keyword-value>aqua</keyword-value>
-    </keyword-def>
-    <keyword-def name="auto">
-        <keyword-value>auto</keyword-value>
-    </keyword-def>
-    <keyword-def name="baseline">
-        <keyword-value>baseline</keyword-value>
-    </keyword-def>
-    <keyword-def name="black">
-        <keyword-value>black</keyword-value>
-    </keyword-def>
-    <keyword-def name="blink">
-        <keyword-value>blink</keyword-value>
-    </keyword-def>
-    <keyword-def name="block">
-        <keyword-value>block</keyword-value>
-    </keyword-def>
-    <keyword-def name="blue">
-        <keyword-value>blue</keyword-value>
-    </keyword-def>
-    <keyword-def name="bold">
-        <keyword-value>bold</keyword-value>
-    </keyword-def>
-    <keyword-def name="bolder">
-        <keyword-value>bolder</keyword-value>
-    </keyword-def>
-    <keyword-def name="both">
-        <keyword-value>both</keyword-value>
-    </keyword-def>
-    <keyword-def name="bottom">
-        <keyword-value>bottom</keyword-value>
-    </keyword-def>
-    <keyword-def name="capitalize">
-        <keyword-value>capitalize</keyword-value>
-    </keyword-def>
-    <keyword-def name="center">
-        <keyword-value>center</keyword-value>
-    </keyword-def>
-    <keyword-def name="circle">
-        <keyword-value>circle</keyword-value>
-    </keyword-def>
-    <keyword-def name="cursive">
-        <keyword-value>cursive</keyword-value>
-    </keyword-def>
-    <keyword-def name="dashed">
-        <keyword-value>dashed</keyword-value>
-    </keyword-def>
-    <keyword-def name="decimal">
-        <keyword-value>decimal</keyword-value>
-    </keyword-def>
-    <keyword-def name="disc">
-        <keyword-value>disc</keyword-value>
-    </keyword-def>
-    <keyword-def name="dotted">
-        <keyword-value>dotted</keyword-value>
-    </keyword-def>
-    <keyword-def name="double">
-        <keyword-value>double</keyword-value>
-    </keyword-def>
-    <keyword-def name="fantasy">
-        <keyword-value>fantasy</keyword-value>
-    </keyword-def>
-    <keyword-def name="fixed">
-        <keyword-value>fixed</keyword-value>
-    </keyword-def>
-    <keyword-def name="fuchsia">
-        <keyword-value>fuchsia</keyword-value>
-    </keyword-def>
-    <keyword-def name="gray">
-        <keyword-value>gray</keyword-value>
-    </keyword-def>
-    <keyword-def name="green">
-        <keyword-value>green</keyword-value>
-    </keyword-def>
-    <keyword-def name="groove">
-        <keyword-value>groove</keyword-value>
-    </keyword-def>
-    <keyword-def name="inline">
-        <keyword-value>inline</keyword-value>
-    </keyword-def>
-    <keyword-def name="inset">
-        <keyword-value>inset</keyword-value>
-    </keyword-def>
-    <keyword-def name="inside">
-        <keyword-value>inside</keyword-value>
-    </keyword-def>
-    <keyword-def name="italic">
-        <keyword-value>italic</keyword-value>
-    </keyword-def>
-    <keyword-def name="justify">
-        <keyword-value>justify</keyword-value>
-    </keyword-def>
-    <keyword-def name="large">
-        <keyword-value>large</keyword-value>
-    </keyword-def>
-    <keyword-def name="larger">
-        <keyword-value>larger</keyword-value>
-    </keyword-def>
-    <keyword-def name="left">
-        <keyword-value>left</keyword-value>
-    </keyword-def>
-    <keyword-def name="lighter">
-        <keyword-value>lighter</keyword-value>
-    </keyword-def>
-    <keyword-def name="lime">
-        <keyword-value>lime</keyword-value>
-    </keyword-def>
-    <keyword-def name="line-through">
-        <keyword-value>line-through</keyword-value>
-    </keyword-def>
-    <keyword-def name="list-item">
-        <keyword-value>list-item</keyword-value>
-    </keyword-def>
-    <keyword-def name="lower-alpha">
-        <keyword-value>lower-alpha</keyword-value>
-    </keyword-def>
-    <keyword-def name="lower-roman">
-        <keyword-value>lower-roman</keyword-value>
-    </keyword-def>
-    <keyword-def name="lowercase">
-        <keyword-value>lowercase</keyword-value>
-    </keyword-def>
-    <keyword-def name="maroon">
-        <keyword-value>maroon</keyword-value>
-    </keyword-def>
-    <keyword-def name="medium">
-        <keyword-value>medium</keyword-value>
-    </keyword-def>
-    <keyword-def name="middle">
-        <keyword-value>middle</keyword-value>
-    </keyword-def>
-    <keyword-def name="monospace">
-        <keyword-value>monospace</keyword-value>
-    </keyword-def>
-    <keyword-def name="navy">
-        <keyword-value>navy</keyword-value>
-    </keyword-def>
-    <keyword-def name="no-repeat">
-        <keyword-value>no-repeat</keyword-value>
-    </keyword-def>
-    <keyword-def name="none">
-        <keyword-value>none</keyword-value>
-    </keyword-def>
-    <keyword-def name="normal">
-        <keyword-value>normal</keyword-value>
-    </keyword-def>
-    <keyword-def name="nowrap">
-        <keyword-value>nowrap</keyword-value>
-    </keyword-def>
-    <keyword-def name="oblique">
-        <keyword-value>oblique</keyword-value>
-    </keyword-def>
-    <keyword-def name="olive">
-        <keyword-value>olive</keyword-value>
-    </keyword-def>
-    <keyword-def name="outset">
-        <keyword-value>outset</keyword-value>
-    </keyword-def>
-    <keyword-def name="outside">
-        <keyword-value>outside</keyword-value>
-    </keyword-def>
-    <keyword-def name="overline">
-        <keyword-value>overline</keyword-value>
-    </keyword-def>
-    <keyword-def name="pre">
-        <keyword-value>pre</keyword-value>
-    </keyword-def>
-    <keyword-def name="purple">
-        <keyword-value>purple</keyword-value>
-    </keyword-def>
-    <keyword-def name="red">
-        <keyword-value>red</keyword-value>
-    </keyword-def>
-    <keyword-def name="repeat">
-        <keyword-value>repeat</keyword-value>
-    </keyword-def>
-    <keyword-def name="repeat-x">
-        <keyword-value>repeat-x</keyword-value>
-    </keyword-def>
-    <keyword-def name="repeat-y">
-        <keyword-value>repeat-y</keyword-value>
-    </keyword-def>
-    <keyword-def name="ridge">
-        <keyword-value>ridge</keyword-value>
-    </keyword-def>
-    <keyword-def name="right">
-        <keyword-value>right</keyword-value>
-    </keyword-def>
-    <keyword-def name="sans-serif">
-        <keyword-value>sans-serif</keyword-value>
-    </keyword-def>
-    <keyword-def name="scroll">
-        <keyword-value>scroll</keyword-value>
-    </keyword-def>
-    <keyword-def name="serif">
-        <keyword-value>serif</keyword-value>
-    </keyword-def>
-    <keyword-def name="silver">
-        <keyword-value>silver</keyword-value>
-    </keyword-def>
-    <keyword-def name="small">
-        <keyword-value>small</keyword-value>
-    </keyword-def>
-    <keyword-def name="small-caps">
-        <keyword-value>small-caps</keyword-value>
-    </keyword-def>
-    <keyword-def name="smaller">
-        <keyword-value>smaller</keyword-value>
-    </keyword-def>
-    <keyword-def name="solid">
-        <keyword-value>solid</keyword-value>
-    </keyword-def>
-    <keyword-def name="square">
-        <keyword-value>square</keyword-value>
-    </keyword-def>
-    <keyword-def name="sub">
-        <keyword-value>sub</keyword-value>
-    </keyword-def>
-    <keyword-def name="super">
-        <keyword-value>super</keyword-value>
-    </keyword-def>
-    <keyword-def name="teal">
-        <keyword-value>teal</keyword-value>
-    </keyword-def>
-    <keyword-def name="text-top">
-        <keyword-value>text-top</keyword-value>
-    </keyword-def>
-    <keyword-def name="text-bottom">
-        <keyword-value>text-bottom</keyword-value>
-    </keyword-def>
-    <keyword-def name="thick">
-        <keyword-value>thick</keyword-value>
-    </keyword-def>
-    <keyword-def name="thin">
-        <keyword-value>thin</keyword-value>
-    </keyword-def>
-    <keyword-def name="top">
-        <keyword-value>top</keyword-value>
-    </keyword-def>
-    <keyword-def name="transparent">
-        <keyword-value>transparent</keyword-value>
-    </keyword-def>
-    <keyword-def name="underline">
-        <keyword-value>underline</keyword-value>
-    </keyword-def>
-    <keyword-def name="upper-alpha">
-        <keyword-value>upper-alpha</keyword-value>
-    </keyword-def>
-    <keyword-def name="upper-roman">
-        <keyword-value>upper-roman</keyword-value>
-    </keyword-def>
-    <keyword-def name="uppercase">
-        <keyword-value>uppercase</keyword-value>
-    </keyword-def>
-    <keyword-def name="white">
-        <keyword-value>white</keyword-value>
-    </keyword-def>
-    <keyword-def name="x-large">
-        <keyword-value>x-large</keyword-value>
-    </keyword-def>
-    <keyword-def name="x-small">
-        <keyword-value>x-small</keyword-value>
-    </keyword-def>
-    <keyword-def name="xx-small">
-        <keyword-value>xx-small</keyword-value>
-    </keyword-def>
-    <keyword-def name="xx-large">
-        <keyword-value>xx-large</keyword-value>
-    </keyword-def>
-    <keyword-def name="yellow">
-        <keyword-value>yellow</keyword-value>
-    </keyword-def>
-</css-profile>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-css2.xml b/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-css2.xml
deleted file mode 100644
index 4efc084..0000000
--- a/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-css2.xml
+++ /dev/null
@@ -1,2258 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--<!DOCTYPE css-profile SYSTEM "css-profile.dtd" >-->
-<css-profile>
-	<stylesheet-def>
-		<description>%css2.stylesheet-def.description</description>
-		<charset-rule/>
-		<import-rule/>
-		<page-rule/>
-		<media-rule/>
-		<fontface-rule/>
-		<style-rule/>
-	</stylesheet-def>
-
-	<charset-rule-def>
-	</charset-rule-def>
-	<import-rule-def>
-	</import-rule-def>
-	<media-rule-def>
-	</media-rule-def>
-
-	<page-rule-def>
-		<pseudo-class name="left"/>
-		<pseudo-class name="right"/>
-		<pseudo-class name="first"/>
-		<property name="size"/>
-		<property name="marks"/>
-		<property name="page-break-after"/>
-		<property name="page-break-before"/>
-		<property name="page-break-inside"/>
-		<property name="orphans"/>
-		<property name="widows"/>
-	</page-rule-def>
-
-	<fontface-rule-def>
-		<descriptor name="ascent"/>
-		<descriptor name="baseline"/>
-		<descriptor name="bbox"/>
-		<descriptor name="cap-height"/>
-		<descriptor name="centerline"/>
-		<descriptor name="definition-src"/>
-		<descriptor name="descent"/>
-		<descriptor name="font-family"/>
-		<descriptor name="font-size"/>
-		<descriptor name="font-stretch"/>
-		<descriptor name="font-style"/>
-		<descriptor name="font-variant"/>
-		<descriptor name="font-weight"/>
-		<descriptor name="mathline"/>
-		<descriptor name="panose-1"/>
-		<descriptor name="slope"/>
-		<descriptor name="slope"/>
-		<descriptor name="src"/>
-		<descriptor name="stemh"/>
-		<descriptor name="stemv"/>
-		<descriptor name="topline"/>
-		<descriptor name="unicode-range"/>
-		<descriptor name="units-per-em"/>
-		<descriptor name="widths"/>
-		<descriptor name="x-height"/>
-	</fontface-rule-def>
-
-	<!-- Which properties can style rule include ? -->
-
-	<style-rule-def>
-		<selector-expression name="descendant"/>
-		<selector-expression name="child"/>
-		<selector-expression name="adjacent"/>
-		<selector-expression name="universal"/>
-		<selector-expression name="attribute"/>
-		<pseudo-element name="first-line"/>
-		<pseudo-element name="first-letter"/>
-		<pseudo-element name="before"/>
-		<pseudo-element name="after"/>
-		<pseudo-class name="first-child"/>
-		<pseudo-class name="link"/>
-		<pseudo-class name="visited"/>
-		<pseudo-class name="hover"/>
-		<pseudo-class name="active"/>
-		<pseudo-class name="focus"/>
-		<pseudo-class name="lang"/>
-		<property name="azimuth"/>
-		<property name="background"/>
-		<property name="background-attachment"/>
-		<property name="background-color"/>
-		<property name="background-image"/>
-		<property name="background-position"/>
-		<property name="background-repeat"/>
-		<property name="border"/>
-		<property name="border-collapse"/>
-		<property name="border-color"/>
-		<property name="border-spacing"/>
-		<property name="border-style"/>
-		<property name="border-top"/>
-		<property name="border-right"/>
-		<property name="border-bottom"/>
-		<property name="border-left"/>
-		<property name="border-top-color"/>
-		<property name="border-right-color"/>
-		<property name="border-bottom-color"/>
-		<property name="border-left-color"/>
-		<property name="border-top-style"/>
-		<property name="border-right-style"/>
-		<property name="border-bottom-style"/>
-		<property name="border-left-style"/>
-		<property name="border-top-width"/>
-		<property name="border-right-width"/>
-		<property name="border-bottom-width"/>
-		<property name="border-left-width"/>
-		<property name="border-width"/>
-		<property name="bottom"/>
-		<property name="caption-side"/>
-		<property name="clear"/>
-		<property name="clip"/>
-		<property name="color"/>
-		<property name="content"/>
-		<property name="counter-increment"/>
-		<property name="counter-reset"/>
-		<property name="cue"/>
-		<property name="cue-after"/>
-		<property name="cue-before"/>
-		<property name="cursor"/>
-		<property name="direction"/>
-		<property name="display"/>
-		<property name="elevation"/>
-		<property name="empty-cells"/>
-		<property name="float"/>
-		<property name="font"/>
-		<property name="font-family"/>
-		<property name="font-size"/>
-		<property name="font-size-adjust"/>
-		<property name="font-stretch"/>
-		<property name="font-style"/>
-		<property name="font-variant"/>
-		<property name="font-weight"/>
-		<property name="height"/>
-		<property name="left"/>
-		<property name="letter-spacing"/>
-		<property name="line-height"/>
-		<property name="list-style"/>
-		<property name="list-style-image"/>
-		<property name="list-style-position"/>
-		<property name="list-style-type"/>
-		<property name="margin"/>
-		<property name="margin-top"/>
-		<property name="margin-right"/>
-		<property name="margin-bottom"/>
-		<property name="margin-left"/>
-		<property name="marker-offset"/>
-		<property name="marks"/>
-		<property name="max-height"/>
-		<property name="max-width"/>
-		<property name="min-height"/>
-		<property name="min-width"/>
-		<property name="orphans"/>
-		<property name="outline"/>
-		<property name="outline-color"/>
-		<property name="outline-style"/>
-		<property name="outline-width"/>
-		<property name="overflow"/>
-		<property name="padding"/>
-		<property name="padding-top"/>
-		<property name="padding-right"/>
-		<property name="padding-bottom"/>
-		<property name="padding-left"/>
-		<property name="page"/>
-		<property name="page-break-after"/>
-		<property name="page-break-before"/>
-		<property name="page-break-inside"/>
-		<property name="pause"/>
-		<property name="pause-after"/>
-		<property name="pause-before"/>
-		<property name="pitch"/>
-		<property name="pitch-range"/>
-		<property name="play-during"/>
-		<property name="position"/>
-		<property name="quotes"/>
-		<property name="richness"/>
-		<property name="right"/>
-		<property name="size"/>
-		<property name="speak"/>
-		<property name="speak-header"/>
-		<property name="speak-numeral"/>
-		<property name="speak-punctuation"/>
-		<property name="speech-rate"/>
-		<property name="stress"/>
-		<property name="table-layout"/>
-		<property name="text-align"/>
-		<property name="text-decoration"/>
-		<property name="text-indent"/>
-		<property name="text-shadow"/>
-		<property name="text-transform"/>
-		<property name="top"/>
-		<property name="unicode-bidi"/>
-		<property name="vertical-align"/>
-		<property name="visibility"/>
-		<property name="voice-family"/>
-		<property name="volume"/>
-		<property name="white-space"/>
-		<property name="widows"/>
-		<property name="width"/>
-		<property name="word-spacing"/>
-		<property name="z-index"/>
-	</style-rule-def>
-
-	<pseudo-class-def name="first-child">
-		<selector-value>first-child</selector-value>
-	</pseudo-class-def>
-	<pseudo-class-def name="link">
-		<selector-value>link</selector-value>
-	</pseudo-class-def>
-	<pseudo-class-def name="visited">
-		<selector-value>visited</selector-value>
-	</pseudo-class-def>
-	<pseudo-class-def name="hover">
-		<selector-value>hover</selector-value>
-	</pseudo-class-def>
-	<pseudo-class-def name="active">
-		<selector-value>active</selector-value>
-	</pseudo-class-def>
-	<pseudo-class-def name="focus">
-		<selector-value>focus</selector-value>
-	</pseudo-class-def>
-	<pseudo-class-def name="lang">
-		<selector-value>lang</selector-value>
-	</pseudo-class-def>
-	<pseudo-class-def name="left">
-		<selector-value>left</selector-value>
-	</pseudo-class-def>
-	<pseudo-class-def name="right">
-		<selector-value>right</selector-value>
-	</pseudo-class-def>
-	<pseudo-class-def name="first">
-		<selector-value>first</selector-value>
-	</pseudo-class-def>
-
-	<pseudo-element-def name="first-line">
-		<selector-value>first-line</selector-value>
-	</pseudo-element-def>
-	<pseudo-element-def name="first-letter">
-		<selector-value>first-letter</selector-value>
-	</pseudo-element-def>
-	<pseudo-element-def name="before">
-		<selector-value>before</selector-value>
-	</pseudo-element-def>
-	<pseudo-element-def name="after">
-		<selector-value>after</selector-value>
-	</pseudo-element-def>
-
-	<!-- property definition -->
-
-	<property-def name="azimuth"
-		inherited="yes" mediagroup="aural" category="aural">
-        <description>This provides spatial audio property for aural
-        presentation</description>
-        <number name="angle"/>
-        <keyword name="left-side"/>
-        <keyword name="far-left"/>
-        <keyword name="left"/>
-        <keyword name="center-left"/>
-        <keyword name="center"/>
-        <keyword name="center-right"/>
-        <keyword name="right"/>
-        <keyword name="far-right"/>
-        <keyword name="right-side"/>
-        <keyword name="behind"/>
-        <keyword name="leftwards"/>
-        <keyword name="rightwards"/>
-        <keyword name="inherit"/>
-    </property-def>
-    <property-def name="background"
-		inherited="no" mediagroup="visual" category="colorandbackground">
-        <property name="background-color"/>
-        <property name="background-image"/>
-        <property name="background-repeat"/>
-        <property name="background-attachment"/>
-        <property name="background-position"/>
-        <keyword name="inherit"/>
-    </property-def>
-    <property-def name="background-attachment"
-		inherited="no" mediagroup="visual" category="colorandbackground">
-        <keyword name="scroll"/>
-        <keyword name="fixed"/>
-        <keyword name="inherit"/>
-    </property-def>
-    <property-def name="background-color"
-		inherited="no" mediagroup="visual" category="colorandbackground">
-        <container name="color"/>
-        <keyword name="transparent"/>
-        <keyword name="inherit"/>
-    </property-def>
-    <property-def name="background-image"
-		inherited="no" mediagroup="visual" category="colorandbackground">
-        <function name="uri"/>
-        <keyword name="none"/>
-        <keyword name="inherit"/>
-    </property-def>
-	<property-def name="background-position"
-		inherited="no" mediagroup="visual" category="colorandbackground">
-		<number name="percentage"/>
-		<number name="length"/>
-		<keyword name="top"/>
-		<keyword name="center"/>
-		<keyword name="bottom"/>
-		<keyword name="left"/>
-		<keyword name="right"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="background-repeat"
-		inherited="no" mediagroup="visual" category="colorandbackground">
-		<keyword name="repeat"/>
-		<keyword name="repeat-x"/>
-		<keyword name="repeat-y"/>
-		<keyword name="no-repeat"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border"
-		inherited="no" mediagroup="visual" category="box">
-		<property name="border-width"/>
-		<property name="border-style"/>
-		<container name="color"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-collapse"
-		inherited="yes" mediagroup="visual" category="tables">
-		<keyword name="collapse"/>
-		<keyword name="separate"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-color"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="color"/>
-		<keyword name="transparent"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-spacing"
-		inherited="yes" mediagroup="visual" category="tables">
-		<number name="length"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-style"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="border-style"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-top"
-		inherited="no" mediagroup="visual" category="box">
-		<property name="border-top-width"/>
-		<property name="border-style"/>
-		<container name="color"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-right"
-		inherited="no" mediagroup="visual" category="box">
-		<property name="border-right-width"/>
-		<property name="border-style"/>
-		<container name="color"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-bottom"
-		inherited="no" mediagroup="visual" category="box">
-		<property name="border-bottom-width"/>
-		<property name="border-style"/>
-		<container name="color"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-left"
-		inherited="no" mediagroup="visual" category="box">
-		<property name="border-left-width"/>
-		<property name="border-style"/>
-		<container name="color"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-top-color"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="color"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-right-color"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="color"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-bottom-color"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="color"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-left-color"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="color"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-top-style"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="border-style"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-right-style"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="border-style"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-bottom-style"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="border-style"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-left-style"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="border-style"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-top-width"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="border-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-right-width"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="border-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-bottom-width"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="border-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-left-width"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="border-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="border-width"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="border-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="bottom"
-		inherited="no" mediagroup="visual" category="visual">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="auto"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="caption-side"
-		inherited="yes" mediagroup="visual" category="tables">
-		<keyword name="top"/>
-		<keyword name="bottom"/>
-		<keyword name="left"/>
-		<keyword name="right"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="clear"
-		inherited="no" mediagroup="visual" category="visual">
-		<keyword name="none"/>
-		<keyword name="left"/>
-		<keyword name="right"/>
-		<keyword name="both"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="clip"
-		inherited="no" mediagroup="visual" category="visual">
-		<container name="shape"/>
-		<keyword name="auto"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="color"
-		inherited="yes" mediagroup="visual" category="colorandbackground">
-		<container name="color"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="content"
-		inherited="no" mediagroup="all" category="content">
-		<string name="any"/>
-		<function name="uri"/>
-		<function name="counter"/>
-		<function name="attr"/>
-		<keyword name="open-quote"/>
-		<keyword name="close-quote"/>
-		<keyword name="no-open-quote"/>
-		<keyword name="no-close-quote"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="counter-increment"
-		inherited="no" mediagroup="all" category="content">
-		<string name="counter-identifier"/>
-		<number name="integer"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="counter-reset"
-		inherited="no" mediagroup="all" category="content">
-		<string name="counter-identifier"/>
-		<number name="integer"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="cue"
-		inherited="no" mediagroup="aural" category="aural">
-		<property name="cue-before"/>
-		<property name="cue-after"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="cue-after"
-		inherited="no" mediagroup="aural" category="aural">
-		<function name="uri"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="cue-before"
-		inherited="no" mediagroup="aural" category="aural">
-		<function name="uri"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="cursor"
-		inherited="yes" mediagroup="visual,interactive" category="ui">
-		<function name="uri"/>
-		<keyword name="auto"/>
-		<keyword name="crosshair"/>
-		<keyword name="default"/>
-		<keyword name="pointer"/>
-		<keyword name="move"/>
-		<keyword name="e-resize"/>
-		<keyword name="ne-resize"/>
-		<keyword name="nw-resize"/>
-		<keyword name="n-resize"/>
-		<keyword name="se-resize"/>
-		<keyword name="sw-resize"/>
-		<keyword name="s-resize"/>
-		<keyword name="w-resize"/>
-		<keyword name="text"/>
-		<keyword name="wait"/>
-		<keyword name="help"/>
-		<keyword name="inherit"/>
-		<separator name="comma"/>
-	</property-def>
-	<property-def name="direction"
-		inherited="yes" mediagroup="visual" category="visual">
-		<keyword name="ltr"/>
-		<keyword name="rtl"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="display"
-		inherited="no" mediagroup="all" category="visual">
-		<keyword name="inline"/>
-		<keyword name="block"/>
-		<keyword name="list-item"/>
-		<keyword name="run-in"/>
-		<keyword name="compact"/>
-		<keyword name="marker"/>
-		<keyword name="table"/>
-		<keyword name="inline-table"/>
-		<keyword name="table-row-group"/>
-		<keyword name="table-header-group"/>
-		<keyword name="table-footer-group"/>
-		<keyword name="table-row"/>
-		<keyword name="table-column-group"/>
-		<keyword name="table-column"/>
-		<keyword name="table-cell"/>
-		<keyword name="table-caption"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="elevation"
-		inherited="yes" mediagroup="aural" category="aural">
-		<number name="angle"/>
-		<keyword name="below"/>
-		<keyword name="level"/>
-		<keyword name="above"/>
-		<keyword name="higher"/>
-		<keyword name="lower"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="empty-cells"
-		inherited="yes" mediagroup="visual" category="tables">
-		<keyword name="show"/>
-		<keyword name="hide"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="float"
-		inherited="no" mediagroup="visual" category="visual">
-		<keyword name="left"/>
-		<keyword name="right"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="font"
-		inherited="yes" mediagroup="visual" category="font">
-		<property name="font-style"/>
-		<property name="font-variant"/>
-		<property name="font-weight"/>
-		<property name="font-size"/>
-		<property name="line-height"/>
-		<property name="font-family"/>
-		<keyword name="caption"/>
-		<keyword name="icon"/>
-		<keyword name="menu"/>
-		<keyword name="message-box"/>
-		<keyword name="small-caption"/>
-		<keyword name="status-bar"/>
-		<keyword name="inherit"/>
-		<separator name="slash"/>
-	</property-def>
-	<property-def name="font-family"
-		inherited="yes" mediagroup="visual" category="font">
-		<string name="family-name"/>
-		<container name="generic-family"/>
-		<keyword name="inherit"/>
-		<separator name="comma"/>
-	</property-def>
-	<property-def name="font-size"
-		inherited="yes" mediagroup="visual" category="font">
-		<container name="absolute-size"/>
-		<container name="relative-size"/>
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="font-size-adjust"
-		inherited="yes" mediagroup="visual" category="font">
-		<number name="number"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="font-stretch"
-		inherited="yes" mediagroup="visual" category="font">
-		<keyword name="normal"/>
-		<keyword name="wider"/>
-		<keyword name="narrower"/>
-		<keyword name="ultra-condensed"/>
-		<keyword name="extra-condensed"/>
-		<keyword name="condensed"/>
-		<keyword name="semi-condensed"/>
-		<keyword name="semi-expanded"/>
-		<keyword name="expanded"/>
-		<keyword name="extra-expanded"/>
-		<keyword name="ultra-expanded"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="font-style"
-		inherited="yes" mediagroup="visual" category="font">
-		<keyword name="normal"/>
-		<keyword name="italic"/>
-		<keyword name="oblique"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="font-variant"
-		inherited="yes" mediagroup="visual" category="font">
-		<keyword name="normal"/>
-		<keyword name="small-caps"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="font-weight"
-		inherited="yes" mediagroup="visual" category="font">
-		<keyword name="normal"/>
-		<keyword name="bold"/>
-		<keyword name="bolder"/>
-		<keyword name="lighter"/>
-		<keyword name="100"/>
-		<keyword name="200"/>
-		<keyword name="300"/>
-		<keyword name="400"/>
-		<keyword name="500"/>
-		<keyword name="600"/>
-		<keyword name="700"/>
-		<keyword name="800"/>
-		<keyword name="900"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="height"
-		inherited="no" mediagroup="visual" category="visual">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="auto"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="left"
-		inherited="no" mediagroup="visual" category="visual">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="auto"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="letter-spacing"
-		inherited="yes" mediagroup="visual" category="text">
-		<keyword name="normal"/>
-		<number name="length"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="line-height"
-		inherited="yes" mediagroup="visual" category="visual">
-		<keyword name="normal"/>
-		<number name="number"/>
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="list-style"
-		inherited="yes" mediagroup="visual" category="content">
-		<property name="list-style-type"/>
-		<property name="list-style-position"/>
-		<property name="list-style-image"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="list-style-image"
-		inherited="yes" mediagroup="visual" category="content">
-		<function name="uri"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="list-style-position"
-		inherited="yes" mediagroup="visual" category="content">
-		<keyword name="inside"/>
-		<keyword name="outside"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="list-style-type"
-		inherited="yes" mediagroup="visual" category="content">
-		<keyword name="disc"/>
-		<keyword name="circle"/>
-		<keyword name="square"/>
-		<keyword name="decimal"/>
-		<keyword name="decimal-leading-zero"/>
-		<keyword name="lower-roman"/>
-		<keyword name="upper-roman"/>
-		<keyword name="lower-greek"/>
-		<keyword name="lower-alpha"/>
-		<keyword name="lower-latin"/>
-		<keyword name="upper-alpha"/>
-		<keyword name="upper-latin"/>
-		<keyword name="hebrew"/>
-		<keyword name="armenian"/>
-		<keyword name="georgian"/>
-		<keyword name="cjk-ideographic"/>
-		<keyword name="hiragana"/>
-		<keyword name="katakana"/>
-		<keyword name="hiragana-iroha"/>
-		<keyword name="katakana-iroha"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="margin"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="margin-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="margin-top"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="margin-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="margin-right"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="margin-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="margin-bottom"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="margin-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="margin-left"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="margin-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="marker-offset"
-		inherited="no" mediagroup="visual" category="content">
-		<number name="length"/>
-		<keyword name="auto"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="marks"
-		inherited="na" mediagroup="visual,paged" category="page">
-		<keyword name="crop"/>
-		<keyword name="cross"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="max-height"
-		inherited="no" mediagroup="visual" category="visual">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="max-width"
-		inherited="no" mediagroup="visual" category="visual">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="min-height"
-		inherited="no" mediagroup="visual" category="visual">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="min-width"
-		inherited="no" mediagroup="visual" category="visual">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="orphans"
-		inherited="yes" mediagroup="visual,paged" category="page">
-		<number name="integer"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="outline"
-		inherited="no" mediagroup="visual,interactive" category="ui">
-		<property name="outline-color"/>
-		<property name="outline-style"/>
-		<property name="outline-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="outline-color"
-		inherited="no" mediagroup="visual,interactive" category="ui">
-		<container name="color"/>
-		<keyword name="invert"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="outline-style"
-		inherited="no" mediagroup="visual,interactive" category="ui">
-		<container name="border-style"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="outline-width"
-		inherited="no" mediagroup="visual,interactive" category="ui">
-		<container name="border-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="overflow"
-		inherited="no" mediagroup="visual" category="visual">
-		<keyword name="visible"/>
-		<keyword name="hidden"/>
-		<keyword name="scroll"/>
-		<keyword name="auto"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="padding"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="padding-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="padding-top"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="padding-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="padding-right"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="padding-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="padding-bottom"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="padding-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="padding-left"
-		inherited="no" mediagroup="visual" category="box">
-		<container name="padding-width"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="page"
-		inherited="yes" mediagroup="visual,paged" category="page">
-		<string name="page-identifier"/>
-		<keyword name="auto"/>
-	</property-def>
-	<property-def name="page-break-after"
-		inherited="no" mediagroup="visual,paged" category="page">
-		<keyword name="auto"/>
-		<keyword name="always"/>
-		<keyword name="avoid"/>
-		<keyword name="left"/>
-		<keyword name="right"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="page-break-before"
-		inherited="no" mediagroup="visual,paged" category="page">
-		<keyword name="auto"/>
-		<keyword name="always"/>
-		<keyword name="avoid"/>
-		<keyword name="left"/>
-		<keyword name="right"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="page-break-inside"
-		inherited="yes" mediagroup="visual,paged" category="page">
-		<keyword name="avoid"/>
-		<keyword name="auto"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="pause"
-		inherited="no" mediagroup="aural" category="aural">
-		<number name="time"/>
-		<number name="percentage"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="pause-after"
-		inherited="no" mediagroup="aural" category="aural">
-		<number name="time"/>
-		<number name="percentage"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="pause-before"
-		inherited="no" mediagroup="aural" category="aural">
-		<number name="time"/>
-		<number name="percentage"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="pitch"
-		inherited="yes" mediagroup="aural" category="aural">
-		<number name="frequency"/>
-		<keyword name="x-low"/>
-		<keyword name="low"/>
-		<keyword name="medium"/>
-		<keyword name="high"/>
-		<keyword name="x-high"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="pitch-range"
-		inherited="yes" mediagroup="aural" category="aural">
-		<number name="number"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="play-during"
-		inherited="no" mediagroup="aural" category="aural">
-		<function name="uri"/>
-		<keyword name="mix"/>
-		<keyword name="repeat"/>
-		<keyword name="auto"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="position"
-		inherited="no" mediagroup="visual" category="visual">
-		<keyword name="static"/>
-		<keyword name="relative"/>
-		<keyword name="absolute"/>
-		<keyword name="fixed"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="quotes"
-		inherited="yes" mediagroup="visual" category="content">
-		<string name="any"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="richness"
-		inherited="yes" mediagroup="aural" category="aural">
-		<number name="number"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="right"
-		inherited="no" mediagroup="visual" category="visual">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="auto"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="size"
-		inherited="na" mediagroup="visual,paged" category="page">
-		<number name="length"/>
-		<keyword name="auto"/>
-		<keyword name="portrait"/>
-		<keyword name="landscape"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="speak"
-		inherited="yes" mediagroup="aural" category="aural">
-		<keyword name="normal"/>
-		<keyword name="none"/>
-		<keyword name="spell-out"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="speak-header"
-		inherited="yes" mediagroup="aural" category="tables">
-		<keyword name="once"/>
-		<keyword name="always"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="speak-numeral"
-		inherited="yes" mediagroup="aural" category="aural">
-		<keyword name="digits"/>
-		<keyword name="continuous"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="speak-punctuation"
-		inherited="yes" mediagroup="aural" category="aural">
-		<keyword name="code"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="speech-rate"
-		inherited="yes" mediagroup="aural" category="aural">
-		<number name="number"/>
-		<keyword name="x-slow"/>
-		<keyword name="slow"/>
-		<keyword name="medium"/>
-		<keyword name="fast"/>
-		<keyword name="x-fast"/>
-		<keyword name="faster"/>
-		<keyword name="slower"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="stress"
-		inherited="yes" mediagroup="aural" category="aural">
-		<number name="number"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="table-layout"
-		inherited="no" mediagroup="visual" category="tables">
-		<keyword name="auto"/>
-		<keyword name="fixed"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="text-align"
-		inherited="yes" mediagroup="visual" category="text">
-		<keyword name="left"/>
-		<keyword name="right"/>
-		<keyword name="center"/>
-		<keyword name="justify"/>
-		<string name="any"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="text-decoration"
-		inherited="no" mediagroup="visual" category="text">
-		<keyword name="none"/>
-		<keyword name="underline"/>
-		<keyword name="overline"/>
-		<keyword name="line-through"/>
-		<keyword name="blink"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="text-indent"
-		inherited="yes" mediagroup="visual" category="text">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="text-shadow"
-		inherited="no" mediagroup="visual" category="text">
-		<keyword name="none"/>
-		<container name="color"/>
-		<number name="length"/>
-		<keyword name="inherit"/>
-		<separator name="comma"/>
-	</property-def>
-	<property-def name="text-transform"
-		inherited="yes" mediagroup="visual" category="text">
-		<keyword name="capitalize"/>
-		<keyword name="uppercase"/>
-		<keyword name="lowercase"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="top"
-		inherited="no" mediagroup="visual" category="visual">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="auto"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="unicode-bidi"
-		inherited="no" mediagroup="visual" category="visual">
-		<keyword name="normal"/>
-		<keyword name="embed"/>
-		<keyword name="bidi-override"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="vertical-align"
-		inherited="no" mediagroup="visual" category="visual">
-		<keyword name="baseline"/>
-		<keyword name="sub"/>
-		<keyword name="super"/>
-		<keyword name="top"/>
-		<keyword name="text-top"/>
-		<keyword name="middle"/>
-		<keyword name="bottom"/>
-		<keyword name="text-bottom"/>
-		<number name="percentage"/>
-		<number name="length"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="visibility"
-		inherited="no" mediagroup="visual" category="visual">
-		<keyword name="visible"/>
-		<keyword name="hidden"/>
-		<keyword name="collapse"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="voice-family"
-		inherited="yes" mediagroup="aural" category="aural">
-		<string name="specific-voice"/>
-		<container name="generic-voice"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="volume"
-		inherited="yes" mediagroup="aural" category="aural">
-		<number name="number"/>
-		<number name="percentage"/>
-		<keyword name="silent"/>
-		<keyword name="x-soft"/>
-		<keyword name="soft"/>
-		<keyword name="medium"/>
-		<keyword name="loud"/>
-		<keyword name="x-loud"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="white-space"
-		inherited="yes" mediagroup="visual" category="text">
-		<keyword name="normal"/>
-		<keyword name="pre"/>
-		<keyword name="nowrap"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="widows"
-		inherited="yes" mediagroup="visual,paged" category="page">
-		<number name="integer"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="width"
-		inherited="no" mediagroup="visual" category="visual">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="auto"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="word-spacing"
-		inherited="yes" mediagroup="visual" category="text">
-		<keyword name="normal"/>
-		<number name="length"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="z-index"
-		inherited="no" mediagroup="visual" category="visual">
-		<keyword name="auto"/>
-		<number name="integer"/>
-		<keyword name="inherit"/>
-	</property-def>
-
-	<!-- descriptor definition : These are for @font-face -->
-
-	<descriptor-def name="ascent">
-		<number name="number"/>
-	</descriptor-def>
-	<descriptor-def name="baseline">
-		<number name="number"/>
-	</descriptor-def>
-	<descriptor-def name="bbox">
-		<number name="number"/>
-		<separator name="comma"/>
-	</descriptor-def>
-	<descriptor-def name="cap-height">
-		<number name="number"/>
-	</descriptor-def>
-	<descriptor-def name="centerline">
-		<number name="number"/>
-	</descriptor-def>
-	<descriptor-def name="definition-src">
-		<function name="uri"/>
-	</descriptor-def>
-	<descriptor-def name="descent">
-		<number name="number"/>
-	</descriptor-def>
-	<descriptor-def name="font-family">
-		<string name="family-name"/>
-		<container name="generic-family"/>
-		<separator name="comma"/>
-	</descriptor-def>
-	<descriptor-def name="font-size">
-		<keyword name="all"/>
-		<number name="length"/>
-		<separator name="comma"/>
-	</descriptor-def>
-	<descriptor-def name="font-stretch">
-		<keyword name="all"/>
-		<keyword name="normal"/>
-		<keyword name="ultra-condensed"/>
-		<keyword name="extra-condensed"/>
-		<keyword name="condensed"/>
-		<keyword name="semi-condensed"/>
-		<keyword name="semi-expanded"/>
-		<keyword name="expanded"/>
-		<keyword name="extra-expanded"/>
-		<keyword name="ultra-expanded"/>
-		<separator name="comma"/>
-	</descriptor-def>
-	<descriptor-def name="font-style">
-		<keyword name="all"/>
-		<keyword name="normal"/>
-		<keyword name="italic"/>
-		<keyword name="oblique"/>
-		<separator name="comma"/>
-	</descriptor-def>
-	<descriptor-def name="font-variant">
-		<keyword name="normal"/>
-		<keyword name="small-caps"/>
-		<separator name="comma"/>
-	</descriptor-def>
-	<descriptor-def name="font-weight">
-		<keyword name="all"/>
-		<keyword name="normal"/>
-		<keyword name="bold"/>
-		<keyword name="100"/>
-		<keyword name="200"/>
-		<keyword name="300"/>
-		<keyword name="400"/>
-		<keyword name="500"/>
-		<keyword name="600"/>
-		<keyword name="700"/>
-		<keyword name="800"/>
-		<keyword name="900"/>
-		<separator name="comma"/>
-	</descriptor-def>
-	<descriptor-def name="mathline">
-		<number name="number"/>
-	</descriptor-def>
-	<descriptor-def name="panose-1">
-		<number name="integer"/>
-	</descriptor-def>
-	<descriptor-def name="slope">
-		<number name="number"/>
-	</descriptor-def>
-	<descriptor-def name="src">
-		<function name="uri"/>
-		<function name="format"/>
-		<container name="font-face-name"/>
-	</descriptor-def>
-	<descriptor-def name="stemh">
-		<number name="number"/>
-	</descriptor-def>
-	<descriptor-def name="stemv">
-		<number name="number"/>
-	</descriptor-def>
-	<descriptor-def name="topline">
-		<number name="number"/>
-	</descriptor-def>
-	<descriptor-def name="unicode-range">
-		<string name="urange"/>
-	</descriptor-def>
-	<descriptor-def name="units-per-em">
-		<number name="number"/>
-	</descriptor-def>
-	<descriptor-def name="widths">
-		<string name="urange"/>
-		<number name="length"/>
-	</descriptor-def>
-	<descriptor-def name="x-height">
-		<number name="number"/>
-	</descriptor-def>
-
-	<!-- container definition : Container is the lump of values.
-	It can be used like macros. -->
-    <container-def name="absolute-size">
-        <keyword name="xx-small"/>
-        <keyword name="x-small"/>
-        <keyword name="small"/>
-        <keyword name="medium"/>
-        <keyword name="large"/>
-        <keyword name="x-large"/>
-        <keyword name="xx-large"/>
-    </container-def>
-    <container-def name="border-style">
-        <keyword name="none"/>
-        <keyword name="hidden"/>
-        <keyword name="dotted"/>
-        <keyword name="dashed"/>
-        <keyword name="solid"/>
-        <keyword name="double"/>
-        <keyword name="groove"/>
-        <keyword name="ridge"/>
-        <keyword name="inset"/>
-        <keyword name="outset"/>
-    </container-def>
-    <container-def name="border-width">
-        <keyword name="thin"/>
-        <keyword name="medium"/>
-        <keyword name="thick"/>
-        <number name="length"/>
-    </container-def>
-	<container-def name="color">
-		<keyword name="aqua"/>
-		<keyword name="black"/>
-		<keyword name="blue"/>
-		<keyword name="fuchsia"/>
-		<keyword name="gray"/>
-		<keyword name="green"/>
-		<keyword name="lime"/>
-		<keyword name="maroon"/>
-		<keyword name="navy"/>
-		<keyword name="olive"/>
-		<keyword name="purple"/>
-		<keyword name="red"/>
-		<keyword name="silver"/>
-		<keyword name="teal"/>
-		<keyword name="white"/>
-		<keyword name="yellow"/>
-		<container name="system-color"/>
-		<function name="rgb"/>
-		<number name="hash"/>
-	</container-def>
-	<container-def name="generic-family">
-		<keyword name="serif"/>
-		<keyword name="sans-serif"/>
-		<keyword name="cursive"/>
-		<keyword name="fantasy"/>
-		<keyword name="monospace"/>
-	</container-def>
-	<container-def name="font-face-name">
-		<function name="local"/>
-	</container-def>
-	<container-def name="generic-voice">
-		<keyword name="male"/>
-		<keyword name="female"/>
-		<keyword name="child"/>
-	</container-def>
-	<container-def name="margin-width">
-		<number name="length"/>
-		<number name="percentage"/>
-		<keyword name="auto"/>
-	</container-def>
-	<container-def name="padding-width">
-		<number name="length"/>
-		<number name="percentage"/>
-	</container-def>
-	<container-def name="relative-size">
-		<keyword name="smaller"/>
-		<keyword name="larger"/>
-	</container-def>
-	<container-def name="shape">
-		<function name="rect"/>
-	</container-def>
-	<container-def name="system-color">
-		<keyword name="ActiveBorder"/>
-		<keyword name="ActiveCaption"/>
-		<keyword name="AppWorkspace"/>
-		<keyword name="Background"/>
-		<keyword name="ButtonFace"/>
-		<keyword name="ButtonHighlight"/>
-		<keyword name="ButtonShadow"/>
-		<keyword name="ButtonText"/>
-		<keyword name="CaptionText"/>
-		<keyword name="GrayText"/>
-		<keyword name="Highlight"/>
-		<keyword name="HighlightText"/>
-		<keyword name="InactiveBorder"/>
-		<keyword name="InactiveCaption"/>
-		<keyword name="InactiveCaptionText"/>
-		<keyword name="InfoBackground"/>
-		<keyword name="InfoText"/>
-		<keyword name="Menu"/>
-		<keyword name="MenuText"/>
-		<keyword name="Scrollbar"/>
-		<keyword name="ThreeDDarkShadow"/>
-		<keyword name="ThreeDFace"/>
-		<keyword name="ThreeDHighlight"/>
-		<keyword name="ThreeDLightShadow"/>
-		<keyword name="ThreeDShadow"/>
-		<keyword name="Window"/>
-		<keyword name="WindowFrame"/>
-		<keyword name="WindowText"/>
-	</container-def>
-
-	<!-- category definition : This is used to categorize properties
-	in Properties View. -->
-	<category-def name="aural">
-		<caption>%css2.category-def.aural.caption</caption>
-	</category-def>
-	<category-def name="box">
-		<caption>%css2.category-def.box.caption</caption>
-	</category-def>
-	<category-def name="colorandbackground">
-		<caption>%css2.category-def.colorandbackground.caption</caption>
-	</category-def>
-	<category-def name="content">
-		<caption>%css2.category-def.content.caption</caption>
-	</category-def>
-	<category-def name="font">
-		<caption>%css2.category-def.font.caption</caption>
-	</category-def>
-	<category-def name="page">
-		<caption>%css2.category-def.page.caption</caption>
-	</category-def>
-	<category-def name="tables">
-		<caption>%css2.category-def.tables.caption</caption>
-	</category-def>
-	<category-def name="text">
-		<caption>%css2.category-def.text.caption</caption>
-	</category-def>
-	<category-def name="ui">
-		<caption>%css2.category-def.ui.caption</caption>
-	</category-def>
-	<category-def name="visual">
-<!--		<caption>%css2.category-def.visual.caption</caption>-->
-		<caption>%css2.category-def.visual.caption</caption>
-	</category-def>
-	
-	<!-- function definition -->
-	<function-def name="attr">
-		<function-value>attr</function-value>
-	</function-def>
-	<function-def name="counter">
-		<function-value>counter</function-value>
-	</function-def>
-	<function-def name="rect">
-		<function-value>rect</function-value>
-	</function-def>
-	<function-def name="rgb">
-		<function-value>rgb</function-value>
-	</function-def>
-	<function-def name="uri">
-		<function-value>url</function-value>
-	</function-def>
-	<function-def name="format">
-		<function-value>format</function-value>
-	</function-def>
-	<function-def name="local">
-		<function-value>local</function-value>
-	</function-def>
-
-	<!-- number definition : What unit types be acceptable for each
-	number type? -->
-    <number-def name="angle">
-        <unit name="deg"/>
-        <unit name="grad"/>
-        <unit name="rad"/>
-    </number-def>
-    <number-def name="frequency">
-        <unit name="hz"/>
-        <unit name="khz"/>
-    </number-def>
-    <number-def name="hash">
-        <unit name="hash"/>
-    </number-def>
-	<number-def name="integer">
-	</number-def>
-    <number-def name="length">
-        <unit name="em"/>
-        <unit name="ex"/>
-        <unit name="px"/>
-        <unit name="in"/>
-        <unit name="cm"/>
-        <unit name="mm"/>
-        <unit name="pt"/>
-        <unit name="pc"/>
-    </number-def>
-	<number-def name="number">
-	</number-def>
-	<number-def name="percentage">
-		<unit name="percentage"/>
-	</number-def>
-	<number-def name="time">
-		<unit name="ms"/>
-		<unit name="s"/>
-	</number-def>
-
-	<unit-def name="cm">
-		<unit-value>cm</unit-value>
-	</unit-def>
-	<unit-def name="deg">
-		<unit-value>deg</unit-value>
-	</unit-def>
-	<unit-def name="em">
-		<unit-value>em</unit-value>
-	</unit-def>
-	<unit-def name="ex">
-		<unit-value>ex</unit-value>
-	</unit-def>
-	<unit-def name="grad">
-		<unit-value>grad</unit-value>
-	</unit-def>
-	<unit-def name="hash">
-		<unit-value>#</unit-value>
-	</unit-def>
-	<unit-def name="hz">
-		<unit-value>Hz</unit-value>
-	</unit-def>
-	<unit-def name="in">
-		<unit-value>in</unit-value>
-	</unit-def>
-	<unit-def name="khz">
-		<unit-value>kHz</unit-value>
-	</unit-def>
-	<unit-def name="mm">
-		<unit-value>mm</unit-value>
-	</unit-def>
-	<unit-def name="ms">
-		<unit-value>ms</unit-value>
-	</unit-def>
-	<unit-def name="pc">
-		<unit-value>pc</unit-value>
-	</unit-def>
-	<unit-def name="percentage">
-		<unit-value>%</unit-value>
-	</unit-def>
-	<unit-def name="pt">
-		<unit-value>pt</unit-value>
-	</unit-def>
-	<unit-def name="px">
-		<unit-value>px</unit-value>
-	</unit-def>
-	<unit-def name="rad">
-		<unit-value>rad</unit-value>
-	</unit-def>
-	<unit-def name="s">
-		<unit-value>s</unit-value>
-	</unit-def>
-
-    <!-- keywords : string constants (this is last part..) -->
-    <keyword-def name="100">
-        <keyword-value>100</keyword-value>
-    </keyword-def>
-    <keyword-def name="200">
-        <keyword-value>200</keyword-value>
-    </keyword-def>
-    <keyword-def name="300">
-        <keyword-value>300</keyword-value>
-    </keyword-def>
-    <keyword-def name="400">
-        <keyword-value>400</keyword-value>
-    </keyword-def>
-    <keyword-def name="500">
-        <keyword-value>500</keyword-value>
-    </keyword-def>
-    <keyword-def name="600">
-        <keyword-value>600</keyword-value>
-    </keyword-def>
-    <keyword-def name="700">
-        <keyword-value>700</keyword-value>
-    </keyword-def>
-    <keyword-def name="800">
-        <keyword-value>800</keyword-value>
-    </keyword-def>
-    <keyword-def name="900">
-        <keyword-value>900</keyword-value>
-    </keyword-def>
-    <keyword-def name="above">
-        <keyword-value>above</keyword-value>
-    </keyword-def>
-    <keyword-def name="absolute">
-        <keyword-value>absolute</keyword-value>
-    </keyword-def>
-    <keyword-def name="ActiveBorder">
-        <keyword-value>ActiveBorder</keyword-value>
-    </keyword-def>
-    <keyword-def name="ActiveCaption">
-        <keyword-value>ActiveCaption</keyword-value>
-    </keyword-def>
-    <keyword-def name="all">
-        <keyword-value>all</keyword-value>
-    </keyword-def>
-    <keyword-def name="always">
-        <keyword-value>always</keyword-value>
-    </keyword-def>
-    <keyword-def name="AppWorkspace">
-        <keyword-value>AppWorkspace</keyword-value>
-    </keyword-def>
-    <keyword-def name="aqua">
-        <keyword-value>aqua</keyword-value>
-    </keyword-def>
-    <keyword-def name="armenian">
-        <keyword-value>armenian</keyword-value>
-    </keyword-def>
-    <keyword-def name="auto">
-        <keyword-value>auto</keyword-value>
-    </keyword-def>
-    <keyword-def name="avoid">
-        <keyword-value>avoid</keyword-value>
-    </keyword-def>
-    <keyword-def name="Background">
-        <keyword-value>Background</keyword-value>
-    </keyword-def>
-    <keyword-def name="baseline">
-        <keyword-value>baseline</keyword-value>
-    </keyword-def>
-    <keyword-def name="behind">
-        <keyword-value>behind</keyword-value>
-    </keyword-def>
-    <keyword-def name="below">
-        <keyword-value>below</keyword-value>
-    </keyword-def>
-    <keyword-def name="bidi-override">
-        <keyword-value>bidi-override</keyword-value>
-    </keyword-def>
-    <keyword-def name="black">
-        <keyword-value>black</keyword-value>
-    </keyword-def>
-    <keyword-def name="blink">
-        <keyword-value>blink</keyword-value>
-    </keyword-def>
-    <keyword-def name="block">
-        <keyword-value>block</keyword-value>
-    </keyword-def>
-    <keyword-def name="blue">
-        <keyword-value>blue</keyword-value>
-    </keyword-def>
-    <keyword-def name="bold">
-        <keyword-value>bold</keyword-value>
-    </keyword-def>
-    <keyword-def name="bolder">
-        <keyword-value>bolder</keyword-value>
-    </keyword-def>
-    <keyword-def name="both">
-        <keyword-value>both</keyword-value>
-    </keyword-def>
-    <keyword-def name="bottom">
-        <keyword-value>bottom</keyword-value>
-    </keyword-def>
-    <keyword-def name="ButtonFace">
-        <keyword-value>ButtonFace</keyword-value>
-    </keyword-def>
-    <keyword-def name="ButtonHighlight">
-        <keyword-value>ButtonHighlight</keyword-value>
-    </keyword-def>
-    <keyword-def name="ButtonShadow">
-        <keyword-value>ButtonShadow</keyword-value>
-    </keyword-def>
-    <keyword-def name="ButtonText">
-        <keyword-value>ButtonText</keyword-value>
-    </keyword-def>
-    <keyword-def name="capitalize">
-        <keyword-value>capitalize</keyword-value>
-    </keyword-def>
-    <keyword-def name="caption">
-        <keyword-value>caption</keyword-value>
-    </keyword-def>
-    <keyword-def name="CaptionText">
-        <keyword-value>CaptionText</keyword-value>
-    </keyword-def>
-    <keyword-def name="center">
-        <keyword-value>center</keyword-value>
-    </keyword-def>
-    <keyword-def name="center-left">
-        <keyword-value>center-left</keyword-value>
-    </keyword-def>
-    <keyword-def name="center-right">
-        <keyword-value>center-right</keyword-value>
-    </keyword-def>
-    <keyword-def name="child">
-        <keyword-value>child</keyword-value>
-    </keyword-def>
-    <keyword-def name="circle">
-        <keyword-value>circle</keyword-value>
-    </keyword-def>
-    <keyword-def name="cjk-ideographic">
-        <keyword-value>cjk-ideographic</keyword-value>
-    </keyword-def>
-    <keyword-def name="close-quote">
-        <keyword-value>close-quote</keyword-value>
-    </keyword-def>
-    <keyword-def name="code">
-        <keyword-value>code</keyword-value>
-    </keyword-def>
-    <keyword-def name="condensed">
-        <keyword-value>condensed</keyword-value>
-    </keyword-def>
-    <keyword-def name="collapse">
-        <keyword-value>collapse</keyword-value>
-    </keyword-def>
-    <keyword-def name="compact">
-        <keyword-value>compact</keyword-value>
-    </keyword-def>
-    <keyword-def name="continuous">
-        <keyword-value>continuous</keyword-value>
-    </keyword-def>
-    <keyword-def name="crop">
-        <keyword-value>crop</keyword-value>
-    </keyword-def>
-    <keyword-def name="cross">
-        <keyword-value>cross</keyword-value>
-    </keyword-def>
-    <keyword-def name="crosshair">
-        <keyword-value>crosshair</keyword-value>
-    </keyword-def>
-    <keyword-def name="cursive">
-        <keyword-value>cursive</keyword-value>
-    </keyword-def>
-    <keyword-def name="dashed">
-        <keyword-value>dashed</keyword-value>
-    </keyword-def>
-    <keyword-def name="decimal">
-        <keyword-value>decimal</keyword-value>
-    </keyword-def>
-    <keyword-def name="decimal-leading-zero">
-        <keyword-value>decimal-leading-zero</keyword-value>
-    </keyword-def>
-    <keyword-def name="default">
-        <keyword-value>default</keyword-value>
-    </keyword-def>
-    <keyword-def name="digits">
-        <keyword-value>digits</keyword-value>
-    </keyword-def>
-    <keyword-def name="disc">
-        <keyword-value>disc</keyword-value>
-    </keyword-def>
-    <keyword-def name="dotted">
-        <keyword-value>dotted</keyword-value>
-    </keyword-def>
-    <keyword-def name="double">
-        <keyword-value>double</keyword-value>
-    </keyword-def>
-    <keyword-def name="e-resize">
-        <keyword-value>e-resize</keyword-value>
-    </keyword-def>
-    <keyword-def name="embed">
-        <keyword-value>embed</keyword-value>
-    </keyword-def>
-    <keyword-def name="expanded">
-        <keyword-value>expanded</keyword-value>
-    </keyword-def>
-    <keyword-def name="extra-condensed">
-        <keyword-value>extra-condensed</keyword-value>
-    </keyword-def>
-    <keyword-def name="extra-expanded">
-        <keyword-value>extra-expanded</keyword-value>
-    </keyword-def>
-    <keyword-def name="fantasy">
-        <keyword-value>fantasy</keyword-value>
-    </keyword-def>
-    <keyword-def name="far-left">
-        <keyword-value>far-left</keyword-value>
-    </keyword-def>
-    <keyword-def name="far-right">
-        <keyword-value>far-right</keyword-value>
-    </keyword-def>
-    <keyword-def name="fast">
-        <keyword-value>fast</keyword-value>
-    </keyword-def>
-    <keyword-def name="faster">
-        <keyword-value>faster</keyword-value>
-    </keyword-def>
-    <keyword-def name="female">
-        <keyword-value>female</keyword-value>
-    </keyword-def>
-    <keyword-def name="fixed">
-        <keyword-value>fixed</keyword-value>
-    </keyword-def>
-    <keyword-def name="fuchsia">
-        <keyword-value>fuchsia</keyword-value>
-    </keyword-def>
-    <keyword-def name="georgian">
-        <keyword-value>georgian</keyword-value>
-    </keyword-def>
-    <keyword-def name="gray">
-        <keyword-value>gray</keyword-value>
-    </keyword-def>
-    <keyword-def name="GrayText">
-        <keyword-value>GrayText</keyword-value>
-    </keyword-def>
-    <keyword-def name="green">
-        <keyword-value>green</keyword-value>
-    </keyword-def>
-    <keyword-def name="groove">
-        <keyword-value>groove</keyword-value>
-    </keyword-def>
-    <keyword-def name="hebrew">
-        <keyword-value>hebrew</keyword-value>
-    </keyword-def>
-    <keyword-def name="help">
-        <keyword-value>help</keyword-value>
-    </keyword-def>
-    <keyword-def name="hidden">
-        <keyword-value>hidden</keyword-value>
-    </keyword-def>
-    <keyword-def name="hide">
-        <keyword-value>hide</keyword-value>
-    </keyword-def>
-    <keyword-def name="high">
-        <keyword-value>high</keyword-value>
-    </keyword-def>
-    <keyword-def name="Highlight">
-        <keyword-value>Highlight</keyword-value>
-    </keyword-def>
-    <keyword-def name="HighlightText">
-        <keyword-value>HighlightText</keyword-value>
-    </keyword-def>
-    <keyword-def name="higher">
-        <keyword-value>higher</keyword-value>
-    </keyword-def>
-    <keyword-def name="hiragana">
-        <keyword-value>hiragana</keyword-value>
-    </keyword-def>
-    <keyword-def name="hiragana-iroha">
-        <keyword-value>hiragana-iroha</keyword-value>
-    </keyword-def>
-    <keyword-def name="icon">
-        <keyword-value>icon</keyword-value>
-    </keyword-def>
-    <keyword-def name="InactiveBorder">
-        <keyword-value>InactiveBorder</keyword-value>
-    </keyword-def>
-    <keyword-def name="InactiveCaption">
-        <keyword-value>InactiveCaption</keyword-value>
-    </keyword-def>
-    <keyword-def name="InactiveCaptionText">
-        <keyword-value>InactiveCaptionText</keyword-value>
-    </keyword-def>
-    <keyword-def name="InfoBackground">
-        <keyword-value>InfoBackground</keyword-value>
-    </keyword-def>
-    <keyword-def name="InfoText">
-        <keyword-value>InfoText</keyword-value>
-    </keyword-def>
-    <keyword-def name="inherit">
-        <keyword-value>inherit</keyword-value>
-    </keyword-def>
-    <keyword-def name="inline">
-        <keyword-value>inline</keyword-value>
-    </keyword-def>
-    <keyword-def name="inline-table">
-        <keyword-value>inline-table</keyword-value>
-    </keyword-def>
-    <keyword-def name="inset">
-        <keyword-value>inset</keyword-value>
-    </keyword-def>
-    <keyword-def name="inside">
-        <keyword-value>inside</keyword-value>
-    </keyword-def>
-    <keyword-def name="invert">
-        <keyword-value>invert</keyword-value>
-    </keyword-def>
-    <keyword-def name="italic">
-        <keyword-value>italic</keyword-value>
-    </keyword-def>
-    <keyword-def name="justify">
-        <keyword-value>justify</keyword-value>
-    </keyword-def>
-    <keyword-def name="katakana">
-        <keyword-value>katakana</keyword-value>
-    </keyword-def>
-    <keyword-def name="katakana-iroha">
-        <keyword-value>katakana-iroha</keyword-value>
-    </keyword-def>
-    <keyword-def name="landscape">
-        <keyword-value>landscape</keyword-value>
-    </keyword-def>
-    <keyword-def name="large">
-        <keyword-value>large</keyword-value>
-    </keyword-def>
-    <keyword-def name="larger">
-        <keyword-value>larger</keyword-value>
-    </keyword-def>
-    <keyword-def name="left">
-        <keyword-value>left</keyword-value>
-    </keyword-def>
-    <keyword-def name="left-side">
-        <keyword-value>left-side</keyword-value>
-    </keyword-def>
-    <keyword-def name="leftwards">
-        <keyword-value>leftwards</keyword-value>
-    </keyword-def>
-    <keyword-def name="level">
-        <keyword-value>level</keyword-value>
-    </keyword-def>
-    <keyword-def name="lighter">
-        <keyword-value>lighter</keyword-value>
-    </keyword-def>
-    <keyword-def name="lime">
-        <keyword-value>lime</keyword-value>
-    </keyword-def>
-    <keyword-def name="line-through">
-        <keyword-value>line-through</keyword-value>
-    </keyword-def>
-    <keyword-def name="list-item">
-        <keyword-value>list-item</keyword-value>
-    </keyword-def>
-    <keyword-def name="loud">
-        <keyword-value>loud</keyword-value>
-    </keyword-def>
-    <keyword-def name="low">
-        <keyword-value>low</keyword-value>
-    </keyword-def>
-    <keyword-def name="lower">
-        <keyword-value>lower</keyword-value>
-    </keyword-def>
-    <keyword-def name="lower-alpha">
-        <keyword-value>lower-alpha</keyword-value>
-    </keyword-def>
-    <keyword-def name="lower-greek">
-        <keyword-value>lower-greek</keyword-value>
-    </keyword-def>
-    <keyword-def name="lower-latin">
-        <keyword-value>lower-latin</keyword-value>
-    </keyword-def>
-    <keyword-def name="lower-roman">
-        <keyword-value>lower-roman</keyword-value>
-    </keyword-def>
-    <keyword-def name="lowercase">
-        <keyword-value>lowercase</keyword-value>
-    </keyword-def>
-    <keyword-def name="ltr">
-        <keyword-value>ltr</keyword-value>
-    </keyword-def>
-    <keyword-def name="male">
-        <keyword-value>male</keyword-value>
-    </keyword-def>
-    <keyword-def name="marker">
-        <keyword-value>marker</keyword-value>
-    </keyword-def>
-    <keyword-def name="maroon">
-        <keyword-value>maroon</keyword-value>
-    </keyword-def>
-    <keyword-def name="medium">
-        <keyword-value>medium</keyword-value>
-    </keyword-def>
-    <keyword-def name="Menu">
-        <keyword-value>Menu</keyword-value>
-    </keyword-def>
-    <keyword-def name="MenuText">
-        <keyword-value>MenuText</keyword-value>
-    </keyword-def>
-    <keyword-def name="message-box">
-        <keyword-value>message-box</keyword-value>
-    </keyword-def>
-    <keyword-def name="middle">
-        <keyword-value>middle</keyword-value>
-    </keyword-def>
-    <keyword-def name="mix">
-        <keyword-value>mix</keyword-value>
-    </keyword-def>
-    <keyword-def name="monospace">
-        <keyword-value>monospace</keyword-value>
-    </keyword-def>
-    <keyword-def name="move">
-        <keyword-value>move</keyword-value>
-    </keyword-def>
-    <keyword-def name="n-resize">
-        <keyword-value>n-resize</keyword-value>
-    </keyword-def>
-    <keyword-def name="narrower">
-        <keyword-value>narrower</keyword-value>
-    </keyword-def>
-    <keyword-def name="navy">
-        <keyword-value>navy</keyword-value>
-    </keyword-def>
-    <keyword-def name="ne-resize">
-        <keyword-value>ne-resize</keyword-value>
-    </keyword-def>
-    <keyword-def name="no-close-quote">
-        <keyword-value>no-close-quote</keyword-value>
-    </keyword-def>
-    <keyword-def name="no-open-quote">
-        <keyword-value>no-open-quote</keyword-value>
-    </keyword-def>
-    <keyword-def name="no-repeat">
-        <keyword-value>no-repeat</keyword-value>
-    </keyword-def>
-    <keyword-def name="none">
-        <keyword-value>none</keyword-value>
-    </keyword-def>
-    <keyword-def name="normal">
-        <keyword-value>normal</keyword-value>
-    </keyword-def>
-    <keyword-def name="nowrap">
-        <keyword-value>nowrap</keyword-value>
-    </keyword-def>
-    <keyword-def name="nw-resize">
-        <keyword-value>nw-resize</keyword-value>
-    </keyword-def>
-    <keyword-def name="oblique">
-        <keyword-value>oblique</keyword-value>
-    </keyword-def>
-    <keyword-def name="olive">
-        <keyword-value>olive</keyword-value>
-    </keyword-def>
-    <keyword-def name="once">
-        <keyword-value>once</keyword-value>
-    </keyword-def>
-    <keyword-def name="open-quote">
-        <keyword-value>open-quote</keyword-value>
-    </keyword-def>
-    <keyword-def name="outset">
-        <keyword-value>outset</keyword-value>
-    </keyword-def>
-    <keyword-def name="outside">
-        <keyword-value>outside</keyword-value>
-    </keyword-def>
-    <keyword-def name="overline">
-        <keyword-value>overline</keyword-value>
-    </keyword-def>
-    <keyword-def name="pointer">
-        <keyword-value>pointer</keyword-value>
-    </keyword-def>
-    <keyword-def name="portrait">
-        <keyword-value>portrait</keyword-value>
-    </keyword-def>
-    <keyword-def name="pre">
-        <keyword-value>pre</keyword-value>
-    </keyword-def>
-    <keyword-def name="purple">
-        <keyword-value>purple</keyword-value>
-    </keyword-def>
-    <keyword-def name="red">
-        <keyword-value>red</keyword-value>
-    </keyword-def>
-    <keyword-def name="relative">
-        <keyword-value>relative</keyword-value>
-    </keyword-def>
-    <keyword-def name="repeat">
-        <keyword-value>repeat</keyword-value>
-    </keyword-def>
-    <keyword-def name="repeat-x">
-        <keyword-value>repeat-x</keyword-value>
-    </keyword-def>
-    <keyword-def name="repeat-y">
-        <keyword-value>repeat-y</keyword-value>
-    </keyword-def>
-    <keyword-def name="ridge">
-        <keyword-value>ridge</keyword-value>
-    </keyword-def>
-    <keyword-def name="right">
-        <keyword-value>right</keyword-value>
-    </keyword-def>
-    <keyword-def name="right-side">
-        <keyword-value>right-side</keyword-value>
-    </keyword-def>
-    <keyword-def name="rightwards">
-        <keyword-value>rightwards</keyword-value>
-    </keyword-def>
-    <keyword-def name="rtl">
-        <keyword-value>rtl</keyword-value>
-    </keyword-def>
-    <keyword-def name="run-in">
-        <keyword-value>run-in</keyword-value>
-    </keyword-def>
-    <keyword-def name="s-resize">
-        <keyword-value>s-resize</keyword-value>
-    </keyword-def>
-    <keyword-def name="sans-serif">
-        <keyword-value>sans-serif</keyword-value>
-    </keyword-def>
-    <keyword-def name="scroll">
-        <keyword-value>scroll</keyword-value>
-    </keyword-def>
-    <keyword-def name="Scrollbar">
-        <keyword-value>Scrollbar</keyword-value>
-    </keyword-def>
-    <keyword-def name="se-resize">
-        <keyword-value>se-resize</keyword-value>
-    </keyword-def>
-    <keyword-def name="semi-condensed">
-        <keyword-value>semi-condensed</keyword-value>
-    </keyword-def>
-    <keyword-def name="semi-expanded">
-        <keyword-value>semi-expanded</keyword-value>
-    </keyword-def>
-    <keyword-def name="separate">
-        <keyword-value>separate</keyword-value>
-    </keyword-def>
-    <keyword-def name="serif">
-        <keyword-value>serif</keyword-value>
-    </keyword-def>
-    <keyword-def name="show">
-        <keyword-value>show</keyword-value>
-    </keyword-def>
-    <keyword-def name="silent">
-        <keyword-value>silent</keyword-value>
-    </keyword-def>
-    <keyword-def name="silver">
-        <keyword-value>silver</keyword-value>
-    </keyword-def>
-    <keyword-def name="slow">
-        <keyword-value>slow</keyword-value>
-    </keyword-def>
-    <keyword-def name="slower">
-        <keyword-value>slower</keyword-value>
-    </keyword-def>
-    <keyword-def name="small">
-        <keyword-value>small</keyword-value>
-    </keyword-def>
-    <keyword-def name="small-caps">
-        <keyword-value>small-caps</keyword-value>
-    </keyword-def>
-    <keyword-def name="small-caption">
-        <keyword-value>small-caption</keyword-value>
-    </keyword-def>
-    <keyword-def name="smaller">
-        <keyword-value>smaller</keyword-value>
-    </keyword-def>
-    <keyword-def name="soft">
-        <keyword-value>soft</keyword-value>
-    </keyword-def>
-    <keyword-def name="solid">
-        <keyword-value>solid</keyword-value>
-    </keyword-def>
-    <keyword-def name="spell-out">
-        <keyword-value>spell-out</keyword-value>
-    </keyword-def>
-    <keyword-def name="square">
-        <keyword-value>square</keyword-value>
-    </keyword-def>
-    <keyword-def name="static">
-        <keyword-value>static</keyword-value>
-    </keyword-def>
-    <keyword-def name="status-bar">
-        <keyword-value>status-bar</keyword-value>
-    </keyword-def>
-    <keyword-def name="sub">
-        <keyword-value>sub</keyword-value>
-    </keyword-def>
-    <keyword-def name="super">
-        <keyword-value>super</keyword-value>
-    </keyword-def>
-    <keyword-def name="sw-resize">
-        <keyword-value>sw-resize</keyword-value>
-    </keyword-def>
-    <keyword-def name="table">
-        <keyword-value>table</keyword-value>
-    </keyword-def>
-    <keyword-def name="table-caption">
-        <keyword-value>table-caption</keyword-value>
-    </keyword-def>
-    <keyword-def name="table-cell">
-        <keyword-value>table-cell</keyword-value>
-    </keyword-def>
-    <keyword-def name="table-column">
-        <keyword-value>table-column</keyword-value>
-    </keyword-def>
-    <keyword-def name="table-column-group">
-        <keyword-value>table-column-group</keyword-value>
-    </keyword-def>
-    <keyword-def name="table-footer-group">
-        <keyword-value>table-footer-group</keyword-value>
-    </keyword-def>
-    <keyword-def name="table-header-group">
-        <keyword-value>table-header-group</keyword-value>
-    </keyword-def>
-    <keyword-def name="table-row">
-        <keyword-value>table-row</keyword-value>
-    </keyword-def>
-    <keyword-def name="table-row-group">
-        <keyword-value>table-row-group</keyword-value>
-    </keyword-def>
-    <keyword-def name="teal">
-        <keyword-value>teal</keyword-value>
-    </keyword-def>
-    <keyword-def name="text">
-        <keyword-value>text</keyword-value>
-    </keyword-def>
-    <keyword-def name="text-top">
-        <keyword-value>text-top</keyword-value>
-    </keyword-def>
-    <keyword-def name="text-bottom">
-        <keyword-value>text-bottom</keyword-value>
-    </keyword-def>
-    <keyword-def name="thick">
-        <keyword-value>thick</keyword-value>
-    </keyword-def>
-    <keyword-def name="thin">
-        <keyword-value>thin</keyword-value>
-    </keyword-def>
-    <keyword-def name="ThreeDDarkShadow">
-        <keyword-value>ThreeDDarkShadow</keyword-value>
-    </keyword-def>
-    <keyword-def name="ThreeDFace">
-        <keyword-value>ThreeDFace</keyword-value>
-    </keyword-def>
-    <keyword-def name="ThreeDHighlight">
-        <keyword-value>ThreeDHighlight</keyword-value>
-    </keyword-def>
-    <keyword-def name="ThreeDLightShadow">
-        <keyword-value>ThreeDLightShadow</keyword-value>
-    </keyword-def>
-    <keyword-def name="ThreeDShadow">
-        <keyword-value>ThreeDShadow</keyword-value>
-    </keyword-def>
-    <keyword-def name="top">
-        <keyword-value>top</keyword-value>
-    </keyword-def>
-    <keyword-def name="transparent">
-        <keyword-value>transparent</keyword-value>
-    </keyword-def>
-    <keyword-def name="ultra-condensed">
-        <keyword-value>ultra-condensed</keyword-value>
-    </keyword-def>
-    <keyword-def name="ultra-expanded">
-        <keyword-value>ultra-expanded</keyword-value>
-    </keyword-def>
-    <keyword-def name="underline">
-        <keyword-value>underline</keyword-value>
-    </keyword-def>
-    <keyword-def name="upper-alpha">
-        <keyword-value>upper-alpha</keyword-value>
-    </keyword-def>
-    <keyword-def name="upper-latin">
-        <keyword-value>upper-latin</keyword-value>
-    </keyword-def>
-    <keyword-def name="upper-roman">
-        <keyword-value>upper-roman</keyword-value>
-    </keyword-def>
-    <keyword-def name="uppercase">
-        <keyword-value>uppercase</keyword-value>
-    </keyword-def>
-    <keyword-def name="visible">
-        <keyword-value>visible</keyword-value>
-    </keyword-def>
-    <keyword-def name="w-resize">
-        <keyword-value>w-resize</keyword-value>
-    </keyword-def>
-    <keyword-def name="wait">
-        <keyword-value>wait</keyword-value>
-    </keyword-def>
-    <keyword-def name="white">
-        <keyword-value>white</keyword-value>
-    </keyword-def>
-    <keyword-def name="wider">
-        <keyword-value>wider</keyword-value>
-    </keyword-def>
-    <keyword-def name="Window">
-        <keyword-value>Window</keyword-value>
-    </keyword-def>
-    <keyword-def name="WindowFrame">
-        <keyword-value>WindowFrame</keyword-value>
-    </keyword-def>
-    <keyword-def name="WindowText">
-        <keyword-value>WindowText</keyword-value>
-    </keyword-def>
-    <keyword-def name="x-fast">
-        <keyword-value>x-fast</keyword-value>
-    </keyword-def>
-    <keyword-def name="x-high">
-        <keyword-value>x-high</keyword-value>
-    </keyword-def>
-    <keyword-def name="x-large">
-        <keyword-value>x-large</keyword-value>
-    </keyword-def>
-    <keyword-def name="x-loud">
-        <keyword-value>x-loud</keyword-value>
-    </keyword-def>
-    <keyword-def name="x-low">
-        <keyword-value>x-low</keyword-value>
-    </keyword-def>
-    <keyword-def name="x-slow">
-        <keyword-value>x-slow</keyword-value>
-    </keyword-def>
-    <keyword-def name="x-small">
-        <keyword-value>x-small</keyword-value>
-    </keyword-def>
-    <keyword-def name="x-soft">
-        <keyword-value>x-soft</keyword-value>
-    </keyword-def>
-    <keyword-def name="xx-small">
-        <keyword-value>xx-small</keyword-value>
-    </keyword-def>
-    <keyword-def name="xx-large">
-        <keyword-value>xx-large</keyword-value>
-    </keyword-def>
-    <keyword-def name="yellow">
-        <keyword-value>yellow</keyword-value>
-    </keyword-def>
-</css-profile>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-mobile1_0.xml b/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-mobile1_0.xml
deleted file mode 100644
index 73b6c12..0000000
--- a/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-mobile1_0.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--<!DOCTYPE css-profile SYSTEM "css-profile.dtd" >-->
-<css-profile>
-	<profile-import name="cssprofile-css2.xml"/>
-	<stylesheet-def>
-		<description>%mobile1_0.stylesheet-def.description</description>
-		<charset-rule/>
-		<import-rule/>
-		<media-rule/>
-		<style-rule/>
-	</stylesheet-def>
-
-	<!-- Which properties can style rule include ? -->
-	<!-- using "overwrite" method: only disabled properties are written. -->
-
-	<style-rule-def overwrite="true">
-		<selector-expression name="child" enabled="false"/>
-		<selector-expression name="adjacent" enabled="false"/>
-		<selector-expression name="attribute" enabled="false"/>
-		<pseudo-class name="first-child" enabled="false"/>
-		<pseudo-class name="link" enabled="false"/>
-		<pseudo-class name="active" enabled="false"/>
-		<pseudo-class name="lang" enabled="false"/>
-		<property name="azimuth" enabled="false"/>
-		<property name="border-collapse" enabled="false"/>
-		<property name="border-spacing" enabled="false"/>
-		<property name="bottom" enabled="false"/>
-		<property name="caption-side" enabled="false"/>
-		<property name="clip" enabled="false"/>
-		<property name="content" enabled="false"/>
-		<property name="counter-increment" enabled="false"/>
-		<property name="counter-reset" enabled="false"/>
-		<property name="cue" enabled="false"/>
-		<property name="cue-after" enabled="false"/>
-		<property name="cue-before" enabled="false"/>
-		<property name="cursor" enabled="false"/>
-		<property name="direction" enabled="false"/>
-		<property name="elevation" enabled="false"/>
-		<property name="empty-cells" enabled="false"/>
-		<property name="font-size-adjust" enabled="false"/>
-		<property name="font-stretch" enabled="false"/>
-		<property name="left" enabled="false"/>
-		<property name="letter-spacing" enabled="false"/>
-		<property name="line-height" enabled="false"/>
-		<property name="marker-offset" enabled="false"/>
-		<property name="marks" enabled="false"/>
-		<property name="max-height" enabled="false"/>
-		<property name="max-width" enabled="false"/>
-		<property name="min-height" enabled="false"/>
-		<property name="min-width" enabled="false"/>
-		<property name="orphans" enabled="false"/>
-		<property name="outline" enabled="false"/>
-		<property name="outline-color" enabled="false"/>
-		<property name="outline-style" enabled="false"/>
-		<property name="outline-width" enabled="false"/>
-		<property name="overflow" enabled="false"/>
-		<property name="page" enabled="false"/>
-		<property name="page-break-after" enabled="false"/>
-		<property name="page-break-before" enabled="false"/>
-		<property name="page-break-inside" enabled="false"/>
-		<property name="pause" enabled="false"/>
-		<property name="pause-after" enabled="false"/>
-		<property name="pause-before" enabled="false"/>
-		<property name="pitch" enabled="false"/>
-		<property name="pitch-range" enabled="false"/>
-		<property name="play-during" enabled="false"/>
-		<property name="position" enabled="false"/>
-		<property name="quotes" enabled="false"/>
-		<property name="richness" enabled="false"/>
-		<property name="right" enabled="false"/>
-		<property name="size" enabled="false"/>
-		<property name="speak" enabled="false"/>
-		<property name="speak-header" enabled="false"/>
-		<property name="speak-numeral" enabled="false"/>
-		<property name="speak-punctuation" enabled="false"/>
-		<property name="speech-rate" enabled="false"/>
-		<property name="stress" enabled="false"/>
-		<property name="table-layout" enabled="false"/>
-		<property name="text-shadow" enabled="false"/>
-		<property name="top" enabled="false"/>
-		<property name="unicode-bidi" enabled="false"/>
-		<property name="voice-family" enabled="false"/>
-		<property name="volume" enabled="false"/>
-		<property name="widows" enabled="false"/>
-		<property name="word-spacing" enabled="false"/>
-		<property name="z-index" enabled="false"/>
-	</style-rule-def>
-
-	<!-- property definition -->
-	<!-- using "redifine" method: if "overwrite" attribute is set to
-	"false"	or not set, it means the node is cleanly redifined -->
-
-    <property-def name="background-attachment"
-		inherited="no" mediagroup="visual" category="colorandbackground">
-        <keyword name="scroll"/>
-        <keyword name="inherit"/>
-    </property-def>
-	<property-def name="display"
-		inherited="no" mediagroup="all" category="visual">
-		<keyword name="inline"/>
-		<keyword name="block"/>
-		<keyword name="list-item"/>
-		<keyword name="none"/>
-	</property-def>
-	<property-def name="list-style-type"
-		inherited="yes" mediagroup="visual" category="content">
-		<keyword name="disc"/>
-		<keyword name="circle"/>
-		<keyword name="square"/>
-		<keyword name="decimal"/>
-		<keyword name="lower-roman"/>
-		<keyword name="upper-roman"/>
-		<keyword name="lower-greek"/>
-		<keyword name="lower-alpha"/>
-		<keyword name="upper-alpha"/>
-		<keyword name="none"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="text-align"
-		inherited="yes" mediagroup="visual" category="text">
-		<keyword name="left"/>
-		<keyword name="right"/>
-		<keyword name="center"/>
-		<keyword name="justify"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="text-decoration"
-		inherited="no" mediagroup="visual" category="text">
-		<keyword name="none"/>
-		<keyword name="underline"/>
-		<keyword name="inherit"/>
-	</property-def>
-	<property-def name="vertical-align"
-		inherited="no" mediagroup="visual" category="visual">
-		<keyword name="baseline"/>
-		<keyword name="sub"/>
-		<keyword name="super"/>
-		<keyword name="inherit"/>
-	</property-def>
-
-	<!-- container definition : Container is the lump of values.
-	It can be used like macros. -->
-	<container-def name="color" overwrite="true">
-		<container name="system-color" enabled="false"/>
-	</container-def>
-</css-profile>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-wap.xml b/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-wap.xml
deleted file mode 100644
index 241bca3..0000000
--- a/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-wap.xml
+++ /dev/null
@@ -1,618 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--<!DOCTYPE css-profile SYSTEM "css-profile.dtd" >-->
-<css-profile>
-        <profile-import name="cssprofile-css2.xml"/>
-        <stylesheet-def>
-                <description>%wap.stylesheet-def.description</description>
-                <charset-rule/>
-                <import-rule/>
-                <media-rule/>
-                <style-rule/>
-        </stylesheet-def>
-
-        <!-- Which properties can style rule include ? -->
-        <!-- using "overwrite" method: only disabled properties are written. -->
-
-        <style-rule-def overwrite="true">
-                <property name="azimuth" enabled="false"/>
-                <property name="border-collapse" enabled="false"/>
-                <property name="border-spacing" enabled="false"/>
-                <property name="bottom" enabled="false"/>
-                <property name="caption-side" enabled="false"/>
-                <property name="clip" enabled="false"/>
-                <property name="content" enabled="false"/>
-                <property name="cue" enabled="false"/>
-                <property name="cue-after" enabled="false"/>
-                <property name="cue-before" enabled="false"/>
-                <property name="cursor" enabled="false"/>
-                <property name="direction" enabled="false"/>
-                <property name="elevation" enabled="false"/>
-                <property name="empty-cells" enabled="false"/>
-                <property name="font-size-adjust" enabled="false"/>
-                <property name="font-stretch" enabled="false"/>
-                <property name="left" enabled="false"/>
-                <property name="letter-spacing" enabled="false"/>
-                <property name="line-height" enabled="false"/>
-                <property name="marker-offset" enabled="false"/>
-                <property name="marks" enabled="false"/>
-                <property name="max-height" enabled="false"/>
-                <property name="max-width" enabled="false"/>
-                <property name="min-height" enabled="false"/>
-                <property name="min-width" enabled="false"/>
-                <property name="orphans" enabled="false"/>
-                <property name="outline" enabled="false"/>
-                <property name="outline-color" enabled="false"/>
-                <property name="outline-style" enabled="false"/>
-                <property name="outline-width" enabled="false"/>
-                <property name="overflow" enabled="false"/>
-                <property name="page" enabled="false"/>
-                <property name="page-break-after" enabled="false"/>
-                <property name="page-break-before" enabled="false"/>
-                <property name="page-break-inside" enabled="false"/>
-                <property name="pause" enabled="false"/>
-                <property name="pause-after" enabled="false"/>
-                <property name="pause-before" enabled="false"/>
-                <property name="pitch" enabled="false"/>
-                <property name="pitch-range" enabled="false"/>
-                <property name="play-during" enabled="false"/>
-                <property name="position" enabled="false"/>
-                <property name="quotes" enabled="false"/>
-                <property name="richness" enabled="false"/>
-                <property name="right" enabled="false"/>
-                <property name="size" enabled="false"/>
-                <property name="speak" enabled="false"/>
-                <property name="speak-header" enabled="false"/>
-                <property name="speak-numeral" enabled="false"/>
-                <property name="speak-punctuation" enabled="false"/>
-                <property name="speech-rate" enabled="false"/>
-                <property name="stress" enabled="false"/>
-                <property name="table-layout" enabled="false"/>
-                <property name="text-shadow" enabled="false"/>
-                <property name="top" enabled="false"/>
-                <property name="unicode-bidi" enabled="false"/>
-                <property name="voice-family" enabled="false"/>
-                <property name="volume" enabled="false"/>
-                <property name="widows" enabled="false"/>
-                <property name="word-spacing" enabled="false"/>
-                <property name="z-index" enabled="false"/>
-                <property name="-wap-marquee-style"/>
-                <property name="-wap-marquee-loop"/>
-                <property name="-wap-marquee-dir"/>
-                <property name="-wap-marquee-speed"/>
-                <property name="-wap-accesskey"/>
-                <property name="-wap-input-format"/>
-                <property name="-wap-input-required"/>
-        </style-rule-def>
-
-        <!-- property definition -->
-        <!-- using "redifine" method: if "overwrite" attribute is set to
-        "false" or not set, it means the node is cleanly redifined -->
-
-        <property-def name="display"
-                inherited="no" mediagroup="all" category="visual">
-                <keyword name="inline"/>
-                <keyword name="block"/>
-                <keyword name="list-item"/>
-                <keyword name="-wap-marquee"/>
-                <keyword name="none"/>
-        </property-def>
-        <property-def name="list-style-type"
-                inherited="yes" mediagroup="visual" category="content">
-                <keyword name="disc"/>
-                <keyword name="circle"/>
-                <keyword name="square"/>
-                <keyword name="decimal"/>
-                <keyword name="lower-roman"/>
-                <keyword name="upper-roman"/>
-                <keyword name="lower-alpha"/>
-                <keyword name="upper-alpha"/>
-                <keyword name="none"/>
-                <keyword name="inherit"/>
-        </property-def>
-        <property-def name="text-align"
-                inherited="yes" mediagroup="visual" category="text">
-                <keyword name="left"/>
-                <keyword name="right"/>
-                <keyword name="center"/>
-                <keyword name="justify"/>
-                <keyword name="inherit"/>
-        </property-def>
-        <property-def name="text-decoration"
-                inherited="no" mediagroup="visual" category="text">
-                <keyword name="none"/>
-                <keyword name="underline"/>
-                <keyword name="blink"/>
-                <keyword name="inherit"/>
-        </property-def>
-        <property-def name="vertical-align"
-                inherited="no" mediagroup="visual" category="visual">
-                <keyword name="baseline"/>
-                <keyword name="sub"/>
-                <keyword name="super"/>
-                <keyword name="top"/>
-                <keyword name="middle"/>
-                <keyword name="bottom"/>
-                <keyword name="inherit"/>
-        </property-def>
-    <property-def name="-wap-marquee-style"
-                inherited="no" mediagroup="visual" category="wap">
-                <keyword name="scroll"/>
-                <keyword name="slide"/>
-                <keyword name="alternate"/>
-                <keyword name="inherit"/>
-        </property-def>
-    <property-def name="-wap-marquee-loop"
-                inherited="no" mediagroup="visual" category="wap">
-                <number name="integer"/>
-                <keyword name="infinite"/>
-                <keyword name="inherit"/>
-        </property-def>
-    <property-def name="-wap-marquee-dir"
-                inherited="no" mediagroup="visual" category="wap">
-                <keyword name="ltr"/>
-                <keyword name="rtl"/>
-                <keyword name="inherit"/>
-        </property-def>
-    <property-def name="-wap-marquee-speed"
-                inherited="no" mediagroup="visual" category="wap">
-                <keyword name="slow"/>
-                <keyword name="normal"/>
-                <keyword name="fast"/>
-                <keyword name="inherit"/>
-        </property-def>
-    <property-def name="-wap-accesskey"
-                inherited="no" mediagroup="interactive" category="wap">
-                <container name="keycombination"/>
-                <keyword name="inherit"/>
-        </property-def>
-    <property-def name="-wap-input-format"
-                inherited="no" mediagroup="interactive" category="wap">
-                <container name="format"/>
-                <keyword name="inherit"/>
-        </property-def>
-    <property-def name="-wap-input-required"
-                inherited="no" mediagroup="interactive" category="wap">
-                <keyword name="true"/>
-                <keyword name="false"/>
-                <keyword name="inherit"/>
-        </property-def>
-
-        <!-- container definition : Container is the lump of values.
-        It can be used like macros. -->
-        <container-def name="color" overwrite="true">
-                <container name="system-color" enabled="false"/>
-        </container-def>
-        <container-def name="format">
-                <string name="any"/>
-        </container-def>
-        <container-def name="keycombination">
-                <container name="key"/>
-                <keyword name="-"/>
-        </container-def>
-        <container-def name="key">
-                <keyword name="space"/>
-                <container name="specialkey"/>
-        </container-def>
-        <container-def name="specialkey">
-                <container name="modifierkey"/>
-                <container name="functionkey"/>
-                <container name="navigationkey"/>
-                <container name="editkey"/>
-                <container name="misckey"/>
-                <container name="volumecontrolkey"/>
-                <container name="applicationkey"/>
-                <container name="phonekey"/>
-                <container name="vendorkey"/>
-        </container-def>
-        <container-def name="modifierkey">
-                <keyword name="accesskey"/>
-                <container name="cmdkey"/>
-                <container name="optkey"/>
-                <container name="ctrlkey"/>
-                <container name="shiftkey"/>
-                <container name="altkey"/>
-                <container name="winkey"/>
-                <container name="metakey"/>
-                <keyword name="fn"/>
-                <keyword name="fcn"/>
-                <keyword name="caps"/>
-        </container-def>
-        <container-def name="cmdkey">
-                <keyword name="cmd"/>
-                <keyword name="rcmd"/>
-                <keyword name="lcmd"/>
-        </container-def>
-        <container-def name="optkey">
-                <keyword name="opt"/>
-                <keyword name="ropt"/>
-                <keyword name="lopt"/>
-        </container-def>
-        <container-def name="ctrlkey">
-                <keyword name="ctrl"/>
-                <keyword name="rctrl"/>
-                <keyword name="lctrl"/>
-        </container-def>
-        <container-def name="shiftkey">
-                <keyword name="shift"/>
-                <keyword name="rshift"/>
-                <keyword name="lshift"/>
-        </container-def>
-        <container-def name="altkey">
-                <keyword name="alt"/>
-                <keyword name="ralt"/>
-                <keyword name="lalt"/>
-        </container-def>
-        <container-def name="winkey">
-                <keyword name="win"/>
-                <keyword name="rwin"/>
-                <keyword name="lwin"/>
-        </container-def>
-        <container-def name="metakey">
-                <keyword name="meta"/>
-                <keyword name="rmeta"/>
-                <keyword name="lmeta"/>
-        </container-def>
-        <container-def name="functionkey">
-                <keyword name="f1"/>
-                <keyword name="f2"/>
-                <keyword name="f3"/>
-                <keyword name="f4"/>
-                <keyword name="f5"/>
-                <keyword name="f6"/>
-                <keyword name="f7"/>
-                <keyword name="f8"/>
-                <keyword name="f9"/>
-                <keyword name="f10"/>
-                <keyword name="f11"/>
-                <keyword name="f12"/>
-                <keyword name="f13"/>
-                <keyword name="f14"/>
-                <keyword name="f15"/>
-        </container-def>
-        <container-def name="navigationkey">
-                <keyword name="tab"/>
-                <keyword name="esc"/>
-                <keyword name="enter"/>
-                <keyword name="return"/>
-                <keyword name="menu"/>
-                <keyword name="help"/>
-                <keyword name="namemenu"/>
-                <keyword name="rcl"/>
-                <keyword name="snd"/>
-                <keyword name="arrowkey"/>
-                <keyword name="pagekey"/>
-        </container-def>
-        <container-def name="arrowkey">
-                <keyword name="up"/>
-                <keyword name="down"/>
-                <keyword name="left"/>
-                <keyword name="right"/>
-        </container-def>
-        <container-def name="pagekey">
-                <keyword name="home"/>
-                <keyword name="end"/>
-                <keyword name="pgup"/>
-                <keyword name="pgdn"/>
-        </container-def>
-        <container-def name="editkey">
-                <keyword name="bs"/>
-                <keyword name="del"/>
-                <keyword name="ins"/>
-                <keyword name="undo"/>
-                <keyword name="cut"/>
-                <keyword name="copy"/>
-                <keyword name="paste"/>
-                <keyword name="clr"/>
-                <keyword name="sto"/>
-        </container-def>
-        <container-def name="misckey">
-                <keyword name="prtsc"/>
-                <keyword name="sysrq"/>
-                <keyword name="scrlock"/>
-                <keyword name="pause"/>
-                <keyword name="brk"/>
-                <keyword name="numlock"/>
-                <keyword name="pwr"/>
-        </container-def>
-        <container-def name="volumecontrolkey">
-                <keyword name="volumeup"/>
-                <keyword name="volumedown"/>
-        </container-def>
-        <container-def name="applicationkey">
-                <keyword name="memo"/>
-                <keyword name="todo"/>
-                <keyword name="calendar"/>
-                <keyword name="mail"/>
-                <keyword name="address"/>
-        </container-def>
-        <container-def name="phonekey">
-                <keyword name="phone-send"/>
-                <keyword name="phone-end"/>
-                <keyword name="phone-accept"/>
-        </container-def>
-        <container-def name="vendorkey">
-                <keyword name="vnd."/>
-        </container-def>
-
-        <category-def name="wap">
-                <caption>%wap.category-def.wap.caption</caption>
-        </category-def>
-
-        <number-def name="length">
-        <unit name="em"/>
-        <unit name="ex"/>
-        <unit name="px"/>
-        </number-def>
-
-    <keyword-def name="-wap-marquee">
-        <keyword-value>-wap-marquee</keyword-value>
-    </keyword-def>
-        <keyword-def name="slide">
-                <keyword-value>slide</keyword-value>
-        </keyword-def>
-        <keyword-def name="alternate">
-                <keyword-value>alternate</keyword-value>
-        </keyword-def>
-        <keyword-def name="infinite">
-                <keyword-value>infinite</keyword-value>
-        </keyword-def>
-        <keyword-def name="-">
-                <keyword-value>-</keyword-value>
-        </keyword-def>
-        <keyword-def name="space">
-                <keyword-value>space</keyword-value>
-        </keyword-def>
-        <keyword-def name="accesskey">
-                <keyword-value>accesskey</keyword-value>
-        </keyword-def>
-        <keyword-def name="fn">
-                <keyword-value>fn</keyword-value>
-        </keyword-def>
-        <keyword-def name="fcn">
-                <keyword-value>fcn</keyword-value>
-        </keyword-def>
-        <keyword-def name="caps">
-                <keyword-value>caps</keyword-value>
-        </keyword-def>
-        <keyword-def name="cmd">
-                <keyword-value>cmd</keyword-value>
-        </keyword-def>
-        <keyword-def name="rcmd">
-                <keyword-value>rcmd</keyword-value>
-        </keyword-def>
-        <keyword-def name="lcmd">
-                <keyword-value>lcmd</keyword-value>
-        </keyword-def>
-        <keyword-def name="opt">
-                <keyword-value>opt</keyword-value>
-        </keyword-def>
-        <keyword-def name="ropt">
-                <keyword-value>ropt</keyword-value>
-        </keyword-def>
-        <keyword-def name="lopt">
-                <keyword-value>lopt</keyword-value>
-        </keyword-def>
-        <keyword-def name="ctrl">
-                <keyword-value>ctrl</keyword-value>
-        </keyword-def>
-        <keyword-def name="rctrl">
-                <keyword-value>rctrl</keyword-value>
-        </keyword-def>
-        <keyword-def name="lctrl">
-                <keyword-value>lctrl</keyword-value>
-        </keyword-def>
-        <keyword-def name="shift">
-                <keyword-value>shift</keyword-value>
-        </keyword-def>
-        <keyword-def name="rshift">
-                <keyword-value>rshift</keyword-value>
-        </keyword-def>
-        <keyword-def name="lshift">
-                <keyword-value>lshift</keyword-value>
-        </keyword-def>
-        <keyword-def name="alt">
-                <keyword-value>alt</keyword-value>
-        </keyword-def>
-        <keyword-def name="ralt">
-                <keyword-value>ralt</keyword-value>
-        </keyword-def>
-        <keyword-def name="lalt">
-                <keyword-value>lalt</keyword-value>
-        </keyword-def>
-        <keyword-def name="win">
-                <keyword-value>win</keyword-value>
-        </keyword-def>
-        <keyword-def name="rwin">
-                <keyword-value>rwin</keyword-value>
-        </keyword-def>
-        <keyword-def name="lwin">
-                <keyword-value>lwin</keyword-value>
-        </keyword-def>
-        <keyword-def name="meta">
-                <keyword-value>meta</keyword-value>
-        </keyword-def>
-        <keyword-def name="rmeta">
-                <keyword-value>rmeta</keyword-value>
-        </keyword-def>
-        <keyword-def name="lmeta">
-                <keyword-value>lmeta</keyword-value>
-        </keyword-def>
-        <keyword-def name="f1">
-                <keyword-value>f1</keyword-value>
-        </keyword-def>
-        <keyword-def name="f2">
-                <keyword-value>f2</keyword-value>
-        </keyword-def>
-        <keyword-def name="f3">
-                <keyword-value>f3</keyword-value>
-        </keyword-def>
-        <keyword-def name="f4">
-                <keyword-value>f4</keyword-value>
-        </keyword-def>
-        <keyword-def name="f5">
-                <keyword-value>f5</keyword-value>
-        </keyword-def>
-        <keyword-def name="f6">
-                <keyword-value>f6</keyword-value>
-        </keyword-def>
-        <keyword-def name="f7">
-                <keyword-value>f7</keyword-value>
-        </keyword-def>
-        <keyword-def name="f8">
-                <keyword-value>f8</keyword-value>
-        </keyword-def>
-        <keyword-def name="f9">
-                <keyword-value>f9</keyword-value>
-        </keyword-def>
-        <keyword-def name="f10">
-                <keyword-value>f10</keyword-value>
-        </keyword-def>
-        <keyword-def name="f11">
-                <keyword-value>f11</keyword-value>
-        </keyword-def>
-        <keyword-def name="f12">
-                <keyword-value>f12</keyword-value>
-        </keyword-def>
-        <keyword-def name="f13">
-                <keyword-value>f13</keyword-value>
-        </keyword-def>
-        <keyword-def name="f14">
-                <keyword-value>f14</keyword-value>
-        </keyword-def>
-        <keyword-def name="f15">
-                <keyword-value>f15</keyword-value>
-        </keyword-def>
-        <keyword-def name="tab">
-                <keyword-value>tab</keyword-value>
-        </keyword-def>
-        <keyword-def name="esc">
-                <keyword-value>esc</keyword-value>
-        </keyword-def>
-        <keyword-def name="enter">
-                <keyword-value>enter</keyword-value>
-        </keyword-def>
-        <keyword-def name="return">
-                <keyword-value>return</keyword-value>
-        </keyword-def>
-        <keyword-def name="namemenu">
-                <keyword-value>namemenu</keyword-value>
-        </keyword-def>
-        <keyword-def name="rcl">
-                <keyword-value>rcl</keyword-value>
-        </keyword-def>
-        <keyword-def name="snd">
-                <keyword-value>snd</keyword-value>
-        </keyword-def>
-        <keyword-def name="arrowkey">
-                <keyword-value>arrowkey</keyword-value>
-        </keyword-def>
-        <keyword-def name="pagekey">
-                <keyword-value>pagekey</keyword-value>
-        </keyword-def>
-        <keyword-def name="up">
-                <keyword-value>up</keyword-value>
-        </keyword-def>
-        <keyword-def name="down">
-                <keyword-value>down</keyword-value>
-        </keyword-def>
-        <keyword-def name="home">
-                <keyword-value>home</keyword-value>
-        </keyword-def>
-        <keyword-def name="end">
-                <keyword-value>end</keyword-value>
-        </keyword-def>
-        <keyword-def name="pgup">
-                <keyword-value>pgup</keyword-value>
-        </keyword-def>
-        <keyword-def name="pgdn">
-                <keyword-value>pgdn</keyword-value>
-        </keyword-def>
-        <keyword-def name="bs">
-                <keyword-value>bs</keyword-value>
-        </keyword-def>
-        <keyword-def name="del">
-                <keyword-value>del</keyword-value>
-        </keyword-def>
-        <keyword-def name="ins">
-                <keyword-value>ins</keyword-value>
-        </keyword-def>
-        <keyword-def name="undo">
-                <keyword-value>undo</keyword-value>
-        </keyword-def>
-        <keyword-def name="cut">
-                <keyword-value>cut</keyword-value>
-        </keyword-def>
-        <keyword-def name="copy">
-                <keyword-value>copy</keyword-value>
-        </keyword-def>
-        <keyword-def name="paste">
-                <keyword-value>paste</keyword-value>
-        </keyword-def>
-        <keyword-def name="clr">
-                <keyword-value>clr</keyword-value>
-        </keyword-def>
-        <keyword-def name="sto">
-                <keyword-value>sto</keyword-value>
-        </keyword-def>
-        <keyword-def name="prtsc">
-                <keyword-value>prtsc</keyword-value>
-        </keyword-def>
-        <keyword-def name="sysrq">
-                <keyword-value>sysrq</keyword-value>
-        </keyword-def>
-        <keyword-def name="scrlock">
-                <keyword-value>scrlock</keyword-value>
-        </keyword-def>
-        <keyword-def name="brk">
-                <keyword-value>brk</keyword-value>
-        </keyword-def>
-        <keyword-def name="numlock">
-                <keyword-value>numlock</keyword-value>
-        </keyword-def>
-        <keyword-def name="pwr">
-                <keyword-value>pwr</keyword-value>
-        </keyword-def>
-        <keyword-def name="volumeup">
-                <keyword-value>volumeup</keyword-value>
-        </keyword-def>
-        <keyword-def name="volumedown">
-                <keyword-value>volumedown</keyword-value>
-        </keyword-def>
-        <keyword-def name="memo">
-                <keyword-value>memo</keyword-value>
-        </keyword-def>
-        <keyword-def name="todo">
-                <keyword-value>todo</keyword-value>
-        </keyword-def>
-        <keyword-def name="calendar">
-                <keyword-value>calendar</keyword-value>
-        </keyword-def>
-        <keyword-def name="mail">
-                <keyword-value>mail</keyword-value>
-        </keyword-def>
-        <keyword-def name="address">
-                <keyword-value>address</keyword-value>
-        </keyword-def>
-        <keyword-def name="phone-send">
-                <keyword-value>phone-send</keyword-value>
-        </keyword-def>
-        <keyword-def name="phone-end">
-                <keyword-value>phone-end</keyword-value>
-        </keyword-def>
-        <keyword-def name="phone-accept">
-                <keyword-value>phone-accept</keyword-value>
-        </keyword-def>
-        <keyword-def name="vnd.">
-                <keyword-value>vnd.</keyword-value>
-        </keyword-def>
-        <keyword-def name="true">
-                <keyword-value>true</keyword-value>
-        </keyword-def>
-        <keyword-def name="false">
-                <keyword-value>false</keyword-value>
-        </keyword-def>
-        <keyword-def name="pause">
-                <keyword-value>pause</keyword-value>
-        </keyword-def>
-
-</css-profile>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile.properties b/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile.properties
deleted file mode 100644
index dd7e399..0000000
--- a/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# cssprofile-css1.xml
-css1.stylesheet-def.description=Cascading Style Sheets, level 1
-css1.category-def.box.caption=Box model
-css1.category-def.colorandbackground.caption=Colors and Backgrounds
-css1.category-def.classification.caption=Classification
-css1.category-def.font.caption=Font
-css1.category-def.text.caption=Text
-# cssprofile-css2.xml
-css2.stylesheet-def.description=Cascading Style Sheets, level 2
-css2.category-def.aural.caption=Aural
-css2.category-def.box.caption=Box model
-css2.category-def.colorandbackground.caption=Colors and Backgrounds
-css2.category-def.content.caption=Generated content/List
-css2.category-def.font.caption=Fonts
-css2.category-def.page.caption=Paged media
-css2.category-def.tables.caption=Tables
-css2.category-def.text.caption=Text
-css2.category-def.visual.caption=Visual
-css2.category-def.ui.caption=User interface
-# cssprofile-mobile1_0.xml
-mobile1_0.stylesheet-def.description=CSS Mobile Profile 1.0
-# cssprofile-wap.xml
-wap.stylesheet-def.description=WCSS 1.0
-wap.category-def.wap.caption=WCSS Extensions
diff --git a/bundles/org.eclipse.wst.css.core/cssprofile/description.txt b/bundles/org.eclipse.wst.css.core/cssprofile/description.txt
deleted file mode 100644
index 9c87545..0000000
--- a/bundles/org.eclipse.wst.css.core/cssprofile/description.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
-
- This file contains definitions of data used internally 
- by CSS code, needs no translation, 
- and in no way should be considered API.
- *******************************************************************************/
- 
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/plugin.properties b/bundles/org.eclipse.wst.css.core/plugin.properties
deleted file mode 100644
index 97e65bf..0000000
--- a/bundles/org.eclipse.wst.css.core/plugin.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-providerName=Eclipse.org
-pluginName=Structured Source CSS Model
-nlFeatureName=Structured Source CSS Model NL Support
-cssprofile_css2.name=CSS2: Cascading Style Sheets, level 2
-cssprofile_css1.name=CSS1: Cascading Style Sheets, level 1
-cssprofile_mobile1_0.name=CSS Mobile Profile 1.0
-cssprofile_wap.name=WCSS 1.0
-Structured_CSS_Document_Factory_Extension.name=Structured CSS Document Factory Extension
-CSS_Content_Type_Extension_Element.name=CSS
diff --git a/bundles/org.eclipse.wst.css.core/plugin.xml b/bundles/org.eclipse.wst.css.core/plugin.xml
deleted file mode 100644
index 15e9920..0000000
--- a/bundles/org.eclipse.wst.css.core/plugin.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension point="org.eclipse.wst.sse.core.cssprofile">
-		<profile
-			name="%cssprofile_css2.name"
-			default="true"
-			uri="cssprofile/cssprofile-css2.xml"
-			id="org.eclipse.wst.css.core.cssprofile.css2">
-		</profile>
-		<profile
-			name="%cssprofile_css1.name"
-			uri="cssprofile/cssprofile-css1.xml"
-			id="org.eclipse.wst.css.core.cssprofile.css1">
-		</profile>
-		<profile
-			name="%cssprofile_mobile1_0.name"
-			uri="cssprofile/cssprofile-mobile1_0.xml"
-			id="org.eclipse.wst.css.core.cssprofile.mobile1_0">
-		</profile>
-		<profile
-			name="%cssprofile_wap.name"
-			uri="cssprofile/cssprofile-wap.xml"
-			id="org.eclipse.wst.css.core.cssprofile.wap">
-		</profile>
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.core.modelHandler">
-		<modelHandler
-			class="org.eclipse.wst.css.core.internal.modelhandler.ModelHandlerForCSS"
-			associatedContentTypeId="org.eclipse.wst.css.core.csssource"
-			id="org.eclipse.wst.css.core.internal.modelhandler">
-		</modelHandler>
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.core.taskscanner">
-		<scanner
-			id="org.eclipse.wst.css.core.internal.tasks.CSSFileTaskScanner"
-			class="org.eclipse.wst.css.core.internal.tasks.CSSFileTaskScanner"
-			contentTypeIds="org.eclipse.wst.css.core.csssource" />
-	</extension>
-
-	<extension
-		point="org.eclipse.core.filebuffers.documentCreation"
-		id="org.eclipse.wst.css.core.documentfactories"
-		name="%Structured_CSS_Document_Factory_Extension.name">
-		<factory
-			contentTypeId="org.eclipse.wst.css.core.csssource"
-			class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory" />
-	</extension>
-
-	<extension point="org.eclipse.team.core.fileTypes">
-		<fileTypes
-			type="text"
-			extension="css">
-		</fileTypes>
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.core.formatProcessors">
-		<processor
-			class="org.eclipse.wst.css.core.internal.format.FormatProcessorCSS"
-			contentTypeId="org.eclipse.wst.css.core.csssource">
-		</processor>
-	</extension>
-
-	<extension point="org.eclipse.core.runtime.contentTypes">
-		<content-type
-			file-extensions="css"
-			priority="high"
-			name="%CSS_Content_Type_Extension_Element.name"
-			id="csssource"
-			base-type="org.eclipse.core.runtime.text">
-			<describer
-				class="org.eclipse.wst.css.core.internal.contenttype.ContentDescriberForCSS" />
-		</content-type>
-	</extension>
-
-	<!-- initialize css core preferences -->
-	<extension point="org.eclipse.core.runtime.preferences">
-		<initializer
-			class="org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceInitializer" />
-	</extension>
-	
-</plugin>
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/CSSCoreMessages.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/CSSCoreMessages.java
deleted file mode 100644
index 9593893..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/CSSCoreMessages.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 IBM Corporation and others. All rights reserved.   This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.wst.css.core.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by CSS Core
- * 
- * @plannedfor 1.0
- */
-public class CSSCoreMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.css.core.internal.CSSCorePluginResources";//$NON-NLS-1$
-
-	public static String You_cannot_use_CSSStyleShe_UI_;
-	public static String _1concat_ERROR_;
-	public static String _2concat_ERROR_;
-	public static String _3concat_ERROR_;
-	public static String _4concat_ERROR_;
-	public static String _25concat_ERROR_;
-	public static String _26concat_ERROR_;
-	public static String _27concat_ERROR_;
-	public static String _28concat_ERROR_;
-	public static String _5concat_ERROR_;
-	public static String _6concat_ERROR_;
-	public static String _7concat_ERROR_;
-	public static String _8concat_ERROR_;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, CSSCoreMessages.class);
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/CSSCorePlugin.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/CSSCorePlugin.java
deleted file mode 100644
index 710b39a..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/CSSCorePlugin.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CSSCorePlugin extends Plugin {
-	// The shared instance.
-	private static CSSCorePlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public CSSCorePlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static CSSCorePlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/CSSCorePluginResources.properties b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/CSSCorePluginResources.properties
deleted file mode 100644
index 6e42bd3..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/CSSCorePluginResources.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-You_cannot_use_CSSStyleShe_UI_=You cannot use CSSStyleSheet.getOwnerRule() because of many referencers of this rule\nPlease use getOnwerRules()
-_1concat_ERROR_={0}first flat node is null.
-_2concat_ERROR_={0}first flat node is not in model.
-_3concat_ERROR_={0}last flat node is null.
-_4concat_ERROR_={0}last flat node is not in model.
-_25concat_ERROR_={0}first region is null.
-_26concat_ERROR_={0}first region is not in model.
-_27concat_ERROR_={0}last region is null.
-_28concat_ERROR_={0}last region is not in model.
-_5concat_ERROR_={0}first region is null.
-_6concat_ERROR_={0}first region is not in model.
-_7concat_ERROR_={0}last region is null.
-_8concat_ERROR_={0}last region is not in model.
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/Logger.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/Logger.java
deleted file mode 100644
index 78e2fed..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/Logger.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal;
-
-
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.css.core"; //$NON-NLS-1$
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
-	public static final int OK = IStatus.OK; // 0
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int ERROR = IStatus.ERROR; // 4
-
-	public static final int OK_DEBUG = 200 + OK;
-	public static final int INFO_DEBUG = 200 + INFO;
-	public static final int WARNING_DEBUG = 200 + WARNING;
-	public static final int ERROR_DEBUG = 200 + ERROR;
-
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 *            OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) 
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * 
-	 * @param message
-	 *            text to print
-	 * @param category
-	 *            category of the message, to be compared with
-	 *            /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) 
-				Platform.getLog(bundle).log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-	
-	/**
-	 * Determines if currently tracing a category
-	 * 
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CSSCleanupStrategy.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CSSCleanupStrategy.java
deleted file mode 100644
index a248250..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CSSCleanupStrategy.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.cleanup;
-
-
-
-public interface CSSCleanupStrategy {
-
-	static final short ASIS = 0;
-	static final short LOWER = 1;
-	static final short UPPER = 2;
-
-	/**
-	 * 
-	 * @return short
-	 */
-	short getIdentCase();
-
-	/**
-	 * 
-	 * @return short
-	 */
-	short getPropNameCase();
-
-	/**
-	 * 
-	 * @return short
-	 */
-	short getPropValueCase();
-
-	/**
-	 * 
-	 * @return short
-	 */
-	short getSelectorTagCase();
-
-	/**
-	 * 
-	 * @return boolean
-	 */
-	boolean isFormatSource();
-
-	/**
-	 * 
-	 * @return boolean
-	 */
-	boolean isQuoteValues();
-
-	/**
-	 * 
-	 * @param formatSource
-	 *            boolean
-	 */
-	void setFormatSource(boolean formatSource);
-
-	/**
-	 * 
-	 * @param identCase
-	 *            short
-	 */
-	void setIdentCase(short identCase);
-
-	/**
-	 * 
-	 * @param propNameCase
-	 *            short
-	 */
-	void setPropNameCase(short propNameCase);
-
-	/**
-	 * 
-	 * @param propValueCase
-	 *            short
-	 */
-	void setPropValueCase(short propValueCase);
-
-	/**
-	 * 
-	 * @param quoteValues
-	 *            boolean
-	 */
-	void setQuoteValues(boolean quoteValues);
-
-	/**
-	 * 
-	 * @param selectorTagCase
-	 *            short
-	 */
-	void setSelectorTagCase(short selectorTagCase);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CSSCleanupStrategyImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CSSCleanupStrategyImpl.java
deleted file mode 100644
index 06e3e62..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CSSCleanupStrategyImpl.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.cleanup;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-
-
-
-public class CSSCleanupStrategyImpl implements CSSCleanupStrategy {
-
-	static private CSSCleanupStrategy instance = null;
-	// initialize with defaults
-	protected short fIdentCase = ASIS;
-	protected short fPropNameCase = ASIS;
-	protected short fPropValueCase = ASIS;
-	protected short fSelectorTagCase = UPPER;
-	protected boolean fQuoteValues = true;
-	protected boolean fFormatSource = true;
-
-	/**
-	 * CSSCleanupStrategyImpl constructor comment.
-	 */
-	protected CSSCleanupStrategyImpl() {
-		super();
-		initialize();
-	}
-
-	/**
-	 * 
-	 * @return short
-	 */
-	public short getIdentCase() {
-		return fIdentCase;
-	}
-
-	/**
-	 * 
-	 * @return org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy
-	 */
-	public synchronized static CSSCleanupStrategy getInstance() {
-		if (instance == null)
-			instance = new CSSCleanupStrategyImpl();
-		return instance;
-	}
-
-	/**
-	 * 
-	 * @return short
-	 */
-	public short getPropNameCase() {
-		return fPropNameCase;
-	}
-
-	/**
-	 * 
-	 * @return short
-	 */
-	public short getPropValueCase() {
-		return fPropValueCase;
-	}
-
-	/**
-	 * 
-	 * @return short
-	 */
-	public short getSelectorTagCase() {
-		return fSelectorTagCase;
-	}
-
-	/**
-	 * 
-	 */
-	private void initialize() {
-		Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
-		fIdentCase = getCleanupCaseValue(prefs.getInt(CSSCorePreferenceNames.CLEANUP_CASE_IDENTIFIER));
-		fPropNameCase = getCleanupCaseValue(prefs.getInt(CSSCorePreferenceNames.CLEANUP_CASE_PROPERTY_NAME));
-		fPropValueCase = getCleanupCaseValue(prefs.getInt(CSSCorePreferenceNames.CLEANUP_CASE_PROPERTY_VALUE));
-		fSelectorTagCase = getCleanupCaseValue(prefs.getInt(CSSCorePreferenceNames.CLEANUP_CASE_SELECTOR));
-		fQuoteValues = prefs.getBoolean(CSSCorePreferenceNames.QUOTE_ATTR_VALUES);
-		fFormatSource = prefs.getBoolean(CSSCorePreferenceNames.FORMAT_SOURCE);
-	}
-
-	/**
-	 * Return the CSSCleanupStrategy equivalent case short value when given an
-	 * int
-	 * 
-	 * @param value
-	 * @return equivalent case short or ASIS if cannot be determined
-	 */
-	private short getCleanupCaseValue(int value) {
-		switch (value) {
-			case CSSCorePreferenceNames.LOWER :
-				return LOWER;
-			case CSSCorePreferenceNames.UPPER :
-				return UPPER;
-		}
-		return ASIS;
-	}
-
-	/**
-	 * 
-	 * @return boolean
-	 */
-	public boolean isFormatSource() {
-		return fFormatSource;
-	}
-
-	/**
-	 * 
-	 * @return boolean
-	 */
-	public boolean isQuoteValues() {
-		return fQuoteValues;
-	}
-
-	/**
-	 * 
-	 * @param formatSource
-	 *            boolean
-	 */
-	public void setFormatSource(boolean formatSource) {
-		fFormatSource = formatSource;
-	}
-
-	/**
-	 * 
-	 * @param identCase
-	 *            short
-	 */
-	public void setIdentCase(short identCase) {
-		fIdentCase = identCase;
-	}
-
-	/**
-	 * 
-	 * @param propNameCase
-	 *            short
-	 */
-	public void setPropNameCase(short propNameCase) {
-		fPropNameCase = propNameCase;
-	}
-
-	/**
-	 * 
-	 * @param propValueCase
-	 *            short
-	 */
-	public void setPropValueCase(short propValueCase) {
-		fPropValueCase = propValueCase;
-	}
-
-	/**
-	 * 
-	 * @param quoteValues
-	 *            boolean
-	 */
-	public void setQuoteValues(boolean quoteValues) {
-		fQuoteValues = quoteValues;
-	}
-
-	/**
-	 * 
-	 * @param selectorTagCase
-	 *            short
-	 */
-	public void setSelectorTagCase(short selectorTagCase) {
-		fSelectorTagCase = selectorTagCase;
-	}
-
-	// TODO: a saveOptions should be added to CSSCleanupStrategy interface
-	public void saveOptions() {
-		CSSCorePlugin.getDefault().getPluginPreferences().setValue(CSSCorePreferenceNames.CLEANUP_CASE_IDENTIFIER, fIdentCase);
-		CSSCorePlugin.getDefault().getPluginPreferences().setValue(CSSCorePreferenceNames.CLEANUP_CASE_PROPERTY_NAME, fPropNameCase);
-		CSSCorePlugin.getDefault().getPluginPreferences().setValue(CSSCorePreferenceNames.CLEANUP_CASE_PROPERTY_VALUE, fPropValueCase);
-		CSSCorePlugin.getDefault().getPluginPreferences().setValue(CSSCorePreferenceNames.CLEANUP_CASE_SELECTOR, fSelectorTagCase);
-		CSSCorePlugin.getDefault().getPluginPreferences().setValue(CSSCorePreferenceNames.QUOTE_ATTR_VALUES, fQuoteValues);
-		CSSCorePlugin.getDefault().getPluginPreferences().setValue(CSSCorePreferenceNames.FORMAT_SOURCE, fFormatSource);
-		CSSCorePlugin.getDefault().savePluginPreferences();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CleanupProcessorCSS.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CleanupProcessorCSS.java
deleted file mode 100644
index 844807c..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CleanupProcessorCSS.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.cleanup;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.css.core.internal.formatter.CSSFormatUtil;
-import org.eclipse.wst.css.core.internal.formatter.CSSSourceFormatter;
-import org.eclipse.wst.css.core.internal.formatter.CSSSourceFormatterFactory;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-
-
-public class CleanupProcessorCSS extends AbstractStructuredCleanupProcessor {
-
-	public void cleanupModel(IStructuredModel structuredModel, int start, int length) {
-		CSSFormatUtil formatUtil = CSSFormatUtil.getInstance();
-		if (structuredModel instanceof ICSSModel) {
-			ICSSDocument doc = ((ICSSModel) structuredModel).getDocument();
-			CSSSourceFormatter formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter((INodeNotifier) doc);
-			StringBuffer buf = formatter.cleanup(doc);
-			if (buf != null) {
-				int startOffset = ((IndexedRegion) doc).getStartOffset();
-				int endOffset = ((IndexedRegion) doc).getEndOffset();
-				formatUtil.replaceSource(doc.getModel(), startOffset, endOffset - startOffset, buf.toString());
-			}
-		}
-		else if (structuredModel instanceof IDOMModel) {
-			List cssnodes = formatUtil.collectCSSNodes(structuredModel, start, length);
-			if (cssnodes != null && !cssnodes.isEmpty()) {
-				ICSSModel model = null;
-				for (int i = 0; i < cssnodes.size(); i++) {
-					ICSSNode node = (ICSSNode) cssnodes.get(i);
-					CSSSourceFormatter formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter((INodeNotifier) node);
-					StringBuffer buf = formatter.cleanup(node);
-					if (buf != null) {
-						int startOffset = ((IndexedRegion) node).getStartOffset();
-						int endOffset = ((IndexedRegion) node).getEndOffset();
-						if (model == null) {
-							model = node.getOwnerDocument().getModel();
-						}
-						formatUtil.replaceSource(model, startOffset, endOffset - startOffset, buf.toString());
-					}
-				}
-			}
-		}
-	}
-
-	protected String getContentType() {
-		return ContentTypeIdForCSS.ContentTypeID_CSS;
-	}
-
-	public void cleanupModel(IStructuredModel structuredModel) {
-		int start = 0;
-		int length = structuredModel.getStructuredDocument().getLength();
-
-		cleanupModel(structuredModel, start, length);
-	}
-
-	public void cleanupDocument(IDocument document) throws IOException, CoreException {
-		// TODO should implement, or delete?
-
-	}
-
-	public void cleanupDocument(IDocument document, int start, int length) throws IOException, CoreException {
-		// TODO should implement, or delete?
-
-	}
-
-	protected IStructuredCleanupHandler getCleanupHandler(Node node) {
-		return null;
-	}
-
-	protected IStructuredFormatProcessor getFormatProcessor() {
-		return null;
-	}
-
-	protected void refreshCleanupPreferences() {
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/IMediaGroupID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/IMediaGroupID.java
deleted file mode 100644
index 8d02ac8..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/IMediaGroupID.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contentmodel;
-
-
-
-/**
- * 
- */
-public interface IMediaGroupID {
-
-	public final static String M_CONTINUOUS = "continuous"; //$NON-NLS-1$
-	public final static String M_PAGED = "paged"; //$NON-NLS-1$
-
-	public final static String M_VISUAL = "visual"; //$NON-NLS-1$
-	public final static String M_AURAL = "aural"; //$NON-NLS-1$
-	public final static String M_TACTILE = "tactile"; //$NON-NLS-1$
-
-	public final static String M_GRID = "grid"; //$NON-NLS-1$
-	public final static String M_BITMAP = "bitmap"; //$NON-NLS-1$
-
-	public final static String M_INTERACTIVE = "interactive"; //$NON-NLS-1$
-	public final static String M_STATIC = "static"; //$NON-NLS-1$
-
-	public final static String M_ALL = "all"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/IValID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/IValID.java
deleted file mode 100644
index f49c1a1..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/IValID.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contentmodel;
-
-
-
-/**
- * 
- */
-public interface IValID {
-
-	public final static String V_100 = "100"; //$NON-NLS-1$
-	public final static String V_200 = "200"; //$NON-NLS-1$
-	public final static String V_300 = "300"; //$NON-NLS-1$
-	public final static String V_400 = "400"; //$NON-NLS-1$
-	public final static String V_500 = "500"; //$NON-NLS-1$
-	public final static String V_600 = "600"; //$NON-NLS-1$
-	public final static String V_700 = "700"; //$NON-NLS-1$
-	public final static String V_800 = "800"; //$NON-NLS-1$
-	public final static String V_900 = "900"; //$NON-NLS-1$
-	public final static String V_ABOVE = "above"; //$NON-NLS-1$
-	public final static String V_ABSOLUTE = "absolute"; //$NON-NLS-1$
-	public final static String V_ACTIVEBORDER = "ActiveBorder"; //$NON-NLS-1$
-	public final static String V_ACTIVECAPTION = "ActiveCaption"; //$NON-NLS-1$
-	public final static String V_ALL = "all"; //$NON-NLS-1$
-	public final static String V_ALWAYS = "always"; //$NON-NLS-1$
-	public final static String V_APPWORKSPACE = "AppWorkspace"; //$NON-NLS-1$
-	public final static String V_AQUA = "aqua"; //$NON-NLS-1$
-	public final static String V_ARMENIAN = "armenian"; //$NON-NLS-1$
-	public final static String V_AUTO = "auto"; //$NON-NLS-1$
-	public final static String V_AVOID = "avoid"; //$NON-NLS-1$
-	public final static String V_BACKGROUND = "Background"; //$NON-NLS-1$
-	public final static String V_BASELINE = "baseline"; //$NON-NLS-1$
-	public final static String V_BEHIND = "behind"; //$NON-NLS-1$
-	public final static String V_BELOW = "below"; //$NON-NLS-1$
-	public final static String V_BIDI_OVERRIDE = "bidi-override"; //$NON-NLS-1$
-	public final static String V_BLACK = "black"; //$NON-NLS-1$
-	public final static String V_BLINK = "blink"; //$NON-NLS-1$
-	public final static String V_BLOCK = "block"; //$NON-NLS-1$
-	public final static String V_BLUE = "blue"; //$NON-NLS-1$
-	public final static String V_BOLD = "bold"; //$NON-NLS-1$
-	public final static String V_BOLDER = "bolder"; //$NON-NLS-1$
-	public final static String V_BOTH = "both"; //$NON-NLS-1$
-	public final static String V_BOTTOM = "bottom"; //$NON-NLS-1$
-	public final static String V_BUTTONFACE = "ButtonFace"; //$NON-NLS-1$
-	public final static String V_BUTTONHIGHLIGHT = "ButtonHighlight"; //$NON-NLS-1$
-	public final static String V_BUTTONSHADOW = "ButtonShadow"; //$NON-NLS-1$
-	public final static String V_BUTTONTEXT = "ButtonText"; //$NON-NLS-1$
-	public final static String V_CAPITALIZE = "capitalize"; //$NON-NLS-1$
-	public final static String V_CAPTION = "caption"; //$NON-NLS-1$
-	public final static String V_CAPTIONTEXT = "CaptionText"; //$NON-NLS-1$
-	public final static String V_CENTER = "center"; //$NON-NLS-1$
-	public final static String V_CENTER_LEFT = "center-left"; //$NON-NLS-1$
-	public final static String V_CENTER_RIGHT = "center-right"; //$NON-NLS-1$
-	public final static String V_CHILD = "child"; //$NON-NLS-1$
-	public final static String V_CIRCLE = "circle"; //$NON-NLS-1$
-	public final static String V_CJK_IDEOGRAPHIC = "cjk-ideographic"; //$NON-NLS-1$
-	public final static String V_CLOSE_QUOTE = "close-quote"; //$NON-NLS-1$
-	public final static String V_CODE = "code"; //$NON-NLS-1$
-	public final static String V_CONDENSED = "condensed"; //$NON-NLS-1$
-	public final static String V_COLLAPSE = "collapse"; //$NON-NLS-1$
-	public final static String V_COMPACT = "compact"; //$NON-NLS-1$
-	public final static String V_CONTINUOUS = "continuous"; //$NON-NLS-1$
-	public final static String V_CROP = "crop"; //$NON-NLS-1$
-	public final static String V_CROSS = "cross"; //$NON-NLS-1$
-	public final static String V_CROSSHAIR = "crosshair"; //$NON-NLS-1$
-	public final static String V_CURSIVE = "cursive"; //$NON-NLS-1$
-	public final static String V_DASHED = "dashed"; //$NON-NLS-1$
-	public final static String V_DECIMAL = "decimal"; //$NON-NLS-1$
-	public final static String V_DECIMAL_LEADING_ZERO = "decimal-leading-zero"; //$NON-NLS-1$
-	public final static String V_DEFAULT = "default"; //$NON-NLS-1$
-	public final static String V_DIGITS = "digits"; //$NON-NLS-1$
-	public final static String V_DISC = "disc"; //$NON-NLS-1$
-	public final static String V_DOTTED = "dotted"; //$NON-NLS-1$
-	public final static String V_DOUBLE = "double"; //$NON-NLS-1$
-	public final static String V_E_RESIZE = "e-resize"; //$NON-NLS-1$
-	public final static String V_EMBED = "embed"; //$NON-NLS-1$
-	public final static String V_EXPANDED = "expanded"; //$NON-NLS-1$
-	public final static String V_EXTRA_CONDENSED = "extra-condensed"; //$NON-NLS-1$
-	public final static String V_EXTRA_EXPANDED = "extra-expanded"; //$NON-NLS-1$
-	public final static String V_FANTASY = "fantasy"; //$NON-NLS-1$
-	public final static String V_FAR_LEFT = "far-left"; //$NON-NLS-1$
-	public final static String V_FAR_RIGHT = "far-right"; //$NON-NLS-1$
-	public final static String V_FAST = "fast"; //$NON-NLS-1$
-	public final static String V_FASTER = "faster"; //$NON-NLS-1$
-	public final static String V_FEMALE = "female"; //$NON-NLS-1$
-	public final static String V_FIXED = "fixed"; //$NON-NLS-1$
-	public final static String V_FUCHSIA = "fuchsia"; //$NON-NLS-1$
-	public final static String V_GEORGIAN = "georgian"; //$NON-NLS-1$
-	public final static String V_GRAY = "gray"; //$NON-NLS-1$
-	public final static String V_GRAYTEXT = "GrayText"; //$NON-NLS-1$
-	public final static String V_GREEN = "green"; //$NON-NLS-1$
-	public final static String V_GROOVE = "groove"; //$NON-NLS-1$
-	public final static String V_HEBREW = "hebrew"; //$NON-NLS-1$
-	public final static String V_HELP = "help"; //$NON-NLS-1$
-	public final static String V_HIDDEN = "hidden"; //$NON-NLS-1$
-	public final static String V_HIDE = "hide"; //$NON-NLS-1$
-	public final static String V_HIGH = "high"; //$NON-NLS-1$
-	public final static String V_HIGHLIGHT = "Highlight"; //$NON-NLS-1$
-	public final static String V_HIGHLIGHTTEXT = "HighlightText"; //$NON-NLS-1$
-	public final static String V_HIGHER = "higher"; //$NON-NLS-1$
-	public final static String V_HIRAGANA = "hiragana"; //$NON-NLS-1$
-	public final static String V_HIRAGANA_IROHA = "hiragana-iroha"; //$NON-NLS-1$
-	public final static String V_ICON = "icon"; //$NON-NLS-1$
-	public final static String V_INACTIVEBORDER = "InactiveBorder"; //$NON-NLS-1$
-	public final static String V_INACTIVECAPTION = "InactiveCaption"; //$NON-NLS-1$
-	public final static String V_INACTIVECAPTIONTEXT = "InactiveCaptionText"; //$NON-NLS-1$
-	public final static String V_INFOBACKGROUND = "InfoBackground"; //$NON-NLS-1$
-	public final static String V_INFOTEXT = "InfoText"; //$NON-NLS-1$
-	public final static String V_INLINE = "inline"; //$NON-NLS-1$
-	public final static String V_INLINE_TABLE = "inline-table"; //$NON-NLS-1$
-	public final static String V_INSET = "inset"; //$NON-NLS-1$
-	public final static String V_INSIDE = "inside"; //$NON-NLS-1$
-	public final static String V_INVERT = "invert"; //$NON-NLS-1$
-	public final static String V_ITALIC = "italic"; //$NON-NLS-1$
-	public final static String V_JUSTIFY = "justify"; //$NON-NLS-1$
-	public final static String V_KATAKANA = "katakana"; //$NON-NLS-1$
-	public final static String V_KATAKANA_IROHA = "katakana-iroha"; //$NON-NLS-1$
-	public final static String V_LANDSCAPE = "landscape"; //$NON-NLS-1$
-	public final static String V_LARGE = "large"; //$NON-NLS-1$
-	public final static String V_LARGER = "larger"; //$NON-NLS-1$
-	public final static String V_LEFT = "left"; //$NON-NLS-1$
-	public final static String V_LEFT_SIDE = "left-side"; //$NON-NLS-1$
-	public final static String V_LEFTWARDS = "leftwards"; //$NON-NLS-1$
-	public final static String V_LEVEL = "level"; //$NON-NLS-1$
-	public final static String V_LIGHTER = "lighter"; //$NON-NLS-1$
-	public final static String V_LIME = "lime"; //$NON-NLS-1$
-	public final static String V_LINE_THROUGH = "line-through"; //$NON-NLS-1$
-	public final static String V_LIST_ITEM = "list-item"; //$NON-NLS-1$
-	public final static String V_LOUD = "loud"; //$NON-NLS-1$
-	public final static String V_LOW = "low"; //$NON-NLS-1$
-	public final static String V_LOWER = "lower"; //$NON-NLS-1$
-	public final static String V_LOWER_ALPHA = "lower-alpha"; //$NON-NLS-1$
-	public final static String V_LOWER_GREEK = "lower-greek"; //$NON-NLS-1$
-	public final static String V_LOWER_LATIN = "lower-latin"; //$NON-NLS-1$
-	public final static String V_LOWER_ROMAN = "lower-roman"; //$NON-NLS-1$
-	public final static String V_LOWERCASE = "lowercase"; //$NON-NLS-1$
-	public final static String V_LTR = "ltr"; //$NON-NLS-1$
-	public final static String V_MALE = "male"; //$NON-NLS-1$
-	public final static String V_MARKER = "marker"; //$NON-NLS-1$
-	public final static String V_MAROON = "maroon"; //$NON-NLS-1$
-	public final static String V_MEDIUM = "medium"; //$NON-NLS-1$
-	public final static String V_MENU = "menu"; //$NON-NLS-1$
-	public final static String V_MENUTEXT = "MenuText"; //$NON-NLS-1$
-	public final static String V_MESSAGE_BOX = "message-box"; //$NON-NLS-1$
-	public final static String V_MIDDLE = "middle"; //$NON-NLS-1$
-	public final static String V_MIX = "mix"; //$NON-NLS-1$
-	public final static String V_MONOSPACE = "monospace"; //$NON-NLS-1$
-	public final static String V_MOVE = "move"; //$NON-NLS-1$
-	public final static String V_N_RESIZE = "n-resize"; //$NON-NLS-1$
-	public final static String V_NARROWER = "narrower"; //$NON-NLS-1$
-	public final static String V_NAVY = "navy"; //$NON-NLS-1$
-	public final static String V_NE_RESIZE = "ne-resize"; //$NON-NLS-1$
-	public final static String V_NO_CLOSE_QUOTE = "no-close-quote"; //$NON-NLS-1$
-	public final static String V_NO_OPEN_QUOTE = "no-open-quote"; //$NON-NLS-1$
-	public final static String V_NO_REPEAT = "no-repeat"; //$NON-NLS-1$
-	public final static String V_NONE = "none"; //$NON-NLS-1$
-	public final static String V_NORMAL = "normal"; //$NON-NLS-1$
-	public final static String V_NOWRAP = "nowrap"; //$NON-NLS-1$
-	public final static String V_NW_RESIZE = "nw-resize"; //$NON-NLS-1$
-	public final static String V_OBLIQUE = "oblique"; //$NON-NLS-1$
-	public final static String V_OLIVE = "olive"; //$NON-NLS-1$
-	public final static String V_ONCE = "once"; //$NON-NLS-1$
-	public final static String V_OPEN_QUOTE = "open-quote"; //$NON-NLS-1$
-	public final static String V_OUTSET = "outset"; //$NON-NLS-1$
-	public final static String V_OUTSIDE = "outside"; //$NON-NLS-1$
-	public final static String V_OVERLINE = "overline"; //$NON-NLS-1$
-	public final static String V_POINTER = "pointer"; //$NON-NLS-1$
-	public final static String V_PORTRAIT = "portrait"; //$NON-NLS-1$
-	public final static String V_PRE = "pre"; //$NON-NLS-1$
-	public final static String V_PURPLE = "purple"; //$NON-NLS-1$
-	public final static String V_RED = "red"; //$NON-NLS-1$
-	public final static String V_RELATIVE = "relative"; //$NON-NLS-1$
-	public final static String V_REPEAT = "repeat"; //$NON-NLS-1$
-	public final static String V_REPEAT_X = "repeat-x"; //$NON-NLS-1$
-	public final static String V_REPEAT_Y = "repeat-y"; //$NON-NLS-1$
-	public final static String V_RIDGE = "ridge"; //$NON-NLS-1$
-	public final static String V_RIGHT = "right"; //$NON-NLS-1$
-	public final static String V_RIGHT_SIDE = "right-side"; //$NON-NLS-1$
-	public final static String V_RIGHTWARDS = "rightwards"; //$NON-NLS-1$
-	public final static String V_RTL = "rtl"; //$NON-NLS-1$
-	public final static String V_RUN_IN = "run-in"; //$NON-NLS-1$
-	public final static String V_S_RESIZE = "s-resize"; //$NON-NLS-1$
-	public final static String V_SANS_SERIF = "sans-serif"; //$NON-NLS-1$
-	public final static String V_SCROLL = "scroll"; //$NON-NLS-1$
-	public final static String V_SCROLLBAR = "Scrollbar"; //$NON-NLS-1$
-	public final static String V_SE_RESIZE = "se-resize"; //$NON-NLS-1$
-	public final static String V_SEMI_CONDENSED = "semi-condensed"; //$NON-NLS-1$
-	public final static String V_SEMI_EXPANDED = "semi-expanded"; //$NON-NLS-1$
-	public final static String V_SEPARATE = "separate"; //$NON-NLS-1$
-	public final static String V_SERIF = "serif"; //$NON-NLS-1$
-	public final static String V_SHOW = "show"; //$NON-NLS-1$
-	public final static String V_SILENT = "silent"; //$NON-NLS-1$
-	public final static String V_SILVER = "silver"; //$NON-NLS-1$
-	public final static String V_SLOW = "slow"; //$NON-NLS-1$
-	public final static String V_SLOWER = "slower"; //$NON-NLS-1$
-	public final static String V_SMALL = "small"; //$NON-NLS-1$
-	public final static String V_SMALL_CAPS = "small-caps"; //$NON-NLS-1$
-	public final static String V_SMALL_CAPTION = "small-caption"; //$NON-NLS-1$
-	public final static String V_SMALLER = "smaller"; //$NON-NLS-1$
-	public final static String V_SOFT = "soft"; //$NON-NLS-1$
-	public final static String V_SOLID = "solid"; //$NON-NLS-1$
-	public final static String V_SPELL_OUT = "spell-out"; //$NON-NLS-1$
-	public final static String V_SQUARE = "square"; //$NON-NLS-1$
-	public final static String V_STATIC = "static"; //$NON-NLS-1$
-	public final static String V_STATUS_BAR = "status-bar"; //$NON-NLS-1$
-	public final static String V_SUB = "sub"; //$NON-NLS-1$
-	public final static String V_SUPER = "super"; //$NON-NLS-1$
-	public final static String V_SW_RESIZE = "sw-resize"; //$NON-NLS-1$
-	public final static String V_TABLE = "table"; //$NON-NLS-1$
-	public final static String V_TABLE_CAPTION = "table-caption"; //$NON-NLS-1$
-	public final static String V_TABLE_CELL = "table-cell"; //$NON-NLS-1$
-	public final static String V_TABLE_COLUMN = "table-column"; //$NON-NLS-1$
-	public final static String V_TABLE_COLUMN_GROUP = "table-column-group"; //$NON-NLS-1$
-	public final static String V_TABLE_FOOTER_GROUP = "table-footer-group"; //$NON-NLS-1$
-	public final static String V_TABLE_HEADER_GROUP = "table-header-group"; //$NON-NLS-1$
-	public final static String V_TABLE_ROW = "table-row"; //$NON-NLS-1$
-	public final static String V_TABLE_ROW_GROUP = "table-row-group"; //$NON-NLS-1$
-	public final static String V_TEAL = "teal"; //$NON-NLS-1$
-	public final static String V_TEXT = "text"; //$NON-NLS-1$
-	public final static String V_TEXT_TOP = "text-top"; //$NON-NLS-1$
-	public final static String V_TEXT_BOTTOM = "text-bottom"; //$NON-NLS-1$
-	public final static String V_THICK = "thick"; //$NON-NLS-1$
-	public final static String V_THIN = "thin"; //$NON-NLS-1$
-	public final static String V_THREEDDARKSHADOW = "ThreeDDarkShadow"; //$NON-NLS-1$
-	public final static String V_THREEDFACE = "ThreeDFace"; //$NON-NLS-1$
-	public final static String V_THREEDHIGHLIGHT = "ThreeDHighlight"; //$NON-NLS-1$
-	public final static String V_THREEDLIGHTSHADOW = "ThreeDLightShadow"; //$NON-NLS-1$
-	public final static String V_THREEDSHADOW = "ThreeDShadow"; //$NON-NLS-1$
-	public final static String V_TOP = "top"; //$NON-NLS-1$
-	public final static String V_TRANSPARENT = "transparent"; //$NON-NLS-1$
-	public final static String V_ULTRA_CONDENSED = "ultra-condensed"; //$NON-NLS-1$
-	public final static String V_ULTRA_EXPANDED = "ultra-expanded"; //$NON-NLS-1$
-	public final static String V_UNDERLINE = "underline"; //$NON-NLS-1$
-	public final static String V_UPPER_ALPHA = "upper-alpha"; //$NON-NLS-1$
-	public final static String V_UPPER_LATIN = "upper-latin"; //$NON-NLS-1$
-	public final static String V_UPPER_ROMAN = "upper-roman"; //$NON-NLS-1$
-	public final static String V_UPPERCASE = "uppercase"; //$NON-NLS-1$
-	public final static String V_VISIBLE = "visible"; //$NON-NLS-1$
-	public final static String V_W_RESIZE = "w-resize"; //$NON-NLS-1$
-	public final static String V_WAIT = "wait"; //$NON-NLS-1$
-	public final static String V_WHITE = "white"; //$NON-NLS-1$
-	public final static String V_WIDER = "wider"; //$NON-NLS-1$
-	public final static String V_WINDOW = "Window"; //$NON-NLS-1$
-	public final static String V_WINDOWFRAME = "WindowFrame"; //$NON-NLS-1$
-	public final static String V_WINDOWTEXT = "WindowText"; //$NON-NLS-1$
-	public final static String V_X_FAST = "x-fast"; //$NON-NLS-1$
-	public final static String V_X_HIGH = "x-high"; //$NON-NLS-1$
-	public final static String V_X_LARGE = "x-large"; //$NON-NLS-1$
-	public final static String V_X_LOUD = "x-loud"; //$NON-NLS-1$
-	public final static String V_X_LOW = "x-low"; //$NON-NLS-1$
-	public final static String V_X_SLOW = "x-slow"; //$NON-NLS-1$
-	public final static String V_X_SMALL = "x-small"; //$NON-NLS-1$
-	public final static String V_X_SOFT = "x-soft"; //$NON-NLS-1$
-	public final static String V_XX_SMALL = "xx-small"; //$NON-NLS-1$
-	public final static String V_XX_LARGE = "xx-large"; //$NON-NLS-1$
-	public final static String V_YELLOW = "yellow"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMContainer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMContainer.java
deleted file mode 100644
index d013f7c..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMContainer.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contentmodel;
-
-
-
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.Vector;
-
-/**
- * 
- */
-public class PropCMContainer extends PropCMNode {
-
-	private java.util.Vector nodes = new Vector();
-	private static java.util.Hashtable instances = null;
-	public final static String VAL_ABSOLUTE_SIZE = "absolute-size";//$NON-NLS-1$
-	public final static String VAL_BORDER_STYLE = "border-style";//$NON-NLS-1$
-	public final static String VAL_BORDER_WIDTH = "border-width";//$NON-NLS-1$
-	public final static String VAL_COLOR = "color";//$NON-NLS-1$
-	public final static String VAL_SYSTEM_COLOR = "system-color";//$NON-NLS-1$
-	public final static String VAL_GENERIC_FAMILY = "generic-family";//$NON-NLS-1$
-	public final static String VAL_GENERIC_VOICE = "generic-voice";//$NON-NLS-1$
-	public final static String VAL_MARGIN_WIDTH = "margin-width";//$NON-NLS-1$
-	public final static String VAL_PADDING_WIDTH = "padding-width";//$NON-NLS-1$
-	public final static String VAL_RELATIVE_SIZE = "relative-size";//$NON-NLS-1$
-
-	/**
-	 * 
-	 */
-	protected PropCMContainer(String name) {
-		super(name);
-	}
-
-	/**
-	 * 
-	 */
-	Object appendChild(Object node) {
-		if (!nodes.contains(node))
-			nodes.add(node);
-		return node;
-	}
-
-	/**
-	 * 
-	 */
-	public boolean canHave(String identifier) {
-		int nChild = getNumChild();
-		for (int i = 0; i < nChild; i++) {
-			Object child = getChildAt(i);
-			if (child instanceof String && identifier.equalsIgnoreCase((String) child))
-				return true;
-			if (child instanceof PropCMContainer && ((PropCMContainer) child).canHave(identifier))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	public Object getChildAt(int index) {
-		if (nodes == null || index < 0 || nodes.size() <= index)
-			return null;
-		return nodes.elementAt(index);
-	}
-
-	/**
-	 * 
-	 */
-	static PropCMContainer getContInstanceOf(String name) {
-		if (name == null)
-			return null;
-
-		// initialize
-		if (instances == null)
-			instances = new Hashtable(20);
-
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		// query
-		Object node = instances.get(name);
-		if (node != null)
-			return (PropCMContainer) node;
-
-		if (PropCMNode.isLoading()) {
-			// register
-			node = new PropCMContainer(name);
-			instances.put(name, node);
-		}
-
-		return (PropCMContainer) node;
-	}
-
-	/**
-	 * 
-	 */
-	void getIdentifiers(Set idents) {
-		if (idents == null)
-			return;
-		int nChildren = nodes.size();
-		for (int i = 0; i < nChildren; i++) {
-			Object node = nodes.elementAt(i);
-			if (node instanceof PropCMNode)
-				((PropCMNode) node).getIdentifiers(idents);
-			else if (node instanceof String)
-				idents.add(node);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public int getNumChild() {
-		if (nodes == null)
-			return 0;
-		return nodes.size();
-	}
-
-	/**
-	 * 
-	 */
-	public short getType() {
-		return VAL_CONTAINER;
-	}
-
-	/**
-	 * 
-	 */
-	void getValues(Collection values) {
-		if (values == null)
-			return;
-		int nChildren = nodes.size();
-		for (int i = 0; i < nChildren; i++) {
-			Object node = nodes.elementAt(i);
-			if (node instanceof PropCMNode)
-				((PropCMNode) node).getValues(values);
-			else if (node instanceof String) {
-				if (!values.contains(node))
-					values.add(node);
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	Object removeChild(Object node) {
-		nodes.remove(node);
-		return node;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMFontProperty.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMFontProperty.java
deleted file mode 100644
index a28e21d..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMFontProperty.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contentmodel;
-
-
-
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-/**
- * 
- */
-public class PropCMFontProperty extends PropCMProperty {
-
-	// static fields
-	private static java.util.Hashtable instances = null;
-	private static java.util.Hashtable cachedIdMap = null;
-	// selecting properties
-	public final static String PF_FONT_FAMILY = "font-family";//$NON-NLS-1$
-	public final static String PF_FONT_STYLE = "font-style";//$NON-NLS-1$
-	public final static String PF_FONT_VARIANT = "font-variant";//$NON-NLS-1$
-	public final static String PF_FONT_WEIGHT = "font-weight";//$NON-NLS-1$
-	public final static String PF_FONT_STRETCH = "font-stretch";//$NON-NLS-1$
-	public final static String PF_FONT_SIZE = "font-size";//$NON-NLS-1$
-	// qualification properties
-	public final static String PF_UNICODE_RANGE = "unicode-range";//$NON-NLS-1$
-	// numeric properties
-	public final static String PF_UNITS_PER_EM = "units-per-em";//$NON-NLS-1$
-	// referencing properties
-	public final static String PF_SRC = "src";//$NON-NLS-1$
-	// matching properties
-	public final static String PF_PANOSE_1 = "panose-1";//$NON-NLS-1$
-	public final static String PF_STEMV = "stemv";//$NON-NLS-1$
-	public final static String PF_STEMH = "stemh";//$NON-NLS-1$
-	public final static String PF_SLOPE = "slope";//$NON-NLS-1$
-	public final static String PF_CAP_HEIGHT = "cap-height";//$NON-NLS-1$
-	public final static String PF_X_HEIGHT = "x-height";//$NON-NLS-1$
-	public final static String PF_ASCENT = "ascent";//$NON-NLS-1$
-	public final static String PF_DESCENT = "descent";//$NON-NLS-1$
-	// synthesis properties
-	public final static String PF_WIDTHS = "widths";//$NON-NLS-1$
-	public final static String PF_BBOX = "bbox";//$NON-NLS-1$
-	public final static String PF_DEFINITION_SRC = "definition-src";//$NON-NLS-1$
-	// alignment properties
-	public final static String PF_BASELINE = "baseline";//$NON-NLS-1$
-	public final static String PF_CENTERLINE = "centerline";//$NON-NLS-1$
-	public final static String PF_MATHLINE = "mathline";//$NON-NLS-1$
-	public final static String PF_TOPLINE = "topline";//$NON-NLS-1$
-
-	/**
-	 * 
-	 */
-	protected PropCMFontProperty(String name) {
-		super(name);
-	}
-
-	/**
-	 * 
-	 */
-	public static PropCMProperty getInstanceOf(String name) {
-		// initialize
-		if (instances == null)
-			instances = new Hashtable(10);
-
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		// query
-		Object node = instances.get(name);
-		if (node != null)
-			return (PropCMProperty) node;
-
-		// register
-		if (PropCMNode.isLoading()) {
-			node = new PropCMFontProperty(name);
-			instances.put(name, node);
-		}
-
-		return (PropCMProperty) node;
-	}
-
-	/**
-	 * 
-	 */
-	public static Enumeration getNameEnum() {
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		return instances.keys();
-	}
-
-	/**
-	 * 
-	 */
-	public static Enumeration getPropertyEnum() {
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		return instances.elements();
-	}
-
-	/**
-	 * 
-	 */
-	public short getType() {
-		return VAL_FONTPROPERTY;
-	}
-
-	/**
-	 * 
-	 */
-	public static Vector names() {
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		return new Vector(instances.keySet());
-	}
-
-	/**
-	 * 
-	 */
-	public static List names(Object mediaGroup) {
-		if (mediaGroup == null)
-			return names();
-
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		Vector properties = new Vector();
-
-		Iterator it = instances.values().iterator();
-		while (it.hasNext()) {
-			PropCMProperty prop = (PropCMProperty) it.next();
-			if (prop.getMediaGroups().contains(mediaGroup))
-				properties.add(prop.getName());
-		}
-
-		return properties;
-	}
-
-	/**
-	 * If itentifier is null, get all properties
-	 */
-	public static Vector propertiesFor(String identifier, boolean shorthands) {
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		// if identifier is null, get all properties
-		if (identifier == null)
-			return new Vector(instances.values());
-
-		if (cachedIdMap == null) {
-			// start cacheing
-			cachedIdMap = new Hashtable();
-		}
-		else {
-			// search cached
-			Object ret = cachedIdMap.get(identifier + String.valueOf(shorthands));
-			if (ret != null)
-				return new Vector((Collection) ret);
-		}
-
-		// create
-		Enumeration properties = getPropertyEnum();
-		HashSet set = new HashSet();
-		while (properties.hasMoreElements()) {
-			PropCMProperty prop = (PropCMProperty) properties.nextElement();
-			if (!shorthands && prop.isShorthand())
-				continue;
-			if (prop.canHave(identifier))
-				set.add(prop);
-		}
-
-		// cache
-		cachedIdMap.put(identifier + String.valueOf(shorthands), set);
-
-		return new Vector(set);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMFunction.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMFunction.java
deleted file mode 100644
index 03efc91..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMFunction.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contentmodel;
-
-
-
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Set;
-
-/**
- * 
- */
-public class PropCMFunction extends PropCMNode {
-
-	private static java.util.Hashtable instances = null;
-	public final static String VAL_ATTR = "attr";//$NON-NLS-1$
-	public final static String VAL_COUNTER = "counter";//$NON-NLS-1$
-	public final static String VAL_RGB = "rgb";//$NON-NLS-1$
-	public final static String VAL_SHAPE = "rect";//$NON-NLS-1$
-	public final static String VAL_URI = "url";//$NON-NLS-1$
-	public final static String VAL_FORMAT = "format";//$NON-NLS-1$
-	public final static String VAL_LOCAL = "local";//$NON-NLS-1$
-
-	/**
-	 * 
-	 */
-	protected PropCMFunction(String name) {
-		super(name);
-	}
-
-	/**
-	 * 
-	 */
-	void getIdentifiers(Set indents) {
-	}
-
-	/**
-	 * 
-	 */
-	static public PropCMFunction getInstanceOf(String name) {
-		if (name == null)
-			return null;
-
-		// initialize
-		if (instances == null)
-			instances = new Hashtable(10);
-
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		// query
-		Object node = instances.get(name);
-		if (node != null)
-			return (PropCMFunction) node;
-
-		// register
-		if (PropCMNode.isLoading()) {
-			node = new PropCMFunction(name);
-			instances.put(name, node);
-		}
-
-		return (PropCMFunction) node;
-	}
-
-	/**
-	 * 
-	 */
-	public short getType() {
-		return VAL_FUNC;
-	}
-
-	/**
-	 * 
-	 */
-	void getValues(Collection values) {
-		if (values != null && !values.contains(this))
-			values.add(this);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMNode.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMNode.java
deleted file mode 100644
index 52a84df..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMNode.java
+++ /dev/null
@@ -1,1369 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contentmodel;
-
-
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Vector;
-
-/**
- * 
- */
-public abstract class PropCMNode {
-
-	public final static short VAL_IDENTIFIER = 0;
-	public final static short VAL_PROPERTY = 1;
-	public final static short VAL_NUMBER = 2;
-	public final static short VAL_STRING = 3;
-	public final static short VAL_FUNC = 4;
-	public final static short VAL_CONTAINER = 5;
-	public final static short VAL_SUBPROPERTY = 6;
-	public final static short VAL_FONTPROPERTY = 7;
-	public final static short VAL_UNICODE_RANGE = 8;
-	protected java.lang.String name = null;
-	private static short LOADING = 0; // 0 : not initialized, 1 : under
-										// initializing, 2 : initialize-done
-										// and fix DB
-
-	/**
-	 * 
-	 */
-	public PropCMNode(String name) {
-		super();
-		this.name = name;
-	}
-
-	/**
-	 * 
-	 */
-	public Set getIdentifiers() {
-		HashSet ids = new HashSet();
-		getIdentifiers(ids);
-		return ids;
-	}
-
-	/**
-	 * 
-	 */
-	abstract void getIdentifiers(Set indents);
-
-	/**
-	 * 
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * 
-	 */
-	public abstract short getType();
-
-	/**
-	 * 
-	 */
-	public Collection getValues() {
-		Vector vals = new Vector();
-		getValues(vals);
-		return vals;
-	}
-
-	/**
-	 * 
-	 */
-	abstract void getValues(Collection values);
-
-	/**
-	 * 
-	 */
-	protected static void initPropertyCM() {
-		if (!isNeedInitialize())
-			return;
-		LOADING = 1;
-
-		PropCMNumber.initNumberCMDim();
-
-		// azimuth
-		PropCMProperty prop = PropCMProperty.getInstanceOf(PropCMProperty.P_AZIMUTH);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_ANGLE));
-		prop.appendChild(IValID.V_LEFT_SIDE);
-		prop.appendChild(IValID.V_FAR_LEFT);
-		prop.appendChild(IValID.V_LEFT);
-		prop.appendChild(IValID.V_CENTER_LEFT);
-		prop.appendChild(IValID.V_CENTER);
-		prop.appendChild(IValID.V_CENTER_RIGHT);
-		prop.appendChild(IValID.V_RIGHT);
-		prop.appendChild(IValID.V_FAR_RIGHT);
-		prop.appendChild(IValID.V_RIGHT_SIDE);
-		prop.appendChild(IValID.V_BEHIND);
-		prop.appendChild(IValID.V_LEFTWARDS);
-		prop.appendChild(IValID.V_RIGHTWARDS);
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-		prop.setMaxValueCount(2);
-
-		// background
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BG);
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_COLOR));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_IMAGE));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_REPEAT));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_ATTACHMENT));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_POSITION));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-		prop.setMaxValueCount(6);
-
-		// background-attachment
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BG_ATTACHMENT);
-		prop.appendChild(IValID.V_SCROLL);
-		prop.appendChild(IValID.V_FIXED);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// background-color
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BG_COLOR);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_COLOR));
-		prop.appendChild(IValID.V_TRANSPARENT);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// background-image
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BG_IMAGE);
-		prop.appendChild(PropCMFunction.getInstanceOf(PropCMFunction.VAL_URI));
-		prop.appendChild(IValID.V_NONE);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// background-position ---- sub-properties horizontal
-		prop = PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_X);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendChild(IValID.V_LEFT);
-		prop.appendChild(IValID.V_CENTER);
-		prop.appendChild(IValID.V_RIGHT);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// background-position ---- sub-properties vertical
-		prop = PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_Y);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendChild(IValID.V_TOP);
-		prop.appendChild(IValID.V_CENTER);
-		prop.appendChild(IValID.V_BOTTOM);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// background-position
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BG_POSITION);
-		prop.appendChild(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_X));
-		prop.appendChild(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_Y));
-		prop.setMaxValueCount(2);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// background-repeat
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BG_REPEAT);
-		prop.appendChild(IValID.V_REPEAT);
-		prop.appendChild(IValID.V_REPEAT_X);
-		prop.appendChild(IValID.V_REPEAT_Y);
-		prop.appendChild(IValID.V_NO_REPEAT);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER);
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_WIDTH));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_STYLE));
-		// prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_COLOR));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_COLOR));
-		prop.setMaxValueCount(9);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-collapse
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_COLLAPSE);
-		prop.appendChild(IValID.V_COLLAPSE);
-		prop.appendChild(IValID.V_SEPARATE);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-color
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_COLOR);
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_COLOR));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_COLOR));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_COLOR));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_COLOR));
-		// prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_COLOR));
-		prop.appendChild(IValID.V_TRANSPARENT);
-		prop.setMaxValueCount(4);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-spacing
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_SPACING);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.setMaxValueCount(2);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-style
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_STYLE);
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_STYLE));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_STYLE));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_STYLE));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_STYLE));
-		// prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_BORDER_STYLE));
-		prop.setMaxValueCount(4);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-top
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP);
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_WIDTH));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_STYLE));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_COLOR));
-		prop.setMaxValueCount(3);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-right
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT);
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_WIDTH));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_STYLE));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_COLOR));
-		prop.setMaxValueCount(3);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-bottom
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM);
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_WIDTH));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_STYLE));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_COLOR));
-		prop.setMaxValueCount(3);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-left
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT);
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_WIDTH));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_STYLE));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_COLOR));
-		prop.setMaxValueCount(3);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-top-color
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_COLOR);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_COLOR));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-top-style
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_STYLE);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_BORDER_STYLE));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-top-width
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_WIDTH);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_BORDER_WIDTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-right-color
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_COLOR);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_COLOR));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-right-style
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_STYLE);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_BORDER_STYLE));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-right-width
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_WIDTH);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_BORDER_WIDTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-bottom-color
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_COLOR);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_COLOR));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-bottom-style
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_STYLE);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_BORDER_STYLE));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-bottom-width
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_WIDTH);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_BORDER_WIDTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-left-color
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_COLOR);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_COLOR));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-left-style
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_STYLE);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_BORDER_STYLE));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-left-width
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_WIDTH);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_BORDER_WIDTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// border-width
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_WIDTH);
-		// prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_BORDER_WIDTH));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_WIDTH));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_WIDTH));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_WIDTH));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_WIDTH));
-		prop.setMaxValueCount(4);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// bottom
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_BOTTOM);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// caption-side
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_CAPTION_SIDE);
-		prop.appendChild(IValID.V_TOP);
-		prop.appendChild(IValID.V_BOTTOM);
-		prop.appendChild(IValID.V_LEFT);
-		prop.appendChild(IValID.V_RIGHT);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// clear
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_CLEAR);
-		prop.appendChild(IValID.V_LEFT);
-		prop.appendChild(IValID.V_RIGHT);
-		prop.appendChild(IValID.V_BOTH);
-		prop.appendChild(IValID.V_STATIC);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// clip ---- sub-properties top
-		prop = PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_TOP);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(IValID.V_AUTO);
-		((PropCMSubProperty) prop).setContainer(PropCMProperty.getInstanceOf(PropCMProperty.P_CLIP));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// clip ---- sub-properties right
-		prop = PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_RIGHT);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(IValID.V_AUTO);
-		((PropCMSubProperty) prop).setContainer(PropCMProperty.getInstanceOf(PropCMProperty.P_CLIP));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// clip ---- sub-properties bottom
-		prop = PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_BOTTOM);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(IValID.V_AUTO);
-		((PropCMSubProperty) prop).setContainer(PropCMProperty.getInstanceOf(PropCMProperty.P_CLIP));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// clip ---- sub-properties left
-		prop = PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_LEFT);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(IValID.V_AUTO);
-		((PropCMSubProperty) prop).setContainer(PropCMProperty.getInstanceOf(PropCMProperty.P_CLIP));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// clip
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_CLIP);
-		prop.appendChild(PropCMFunction.getInstanceOf(PropCMFunction.VAL_SHAPE));
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// color
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_COLOR);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_COLOR));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// content
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_CONTENT);
-		prop.appendChild(PropCMString.getInstanceOf(PropCMString.VAL_ANY));
-		prop.appendChild(PropCMFunction.getInstanceOf(PropCMFunction.VAL_URI));
-		prop.appendChild(PropCMFunction.getInstanceOf(PropCMFunction.VAL_COUNTER));
-		prop.appendChild(PropCMFunction.getInstanceOf(PropCMFunction.VAL_ATTR));
-		prop.appendChild(IValID.V_OPEN_QUOTE);
-		prop.appendChild(IValID.V_CLOSE_QUOTE);
-		prop.appendChild(IValID.V_NO_OPEN_QUOTE);
-		prop.appendChild(IValID.V_NO_CLOSE_QUOTE);
-		prop.setMaxValueCount(-1); // infinite
-		prop.appendMediaGroup(IMediaGroupID.M_ALL);
-
-		// counter-increment
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_COUNTER_INCREMENT);
-		prop.appendChild(PropCMString.getInstanceOf(PropCMString.VAL_COUNTER_ID));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_INTEGER));
-		prop.appendChild(IValID.V_NONE);
-		prop.setMaxValueCount(-1);
-		prop.appendMediaGroup(IMediaGroupID.M_ALL);
-
-		// counter-reset
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_COUNTER_RESET);
-		prop.appendChild(PropCMString.getInstanceOf(PropCMString.VAL_COUNTER_ID));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_INTEGER));
-		prop.appendChild(IValID.V_NONE);
-		prop.setMaxValueCount(-1);
-		prop.appendMediaGroup(IMediaGroupID.M_ALL);
-
-		// cue
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_CUE);
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_CUE_BEFORE));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_CUE_AFTER));
-		prop.setMaxValueCount(2);
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// cue-after
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_CUE_AFTER);
-		prop.appendChild(PropCMFunction.getInstanceOf(PropCMFunction.VAL_URI));
-		prop.appendChild(IValID.V_NONE);
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// cue-before
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_CUE_BEFORE);
-		prop.appendChild(PropCMFunction.getInstanceOf(PropCMFunction.VAL_URI));
-		prop.appendChild(IValID.V_NONE);
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// cursor
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_CURSOR);
-		prop.appendChild(PropCMFunction.getInstanceOf(PropCMFunction.VAL_URI));
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendChild(IValID.V_CROSSHAIR);
-		prop.appendChild(IValID.V_DEFAULT);
-		prop.appendChild(IValID.V_POINTER);
-		prop.appendChild(IValID.V_MOVE);
-		prop.appendChild(IValID.V_E_RESIZE);
-		prop.appendChild(IValID.V_NE_RESIZE);
-		prop.appendChild(IValID.V_NW_RESIZE);
-		prop.appendChild(IValID.V_N_RESIZE);
-		prop.appendChild(IValID.V_SE_RESIZE);
-		prop.appendChild(IValID.V_SW_RESIZE);
-		prop.appendChild(IValID.V_S_RESIZE);
-		prop.appendChild(IValID.V_W_RESIZE);
-		prop.appendChild(IValID.V_TEXT);
-		prop.appendChild(IValID.V_WAIT);
-		prop.appendChild(IValID.V_HELP);
-		prop.setMaxValueCount(-1); // infinite
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-		prop.appendMediaGroup(IMediaGroupID.M_INTERACTIVE);
-
-		// direction
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_DIRECTION);
-		prop.appendChild(IValID.V_LTR);
-		prop.appendChild(IValID.V_RTL);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// display
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_DISPLAY);
-		prop.appendChild(IValID.V_INLINE);
-		prop.appendChild(IValID.V_BLOCK);
-		prop.appendChild(IValID.V_LIST_ITEM);
-		prop.appendChild(IValID.V_RUN_IN);
-		prop.appendChild(IValID.V_COMPACT);
-		prop.appendChild(IValID.V_MARKER);
-		prop.appendChild(IValID.V_TABLE);
-		prop.appendChild(IValID.V_INLINE_TABLE);
-		prop.appendChild(IValID.V_TABLE_ROW_GROUP);
-		prop.appendChild(IValID.V_TABLE_HEADER_GROUP);
-		prop.appendChild(IValID.V_TABLE_FOOTER_GROUP);
-		prop.appendChild(IValID.V_TABLE_ROW);
-		prop.appendChild(IValID.V_TABLE_COLUMN_GROUP);
-		prop.appendChild(IValID.V_TABLE_COLUMN);
-		prop.appendChild(IValID.V_TABLE_CELL);
-		prop.appendChild(IValID.V_TABLE_CAPTION);
-		prop.appendChild(IValID.V_NONE);
-		prop.appendMediaGroup(IMediaGroupID.M_ALL);
-
-		// elevation
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_ELEVATION);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_ANGLE));
-		prop.appendChild(IValID.V_BELOW);
-		prop.appendChild(IValID.V_LEVEL);
-		prop.appendChild(IValID.V_ABOVE);
-		prop.appendChild(IValID.V_HIGHER);
-		prop.appendChild(IValID.V_LOWER);
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// empty-cells
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_EMPTY_CELLS);
-		prop.appendChild(IValID.V_SHOW);
-		prop.appendChild(IValID.V_HIDE);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// float
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_FLOAT);
-		prop.appendChild(IValID.V_LEFT);
-		prop.appendChild(IValID.V_RIGHT);
-		prop.appendChild(IValID.V_NONE);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// font
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT);
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_STYLE));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_VARIANT));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_WEIGHT));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_SIZE));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_LINE_HEIGHT));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_FAMILY));
-		prop.appendChild(IValID.V_CAPTION);
-		prop.appendChild(IValID.V_ICON);
-		prop.appendChild(IValID.V_MENU);
-		prop.appendChild(IValID.V_MESSAGE_BOX);
-		prop.appendChild(IValID.V_SMALL_CAPTION);
-		prop.appendChild(IValID.V_STATUS_BAR);
-		prop.setMaxValueCount(-1);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// font-family
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_FAMILY);
-		prop.appendChild(PropCMString.getInstanceOf(PropCMString.VAL_FONT));
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_GENERIC_FAMILY));
-		prop.setMaxValueCount(-1);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// font-size
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_SIZE);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_ABSOLUTE_SIZE));
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_RELATIVE_SIZE));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// font-size-adjust
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_SIZE_ADJUST);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-		prop.appendChild(IValID.V_NONE);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// font-stretch
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_STRETCH);
-		prop.appendChild(IValID.V_NORMAL);
-		prop.appendChild(IValID.V_WIDER);
-		prop.appendChild(IValID.V_NARROWER);
-		prop.appendChild(IValID.V_ULTRA_CONDENSED);
-		prop.appendChild(IValID.V_EXTRA_CONDENSED);
-		prop.appendChild(IValID.V_CONDENSED);
-		prop.appendChild(IValID.V_SEMI_CONDENSED);
-		prop.appendChild(IValID.V_SEMI_EXPANDED);
-		prop.appendChild(IValID.V_EXPANDED);
-		prop.appendChild(IValID.V_EXTRA_EXPANDED);
-		prop.appendChild(IValID.V_ULTRA_EXPANDED);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// font-style
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_STYLE);
-		prop.appendChild(IValID.V_ITALIC);
-		prop.appendChild(IValID.V_OBLIQUE);
-		prop.appendChild(IValID.V_NORMAL);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// font-variant
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_VARIANT);
-		prop.appendChild(IValID.V_SMALL_CAPS);
-		prop.appendChild(IValID.V_NORMAL);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// font-weight
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_WEIGHT);
-		prop.appendChild(IValID.V_BOLD);
-		prop.appendChild(IValID.V_100);
-		prop.appendChild(IValID.V_200);
-		prop.appendChild(IValID.V_300);
-		prop.appendChild(IValID.V_400);
-		prop.appendChild(IValID.V_500);
-		prop.appendChild(IValID.V_600);
-		prop.appendChild(IValID.V_700);
-		prop.appendChild(IValID.V_800);
-		prop.appendChild(IValID.V_900);
-		prop.appendChild(IValID.V_LIGHTER);
-		prop.appendChild(IValID.V_BOLDER);
-		prop.appendChild(IValID.V_NORMAL);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// height
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_HEIGHT);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// leftt
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_LEFT);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// letter-spacing
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_LETTER_SPACING);
-		prop.appendChild(IValID.V_NORMAL);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// line-height
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_LINE_HEIGHT);
-		prop.appendChild(IValID.V_NORMAL);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// list-style
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE);
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_TYPE));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_POSITION));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_IMAGE));
-		prop.setMaxValueCount(3);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// list-style-image
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_IMAGE);
-		prop.appendChild(PropCMFunction.getInstanceOf(PropCMFunction.VAL_URI));
-		prop.appendChild(IValID.V_NONE);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// list-style-position
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_POSITION);
-		prop.appendChild(IValID.V_INSIDE);
-		prop.appendChild(IValID.V_OUTSIDE);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// list-style-type
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_TYPE);
-		prop.appendChild(IValID.V_DISC);
-		prop.appendChild(IValID.V_CIRCLE);
-		prop.appendChild(IValID.V_SQUARE);
-		prop.appendChild(IValID.V_DECIMAL);
-		prop.appendChild(IValID.V_DECIMAL_LEADING_ZERO);
-		prop.appendChild(IValID.V_LOWER_ROMAN);
-		prop.appendChild(IValID.V_UPPER_ROMAN);
-		prop.appendChild(IValID.V_LOWER_GREEK);
-		prop.appendChild(IValID.V_LOWER_ALPHA);
-		prop.appendChild(IValID.V_LOWER_LATIN);
-		prop.appendChild(IValID.V_UPPER_ALPHA);
-		prop.appendChild(IValID.V_UPPER_LATIN);
-		prop.appendChild(IValID.V_HEBREW);
-		prop.appendChild(IValID.V_ARMENIAN);
-		prop.appendChild(IValID.V_GEORGIAN);
-		prop.appendChild(IValID.V_CJK_IDEOGRAPHIC);
-		prop.appendChild(IValID.V_HIRAGANA);
-		prop.appendChild(IValID.V_KATAKANA);
-		prop.appendChild(IValID.V_HIRAGANA_IROHA);
-		prop.appendChild(IValID.V_KATAKANA_IROHA);
-		prop.appendChild(IValID.V_NONE);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// margin
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN);
-		// prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_MARGIN_WIDTH));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_TOP));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_RIGHT));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_BOTTOM));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_LEFT));
-		prop.setMaxValueCount(4);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// margin-top
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_TOP);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_MARGIN_WIDTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// margin-right
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_RIGHT);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_MARGIN_WIDTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// margin-bottom
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_BOTTOM);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_MARGIN_WIDTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// margin-left
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_LEFT);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_MARGIN_WIDTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// marker-offset
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_MARKER_OFFSET);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// marks
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_MARKS);
-		prop.appendChild(IValID.V_CROP);
-		prop.appendChild(IValID.V_CROSS);
-		prop.appendChild(IValID.V_NONE);
-		prop.setMaxValueCount(2);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-		prop.appendMediaGroup(IMediaGroupID.M_PAGED);
-
-		// max-height
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_MAX_HEIGHT);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendChild(IValID.V_NONE);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// max-width
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_MAX_WIDTH);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendChild(IValID.V_NONE);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// min-height
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_MIN_HEIGHT);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// min-width
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_MIN_WIDTH);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// orphans
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_ORPHANS);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_INTEGER));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-		prop.appendMediaGroup(IMediaGroupID.M_PAGED);
-
-		// outline
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_OUTLINE);
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_OUTLINE_COLOR));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_OUTLINE_STYLE));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_OUTLINE_WIDTH));
-		prop.setMaxValueCount(3);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-		prop.appendMediaGroup(IMediaGroupID.M_INTERACTIVE);
-
-		// outline-color
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_OUTLINE_COLOR);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_COLOR));
-		prop.appendChild(IValID.V_INVERT);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-		prop.appendMediaGroup(IMediaGroupID.M_INTERACTIVE);
-
-		// outline-style
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_OUTLINE_STYLE);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_BORDER_STYLE));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-		prop.appendMediaGroup(IMediaGroupID.M_INTERACTIVE);
-
-		// outline-width
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_OUTLINE_WIDTH);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_BORDER_WIDTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-		prop.appendMediaGroup(IMediaGroupID.M_INTERACTIVE);
-
-		// overflow
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_OVERFLOW);
-		prop.appendChild(IValID.V_VISIBLE);
-		prop.appendChild(IValID.V_HIDDEN);
-		prop.appendChild(IValID.V_SCROLL);
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// padding
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING);
-		// prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_PADDING_WIDTH));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_TOP));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_RIGHT));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_BOTTOM));
-		prop.appendChild(PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_LEFT));
-		prop.setMaxValueCount(4);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// padding-top
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_TOP);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_PADDING_WIDTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// padding-right
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_RIGHT);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_PADDING_WIDTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// padding-bottom
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_BOTTOM);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_PADDING_WIDTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// padding-left
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_LEFT);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_PADDING_WIDTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// page
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_PAGE);
-		prop.appendChild(PropCMString.getInstanceOf(PropCMString.VAL_PAGE_ID));
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-		prop.appendMediaGroup(IMediaGroupID.M_PAGED);
-
-		// page-break-after
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_PAGE_BREAK_AFTER);
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendChild(IValID.V_ALWAYS);
-		prop.appendChild(IValID.V_AVOID);
-		prop.appendChild(IValID.V_LEFT);
-		prop.appendChild(IValID.V_RIGHT);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-		prop.appendMediaGroup(IMediaGroupID.M_PAGED);
-
-		// page-break-before
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_PAGE_BREAK_BEFORE);
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendChild(IValID.V_ALWAYS);
-		prop.appendChild(IValID.V_AVOID);
-		prop.appendChild(IValID.V_LEFT);
-		prop.appendChild(IValID.V_RIGHT);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-		prop.appendMediaGroup(IMediaGroupID.M_PAGED);
-
-		// page-break-inside
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_PAGE_BREAK_INSIDE);
-		prop.appendChild(IValID.V_AVOID);
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-		prop.appendMediaGroup(IMediaGroupID.M_PAGED);
-
-		// pause
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_PAUSE);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_TIME));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.setMaxValueCount(2);
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// pause-after
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_PAUSE_AFTER);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_TIME));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// pause-before
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_PAUSE_BEFORE);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_TIME));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// pitch
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_PITCH);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_FREQUENCY));
-		prop.appendChild(IValID.V_X_LOW);
-		prop.appendChild(IValID.V_LOW);
-		prop.appendChild(IValID.V_MEDIUM);
-		prop.appendChild(IValID.V_HIGH);
-		prop.appendChild(IValID.V_X_HIGH);
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// pitch-range
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_PITCH_RANGE);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// play-during
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_PLAY_DURING);
-		prop.appendChild(PropCMFunction.getInstanceOf(PropCMFunction.VAL_URI));
-		prop.appendChild(IValID.V_MIX);
-		prop.appendChild(IValID.V_REPEAT);
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendChild(IValID.V_NONE);
-		prop.setMaxValueCount(3);
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// position
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_POSITION);
-		prop.appendChild(IValID.V_ABSOLUTE);
-		prop.appendChild(IValID.V_RELATIVE);
-		prop.appendChild(IValID.V_FIXED);
-		prop.appendChild(IValID.V_STATIC);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// quotes
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_QUOTES);
-		prop.appendChild(PropCMString.getInstanceOf(PropCMString.VAL_ANY));
-		prop.appendChild(IValID.V_NONE);
-		prop.setMaxValueCount(-1);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// richness
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_RICHNESS);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// right
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_RIGHT);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// size
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_SIZE);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendChild(IValID.V_PORTRAIT);
-		prop.appendChild(IValID.V_LANDSCAPE);
-		prop.setMaxValueCount(2);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-		prop.appendMediaGroup(IMediaGroupID.M_PAGED);
-
-		// speak
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_SPEAK);
-		prop.appendChild(IValID.V_NORMAL);
-		prop.appendChild(IValID.V_NONE);
-		prop.appendChild(IValID.V_SPELL_OUT);
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// speak-header
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_SPEAK_HEADER);
-		prop.appendChild(IValID.V_ONCE);
-		prop.appendChild(IValID.V_ALWAYS);
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// speak-numeral
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_SPEAK_NUMERAL);
-		prop.appendChild(IValID.V_DIGITS);
-		prop.appendChild(IValID.V_CONTINUOUS);
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// speak-punctuation
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_SPEAK_PUNCTUATION);
-		prop.appendChild(IValID.V_CODE);
-		prop.appendChild(IValID.V_NONE);
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// speech-rate
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_SPEECH_RATE);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-		prop.appendChild(IValID.V_X_SLOW);
-		prop.appendChild(IValID.V_SLOW);
-		prop.appendChild(IValID.V_MEDIUM);
-		prop.appendChild(IValID.V_FAST);
-		prop.appendChild(IValID.V_X_FAST);
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// stress
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_STRESS);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// table-layout
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_TABLE_LAYOUT);
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendChild(IValID.V_FIXED);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// text-align
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_TEXT_ALIGN);
-		prop.appendChild(IValID.V_LEFT);
-		prop.appendChild(IValID.V_CENTER);
-		prop.appendChild(IValID.V_RIGHT);
-		prop.appendChild(IValID.V_JUSTIFY);
-		prop.appendChild(PropCMString.getInstanceOf(PropCMString.VAL_ANY));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// text-decoration
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_TEXT_DECORATION);
-		prop.appendChild(IValID.V_UNDERLINE);
-		prop.appendChild(IValID.V_OVERLINE);
-		prop.appendChild(IValID.V_LINE_THROUGH);
-		prop.appendChild(IValID.V_BLINK);
-		prop.appendChild(IValID.V_NONE);
-		prop.setMaxValueCount(4);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// text-indent
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_TEXT_INDENT);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// text-shadow
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_TEXT_SHADOW);
-		prop.appendChild(IValID.V_NONE);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_COLOR));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.setMaxValueCount(-1);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// text-transform
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_TEXT_TRANSFORM);
-		prop.appendChild(IValID.V_CAPITALIZE);
-		prop.appendChild(IValID.V_UPPERCASE);
-		prop.appendChild(IValID.V_LOWERCASE);
-		prop.appendChild(IValID.V_NONE);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// top
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_TOP);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// unicode-bidi
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_UNICODE_BIDI);
-		prop.appendChild(IValID.V_NORMAL);
-		prop.appendChild(IValID.V_EMBED);
-		prop.appendChild(IValID.V_BIDI_OVERRIDE);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// vertical-align
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_VERTICAL_ALIGN);
-		prop.appendChild(IValID.V_BOTTOM);
-		prop.appendChild(IValID.V_TEXT_BOTTOM);
-		prop.appendChild(IValID.V_SUB);
-		prop.appendChild(IValID.V_BASELINE);
-		prop.appendChild(IValID.V_MIDDLE);
-		prop.appendChild(IValID.V_SUPER);
-		prop.appendChild(IValID.V_TEXT_TOP);
-		prop.appendChild(IValID.V_TOP);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// visibility
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_VISIBILITY);
-		prop.appendChild(IValID.V_VISIBLE);
-		prop.appendChild(IValID.V_HIDDEN);
-		prop.appendChild(IValID.V_COLLAPSE);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// voice-family
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_VOICE_FAMILY);
-		prop.appendChild(PropCMString.getInstanceOf(PropCMString.VAL_VOICE));
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_GENERIC_VOICE));
-		prop.setMaxValueCount(-1);
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// volume
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_VOLUME);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendChild(IValID.V_SILENT);
-		prop.appendChild(IValID.V_X_SOFT);
-		prop.appendChild(IValID.V_SOFT);
-		prop.appendChild(IValID.V_MEDIUM);
-		prop.appendChild(IValID.V_LOUD);
-		prop.appendChild(IValID.V_X_LOUD);
-		prop.appendMediaGroup(IMediaGroupID.M_AURAL);
-
-		// white-space
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_WHITE_SPACE);
-		prop.appendChild(IValID.V_NORMAL);
-		prop.appendChild(IValID.V_PRE);
-		prop.appendChild(IValID.V_NOWRAP);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// widows
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_WIDOWS);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_INTEGER));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-		prop.appendMediaGroup(IMediaGroupID.M_PAGED);
-
-		// width
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_WIDTH);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// word-spacing
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_WORD_SPACING);
-		prop.appendChild(IValID.V_NORMAL);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		// z-index
-		prop = PropCMProperty.getInstanceOf(PropCMProperty.P_Z_INDEX);
-		prop.appendChild(IValID.V_AUTO);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_INTEGER));
-		prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
-
-		/** ******** font properties ********* */
-		// font-family
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_FONT_FAMILY);
-		prop.appendChild(PropCMString.getInstanceOf(PropCMString.VAL_FONT));
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_GENERIC_FAMILY));
-		prop.setMaxValueCount(-1);
-
-		// font-style
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_FONT_STYLE);
-		prop.appendChild(IValID.V_ITALIC);
-		prop.appendChild(IValID.V_OBLIQUE);
-		prop.appendChild(IValID.V_NORMAL);
-		prop.appendChild(IValID.V_ALL);
-		prop.setMaxValueCount(-1);
-
-		// font-variant
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_FONT_VARIANT);
-		prop.appendChild(IValID.V_SMALL_CAPS);
-		prop.appendChild(IValID.V_NORMAL);
-		prop.setMaxValueCount(-1);
-
-		// font-weight
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_FONT_WEIGHT);
-		prop.appendChild(IValID.V_BOLD);
-		prop.appendChild(IValID.V_100);
-		prop.appendChild(IValID.V_200);
-		prop.appendChild(IValID.V_300);
-		prop.appendChild(IValID.V_400);
-		prop.appendChild(IValID.V_500);
-		prop.appendChild(IValID.V_600);
-		prop.appendChild(IValID.V_700);
-		prop.appendChild(IValID.V_800);
-		prop.appendChild(IValID.V_900);
-		prop.appendChild(IValID.V_NORMAL);
-		prop.appendChild(IValID.V_ALL);
-		prop.setMaxValueCount(-1);
-
-		// font-stretch
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_FONT_STRETCH);
-		prop.appendChild(IValID.V_NORMAL);
-		prop.appendChild(IValID.V_ULTRA_CONDENSED);
-		prop.appendChild(IValID.V_EXTRA_CONDENSED);
-		prop.appendChild(IValID.V_CONDENSED);
-		prop.appendChild(IValID.V_SEMI_CONDENSED);
-		prop.appendChild(IValID.V_SEMI_EXPANDED);
-		prop.appendChild(IValID.V_EXPANDED);
-		prop.appendChild(IValID.V_EXTRA_EXPANDED);
-		prop.appendChild(IValID.V_ULTRA_EXPANDED);
-		prop.appendChild(IValID.V_ALL);
-		prop.setMaxValueCount(-1);
-
-		// font-size
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_FONT_SIZE);
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_ABSOLUTE_SIZE));
-		prop.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_RELATIVE_SIZE));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		prop.appendChild(IValID.V_ALL);
-		prop.setMaxValueCount(-1);
-
-		// unicode-range
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_UNICODE_RANGE);
-		prop.appendChild(PropCMURange.getInstanceOf(PropCMURange.VAL_URANGE));
-		prop.setMaxValueCount(-1);
-
-		// units-per-em
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_UNITS_PER_EM);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-
-		// src
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_SRC);
-		prop.appendChild(PropCMFunction.getInstanceOf(PropCMFunction.VAL_URI));
-		prop.appendChild(PropCMFunction.getInstanceOf(PropCMFunction.VAL_FORMAT));
-		prop.appendChild(PropCMFunction.getInstanceOf(PropCMFunction.VAL_LOCAL));
-		prop.setMaxValueCount(-1);
-
-		// panose-1
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_PANOSE_1);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_INTEGER));
-		prop.setMaxValueCount(10);
-
-		// stemv
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_STEMV);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-
-		// stemh
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_STEMH);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-
-		// slope
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_SLOPE);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-
-		// cap-height
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_CAP_HEIGHT);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-
-		// x-height
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_X_HEIGHT);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-
-		// ascent
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_ASCENT);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-
-		// descent
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_DESCENT);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-
-		// widths
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_WIDTHS);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-		prop.appendChild(PropCMURange.getInstanceOf(PropCMURange.VAL_URANGE));
-		prop.setMaxValueCount(-1);
-
-		// bbox
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_BBOX);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-		prop.setMaxValueCount(4);
-		prop.setMaxValueCount(4);
-
-		// definition-src
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_DEFINITION_SRC);
-		prop.appendChild(PropCMFunction.getInstanceOf(PropCMFunction.VAL_URI));
-
-		// baseline
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_BASELINE);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-
-		// centerline
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_CENTERLINE);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-
-		// mathline
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_MATHLINE);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-
-		// topline
-		prop = PropCMFontProperty.getInstanceOf(PropCMFontProperty.PF_TOPLINE);
-		prop.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_NUM));
-
-		/** ******** containers ********* */
-
-		// absolute-size
-		PropCMContainer cont = PropCMContainer.getContInstanceOf(PropCMContainer.VAL_ABSOLUTE_SIZE);
-		cont.appendChild(IValID.V_XX_SMALL);
-		cont.appendChild(IValID.V_X_SMALL);
-		cont.appendChild(IValID.V_SMALL);
-		cont.appendChild(IValID.V_MEDIUM);
-		cont.appendChild(IValID.V_LARGE);
-		cont.appendChild(IValID.V_X_LARGE);
-		cont.appendChild(IValID.V_XX_LARGE);
-
-		// border-style
-		cont = PropCMContainer.getContInstanceOf(PropCMContainer.VAL_BORDER_STYLE);
-		cont.appendChild(IValID.V_SOLID);
-		cont.appendChild(IValID.V_DASHED);
-		cont.appendChild(IValID.V_DOTTED);
-		cont.appendChild(IValID.V_DOUBLE);
-		cont.appendChild(IValID.V_GROOVE);
-		cont.appendChild(IValID.V_RIDGE);
-		cont.appendChild(IValID.V_INSET);
-		cont.appendChild(IValID.V_OUTSET);
-		cont.appendChild(IValID.V_HIDDEN);
-		cont.appendChild(IValID.V_NONE);
-
-		// border-width
-		cont = PropCMContainer.getContInstanceOf(PropCMContainer.VAL_BORDER_WIDTH);
-		cont.appendChild(IValID.V_THIN);
-		cont.appendChild(IValID.V_MEDIUM);
-		cont.appendChild(IValID.V_THICK);
-		cont.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-
-		// color
-		cont = PropCMContainer.getContInstanceOf(PropCMContainer.VAL_COLOR);
-		cont.appendChild(IValID.V_AQUA);
-		cont.appendChild(IValID.V_BLACK);
-		cont.appendChild(IValID.V_BLUE);
-		cont.appendChild(IValID.V_FUCHSIA);
-		cont.appendChild(IValID.V_GRAY);
-		cont.appendChild(IValID.V_GREEN);
-		cont.appendChild(IValID.V_LIME);
-		cont.appendChild(IValID.V_MAROON);
-		cont.appendChild(IValID.V_NAVY);
-		cont.appendChild(IValID.V_OLIVE);
-		cont.appendChild(IValID.V_PURPLE);
-		cont.appendChild(IValID.V_RED);
-		cont.appendChild(IValID.V_SILVER);
-		cont.appendChild(IValID.V_TEAL);
-		cont.appendChild(IValID.V_WHITE);
-		cont.appendChild(IValID.V_YELLOW);
-		cont.appendChild(PropCMContainer.getContInstanceOf(PropCMContainer.VAL_SYSTEM_COLOR));
-		cont.appendChild(PropCMFunction.getInstanceOf(PropCMFunction.VAL_RGB));
-		cont.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_HASH));
-
-		// system color
-		cont = PropCMContainer.getContInstanceOf(PropCMContainer.VAL_SYSTEM_COLOR);
-		cont.appendChild(IValID.V_ACTIVEBORDER);
-		cont.appendChild(IValID.V_ACTIVECAPTION);
-		cont.appendChild(IValID.V_APPWORKSPACE);
-		cont.appendChild(IValID.V_BACKGROUND);
-		cont.appendChild(IValID.V_BUTTONFACE);
-		cont.appendChild(IValID.V_BUTTONHIGHLIGHT);
-		cont.appendChild(IValID.V_BUTTONSHADOW);
-		cont.appendChild(IValID.V_BUTTONTEXT);
-		cont.appendChild(IValID.V_CAPTIONTEXT);
-		cont.appendChild(IValID.V_GRAYTEXT);
-		cont.appendChild(IValID.V_HIGHLIGHT);
-		cont.appendChild(IValID.V_HIGHLIGHTTEXT);
-		cont.appendChild(IValID.V_INACTIVEBORDER);
-		cont.appendChild(IValID.V_INACTIVECAPTION);
-		cont.appendChild(IValID.V_INACTIVECAPTIONTEXT);
-		cont.appendChild(IValID.V_INFOBACKGROUND);
-		cont.appendChild(IValID.V_INFOTEXT);
-		cont.appendChild(IValID.V_MENU);
-		cont.appendChild(IValID.V_MENUTEXT);
-		cont.appendChild(IValID.V_SCROLLBAR);
-		cont.appendChild(IValID.V_THREEDDARKSHADOW);
-		cont.appendChild(IValID.V_THREEDFACE);
-		cont.appendChild(IValID.V_THREEDHIGHLIGHT);
-		cont.appendChild(IValID.V_THREEDLIGHTSHADOW);
-		cont.appendChild(IValID.V_THREEDSHADOW);
-		cont.appendChild(IValID.V_WINDOW);
-		cont.appendChild(IValID.V_WINDOWFRAME);
-		cont.appendChild(IValID.V_WINDOWTEXT);
-
-		// generic-family
-		cont = PropCMContainer.getContInstanceOf(PropCMContainer.VAL_GENERIC_FAMILY);
-		cont.appendChild(IValID.V_SERIF);
-		cont.appendChild(IValID.V_SANS_SERIF);
-		cont.appendChild(IValID.V_CURSIVE);
-		cont.appendChild(IValID.V_FANTASY);
-		cont.appendChild(IValID.V_MONOSPACE);
-
-		// generic-voice
-		cont = PropCMContainer.getContInstanceOf(PropCMContainer.VAL_GENERIC_VOICE);
-		cont.appendChild(IValID.V_MALE);
-		cont.appendChild(IValID.V_FEMALE);
-		cont.appendChild(IValID.V_CHILD);
-
-		// margin-width
-		cont = PropCMContainer.getContInstanceOf(PropCMContainer.VAL_MARGIN_WIDTH);
-		cont.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		cont.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-		cont.appendChild(IValID.V_AUTO);
-
-		// padding-width
-		cont = PropCMContainer.getContInstanceOf(PropCMContainer.VAL_PADDING_WIDTH);
-		cont.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_LENGTH));
-		cont.appendChild(PropCMNumber.getInstanceOf(PropCMNumber.VAL_PERCENTAGE));
-
-		// relative-size
-		cont = PropCMContainer.getContInstanceOf(PropCMContainer.VAL_RELATIVE_SIZE);
-		cont.appendChild(IValID.V_SMALLER);
-		cont.appendChild(IValID.V_LARGER);
-
-		LOADING = 2;
-	}
-
-	/**
-	 * 
-	 */
-	protected static boolean isLoading() {
-		return LOADING == 1;
-	}
-
-	/**
-	 * 
-	 */
-	protected static boolean isNeedInitialize() {
-		return LOADING == 0;
-	}
-
-	/**
-	 * 
-	 */
-	public String toString() {
-		return getName();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMNumber.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMNumber.java
deleted file mode 100644
index 2fcccb0..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMNumber.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contentmodel;
-
-
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Vector;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.w3c.dom.css.CSSPrimitiveValue;
-
-
-/**
- * 
- */
-public class PropCMNumber extends PropCMNode {
-
-	private static java.util.Hashtable instances = null;
-	public final static java.lang.String VAL_ANGLE = "angle";//$NON-NLS-1$
-	public final static java.lang.String VAL_FREQUENCY = "frequency";//$NON-NLS-1$
-	public final static java.lang.String VAL_INTEGER = "integer";//$NON-NLS-1$
-	public final static java.lang.String VAL_LENGTH = "length";//$NON-NLS-1$
-	public final static java.lang.String VAL_PERCENTAGE = "percentage";//$NON-NLS-1$
-	public final static java.lang.String VAL_TIME = "time";//$NON-NLS-1$
-	public final static java.lang.String VAL_HASH = "hash"; //$NON-NLS-1$
-	public final static java.lang.String VAL_NUM = "number";//$NON-NLS-1$
-	public final static String DIM_CM = "cm";//$NON-NLS-1$
-	public final static String DIM_DEG = "deg";//$NON-NLS-1$
-	public final static String DIM_EMS = "em";//$NON-NLS-1$
-	public final static String DIM_EXS = "ex";//$NON-NLS-1$
-	public final static String DIM_GRAD = "grad";//$NON-NLS-1$
-	public final static String DIM_HASH = "#";//$NON-NLS-1$
-	public final static String DIM_HZ = "Hz";//$NON-NLS-1$
-	public final static String DIM_IN = "in";//$NON-NLS-1$
-	public final static String DIM_INTEGER = "INTEGER";//$NON-NLS-1$
-	public final static String DIM_KHZ = "kHz";//$NON-NLS-1$
-	public final static String DIM_MM = "mm";//$NON-NLS-1$
-	public final static String DIM_MS = "ms";//$NON-NLS-1$
-	public final static String DIM_NUMBER = "NUMBER";//$NON-NLS-1$
-	public final static String DIM_PC = "pc";//$NON-NLS-1$
-	public final static String DIM_PERCENTAGE = "%";//$NON-NLS-1$
-	public final static String DIM_PT = "pt";//$NON-NLS-1$
-	public final static String DIM_PX = "px";//$NON-NLS-1$
-	public final static String DIM_RAD = "rad";//$NON-NLS-1$
-	public final static String DIM_S = "s";//$NON-NLS-1$
-	private java.util.Vector fDims = new Vector();
-
-	/**
-	 * 
-	 */
-	protected PropCMNumber(String name) {
-		super(name);
-	}
-
-	/**
-	 * 
-	 */
-	public static String getDimension(short primitiveType) {
-		switch (primitiveType) {
-			case CSSPrimitiveValue.CSS_CM :
-				return DIM_CM;
-			case CSSPrimitiveValue.CSS_DEG :
-				return DIM_DEG;
-			case CSSPrimitiveValue.CSS_EMS :
-				return DIM_EMS;
-			case CSSPrimitiveValue.CSS_EXS :
-				return DIM_EXS;
-			case CSSPrimitiveValue.CSS_GRAD :
-				return DIM_GRAD;
-			case ICSSPrimitiveValue.CSS_HASH :
-				return DIM_HASH; // prefix dimension ....
-			case CSSPrimitiveValue.CSS_HZ :
-				return DIM_HZ;
-			case CSSPrimitiveValue.CSS_IN :
-				return DIM_IN;
-			case ICSSPrimitiveValue.CSS_INTEGER :
-				return "";//$NON-NLS-1$
-			case CSSPrimitiveValue.CSS_KHZ :
-				return DIM_KHZ;
-			case CSSPrimitiveValue.CSS_MM :
-				return DIM_MM;
-			case CSSPrimitiveValue.CSS_MS :
-				return DIM_MS;
-			case CSSPrimitiveValue.CSS_NUMBER :
-				return "";//$NON-NLS-1$
-			case CSSPrimitiveValue.CSS_PC :
-				return DIM_PC;
-			case CSSPrimitiveValue.CSS_PERCENTAGE :
-				return DIM_PERCENTAGE;
-			case CSSPrimitiveValue.CSS_PT :
-				return DIM_PT;
-			case CSSPrimitiveValue.CSS_PX :
-				return DIM_PX;
-			case CSSPrimitiveValue.CSS_RAD :
-				return DIM_RAD;
-			case CSSPrimitiveValue.CSS_S :
-				return DIM_S;
-		}
-
-		return null;
-	}
-
-	/**
-	 * 
-	 */
-	public Set getDimensions() {
-		HashSet vals = new HashSet();
-		Iterator it = fDims.iterator();
-		while (it.hasNext()) {
-			vals.add(it.next());
-		}
-
-		return vals;
-	}
-
-	/**
-	 * 
-	 */
-	void getIdentifiers(Set indents) {
-	}
-
-	/**
-	 * 
-	 */
-	static public PropCMNumber getInstanceOf(String name) {
-		if (name == null)
-			return null;
-
-		// initialize
-		if (instances == null)
-			instances = new Hashtable(20);
-
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		// query
-		Object node = instances.get(name);
-		if (node != null)
-			return (PropCMNumber) node;
-
-		// register
-		if (PropCMNode.isLoading()) {
-			node = new PropCMNumber(name);
-			instances.put(name, node);
-		}
-
-		return (PropCMNumber) node;
-	}
-
-	/**
-	 * 
-	 */
-	public short getType() {
-		return VAL_NUMBER;
-	}
-
-	/**
-	 * 
-	 */
-	void getValues(Collection values) {
-		if (values != null && !values.contains(this))
-			values.add(this);
-	}
-
-	/**
-	 * 
-	 */
-	static void initNumberCMDim() {
-		PropCMNumber num = getInstanceOf(VAL_ANGLE);
-		num.fDims.add(DIM_DEG);
-		num.fDims.add(DIM_GRAD);
-		num.fDims.add(DIM_RAD);
-
-		num = getInstanceOf(VAL_FREQUENCY);
-		num.fDims.add(DIM_HZ);
-		num.fDims.add(DIM_KHZ);
-
-		num = getInstanceOf(VAL_HASH);
-		num.fDims.add(DIM_HASH);
-
-		// num = getInstanceOf(VAL_INTEGER);
-		// num.fDims.add(DIM_INTEGER);
-
-		num = getInstanceOf(VAL_LENGTH);
-		num.fDims.add(DIM_CM);
-		num.fDims.add(DIM_EMS);
-		num.fDims.add(DIM_EXS);
-		num.fDims.add(DIM_IN);
-		num.fDims.add(DIM_MM);
-		num.fDims.add(DIM_PC);
-		num.fDims.add(DIM_PT);
-		num.fDims.add(DIM_PX);
-
-		// num = getInstanceOf(VAL_NUMBER);
-		// num.fDims.add(DIM_NUMBER);
-
-		num = getInstanceOf(VAL_PERCENTAGE);
-		num.fDims.add(DIM_PERCENTAGE);
-
-		num = getInstanceOf(VAL_TIME);
-		num.fDims.add(DIM_MS);
-		num.fDims.add(DIM_S);
-
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMProperty.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMProperty.java
deleted file mode 100644
index bbab38f..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMProperty.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contentmodel;
-
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-/**
- * 
- */
-public class PropCMProperty extends PropCMContainer {
-
-	// static fields
-	private static java.util.Hashtable instances = null;
-	private static java.util.Hashtable cachedIdMap = null;
-	public final static String P_AZIMUTH = "azimuth";//$NON-NLS-1$
-	public final static String P_BG = "background";//$NON-NLS-1$
-	public final static String P_BG_ATTACHMENT = "background-attachment";//$NON-NLS-1$
-	public final static String P_BG_COLOR = "background-color";//$NON-NLS-1$
-	public final static String P_BG_IMAGE = "background-image";//$NON-NLS-1$
-	public final static String P_BG_POSITION = "background-position";//$NON-NLS-1$
-	public final static String P_BG_REPEAT = "background-repeat";//$NON-NLS-1$
-	public final static String P_BORDER = "border";//$NON-NLS-1$
-	public final static String P_BORDER_COLLAPSE = "border-collapse";//$NON-NLS-1$
-	public final static String P_BORDER_COLOR = "border-color";//$NON-NLS-1$
-	public final static String P_BORDER_SPACING = "border-spacing";//$NON-NLS-1$
-	public final static String P_BORDER_STYLE = "border-style";//$NON-NLS-1$
-	public final static String P_BORDER_TOP = "border-top";//$NON-NLS-1$
-	public final static String P_BORDER_RIGHT = "border-right";//$NON-NLS-1$
-	public final static String P_BORDER_BOTTOM = "border-bottom";//$NON-NLS-1$
-	public final static String P_BORDER_LEFT = "border-left";//$NON-NLS-1$
-	public final static String P_BORDER_TOP_COLOR = "border-top-color";//$NON-NLS-1$
-	public final static String P_BORDER_RIGHT_COLOR = "border-right-color";//$NON-NLS-1$
-	public final static String P_BORDER_BOTTOM_COLOR = "border-bottom-color";//$NON-NLS-1$
-	public final static String P_BORDER_LEFT_COLOR = "border-left-color";//$NON-NLS-1$
-	public final static String P_BORDER_TOP_STYLE = "border-top-style";//$NON-NLS-1$
-	public final static String P_BORDER_RIGHT_STYLE = "border-right-style";//$NON-NLS-1$
-	public final static String P_BORDER_BOTTOM_STYLE = "border-bottom-style";//$NON-NLS-1$
-	public final static String P_BORDER_LEFT_STYLE = "border-left-style";//$NON-NLS-1$
-	public final static String P_BORDER_TOP_WIDTH = "border-top-width";//$NON-NLS-1$
-	public final static String P_BORDER_RIGHT_WIDTH = "border-right-width";//$NON-NLS-1$
-	public final static String P_BORDER_BOTTOM_WIDTH = "border-bottom-width";//$NON-NLS-1$
-	public final static String P_BORDER_LEFT_WIDTH = "border-left-width";//$NON-NLS-1$
-	public final static String P_BORDER_WIDTH = "border-width";//$NON-NLS-1$
-	public final static String P_BOTTOM = "bottom";//$NON-NLS-1$
-	public final static String P_CAPTION_SIDE = "caption-side";//$NON-NLS-1$
-	public final static String P_CLEAR = "clear";//$NON-NLS-1$
-	public final static String P_CLIP = "clip";//$NON-NLS-1$
-	public final static String P_COLOR = "color";//$NON-NLS-1$
-	public final static String P_CONTENT = "content";//$NON-NLS-1$
-	public final static String P_COUNTER_INCREMENT = "counter-increment";//$NON-NLS-1$
-	public final static String P_COUNTER_RESET = "counter-reset";//$NON-NLS-1$
-	public final static String P_CUE = "cue";//$NON-NLS-1$
-	public final static String P_CUE_AFTER = "cue-after";//$NON-NLS-1$
-	public final static String P_CUE_BEFORE = "cue-before";//$NON-NLS-1$
-	public final static String P_CURSOR = "cursor";//$NON-NLS-1$
-	public final static String P_DIRECTION = "direction";//$NON-NLS-1$
-	public final static String P_DISPLAY = "display";//$NON-NLS-1$
-	public final static String P_ELEVATION = "elevation";//$NON-NLS-1$
-	public final static String P_EMPTY_CELLS = "empty-cells";//$NON-NLS-1$
-	public final static String P_FLOAT = "float";//$NON-NLS-1$
-	public final static String P_FONT = "font";//$NON-NLS-1$
-	public final static String P_FONT_FAMILY = "font-family";//$NON-NLS-1$
-	public final static String P_FONT_SIZE = "font-size";//$NON-NLS-1$
-	public final static String P_FONT_SIZE_ADJUST = "font-size-adjust";//$NON-NLS-1$
-	public final static String P_FONT_STRETCH = "font-stretch";//$NON-NLS-1$
-	public final static String P_FONT_STYLE = "font-style";//$NON-NLS-1$
-	public final static String P_FONT_VARIANT = "font-variant";//$NON-NLS-1$
-	public final static String P_FONT_WEIGHT = "font-weight";//$NON-NLS-1$
-	public final static String P_HEIGHT = "height";//$NON-NLS-1$
-	public final static String P_LEFT = "left";//$NON-NLS-1$
-	public final static String P_LETTER_SPACING = "letter-spacing";//$NON-NLS-1$
-	public final static String P_LINE_HEIGHT = "line-height";//$NON-NLS-1$
-	public final static String P_LIST_STYLE = "list-style";//$NON-NLS-1$
-	public final static String P_LIST_STYLE_IMAGE = "list-style-image";//$NON-NLS-1$
-	public final static String P_LIST_STYLE_POSITION = "list-style-position";//$NON-NLS-1$
-	public final static String P_LIST_STYLE_TYPE = "list-style-type";//$NON-NLS-1$
-	public final static String P_MARGIN = "margin";//$NON-NLS-1$
-	public final static String P_MARGIN_TOP = "margin-top";//$NON-NLS-1$
-	public final static String P_MARGIN_RIGHT = "margin-right";//$NON-NLS-1$
-	public final static String P_MARGIN_BOTTOM = "margin-bottom";//$NON-NLS-1$
-	public final static String P_MARGIN_LEFT = "margin-left";//$NON-NLS-1$
-	public final static String P_MARKER_OFFSET = "marker-offset";//$NON-NLS-1$
-	public final static String P_MARKS = "marks";//$NON-NLS-1$
-	public final static String P_MAX_HEIGHT = "max-height";//$NON-NLS-1$
-	public final static String P_MAX_WIDTH = "max-width";//$NON-NLS-1$
-	public final static String P_MIN_HEIGHT = "min-height";//$NON-NLS-1$
-	public final static String P_MIN_WIDTH = "min-width";//$NON-NLS-1$
-	public final static String P_ORPHANS = "orphans";//$NON-NLS-1$
-	public final static String P_OUTLINE = "outline";//$NON-NLS-1$
-	public final static String P_OUTLINE_COLOR = "outline-color";//$NON-NLS-1$
-	public final static String P_OUTLINE_STYLE = "outline-style";//$NON-NLS-1$
-	public final static String P_OUTLINE_WIDTH = "outline-width";//$NON-NLS-1$
-	public final static String P_OVERFLOW = "overflow";//$NON-NLS-1$
-	public final static String P_PADDING = "padding";//$NON-NLS-1$
-	public final static String P_PADDING_TOP = "padding-top";//$NON-NLS-1$
-	public final static String P_PADDING_RIGHT = "padding-right";//$NON-NLS-1$
-	public final static String P_PADDING_BOTTOM = "padding-bottom";//$NON-NLS-1$
-	public final static String P_PADDING_LEFT = "padding-left";//$NON-NLS-1$
-	public final static String P_PAGE = "page";//$NON-NLS-1$
-	public final static String P_PAGE_BREAK_AFTER = "page-break-after";//$NON-NLS-1$
-	public final static String P_PAGE_BREAK_BEFORE = "page-break-before";//$NON-NLS-1$
-	public final static String P_PAGE_BREAK_INSIDE = "page-break-inside";//$NON-NLS-1$
-	public final static String P_PAUSE = "pause";//$NON-NLS-1$
-	public final static String P_PAUSE_AFTER = "pause-after";//$NON-NLS-1$
-	public final static String P_PAUSE_BEFORE = "pause-before";//$NON-NLS-1$
-	public final static String P_PITCH = "pitch";//$NON-NLS-1$
-	public final static String P_PITCH_RANGE = "pitch-range";//$NON-NLS-1$
-	public final static String P_PLAY_DURING = "play-during";//$NON-NLS-1$
-	public final static String P_POSITION = "position";//$NON-NLS-1$
-	public final static String P_QUOTES = "quotes";//$NON-NLS-1$
-	public final static String P_RICHNESS = "richness";//$NON-NLS-1$
-	public final static String P_RIGHT = "right";//$NON-NLS-1$
-	public final static String P_SIZE = "size";//$NON-NLS-1$
-	public final static String P_SPEAK = "speak";//$NON-NLS-1$
-	public final static String P_SPEAK_HEADER = "speak-header";//$NON-NLS-1$
-	public final static String P_SPEAK_NUMERAL = "speak-numeral";//$NON-NLS-1$
-	public final static String P_SPEAK_PUNCTUATION = "speak-punctuation";//$NON-NLS-1$
-	public final static String P_SPEECH_RATE = "speech-rate";//$NON-NLS-1$
-	public final static String P_STRESS = "stress";//$NON-NLS-1$
-	public final static String P_TABLE_LAYOUT = "table-layout";//$NON-NLS-1$
-	public final static String P_TEXT_ALIGN = "text-align";//$NON-NLS-1$
-	public final static String P_TEXT_DECORATION = "text-decoration";//$NON-NLS-1$
-	public final static String P_TEXT_INDENT = "text-indent";//$NON-NLS-1$
-	public final static String P_TEXT_SHADOW = "text-shadow";//$NON-NLS-1$
-	public final static String P_TEXT_TRANSFORM = "text-transform";//$NON-NLS-1$
-	public final static String P_TOP = "top";//$NON-NLS-1$
-	public final static String P_UNICODE_BIDI = "unicode-bidi";//$NON-NLS-1$
-	public final static String P_VERTICAL_ALIGN = "vertical-align";//$NON-NLS-1$
-	public final static String P_VISIBILITY = "visibility";//$NON-NLS-1$
-	public final static String P_VOICE_FAMILY = "voice-family";//$NON-NLS-1$
-	public final static String P_VOLUME = "volume";//$NON-NLS-1$
-	public final static String P_WHITE_SPACE = "white-space";//$NON-NLS-1$
-	public final static String P_WIDOWS = "widows";//$NON-NLS-1$
-	public final static String P_WIDTH = "width";//$NON-NLS-1$
-	public final static String P_WORD_SPACING = "word-spacing";//$NON-NLS-1$
-	public final static String P_Z_INDEX = "z-index";//$NON-NLS-1$
-	// instance fields
-	private int fMinValueCount = 1;
-	private int fMaxValueCount = 1;
-	private Object[] mediaGroups;
-	protected List containers;
-
-	/**
-	 * 
-	 */
-	protected PropCMProperty(String name) {
-		super(name);
-	}
-
-	/**
-	 * 
-	 */
-	Object appendChild(Object node) {
-		Object ret = super.appendChild(node);
-		if (node instanceof PropCMProperty) {
-			// register shorthand container
-			PropCMProperty cm = (PropCMProperty) node;
-			if (cm.containers == null)
-				cm.containers = new Vector();
-			if (!cm.containers.contains(this))
-				cm.containers.add(this);
-		}
-		return ret;
-	}
-
-	/**
-	 * 
-	 */
-	void appendMediaGroup(Object mg) {
-		if (mediaGroups == null)
-			mediaGroups = new Object[1];
-		else {
-			Object[] oldMediaGroups = mediaGroups;
-			mediaGroups = new Object[oldMediaGroups.length + 1];
-			System.arraycopy(oldMediaGroups, 0, mediaGroups, 0, oldMediaGroups.length);
-		}
-		mediaGroups[mediaGroups.length - 1] = mg;
-	}
-
-	/**
-	 * 
-	 */
-	public static PropCMProperty getInstanceOf(String name) {
-		// initialize
-		if (instances == null)
-			instances = new Hashtable(200);
-
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		// query
-		Object node = instances.get(name);
-		if (node != null)
-			return (PropCMProperty) node;
-
-		// register
-		if (PropCMNode.isLoading()) {
-			node = new PropCMProperty(name);
-			instances.put(name, node);
-		}
-
-		return (PropCMProperty) node;
-	}
-
-	/**
-	 * 
-	 */
-	public int getMaxValueCount() {
-		return fMaxValueCount;
-	}
-
-	/**
-	 * 
-	 */
-	public List getMediaGroups() {
-		if (mediaGroups != null)
-			return Arrays.asList(mediaGroups);
-		else
-			return new ArrayList();
-	}
-
-	/**
-	 * 
-	 */
-	public int getMinValueCount() {
-		return fMinValueCount;
-	}
-
-	/**
-	 * 
-	 */
-	public static Enumeration getNameEnum() {
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		return instances.keys();
-	}
-
-	/**
-	 * 
-	 */
-	public static Enumeration getPropertyEnum() {
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		return instances.elements();
-	}
-
-	/**
-	 * 
-	 */
-	public int getShorthandContainerCount() {
-		return (containers == null) ? 0 : containers.size();
-	}
-
-	/**
-	 * 
-	 */
-	public short getType() {
-		return VAL_PROPERTY;
-	}
-
-	/**
-	 * 
-	 */
-	public boolean isShorthand() {
-		int nChild = getNumChild();
-		for (int i = 0; i < nChild; i++) {
-			Object obj = getChildAt(i);
-			if (obj instanceof PropCMProperty && !(obj instanceof PropCMSubProperty))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	public static Vector names() {
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		return new Vector(instances.keySet());
-	}
-
-	/**
-	 * 
-	 */
-	public static List names(Object mediaGroup) {
-		if (mediaGroup == null)
-			return names();
-
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		Vector properties = new Vector();
-
-		Iterator it = instances.values().iterator();
-		while (it.hasNext()) {
-			PropCMProperty prop = (PropCMProperty) it.next();
-			if (prop.getMediaGroups().contains(mediaGroup))
-				properties.add(prop.getName());
-		}
-
-		return properties;
-	}
-
-	/**
-	 * If identifier is null, get all properties
-	 */
-	public static Vector propertiesFor(String identifier, boolean shorthands) {
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		// if identifier is null, get all properties
-		if (identifier == null)
-			return new Vector(instances.values());
-
-		if (cachedIdMap == null) {
-			// start cacheing
-			cachedIdMap = new Hashtable();
-		}
-		else {
-			// search cached
-			Object ret = cachedIdMap.get(identifier + String.valueOf(shorthands));
-			if (ret != null)
-				return new Vector((Collection) ret);
-		}
-
-		// create
-		Enumeration propertyEnum = getPropertyEnum();
-		HashSet set = new HashSet();
-		while (propertyEnum.hasMoreElements()) {
-			PropCMProperty prop = (PropCMProperty) propertyEnum.nextElement();
-			if (!shorthands && prop.isShorthand())
-				continue;
-			if (prop.canHave(identifier))
-				set.add(prop);
-		}
-
-		// cache
-		cachedIdMap.put(identifier + String.valueOf(shorthands), set);
-
-		return new Vector(set);
-	}
-
-	/**
-	 * 
-	 */
-	protected void setMaxValueCount(int newMaxValueCount) {
-		fMaxValueCount = newMaxValueCount;
-	}
-
-	/**
-	 * 
-	 */
-	protected void setMinValueCount(int newMinValueCount) {
-		fMinValueCount = newMinValueCount;
-	}
-
-	/**
-	 * 
-	 */
-	public PropCMProperty shorthandContainerAt(int i) {
-		if (containers == null)
-			return null;
-		if (i < 0 || containers.size() <= i)
-			return null;
-		return (PropCMProperty) containers.get(i);
-	}
-
-	/**
-	 * 
-	 */
-	public Iterator shorthandContainerIterator() {
-		if (containers == null) {
-			return new Iterator() {
-				public boolean hasNext() {
-					return false;
-				}
-
-				public Object next() {
-					return null;
-				}
-
-				public void remove() {
-				}
-			};
-		}
-		else
-			return containers.iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMString.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMString.java
deleted file mode 100644
index 61b30c3..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMString.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contentmodel;
-
-
-
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Set;
-
-/**
- * 
- */
-public class PropCMString extends PropCMNode {
-
-	private static java.util.Hashtable instances = null;
-	public final static java.lang.String VAL_FONT = "font";//$NON-NLS-1$
-	public final static java.lang.String VAL_COUNTER_ID = "counterId";//$NON-NLS-1$
-	public final static java.lang.String VAL_PAGE_ID = "pageId";//$NON-NLS-1$
-	public final static java.lang.String VAL_VOICE = "voice";//$NON-NLS-1$
-	public final static java.lang.String VAL_ANY = "any"; //$NON-NLS-1$
-
-	/**
-	 * 
-	 */
-	protected PropCMString(String name) {
-		super(name);
-	}
-
-	/**
-	 * 
-	 */
-	void getIdentifiers(Set indents) {
-	}
-
-	/**
-	 * 
-	 */
-	static public PropCMString getInstanceOf(String name) {
-		if (name == null)
-			return null;
-
-		// initialize
-		if (instances == null)
-			instances = new Hashtable(10);
-
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		// query
-		Object node = instances.get(name);
-		if (node != null)
-			return (PropCMString) node;
-
-		// register
-		node = new PropCMString(name);
-		instances.put(name, node);
-
-		return (PropCMString) node;
-	}
-
-	/**
-	 * 
-	 */
-	public short getType() {
-		return VAL_STRING;
-	}
-
-	/**
-	 * 
-	 */
-	void getValues(Collection values) {
-		if (values != null && !values.contains(this))
-			values.add(this);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMSubProperty.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMSubProperty.java
deleted file mode 100644
index 81ebb37..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMSubProperty.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contentmodel;
-
-
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-/**
- * 
- */
-public class PropCMSubProperty extends PropCMProperty {
-
-	// static fields
-	private static java.util.Hashtable instances = null;
-	public final static String PSUB_BG_POSITION_X = "background-positionH";//$NON-NLS-1$
-	public final static String PSUB_BG_POSITION_Y = "background-positionV";//$NON-NLS-1$
-	public final static String PSUB_CLIP_TOP = "clipTop";//$NON-NLS-1$
-	public final static String PSUB_CLIP_RIGHT = "clipRight";//$NON-NLS-1$
-	public final static String PSUB_CLIP_BOTTOM = "clipBottom";//$NON-NLS-1$
-	public final static String PSUB_CLIP_LEFT = "clipLeft";//$NON-NLS-1$
-
-	/**
-	 * 
-	 */
-	protected PropCMSubProperty(String name) {
-		super(name);
-	}
-
-	/**
-	 * 
-	 */
-	public PropCMProperty getContainer() {
-		return shorthandContainerAt(0);
-	}
-
-	/**
-	 * 
-	 */
-	public static PropCMProperty getInstanceOf(String name) {
-		// initialize
-		if (instances == null)
-			instances = new Hashtable(10);
-
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		// query
-		Object node = instances.get(name);
-		if (node != null)
-			return (PropCMProperty) node;
-
-		// register
-		if (PropCMNode.isLoading()) {
-			node = new PropCMSubProperty(name);
-			instances.put(name, node);
-		}
-
-		return (PropCMProperty) node;
-	}
-
-	/**
-	 * 
-	 */
-	public static Enumeration getNameEnum() {
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		return instances.keys();
-	}
-
-	/**
-	 * 
-	 */
-	public static Enumeration getPropertyEnum() {
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		return instances.elements();
-	}
-
-	/**
-	 * 
-	 */
-	public short getType() {
-		return VAL_SUBPROPERTY;
-	}
-
-	/**
-	 * 
-	 */
-	public static Vector names() {
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		return new Vector(instances.keySet());
-	}
-
-	/**
-	 * 
-	 */
-	public void setContainer(PropCMProperty prop) {
-		if (containers == null)
-			containers = new Vector();
-		containers.clear();
-		containers.add(prop);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMURange.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMURange.java
deleted file mode 100644
index 3375715..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMURange.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contentmodel;
-
-
-
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Set;
-
-/**
- * 
- */
-public class PropCMURange extends PropCMNode {
-
-	private static java.util.Hashtable instances = null;
-	public final static String VAL_URANGE = "urange";//$NON-NLS-1$
-
-	/**
-	 * 
-	 */
-	protected PropCMURange(String name) {
-		super(name);
-	}
-
-	/**
-	 * 
-	 */
-	void getIdentifiers(Set indents) {
-	}
-
-	/**
-	 * 
-	 */
-	public static PropCMURange getInstanceOf(String name) {
-		if (name == null)
-			return null;
-
-		// initialize
-		if (instances == null)
-			instances = new Hashtable(10);
-
-		// Initialize of DB
-		if (isNeedInitialize())
-			PropCMNode.initPropertyCM();
-
-		// query
-		Object node = instances.get(name);
-		if (node != null)
-			return (PropCMURange) node;
-
-		// register
-		node = new PropCMURange(name);
-		instances.put(name, node);
-
-		return (PropCMURange) node;
-	}
-
-	/**
-	 * 
-	 */
-	public short getType() {
-		return VAL_UNICODE_RANGE;
-	}
-
-	/**
-	 * 
-	 */
-	void getValues(Collection values) {
-		if (values != null && !values.contains(this))
-			values.add(this);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMUtil.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMUtil.java
deleted file mode 100644
index 816ba37..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMUtil.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contentmodel;
-
-
-
-import java.util.Collection;
-import java.util.Iterator;
-
-/**
- * 
- */
-public class PropCMUtil {
-
-	/**
-	 * 
-	 */
-	public static void minus(Collection src, Collection ref) {
-		Iterator it = ref.iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-			if (src.contains(obj))
-				src.remove(obj);
-		}
-		return;
-	}
-
-	/**
-	 * 
-	 */
-	public static void plus(Collection src, Collection ref) {
-		Iterator it = ref.iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-			if (!src.contains(obj))
-				src.add(obj);
-		}
-		return;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/ByteReader.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/ByteReader.java
deleted file mode 100644
index 506cc1f..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/ByteReader.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contenttype;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.eclipse.wst.sse.core.internal.encoding.CodedIO;
-
-/**
- * This is an "adapter" class, simply to get in input stream to act like a
- * reader. We could not use InputStreamReader directly because its internal
- * buffers are not controllable, and it sometimes pulls too much out of input
- * stream (even when it wasn't needed for our purposes).
- * 
- * The use of this class is highly specialized and by not means meant to be
- * general purpose. Its use is restricted to those cases where the input
- * stream can be regarded as ascii just long enough to determine what the real
- * encoding should be.
- */
-
-public class ByteReader extends Reader {
-
-	
-	public static final int DEFAULT_BUFFER_SIZE = CodedIO.MAX_BUF_SIZE;
-
-	protected byte[] fBuffer;
-
-	protected InputStream fInputStream;
-
-	protected ByteReader() {
-		super();
-	}
-
-	public ByteReader(InputStream inputStream) {
-		this(inputStream, DEFAULT_BUFFER_SIZE);
-		if (!inputStream.markSupported()) {
-			throw new IllegalArgumentException("ByteReader is required to have a resettable stream"); //$NON-NLS-1$
-		}
-	}
-
-	public ByteReader(InputStream inputStream, int size) {
-		this.fInputStream = inputStream;
-		if (!inputStream.markSupported()) {
-			throw new IllegalArgumentException("ByteReader is required to have a resettable stream"); //$NON-NLS-1$
-		}
-		this.fBuffer = new byte[size];
-
-	}
-
-	public void close() throws IOException {
-		this.fInputStream.close();
-	}
-
-	public void mark(int readAheadLimit) {
-		this.fInputStream.mark(readAheadLimit);
-	}
-
-	public boolean markSupported() {
-		return true;
-	}
-
-	public int read() throws IOException {
-		int b0 = this.fInputStream.read();
-		return (b0 & 0x00FF);
-	}
-
-	public int read(char ch[], int offset, int length) throws IOException {
-		if (length > this.fBuffer.length) {
-			length = this.fBuffer.length;
-		}
-
-		int count = this.fInputStream.read(this.fBuffer, 0, length);
-
-		for (int i = 0; i < count; i++) {
-			int b0 = this.fBuffer[i];
-			// the 0x00FF is to "lose" the negative bits filled in the byte to
-			// int conversion
-			// (and which would be there if cast directly from byte to char).
-			char c0 = (char) (b0 & 0x00FF);
-			ch[offset + i] = c0;
-		}
-		return count;
-	}
-
-	public boolean ready() throws IOException {
-		return this.fInputStream.available() > 0;
-	}
-
-	public void reset() throws IOException {
-		this.fInputStream.reset();
-	}
-
-	public long skip(long n) throws IOException {
-		return this.fInputStream.skip(n);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/CSSHeadTokenizer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/CSSHeadTokenizer.java
deleted file mode 100644
index 02da8cf..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/CSSHeadTokenizer.java
+++ /dev/null
@@ -1,1355 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/* The following code was generated by JFlex 1.2.2 on 1/27/04 6:42 PM */
-
-/*nlsXXX*/
-package org.eclipse.wst.css.core.internal.contenttype;
-
-import java.io.IOException;
-import java.io.Reader;
-
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
-
-
-/**
- * This class is a scanner generated by <a
- * href="http://www.informatik.tu-muenchen.de/~kleing/jflex/">JFlex </a> 1.2.2
- * on 1/27/04 6:42 PM from the specification file
- * <tt>file:/D:/DevTimeSupport/HeadParsers/CSSHeadTokenizer/CSSHeadTokenizer.jflex</tt>
- */
-public class CSSHeadTokenizer {
-
-	/** this character denotes the end of file */
-	final public static int YYEOF = -1;
-
-	/** lexical states */
-	final public static int YYINITIAL = 0;
-	final public static int UnDelimitedString = 12;
-	final public static int DQ_STRING = 8;
-	final public static int SQ_STRING = 10;
-	final public static int ST_XMLDecl = 2;
-	final public static int QuotedAttributeValue = 6;
-	final public static int CHARSET_RULE = 4;
-
-	/**
-	 * YY_LEXSTATE[l] is the state in the DFA for the lexical state l
-	 * YY_LEXSTATE[l+1] is the state in the DFA for the lexical state l at the
-	 * beginning of a line l is of the form l = 2*k, k a non negative integer
-	 */
-	private final static int YY_LEXSTATE[] = {0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7};
-
-	/**
-	 * Translates characters to character classes
-	 */
-	final private static String yycmap_packed = "\11\0\1\6\1\11\2\0\1\10\22\0\1\6\1\0\1\36\2\0" + "\1\41\1\0\1\37\7\0\1\40\13\0\1\35\1\12\1\7\1\34" + "\1\13\1\17\1\22\1\0\1\20\1\31\1\25\1\0\1\33\1\21" + "\1\32\2\0\1\16\1\15\1\27\1\30\2\0\1\23\1\24\1\26" + "\3\0\1\14\10\0\1\22\1\0\1\20\1\31\1\25\1\0\1\33" + "\1\21\1\32\2\0\1\16\1\15\1\27\1\30\2\0\1\23\1\24" + "\1\26\3\0\1\14\102\0\1\4\3\0\1\5\17\0\1\3\16\0" + "\1\1\20\0\1\3\16\0\1\1\1\2\170\0\1\2\ufe87\0";
-
-	/**
-	 * Translates characters to character classes
-	 */
-	final private static char[] yycmap = yy_unpack_cmap(yycmap_packed);
-
-
-	/* error codes */
-	final private static int YY_UNKNOWN_ERROR = 0;
-	final private static int YY_ILLEGAL_STATE = 1;
-	final private static int YY_NO_MATCH = 2;
-	final private static int YY_PUSHBACK_2BIG = 3;
-
-	/* error messages for the codes above */
-	final private static String YY_ERROR_MSG[] = {"Unkown internal scanner error", "Internal error: unknown state", "Error: could not match input", "Error: pushback value was too large"};
-
-	/** the input device */
-	private java.io.Reader yy_reader;
-
-	/** the current state of the DFA */
-	private int yy_state;
-
-	/** the current lexical state */
-	private int yy_lexical_state = YYINITIAL;
-
-	/**
-	 * this buffer contains the current text to be matched and is the source
-	 * of the yytext() string
-	 */
-	private char yy_buffer[] = new char[16384];
-
-	/** the textposition at the last accepting state */
-	private int yy_markedPos;
-
-	/** the textposition at the last state to be included in yytext */
-	private int yy_pushbackPos;
-
-	/** the current text position in the buffer */
-	private int yy_currentPos;
-
-	/** startRead marks the beginning of the yytext() string in the buffer */
-	private int yy_startRead;
-
-	/**
-	 * endRead marks the last character in the buffer, that has been read from
-	 * input
-	 */
-	private int yy_endRead;
-
-
-	/** the number of characters up to the start of the matched text */
-	private int yychar;
-
-
-	/**
-	 * yy_atBOL == true <=>the scanner is currently at the beginning of a
-	 * line
-	 */
-	private boolean yy_atBOL;
-
-	/** yy_atEOF == true <=>the scanner has returned a value for EOF */
-	private boolean yy_atEOF;
-
-	/** denotes if the user-EOF-code has already been executed */
-	private boolean yy_eof_done;
-
-	/* user code: */
-
-
-	private boolean hasMore = true;
-	private final static int MAX_TO_SCAN = 8000;
-	StringBuffer string = new StringBuffer();
-	// state stack for easier state handling
-	private IntStack fStateStack = new IntStack();
-	private String valueText = null;
-
-
-
-	public CSSHeadTokenizer() {
-		super();
-	}
-
-	public void reset(Reader in) {
-		/* the input device */
-		yy_reader = in;
-
-		/* the current state of the DFA */
-		yy_state = 0;
-
-		/* the current lexical state */
-		yy_lexical_state = YYINITIAL;
-
-		/*
-		 * this buffer contains the current text to be matched and is the
-		 * source of the yytext() string
-		 */
-		java.util.Arrays.fill(yy_buffer, (char) 0);
-
-		/* the textposition at the last accepting state */
-		yy_markedPos = 0;
-
-		/* the textposition at the last state to be included in yytext */
-		yy_pushbackPos = 0;
-
-		/* the current text position in the buffer */
-		yy_currentPos = 0;
-
-		/* startRead marks the beginning of the yytext() string in the buffer */
-		yy_startRead = 0;
-
-		/**
-		 * endRead marks the last character in the buffer, that has been read
-		 * from input
-		 */
-		yy_endRead = 0;
-
-
-		/* the number of characters up to the start of the matched text */
-		yychar = 0;
-
-
-		/**
-		 * yy_atBOL == true <=>the scanner is currently at the beginning of a
-		 * line
-		 */
-		yy_atBOL = false;
-
-		/* yy_atEOF == true <=> the scanner has returned a value for EOF */
-		yy_atEOF = false;
-
-		/* denotes if the user-EOF-code has already been executed */
-		yy_eof_done = false;
-
-
-		fStateStack.clear();
-
-		hasMore = true;
-
-		// its a little wasteful to "throw away" first char array generated
-		// by class init (via auto generated code), but we really do want
-		// a small buffer for our head parsers.
-		if (yy_buffer.length != MAX_TO_SCAN) {
-			yy_buffer = new char[MAX_TO_SCAN];
-		}
-
-
-	}
-
-
-	public final HeadParserToken getNextToken() throws IOException {
-		String context = null;
-		context = primGetNextToken();
-		HeadParserToken result = null;
-		if (valueText != null) {
-			result = createToken(context, yychar, valueText);
-			valueText = null;
-		}
-		else {
-			result = createToken(context, yychar, yytext());
-		}
-		return result;
-	}
-
-	public final boolean hasMoreTokens() {
-		return hasMore && yychar < MAX_TO_SCAN;
-	}
-
-	private void pushCurrentState() {
-		fStateStack.push(yystate());
-
-	}
-
-	private void popState() {
-		yybegin(fStateStack.pop());
-	}
-
-	private HeadParserToken createToken(String context, int start, String text) {
-		return new HeadParserToken(context, start, text);
-	}
-
-
-
-	/**
-	 * Creates a new scanner There is also a java.io.InputStream version of
-	 * this constructor.
-	 * 
-	 * @param in
-	 *            the java.io.Reader to read input from.
-	 */
-	public CSSHeadTokenizer(java.io.Reader in) {
-		this.yy_reader = in;
-	}
-
-	/**
-	 * Creates a new scanner. There is also java.io.Reader version of this
-	 * constructor.
-	 * 
-	 * @param in
-	 *            the java.io.Inputstream to read input from.
-	 */
-	public CSSHeadTokenizer(java.io.InputStream in) {
-		this(new java.io.InputStreamReader(in));
-	}
-
-	/**
-	 * Unpacks the compressed character translation table.
-	 * 
-	 * @param packed
-	 *            the packed character translation table
-	 * @return the unpacked character translation table
-	 */
-	private static char[] yy_unpack_cmap(String packed) {
-		char[] map = new char[0x10000];
-		int i = 0; /* index in packed string */
-		int j = 0; /* index in unpacked array */
-		while (i < 158) {
-			int count = packed.charAt(i++);
-			char value = packed.charAt(i++);
-			do
-				map[j++] = value;
-			while (--count > 0);
-		}
-		return map;
-	}
-
-
-	/**
-	 * Gets the next input character.
-	 * 
-	 * @return the next character of the input stream, EOF if the end of the
-	 *         stream is reached.
-	 * @exception IOException
-	 *                if any I/O-Error occurs
-	 */
-	private int yy_advance() throws java.io.IOException {
-
-		/* standard case */
-		if (yy_currentPos < yy_endRead)
-			return yy_buffer[yy_currentPos++];
-
-		/* if the eof is reached, we don't need to work hard */
-		if (yy_atEOF)
-			return YYEOF;
-
-		/* otherwise: need to refill the buffer */
-
-		/* first: make room (if you can) */
-		if (yy_startRead > 0) {
-			System.arraycopy(yy_buffer, yy_startRead, yy_buffer, 0, yy_endRead - yy_startRead);
-
-			/* translate stored positions */
-			yy_endRead -= yy_startRead;
-			yy_currentPos -= yy_startRead;
-			yy_markedPos -= yy_startRead;
-			yy_pushbackPos -= yy_startRead;
-			yy_startRead = 0;
-		}
-
-		/* is the buffer big enough? */
-		if (yy_currentPos >= yy_buffer.length) {
-			/* if not: blow it up */
-			char newBuffer[] = new char[yy_currentPos * 2];
-			System.arraycopy(yy_buffer, 0, newBuffer, 0, yy_buffer.length);
-			yy_buffer = newBuffer;
-		}
-
-		/* finally: fill the buffer with new input */
-		int numRead = yy_reader.read(yy_buffer, yy_endRead, yy_buffer.length - yy_endRead);
-
-		if (numRead == -1)
-			return YYEOF;
-
-		yy_endRead += numRead;
-
-		return yy_buffer[yy_currentPos++];
-	}
-
-
-	/**
-	 * Closes the input stream.
-	 */
-	final public void yyclose() throws java.io.IOException {
-		yy_atEOF = true; /* indicate end of file */
-		yy_endRead = yy_startRead; /* invalidate buffer */
-		yy_reader.close();
-	}
-
-
-	/**
-	 * Returns the current lexical state.
-	 */
-	final public int yystate() {
-		return yy_lexical_state;
-	}
-
-	/**
-	 * Enters a new lexical state
-	 * 
-	 * @param newState
-	 *            the new lexical state
-	 */
-	final public void yybegin(int newState) {
-		yy_lexical_state = newState;
-	}
-
-
-	/**
-	 * Returns the text matched by the current regular expression.
-	 */
-	final public String yytext() {
-		return new String(yy_buffer, yy_startRead, yy_markedPos - yy_startRead);
-	}
-
-	/**
-	 * Returns the length of the matched text region.
-	 */
-	final public int yylength() {
-		return yy_markedPos - yy_startRead;
-	}
-
-
-	/**
-	 * Reports an error that occured while scanning.
-	 * 
-	 * @param errorCode
-	 *            the code of the errormessage to display
-	 */
-	private void yy_ScanError(int errorCode) {
-		try {
-			System.out.println(YY_ERROR_MSG[errorCode]);
-		}
-		catch (ArrayIndexOutOfBoundsException e) {
-			System.out.println(YY_ERROR_MSG[YY_UNKNOWN_ERROR]);
-		}
-
-		System.exit(1);
-	}
-
-
-	/**
-	 * Pushes the specified amount of characters back into the input stream.
-	 * 
-	 * They will be read again by then next call of the scanning method
-	 * 
-	 * @param number
-	 *            the number of characters to be read again. This number must
-	 *            not be greater than yylength()!
-	 */
-	private void yypushback(int number) {
-		if (number > yylength())
-			yy_ScanError(YY_PUSHBACK_2BIG);
-
-		yy_markedPos -= number;
-	}
-
-
-	/**
-	 * Contains user EOF-code, which will be executed exactly once, when the
-	 * end of file is reached
-	 */
-	private void yy_do_eof() {
-		if (!yy_eof_done) {
-			yy_eof_done = true;
-			hasMore = false;
-
-		}
-	}
-
-
-	/**
-	 * Resumes scanning until the next regular expression is matched, the end
-	 * of input is encountered or an I/O-Error occurs.
-	 * 
-	 * @return the next token
-	 * @exception IOException
-	 *                if any I/O-Error occurs
-	 */
-	public String primGetNextToken() throws java.io.IOException {
-		int yy_input;
-		int yy_action;
-
-
-		while (true) {
-
-			yychar += yylength();
-
-			yy_atBOL = yy_markedPos <= 0 || yy_buffer[yy_markedPos - 1] == '\n';
-			if (!yy_atBOL && yy_buffer[yy_markedPos - 1] == '\r') {
-				yy_atBOL = yy_advance() != '\n';
-				if (!yy_atEOF)
-					yy_currentPos--;
-			}
-
-			yy_action = -1;
-
-			yy_currentPos = yy_startRead = yy_markedPos;
-
-			if (yy_atBOL)
-				yy_state = YY_LEXSTATE[yy_lexical_state + 1];
-			else
-				yy_state = YY_LEXSTATE[yy_lexical_state];
-
-
-			yy_forAction : {
-				while (true) {
-
-					yy_input = yy_advance();
-
-					if (yy_input == YYEOF)
-						break yy_forAction;
-
-					yy_input = yycmap[yy_input];
-
-					boolean yy_isFinal = false;
-					boolean yy_noLookAhead = false;
-
-					yy_forNext : {
-						switch (yy_state) {
-							case 0 :
-								switch (yy_input) {
-									case 1 :
-										yy_isFinal = true;
-										yy_state = 9;
-										break yy_forNext;
-									case 2 :
-										yy_isFinal = true;
-										yy_state = 10;
-										break yy_forNext;
-									case 3 :
-										yy_isFinal = true;
-										yy_state = 11;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 8;
-										break yy_forNext;
-								}
-
-							case 1 :
-								switch (yy_input) {
-									case 1 :
-										yy_isFinal = true;
-										yy_state = 9;
-										break yy_forNext;
-									case 2 :
-										yy_isFinal = true;
-										yy_state = 10;
-										break yy_forNext;
-									case 3 :
-										yy_isFinal = true;
-										yy_state = 11;
-										break yy_forNext;
-									case 6 :
-									case 8 :
-									case 9 :
-										yy_isFinal = true;
-										yy_state = 12;
-										break yy_forNext;
-									case 10 :
-										yy_isFinal = true;
-										yy_state = 13;
-										break yy_forNext;
-									case 15 :
-										yy_isFinal = true;
-										yy_state = 14;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 8;
-										break yy_forNext;
-								}
-
-							case 2 :
-								switch (yy_input) {
-									case 11 :
-										yy_isFinal = true;
-										yy_state = 15;
-										break yy_forNext;
-									case 21 :
-										yy_isFinal = true;
-										yy_state = 16;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 8;
-										break yy_forNext;
-								}
-
-							case 3 :
-								switch (yy_input) {
-									case 6 :
-									case 8 :
-									case 9 :
-										yy_isFinal = true;
-										yy_state = 17;
-										break yy_forNext;
-									case 29 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 18;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 8;
-										break yy_forNext;
-								}
-
-							case 4 :
-								switch (yy_input) {
-									case 6 :
-									case 8 :
-										yy_isFinal = true;
-										yy_state = 20;
-										break yy_forNext;
-									case 9 :
-										yy_isFinal = true;
-										yy_state = 21;
-										break yy_forNext;
-									case 30 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 22;
-										break yy_forNext;
-									case 31 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 23;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 19;
-										break yy_forNext;
-								}
-
-							case 5 :
-								switch (yy_input) {
-									case 8 :
-									case 9 :
-									case 10 :
-									case 28 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 25;
-										break yy_forNext;
-									case 11 :
-									case 32 :
-										yy_isFinal = true;
-										yy_state = 26;
-										break yy_forNext;
-									case 29 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 27;
-										break yy_forNext;
-									case 30 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 28;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 24;
-										break yy_forNext;
-								}
-
-							case 6 :
-								switch (yy_input) {
-									case 8 :
-									case 9 :
-									case 10 :
-									case 28 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 25;
-										break yy_forNext;
-									case 32 :
-										yy_isFinal = true;
-										yy_state = 26;
-										break yy_forNext;
-									case 29 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 27;
-										break yy_forNext;
-									case 31 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 28;
-										break yy_forNext;
-									case 33 :
-										yy_isFinal = true;
-										yy_state = 29;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 24;
-										break yy_forNext;
-								}
-
-							case 7 :
-								switch (yy_input) {
-									case 10 :
-									case 28 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 25;
-										break yy_forNext;
-									case 32 :
-										yy_isFinal = true;
-										yy_state = 26;
-										break yy_forNext;
-									case 11 :
-										yy_isFinal = true;
-										yy_state = 29;
-										break yy_forNext;
-									case 6 :
-									case 8 :
-									case 9 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 30;
-										break yy_forNext;
-									case 29 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 31;
-										break yy_forNext;
-									case 30 :
-									case 31 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 32;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 24;
-										break yy_forNext;
-								}
-
-							case 9 :
-								switch (yy_input) {
-									case 2 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 33;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 10 :
-								switch (yy_input) {
-									case 1 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 34;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 11 :
-								switch (yy_input) {
-									case 4 :
-										yy_state = 35;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 12 :
-								switch (yy_input) {
-									case 6 :
-									case 8 :
-									case 9 :
-										yy_state = 36;
-										break yy_forNext;
-									case 10 :
-										yy_state = 37;
-										break yy_forNext;
-									case 15 :
-										yy_state = 38;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 13 :
-								switch (yy_input) {
-									case 11 :
-										yy_state = 39;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 14 :
-								switch (yy_input) {
-									case 16 :
-										yy_state = 40;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 15 :
-								switch (yy_input) {
-									case 28 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 41;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 16 :
-								switch (yy_input) {
-									case 23 :
-										yy_state = 42;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 17 :
-								switch (yy_input) {
-									case 6 :
-									case 8 :
-									case 9 :
-										yy_isFinal = true;
-										yy_state = 17;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 20 :
-								switch (yy_input) {
-									case 6 :
-									case 8 :
-										yy_isFinal = true;
-										yy_state = 20;
-										break yy_forNext;
-									case 9 :
-										yy_state = 43;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 19;
-										break yy_forNext;
-								}
-
-							case 21 :
-								switch (yy_input) {
-									case 6 :
-									case 8 :
-										yy_isFinal = true;
-										yy_state = 20;
-										break yy_forNext;
-									case 9 :
-										yy_state = 43;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 19;
-										break yy_forNext;
-								}
-
-							case 26 :
-								switch (yy_input) {
-									case 28 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 44;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 29 :
-								switch (yy_input) {
-									case 28 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 45;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 35 :
-								switch (yy_input) {
-									case 5 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 46;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 36 :
-								switch (yy_input) {
-									case 6 :
-									case 8 :
-									case 9 :
-										yy_state = 36;
-										break yy_forNext;
-									case 10 :
-										yy_state = 37;
-										break yy_forNext;
-									case 15 :
-										yy_state = 38;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 37 :
-								switch (yy_input) {
-									case 11 :
-										yy_state = 39;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 38 :
-								switch (yy_input) {
-									case 16 :
-										yy_state = 40;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 39 :
-								switch (yy_input) {
-									case 12 :
-										yy_state = 47;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 40 :
-								switch (yy_input) {
-									case 17 :
-										yy_state = 48;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 42 :
-								switch (yy_input) {
-									case 16 :
-										yy_state = 49;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 43 :
-								switch (yy_input) {
-									case 6 :
-									case 8 :
-										yy_isFinal = true;
-										yy_state = 20;
-										break yy_forNext;
-									case 9 :
-										yy_state = 43;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 19;
-										break yy_forNext;
-								}
-
-							case 47 :
-								switch (yy_input) {
-									case 13 :
-										yy_state = 50;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 48 :
-								switch (yy_input) {
-									case 18 :
-										yy_state = 51;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 49 :
-								switch (yy_input) {
-									case 24 :
-										yy_state = 52;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 50 :
-								switch (yy_input) {
-									case 14 :
-										yy_state = 53;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 51 :
-								switch (yy_input) {
-									case 19 :
-										yy_state = 54;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 52 :
-								switch (yy_input) {
-									case 25 :
-										yy_state = 55;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 53 :
-								switch (yy_input) {
-									case 6 :
-									case 8 :
-									case 9 :
-										yy_isFinal = true;
-										yy_state = 56;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 54 :
-								switch (yy_input) {
-									case 20 :
-										yy_state = 57;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 55 :
-								switch (yy_input) {
-									case 26 :
-										yy_state = 58;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 56 :
-								switch (yy_input) {
-									case 6 :
-									case 8 :
-									case 9 :
-										yy_isFinal = true;
-										yy_state = 56;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 57 :
-								switch (yy_input) {
-									case 21 :
-										yy_state = 59;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 58 :
-								switch (yy_input) {
-									case 23 :
-										yy_state = 60;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 59 :
-								switch (yy_input) {
-									case 22 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 61;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 60 :
-								switch (yy_input) {
-									case 27 :
-										yy_state = 62;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 62 :
-								switch (yy_input) {
-									case 6 :
-									case 8 :
-									case 9 :
-										yy_state = 62;
-										break yy_forNext;
-									case 7 :
-										yy_isFinal = true;
-										yy_state = 63;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 63 :
-								switch (yy_input) {
-									case 6 :
-									case 8 :
-									case 9 :
-										yy_isFinal = true;
-										yy_state = 63;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							default :
-								yy_ScanError(YY_ILLEGAL_STATE);
-								break;
-						}
-					}
-
-					if (yy_isFinal) {
-						yy_action = yy_state;
-						yy_markedPos = yy_currentPos;
-						if (yy_noLookAhead)
-							break yy_forAction;
-					}
-
-				}
-			}
-
-
-			switch (yy_action) {
-
-				case 45 : {
-					yypushback(2);
-					popState();
-					valueText = string.toString();
-					return EncodingParserConstants.InvalidTerminatedStringValue;
-				}
-				case 65 :
-					break;
-				case 25 : {
-					yypushback(1);
-					popState();
-					valueText = string.toString();
-					return EncodingParserConstants.InvalidTerminatedStringValue;
-				}
-				case 66 :
-					break;
-				case 19 :
-				case 20 : {
-					yypushback(1);
-					yybegin(UnDelimitedString);
-					string.setLength(0);
-				}
-				case 67 :
-					break;
-				case 18 : {
-					yybegin(YYINITIAL);
-					hasMore = false;
-					return CSSHeadTokenizerConstants.RuleEnd;
-				}
-				case 68 :
-					break;
-				case 32 : {
-					yypushback(1);
-					popState();
-					valueText = string.toString();
-					return EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue;
-				}
-				case 69 :
-					break;
-				case 44 : {
-					yypushback(2);
-					popState();
-					valueText = string.toString();
-					return EncodingParserConstants.InvalidTerminatedStringValue;
-				}
-				case 70 :
-					break;
-				case 61 : {
-					if (yychar == 0) {
-						yybegin(CHARSET_RULE);
-						return CSSHeadTokenizerConstants.CHARSET_RULE;
-					}
-				}
-				case 71 :
-					break;
-				case 56 : {
-					if (yychar == 0) {
-						yybegin(ST_XMLDecl);
-						return XMLHeadTokenizerConstants.XMLDeclStart;
-					}
-				}
-				case 72 :
-					break;
-				case 8 :
-				case 9 :
-				case 10 :
-				case 11 :
-				case 12 :
-				case 13 :
-				case 14 :
-				case 15 :
-				case 16 :
-				case 21 : {
-					if (yychar > MAX_TO_SCAN) {
-						hasMore = false;
-						return EncodingParserConstants.MAX_CHARS_REACHED;
-					}
-				}
-				case 73 :
-					break;
-				case 41 : {
-					yybegin(YYINITIAL);
-					return XMLHeadTokenizerConstants.XMLDeclEnd;
-				}
-				case 74 :
-					break;
-				case 63 : {
-					pushCurrentState();
-					yybegin(QuotedAttributeValue);
-					return XMLHeadTokenizerConstants.XMLDelEncoding;
-				}
-				case 75 :
-					break;
-				case 3 :
-				case 17 : {
-					pushCurrentState();
-					yybegin(QuotedAttributeValue);
-				}
-				case 76 :
-					break;
-				case 46 : {
-					hasMore = false;
-					return EncodingParserConstants.UTF83ByteBOM;
-				}
-				case 77 :
-					break;
-				case 33 : {
-					hasMore = false;
-					return EncodingParserConstants.UTF16BE;
-				}
-				case 78 :
-					break;
-				case 34 : {
-					hasMore = false;
-					return EncodingParserConstants.UTF16LE;
-				}
-				case 79 :
-					break;
-				case 24 :
-				case 26 :
-				case 29 : {
-					string.append(yytext());
-				}
-				case 80 :
-					break;
-				case 23 : {
-					yybegin(SQ_STRING);
-					string.setLength(0);
-				}
-				case 81 :
-					break;
-				case 22 : {
-					yybegin(DQ_STRING);
-					string.setLength(0);
-				}
-				case 82 :
-					break;
-				case 27 : {
-					yypushback(1);
-					popState();
-					valueText = string.toString();
-					return EncodingParserConstants.InvalidTerminatedStringValue;
-				}
-				case 83 :
-					break;
-				case 28 : {
-					popState();
-					valueText = string.toString();
-					return EncodingParserConstants.StringValue;
-				}
-				case 84 :
-					break;
-				case 30 : {
-					yypushback(1);
-					popState();
-					valueText = string.toString();
-					return EncodingParserConstants.UnDelimitedStringValue;
-				}
-				case 85 :
-					break;
-				case 31 : {
-					yypushback(1);
-					popState();
-					valueText = string.toString();
-					return EncodingParserConstants.UnDelimitedStringValue;
-				}
-				case 86 :
-					break;
-				default :
-					if (yy_input == YYEOF && yy_startRead == yy_currentPos) {
-						yy_atEOF = true;
-						yy_do_eof();
-						{
-							hasMore = false;
-							return EncodingParserConstants.EOF;
-						}
-					}
-					else {
-						yy_ScanError(YY_NO_MATCH);
-					}
-			}
-		}
-	}
-
-	/**
-	 * Runs the scanner on input files.
-	 * 
-	 * This main method is the debugging routine for the scanner. It prints
-	 * each returned token to System.out until the end of file is reached, or
-	 * an error occured.
-	 * 
-	 * @param argv
-	 *            the command line, contains the filenames to run the scanner
-	 *            on.
-	 */
-	public static void main(String argv[]) {
-		for (int i = 0; i < argv.length; i++) {
-			CSSHeadTokenizer scanner = null;
-			try {
-				scanner = new CSSHeadTokenizer(new java.io.FileReader(argv[i]));
-			}
-			catch (java.io.FileNotFoundException e) {
-				System.out.println("File not found : \"" + argv[i] + "\"");
-				System.exit(1);
-			}
-			catch (ArrayIndexOutOfBoundsException e) {
-				System.out.println("Usage : java CSSHeadTokenizer <inputfile>");
-				System.exit(1);
-			}
-
-			try {
-				do {
-					System.out.println(scanner.primGetNextToken());
-				}
-				while (!scanner.yy_atEOF);
-
-			}
-			catch (java.io.IOException e) {
-				System.out.println("An I/O error occured while scanning :");
-				System.out.println(e);
-				System.exit(1);
-			}
-			catch (Exception e) {
-				e.printStackTrace();
-				System.exit(1);
-			}
-		}
-	}
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/CSSHeadTokenizerConstants.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/CSSHeadTokenizerConstants.java
deleted file mode 100644
index 75446c7..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/CSSHeadTokenizerConstants.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contenttype;
-
-
-public interface CSSHeadTokenizerConstants {
-
-	String RuleEnd = "RuleEnd"; //$NON-NLS-1$
-	String CHARSET_RULE = "CHARSET_RULE"; //$NON-NLS-1$
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/CSSResourceEncodingDetector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/CSSResourceEncodingDetector.java
deleted file mode 100644
index b6b6e68..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/CSSResourceEncodingDetector.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contenttype;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.IllegalCharsetNameException;
-import java.nio.charset.UnsupportedCharsetException;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.sse.core.internal.encoding.CodedIO;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-import org.eclipse.wst.sse.core.internal.encoding.NonContentBasedEncodingRules;
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-
-
-
-public class CSSResourceEncodingDetector implements IResourceCharsetDetector {
-	class NullMemento extends EncodingMemento {
-		/**
-		 * 
-		 */
-		public NullMemento() {
-			super();
-			String defaultCharset = NonContentBasedEncodingRules.useDefaultNameRules(null);
-			setJavaCharsetName(defaultCharset);
-			setAppropriateDefault(defaultCharset);
-			setDetectedCharsetName(null);
-		}
-	}
-
-
-	private CSSHeadTokenizer fTokenizer;
-	private EncodingMemento fEncodingMemento;
-	private boolean fHeaderParsed;
-	private Reader fReader;
-
-	/**
-	 * There is no spec defined encoding for CSS, so Null is returned.
-	 */
-	public String getSpecDefaultEncoding() {
-		// should match what's in plugin.xml (or look it up from there).
-		return null;
-	}
-
-	private boolean canHandleAsUnicodeStream(String tokenType) {
-		boolean canHandleAsUnicodeStream = false;
-		if (tokenType == EncodingParserConstants.UTF83ByteBOM) {
-			canHandleAsUnicodeStream = true;
-			String enc = "UTF-8"; //$NON-NLS-1$
-			createEncodingMemento(enc, EncodingMemento.DETECTED_STANDARD_UNICODE_BYTES);
-			fEncodingMemento.setUTF83ByteBOMUsed(true);
-		}
-		else if (tokenType == EncodingParserConstants.UTF16BE) {
-			canHandleAsUnicodeStream = true;
-			String enc = "UTF-16BE"; //$NON-NLS-1$
-			createEncodingMemento(enc, EncodingMemento.DETECTED_STANDARD_UNICODE_BYTES);
-		}
-		else if (tokenType == EncodingParserConstants.UTF16LE) {
-			canHandleAsUnicodeStream = true;
-			String enc = "UTF-16"; //$NON-NLS-1$
-			createEncodingMemento(enc, EncodingMemento.DETECTED_STANDARD_UNICODE_BYTES);
-		}
-		return canHandleAsUnicodeStream;
-	}
-
-	/**
-	 * @return Returns the tokenizer.
-	 */
-	private CSSHeadTokenizer getTokenizer() {
-		if (fTokenizer == null) {
-			fTokenizer = new CSSHeadTokenizer();
-		}
-		return fTokenizer;
-	}
-
-	private boolean isLegalString(String valueTokenType) {
-		boolean result = false;
-		if (valueTokenType != null) {
-			result = valueTokenType.equals(EncodingParserConstants.StringValue) || valueTokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || valueTokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || valueTokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
-		}
-		return result;
-	}
-
-	private void parseInput() throws IOException {
-		checkInContents();
-		if (fEncodingMemento == null) {
-			checkHeuristics();
-		}
-	}
-
-	private void checkInContents() throws IOException {
-		CSSHeadTokenizer tokenizer = getTokenizer();
-		tokenizer.reset(fReader);
-		HeadParserToken token = null;
-		String tokenType = null;
-		do {
-			token = tokenizer.getNextToken();
-			tokenType = token.getType();
-			if (canHandleAsUnicodeStream(tokenType)) {
-				// side effect of canHandle is to create appropriate memento
-			}
-			else if (tokenType == CSSHeadTokenizerConstants.CHARSET_RULE) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						createEncodingMemento(valueToken.getText(), EncodingMemento.FOUND_ENCODING_IN_CONTENT);
-
-					}
-				}
-			}
-
-		}
-		while (tokenizer.hasMoreTokens());
-	}
-
-	/**
-	 * 
-	 */
-	private void checkHeuristics() throws IOException {
-		boolean noHeuristic = false;
-		String heuristicEncoding = null;
-		try {
-			fReader.reset();
-			byte[] bytes = new byte[3];
-			int nRead = 0;
-			for (int i = 0; i < bytes.length; i++) {
-				if (fReader.ready()) {
-					int oneByte = fReader.read();
-					nRead++;
-					if (oneByte <= 0xFF) {
-						bytes[i] = (byte) oneByte;
-					}
-					else {
-						noHeuristic = true;
-					}
-				}
-				else {
-					noHeuristic = true;
-					break;
-				}
-			}
-			if (!noHeuristic && nRead == 3) {
-				heuristicEncoding = EncodingGuesser.guessEncoding(bytes, 3);
-			}
-		}
-		catch (IOException e) {
-			// if any IO exception, then not a heuristic case
-		}
-		finally {
-			fReader.reset();
-		}
-		if (heuristicEncoding != null) {
-			createEncodingMemento(heuristicEncoding, EncodingMemento.GUESSED_ENCODING_FROM_STREAM);
-		}
-
-	}
-
-	/**
-	 * Note: once this instance is created, trace info still needs to be
-	 * appended by caller, depending on the context its created.
-	 */
-	private void createEncodingMemento(String detectedCharsetName) {
-		fEncodingMemento = new EncodingMemento();
-		fEncodingMemento.setJavaCharsetName(getAppropriateJavaCharset(detectedCharsetName));
-		fEncodingMemento.setDetectedCharsetName(detectedCharsetName);
-		// TODO: if detectedCharset and spec default is
-		// null, need to use "work
-		// bench based" defaults.
-		fEncodingMemento.setAppropriateDefault(getSpecDefaultEncoding());
-	}
-
-	/**
-	 * convience method all subclasses can use (but not override)
-	 * 
-	 * @param detectedCharsetName
-	 * @param reason
-	 */
-	private void createEncodingMemento(String detectedCharsetName, String reason) {
-		createEncodingMemento(detectedCharsetName);
-	}
-
-	/**
-	 * convience method all subclasses can use (but not override)
-	 */
-	private final void ensureInputSet() {
-		if (fReader == null) {
-			throw new IllegalStateException("input must be set before use"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * This method can return null, if invalid charset name (in which case
-	 * "appropriateDefault" should be used, if a name is really need for some
-	 * "save anyway" cases).
-	 * 
-	 * @param detectedCharsetName
-	 * @return
-	 */
-	private String getAppropriateJavaCharset(String detectedCharsetName) {
-		String result = null;
-		// 1. Check explicit mapping overrides from
-		// property file -- its here we pick up "rules" for cases
-		// that are not even in Java
-		result = CodedIO.checkMappingOverrides(detectedCharsetName);
-		// 2. Use the "canonical" name from JRE mappings
-		// Note: see Charset JavaDoc, the name you get one
-		// with can be alias,
-		// the name you get back is "standard" name.
-		Charset javaCharset = null;
-		try {
-			javaCharset = Charset.forName(detectedCharsetName);
-		}
-		catch (UnsupportedCharsetException e) {
-			// only set invalid, if result is same as detected -- they won't
-			// be equal if
-			// overridden
-			if (result != null && result.equals(detectedCharsetName)) {
-				fEncodingMemento.setInvalidEncoding(detectedCharsetName);
-			}
-		}
-		catch (IllegalCharsetNameException e) {
-			// only set invalid, if result is same as detected -- they won't
-			// be equal if
-			// overridden
-			if (result != null && result.equals(detectedCharsetName)) {
-				fEncodingMemento.setInvalidEncoding(detectedCharsetName);
-			}
-		}
-		// give priority to java cononical name, if present
-		if (javaCharset != null) {
-			result = javaCharset.name();
-			// but still allow overrides
-			result = CodedIO.checkMappingOverrides(result);
-		}
-		return result;
-	}
-
-	public String getEncoding() throws IOException {
-		return getEncodingMemento().getDetectedCharsetName();
-	}
-
-	public EncodingMemento getEncodingMemento() throws IOException {
-		ensureInputSet();
-		if (!fHeaderParsed) {
-			parseInput();
-			// we keep track of if header's already been
-			// parse, so can make
-			// multiple 'get' calls, without causing
-			// reparsing.
-			fHeaderParsed = true;
-			// Note: there is a "hidden assumption" here
-			// that an empty
-			// string in content should be treated same as
-			// not present.
-		}
-		if (fEncodingMemento == null) {
-			handleSpecDefault();
-		}
-		if (fEncodingMemento == null) {
-			// safty net
-			fEncodingMemento = new NullMemento();
-		}
-		return fEncodingMemento;
-	}
-
-	public EncodingMemento getSpecDefaultEncodingMemento() {
-		resetAll();
-		EncodingMemento result = null;
-		String enc = getSpecDefaultEncoding();
-		if (enc != null) {
-			createEncodingMemento(enc, EncodingMemento.DEFAULTS_ASSUMED_FOR_EMPTY_INPUT);
-			fEncodingMemento.setAppropriateDefault(enc);
-			result = fEncodingMemento;
-		}
-		return result;
-	}
-
-	private void handleSpecDefault() {
-		String encodingName;
-		encodingName = getSpecDefaultEncoding();
-		if (encodingName != null) {
-			// createEncodingMemento(encodingName,
-			// EncodingMemento.USED_CONTENT_TYPE_DEFAULT);
-			fEncodingMemento = new EncodingMemento();
-			fEncodingMemento.setJavaCharsetName(encodingName);
-			fEncodingMemento.setAppropriateDefault(encodingName);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void resetAll() {
-		fReader = null;
-		fHeaderParsed = false;
-		fEncodingMemento = null;
-	}
-
-	/**
-	 * 
-	 */
-	public void set(InputStream inputStream) {
-		resetAll();
-		fReader = new ByteReader(inputStream);
-		try {
-			fReader.mark(CodedIO.MAX_MARK_SIZE);
-		}
-		catch (IOException e) {
-			// impossible, since we know ByteReader
-			// supports marking
-			throw new Error(e);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void set(IStorage iStorage) throws CoreException {
-		resetAll();
-		InputStream inputStream = iStorage.getContents();
-		InputStream resettableStream = new BufferedInputStream(inputStream, CodedIO.MAX_BUF_SIZE);
-		resettableStream.mark(CodedIO.MAX_MARK_SIZE);
-		set(resettableStream);
-		// TODO we'll need to "remember" IFile, or
-		// get its (or its project's) settings, in case
-		// those are needed to handle cases when the
-		// encoding is not in the file stream.
-	}
-
-	/**
-	 * Note: this is not part of interface to help avoid confusion ... it
-	 * expected this Reader is a well formed character reader ... that is, its
-	 * all ready been determined to not be a unicode marked input stream. And,
-	 * its assumed to be in the correct position, at position zero, ready to
-	 * read first character.
-	 */
-	public void set(Reader reader) {
-		resetAll();
-		fReader = reader;
-		if (!fReader.markSupported()) {
-			fReader = new BufferedReader(fReader);
-		}
-		try {
-			fReader.mark(CodedIO.MAX_MARK_SIZE);
-		}
-		catch (IOException e) {
-			// impossble, since we just checked if markable
-			throw new Error(e);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/ContentDescriberForCSS.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/ContentDescriberForCSS.java
deleted file mode 100644
index ea0655b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/ContentDescriberForCSS.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contenttype;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.content.IContentDescriber;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.ITextContentDescriber;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IContentDescriptionExtended;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-
-public final class ContentDescriberForCSS implements ITextContentDescriber {
-	final private static QualifiedName[] SUPPORTED_OPTIONS = {IContentDescription.CHARSET, IContentDescription.BYTE_ORDER_MARK, IContentDescriptionExtended.DETECTED_CHARSET, IContentDescriptionExtended.UNSUPPORTED_CHARSET, IContentDescriptionExtended.APPROPRIATE_DEFAULT};
-
-	public int describe(InputStream contents, IContentDescription description) throws IOException {
-		int result = IContentDescriber.INDETERMINATE;
-
-		if (description == null) {
-			result = computeValidity(contents);
-		}
-		else {
-			calculateSupportedOptions(contents, description);
-			result = computeValidity(contents);
-		}
-		return result;
-	}
-
-	public int describe(Reader contents, IContentDescription description) throws IOException {
-		int result = IContentDescriber.INDETERMINATE;
-
-		if (description == null) {
-			result = computeValidity(contents);
-		}
-		else {
-			calculateSupportedOptions(contents, description);
-			result = computeValidity(contents);
-		}
-		return result;
-	}
-
-	public QualifiedName[] getSupportedOptions() {
-
-		return SUPPORTED_OPTIONS;
-	}
-
-	private void calculateSupportedOptions(InputStream contents, IContentDescription description) throws IOException {
-		if (isRelevent(description)) {
-			IResourceCharsetDetector detector = getDetector();
-			detector.set(contents);
-			handleCalculations(description, detector);
-		}
-	}
-
-	/**
-	 * @param contents
-	 * @param description
-	 * @throws IOException
-	 */
-	private void calculateSupportedOptions(Reader contents, IContentDescription description) throws IOException {
-		if (isRelevent(description)) {
-			IResourceCharsetDetector detector = getDetector();
-			detector.set(contents);
-			handleCalculations(description, detector);
-		}
-	}
-
-	private int computeValidity(InputStream inputStream) {
-		// currently no specific check for validilty
-		// based on contents.
-		return IContentDescriber.INDETERMINATE;
-	}
-
-	private int computeValidity(Reader reader) {
-		// currently no specific check for validilty
-		// based on contents.
-		return IContentDescriber.INDETERMINATE;
-	}
-
-	private IResourceCharsetDetector getDetector() {
-		return new CSSResourceEncodingDetector();
-	}
-
-	/**
-	 * @param description
-	 * @param detector
-	 * @throws IOException
-	 */
-	private void handleCalculations(IContentDescription description, IResourceCharsetDetector detector) throws IOException {
-		// note: if we're asked for one, we set them all. I need to be sure if
-		// called
-		// mulitiple times (one for each, say) that we don't waste time
-		// processing same
-		// content again.
-		EncodingMemento encodingMemento = ((CSSResourceEncodingDetector) detector).getEncodingMemento();
-		// TODO: I need to verify to see if this BOM work is always done
-		// by text type.
-		Object detectedByteOrderMark = encodingMemento.getUnicodeBOM();
-		if (detectedByteOrderMark != null) {
-			Object existingByteOrderMark = description.getProperty(IContentDescription.BYTE_ORDER_MARK);
-			// not sure why would ever be different, so if is different, may
-			// need to "push" up into base.
-			if (!detectedByteOrderMark.equals(existingByteOrderMark))
-				description.setProperty(IContentDescription.BYTE_ORDER_MARK, detectedByteOrderMark);
-		}
-
-
-		if (!encodingMemento.isValid()) {
-			// note: after setting here, its the mere presence of
-			// IContentDescriptionExtended.UNSUPPORTED_CHARSET
-			// in the resource's description that can be used to determine if
-			// invalid
-			// in those cases, the "detected" property contains an
-			// "appropriate default" to use.
-			description.setProperty(IContentDescriptionExtended.UNSUPPORTED_CHARSET, encodingMemento.getInvalidEncoding());
-			description.setProperty(IContentDescriptionExtended.APPROPRIATE_DEFAULT, encodingMemento.getAppropriateDefault());
-		}
-
-		Object detectedCharset = encodingMemento.getDetectedCharsetName();
-		Object javaCharset = encodingMemento.getJavaCharsetName();
-
-		// we always include detected, if its different than java
-		handleDetectedSpecialCase(description, detectedCharset, javaCharset);
-
-		if (javaCharset != null) {
-			Object existingCharset = description.getProperty(IContentDescription.CHARSET);
-			if (javaCharset.equals(existingCharset)) {
-				handleDetectedSpecialCase(description, detectedCharset, javaCharset);
-			}
-			else {
-				// we may need to add what we found, but only need to add
-				// if different from default.the
-				Object defaultCharset = getDetector().getSpecDefaultEncoding();
-				if (defaultCharset != null) {
-					if (!defaultCharset.equals(javaCharset)) {
-						description.setProperty(IContentDescription.CHARSET, javaCharset);
-					}
-				}
-				else {
-					// assuming if there is no spec default, we always need to
-					// add, I'm assuming
-					description.setProperty(IContentDescription.CHARSET, javaCharset);
-				}
-			}
-		}
-
-	}
-
-	private void handleDetectedSpecialCase(IContentDescription description, Object detectedCharset, Object javaCharset) {
-		// since equal, we don't need to add, but if our detected version is
-		// different than javaCharset, then we should add it. This will
-		// happen, for example, if there's differences in case, or differences
-		// due to override properties
-		if (detectedCharset != null) {
-
-			// Once we detected a charset, we should set the property even
-			// though it's the same as javaCharset
-			// because there are clients that rely on this property to
-			// determine if the charset is actually detected in file or not.
-			description.setProperty(IContentDescriptionExtended.DETECTED_CHARSET, detectedCharset);
-		}
-	}
-
-	/**
-	 * @param description
-	 * @return
-	 */
-	private boolean isRelevent(IContentDescription description) {
-		boolean result = false;
-		if (description == null)
-			result = false;
-		else if (description.isRequested(IContentDescription.BYTE_ORDER_MARK))
-			result = true;
-		else if (description.isRequested(IContentDescription.CHARSET))
-			result = true;
-		else if (description.isRequested(IContentDescriptionExtended.APPROPRIATE_DEFAULT))
-			result = true;
-		else if (description.isRequested(IContentDescriptionExtended.DETECTED_CHARSET))
-			result = true;
-		else if (description.isRequested(IContentDescriptionExtended.UNSUPPORTED_CHARSET))
-			result = true;
-		// else if
-		// (description.isRequested(IContentDescriptionExtended.ENCODING_MEMENTO))
-		// result = true;
-		return result;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/EncodingGuesser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/EncodingGuesser.java
deleted file mode 100644
index 82f6e5c..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/EncodingGuesser.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contenttype;
-
-/**
- * 
- * This is ported from PageDesigner's hpbcom/Kanji.cpp's
- * Kanji::guess_kanji_code(),
- *  
- */
-public class EncodingGuesser {
-	private static final int ASCII = 0; // ASCII
-	// ISO-2022-JP
-	private static final int ASCII_IN = 8; // This is after ISO2022's change
-	// Shift-JIS
-	private static final int EUC_HALFKANA = 6; // This is Half Kana in EUC-JP
-	private static final int EUC_JP = 3; // This is EUC-JP
-	private static final int ISO2022_JP = 4; // This is ISO-2022-JP
-	private static final int JIS_HALFKANA = 7; // THis is Half Kana in
-	private static final byte KT_EUC1 = 0x40;
-	private static final byte KT_EUC2 = (byte) 0x80;
-	// ASCII
-	private static final byte KT_JIN = 0x01;
-	private static final byte KT_JOUT = 0x02;
-	//	private static final byte KT_ESC = 0x04;
-	//	private static final byte KT_JIS = 0x08;
-	private static final byte KT_SFT1 = 0x10;
-	private static final byte KT_SFT2 = 0x20;
-	private static final byte ktype[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 00 */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 10 */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x09, 0x08, 0x08, 0x08, /* !"#$%&' *//* " */
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, /* ()*+,-./ */
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, /* 01234567 */
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, /* 89:; <=>? */
-	0x29, 0x28, 0x2b, 0x28, 0x28, 0x28, 0x28, 0x28, /* @ABCDEFG */
-	0x2a, 0x28, 0x2a, 0x28, 0x28, 0x28, 0x28, 0x28, /* HIJKLMNO */
-	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, /* PQRSTUVW */
-	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, /* XYZ[\]^_ */
-	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, /* abcdefg */
-	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, /* hijklmno */
-	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, /* pqrstuvw */
-	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x00, /* xyz{|}~ */
-	0x20, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, /* 80 */
-	0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, /* 90 */
-	0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x20, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, /* A0 */
-	(byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, /* B0 */
-	(byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, /* C0 */
-	(byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, /* D0 */
-	(byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, /* E0 */
-	(byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, /* F0 */
-	(byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xc0, (byte) 0xc0, 0x00,};
-	//	private static final int ISO8859_1 = 1; // ISO-1
-	private static final int SHIFT_JIS = 2; // This is Shift-JIS
-	private static final int SJIS_HALFKANA = 5; // This is Half Kana in
-
-	/**
-	 * Currently, only Japanese encodings are supported.
-	 */
-	private static final int UNKNOWN = -1; // Unknown
-
-	/**
-	 * @return java.lang.String
-	 * @param code
-	 *            int
-	 * 
-	 * Convert private int to IANA Encoding name.
-	 */
-	private static String convertToIANAEncodingName(int code) {
-		String encoding = null;
-
-		switch (code) {
-			case SHIFT_JIS :
-			case SJIS_HALFKANA :
-				encoding = "Shift_JIS";//$NON-NLS-1$
-				break;
-			case EUC_JP :
-			case EUC_HALFKANA :
-				encoding = "EUC-JP";//$NON-NLS-1$
-				break;
-			case ISO2022_JP :
-			case JIS_HALFKANA :
-				encoding = "ISO-2022-JP";//$NON-NLS-1$
-			default :
-				break;
-		}
-
-		return encoding;
-	}
-
-	/**
-	 * Return guessed Java Encoding name target: bytes to be inspected length:
-	 * length of target
-	 */
-	public static String guessEncoding(byte[] target, int length) {
-		int code = UNKNOWN;
-
-		// Currently, only Japanese is supported.
-		String system_ctype = java.util.Locale.getDefault().getLanguage();
-		String jp_ctype = java.util.Locale.JAPANESE.getLanguage();
-		if (system_ctype.compareTo(jp_ctype) == 0) {
-			// Ok, I'm under ja_JP.
-			code = ASCII;
-			int pos = 0;
-			while ((code == ASCII) && (length > 0)) {
-				int ch1 = target[pos];
-				ch1 = ch1 & 0x000000FF;
-				int ch2 = (length >= 2) ? target[pos + 1] : 0;
-				ch2 = ch2 & 0x000000FF;
-				int ch3 = (length >= 3) ? target[pos + 2] : 0;
-				ch3 = ch3 & 0x000000FF;
-				code = guessJapaneseKanjiCode(ch1, ch2, ch3, 0);
-				pos++;
-				length--;
-			}
-			switch (code) {
-				case ISO2022_JP :
-				case JIS_HALFKANA :
-					code = ISO2022_JP;
-					break;
-				case EUC_JP :
-					code = EUC_JP;
-					break;
-				default :
-					code = SHIFT_JIS;
-			}
-		}
-		return (convertToIANAEncodingName(code));
-	}
-
-	/**
-	 * Guess the encoding. halfkana_flag = 0x01 ( detect SJIS half kana )
-	 * halfkana_flag = 0x02 ( detect EUC half kana )
-	 */
-	private static int guessJapaneseKanjiCode(int ch1, int ch2, int ch3, int halfkana_flag) {
-		boolean sjis_hankaku_flag = ((halfkana_flag & 0x01) != 0) ? true : false;
-		boolean euc_hankaku_flag = ((halfkana_flag & 0x02) != 0) ? true : false;
-
-		if (ch1 == 0)
-			return UNKNOWN;
-		if (sjis_hankaku_flag && ch1 >= 0xa1 && ch1 <= 0xdf)
-			return SJIS_HALFKANA;
-		else if (euc_hankaku_flag && ch1 == 0x8e && ch2 >= 0xa1 && ch2 <= 0xdf)
-			return EUC_HALFKANA;
-		else if (((ktype[ch1] & KT_SFT1) != 0) && ((ktype[ch2] & KT_SFT2) != 0))
-			return SHIFT_JIS;
-		else if (((ktype[ch1] & KT_EUC1) != 0) && ((ktype[ch2] & KT_EUC2) != 0))
-			return EUC_JP;
-		else if (ch1 == 0x1b && ((ktype[ch2] & KT_JIN) != 0))
-			return ISO2022_JP;
-		else if (ch1 >= 0xa1 && ch1 <= 0xdf)
-			return SJIS_HALFKANA;
-		else if (ch1 == 0x1b && ch2 == 0x28/* '(' */&& ch3 == 0x49/* 'I' */)
-			return JIS_HALFKANA;
-		else if (ch1 == 0x1b && ch2 == 0x28/* '(' */&& ((ktype[ch3] & KT_JOUT) != 0))
-			return ASCII_IN;
-
-		return ASCII;
-	}
-
-	public EncodingGuesser() {
-		super();
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/HeadParserToken.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/HeadParserToken.java
deleted file mode 100644
index 8821407..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/HeadParserToken.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contenttype;
-
-public class HeadParserToken {
-	private int fStart;
-
-	private String fText;
-	private String fType;
-
-	protected HeadParserToken() {
-		super();
-	}
-
-	public HeadParserToken(String type, int start, String text) {
-		this();
-		fType = type;
-		fStart = start;
-		fText = text;
-
-	}
-
-	public String getText() {
-		return fText;
-	}
-
-	public String getType() {
-		return fType;
-	}
-
-	public String toString() {
-		return ("text: " + fText + " offset: " + fStart + " type: " + fType); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/IntStack.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/IntStack.java
deleted file mode 100644
index 117136d..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/IntStack.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.contenttype;
-
-/*
- * 
- * A non-resizable class implementing the behavior of java.util.Stack, but
- * directly for the <code> integer </code> primitive.
- */
-import java.util.EmptyStackException;
-
-public class IntStack {
-	private int[] list = null;
-
-	private int size = 0;
-
-	public IntStack() {
-		this(100);
-	}
-
-	public IntStack(int maxdepth) {
-		super();
-		list = new int[maxdepth];
-		initialize();
-	}
-
-	public void clear() {
-		initialize();
-	}
-
-	public boolean empty() {
-		return size == 0;
-	}
-
-	public int get(int slot) {
-		return list[slot];
-	}
-
-	private void initialize() {
-		for (int i = 0; i < list.length; i++)
-			list[i] = -1;
-	}
-
-	/**
-	 * Returns the int at the top of the stack without removing it
-	 * 
-	 * @return int at the top of this stack.
-	 * @exception EmptyStackException
-	 *                when empty.
-	 */
-	public int peek() {
-		if (size == 0)
-			throw new EmptyStackException();
-		return list[size - 1];
-	}
-
-	/**
-	 * Removes and returns the int at the top of the stack
-	 * 
-	 * @return int at the top of this stack.
-	 * @exception EmptyStackException
-	 *                when empty.
-	 */
-	public int pop() {
-		int value = peek();
-		list[size - 1] = -1;
-		size--;
-		return value;
-	}
-
-	/**
-	 * Pushes an item onto the top of this stack.
-	 * 
-	 * @param newValue -
-	 *            the int to be pushed onto this stack.
-	 * @return the <code>newValue</code> argument.
-	 */
-	public int push(int newValue) {
-		if (size == list.length) {
-			throw new StackOverflowError();
-		}
-		list[size++] = newValue;
-		return newValue;
-	}
-
-	public int size() {
-		return list.length;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/AbstractCSSNodeList.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/AbstractCSSNodeList.java
deleted file mode 100644
index 10949cc..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/AbstractCSSNodeList.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-import java.util.Vector;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-
-
-/**
- * 
- */
-abstract class AbstractCSSNodeList {
-
-	protected Vector nodes = null;
-
-	ICSSNode appendNode(ICSSNode node) {
-		if (node == null)
-			return null;
-		if (this.nodes == null)
-			this.nodes = new Vector();
-		this.nodes.addElement(node);
-		return node;
-	}
-
-	/**
-	 * @return int
-	 */
-	public int getLength() {
-		if (this.nodes == null)
-			return 0;
-		return this.nodes.size();
-	}
-
-
-	protected ICSSNode itemImpl(int index) {
-		if (this.nodes == null)
-			return null;
-		if (index < 0 || index >= this.nodes.size())
-			return null;
-		return (ICSSNode) this.nodes.elementAt(index);
-	}
-
-
-	ICSSNode removeNode(int index) {
-		if (this.nodes == null)
-			return null; // no node
-		if (index < 0 || index >= this.nodes.size())
-			return null; // invalid parameter
-
-		ICSSNode removed = (ICSSNode) this.nodes.elementAt(index);
-		this.nodes.removeElementAt(index);
-		return removed;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSAttrImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSAttrImpl.java
deleted file mode 100644
index 471b452..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSAttrImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNamedNodeMap;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-
-/**
- * 
- */
-class CSSAttrImpl extends CSSRegionContainer implements ICSSAttr {
-
-	private String fName = null;
-	private String fValue = null;
-	private CSSNodeImpl ownerCSSNode = null;
-
-	CSSAttrImpl(CSSAttrImpl that) {
-		super(that);
-		this.fName = that.fName;
-		this.setValue(that.fValue);
-	}
-
-	/**
-	 * CSSAttr constructor comment.
-	 */
-	CSSAttrImpl(String name) {
-		super();
-		this.fName = name;
-	}
-
-	public ICSSNode cloneNode(boolean deep) {
-		return new CSSAttrImpl(this);
-	}
-
-	/**
-	 * @return org.eclipse.wst.css.core.model.interfaces.ICSSNamedNodeMap
-	 */
-	public ICSSNamedNodeMap getAttributes() {
-		return null;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public java.lang.String getName() {
-		return fName;
-	}
-
-	/**
-	 * @return short
-	 */
-	public short getNodeType() {
-		return ATTR_NODE;
-	}
-
-	public ICSSNode getOwnerCSSNode() {
-		return ownerCSSNode;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public java.lang.String getValue() {
-		return fValue;
-	}
-
-	/**
-	 * @return boolean
-	 * @param name
-	 *            java.lang.String
-	 */
-	protected boolean matchName(String name) {
-		if (name == null)
-			return /* (this.name == null) */false;
-		if (this.fName == null)
-			return false;
-		return this.fName.equals(name);
-	}
-
-	/**
-	 * 
-	 */
-	protected void notifyValueChanged(String oldValue) {
-		if (this.ownerCSSNode == null)
-			return;
-
-		// for model
-		ICSSDocument doc = ownerCSSNode.getContainerDocument();
-		if (doc == null)
-			return;
-		CSSModelImpl model = (CSSModelImpl) doc.getModel();
-		if (model == null)
-			return;
-		model.valueChanged(this, oldValue);
-
-		// for adapters
-		String value = getValue();
-		this.ownerCSSNode.notify(CHANGE, this, oldValue, value, this.ownerCSSNode.getStartOffset());
-	}
-
-	/**
-	 * @param newName
-	 *            java.lang.String
-	 */
-	protected void setName(java.lang.String newName) {
-		fName = newName;
-	}
-
-	protected void setOwnerCSSNode(CSSNodeImpl newOwnerCSSNode) {
-		ownerCSSNode = newOwnerCSSNode;
-	}
-
-	/**
-	 * @param newValue
-	 *            java.lang.String
-	 */
-	public void setValue(java.lang.String newValue) {
-		String oldValue = fValue;
-		fValue = newValue;
-
-		notifyValueChanged(oldValue);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSCharsetRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSCharsetRuleImpl.java
deleted file mode 100644
index aec5d5e..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSCharsetRuleImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSCharsetRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-
-
-/**
- * 
- */
-class CSSCharsetRuleImpl extends CSSRuleImpl implements ICSSCharsetRule {
-
-	/**
-	 * 
-	 */
-	CSSCharsetRuleImpl() {
-		super();
-	}
-
-	CSSCharsetRuleImpl(CSSCharsetRuleImpl that) {
-		super(that);
-	}
-
-	public ICSSNode cloneNode(boolean deep) {
-		CSSCharsetRuleImpl cloned = new CSSCharsetRuleImpl(this);
-
-		return cloned;
-	}
-
-	/**
-	 * The encoding information used in this <code>@charset</code> rule.
-	 * @exception org.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the specified encoding value has a
-	 *                syntax error and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this encoding
-	 *                rule is readonly.
-	 */
-	public String getEncoding() {
-		return CSSUtil.extractStringContents(getAttribute(ENCODING));
-	}
-
-	/**
-	 * @return short
-	 */
-	public short getNodeType() {
-		return CHARSETRULE_NODE;
-	}
-
-	/**
-	 * The type of the rule, as defined above. The expectation is that
-	 * binding-specific casting methods can be used to cast down from an
-	 * instance of the <code>CSSRule</code> interface to the specific
-	 * derived interface implied by the <code>type</code>.
-	 */
-	public short getType() {
-		return CHARSET_RULE;
-	}
-
-	public void setEncoding(String encoding) throws org.w3c.dom.DOMException {
-		String quote = CSSCorePlugin.getDefault().getPluginPreferences().getString(CSSCorePreferenceNames.FORMAT_QUOTE);
-		String enc = CSSUtil.extractStringContents(encoding);
-		quote = CSSUtil.detectQuote(enc, quote);
-		setAttribute(ENCODING, quote + enc + quote);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSDeclarationItemParser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSDeclarationItemParser.java
deleted file mode 100644
index b35b7d5..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSDeclarationItemParser.java
+++ /dev/null
@@ -1,1077 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICounter;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.text.TextRegionListImpl;
-import org.w3c.dom.css.CSSPrimitiveValue;
-
-
-/**
- * 
- */
-class CSSDeclarationItemParser {
-	/**
-	 * 
-	 */
-	final class FloatInfo {
-		/**
-		 * 
-		 */
-		FloatInfo(String text) {
-			parse(text);
-		}
-
-		/**
-		 * 
-		 */
-		void parse(String text) {
-			StringBuffer bufValue = new StringBuffer();
-			StringBuffer bufIdent = new StringBuffer();
-			boolean bNum = true;
-			int len = text.length();
-			for (int i = 0; i < len; i++) {
-				char c = text.charAt(i);
-				if (bNum) {
-					if ('0' <= c && c <= '9' || c == '.' || c == '+' || c == '-') {
-						bufValue.append(c);
-					}
-					else {
-						bufIdent.append(c);
-						bNum = false;
-					}
-				}
-				else {
-					bufIdent.append(c);
-				}
-			}
-			String valueStr = bufValue.toString();
-			fValue = Float.valueOf(valueStr).floatValue();
-			fIdentifier = bufIdent.toString();
-			fType = getFloatValueType(valueStr, fIdentifier);
-		}
-
-		/**
-		 * 
-		 */
-		float getValue() {
-			return fValue;
-		}
-
-		/**
-		 * 
-		 */
-		String getIdentifier() {
-			return fIdentifier;
-		}
-
-		/**
-		 * 
-		 */
-		short getValueType() {
-			return fType;
-		}
-
-		private float fValue = 0.0f;
-		private String fIdentifier = null;
-		private short fType = CSSPrimitiveValue.CSS_UNKNOWN;
-	}
-
-	final static int S_NORMAL = 0;
-	final static int S_FUNCTION = 1;
-	final static int S_FONT_SLASH = 2;
-	final static int S_COMMA_SEPARATION = 3;
-	private ICSSDocument fDocument = null;
-	private IStructuredDocumentRegion fParentRegion = null;
-	private boolean fTempStructuredDocument = false;
-	private CSSModelUpdateContext fUpdateContext = null;
-
-	/**
-	 * CSSDeclarationItemParser constructor comment.
-	 */
-	CSSDeclarationItemParser(ICSSDocument doc) {
-		super();
-		fDocument = doc;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSPrimitiveValueImpl createAttrValue(ITextRegionList regions) {
-		String funcName = getFunctionName(regions);
-		if (funcName == null || !funcName.toLowerCase().equals("attr")) { //$NON-NLS-1$
-			return null;
-		}
-		String accepts[] = {CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT};
-		ITextRegionList valueRegions = getFunctionParameters(regions, accepts);
-		if (valueRegions.size() != 1) {
-			return null;
-		}
-
-		CSSPrimitiveValueImpl value = getCSSPrimitiveValue(CSSPrimitiveValue.CSS_ATTR);
-		if (value == null) {
-			return null;
-		}
-
-		ITextRegion region = valueRegions.get(0);
-		value.setValue(getText(region));
-
-		return value;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSPrimitiveValueImpl createCountersValue(ITextRegionList regions) {
-		String funcName = getFunctionName(regions);
-		if (funcName == null || !funcName.toLowerCase().equals("counters")) { //$NON-NLS-1$
-			return null;
-		}
-
-		String accepts[] = {CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT, CSSRegionContexts.CSS_DECLARATION_VALUE_STRING};
-		ITextRegionList valueRegions = getFunctionParameters(regions, accepts);
-		int size = valueRegions.size();
-		if (size != 2 && size != 3) {
-			return null;
-		}
-
-		CounterImpl value = getCounter();
-		if (value == null) {
-			return null;
-		}
-
-		for (int i = 0; i < size; i++) {
-			ITextRegion region = valueRegions.get(i);
-			String text = getText(region);
-			CSSAttrImpl attr = null;
-			switch (i) {
-				case 0 :
-					value.setIdentifier(text);
-					attr = value.getAttributeNode(ICounter.IDENTIFIER);
-					break;
-				case 1 :
-					value.setSeparator(text);
-					attr = value.getAttributeNode(ICounter.SEPARATOR);
-					break;
-				case 2 :
-					value.setListStyle(text);
-					attr = value.getAttributeNode(ICounter.LISTSTYLE);
-					break;
-				default :
-					break;
-			}
-			if (attr != null) {
-				attr.setRangeRegion(fParentRegion, region, region);
-			}
-		}
-
-		return value;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSPrimitiveValueImpl createCounterValue(ITextRegionList regions) {
-		String funcName = getFunctionName(regions);
-		if (funcName == null || !funcName.toLowerCase().equals("counter")) { //$NON-NLS-1$
-			return null;
-		}
-
-		String accepts[] = {CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT};
-		ITextRegionList valueRegions = getFunctionParameters(regions, accepts);
-		int size = valueRegions.size();
-		if (size != 1 && size != 2) {
-			return null;
-		}
-
-		CounterImpl value = getCounter();
-		if (value == null) {
-			return null;
-		}
-
-		for (int i = 0; i < size; i++) {
-			ITextRegion region = valueRegions.get(i);
-			String text = getText(region);
-			CSSAttrImpl attr = null;
-			switch (i) {
-				case 0 :
-					value.setIdentifier(text);
-					attr = value.getAttributeNode(ICounter.IDENTIFIER);
-					break;
-				case 1 :
-					value.setListStyle(text);
-					attr = value.getAttributeNode(ICounter.LISTSTYLE);
-					break;
-				default :
-					break;
-			}
-			if (attr != null) {
-				attr.setRangeRegion(fParentRegion, region, region);
-			}
-		}
-
-		return value;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSStyleDeclItemImpl createDeclarationItem(ITextRegionList nodeRegions) {
-		CSSStyleDeclItemImpl item = null;
-		String name = getPropertyName(nodeRegions);
-		if (name != null) {
-			item = getCSSStyleDeclItem(name);
-		}
-		return item;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSPrimitiveValueImpl createFloatValue(String text, String type) {
-		FloatInfo info = new FloatInfo(text);
-		CSSPrimitiveValueImpl value = getCSSPrimitiveValue(info.getValueType());
-		if (value != null) {
-			value.setValue(info.getValue());
-		}
-		return value;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSPrimitiveValueImpl createFormatValue(ITextRegionList regions) {
-		String funcName = getFunctionName(regions);
-		if (funcName == null || !funcName.toLowerCase().equals("format")) { //$NON-NLS-1$
-			return null;
-		}
-		String accepts[] = {CSSRegionContexts.CSS_DECLARATION_VALUE_STRING};
-		ITextRegionList valueRegions = getFunctionParameters(regions, accepts);
-		// format can take variable args.
-		if (valueRegions.size() == 0) {
-			return null;
-		}
-
-		CSSPrimitiveValueImpl value = getCSSPrimitiveValue(ICSSPrimitiveValue.CSS_FORMAT);
-		if (value == null) {
-			return null;
-		}
-
-		ITextRegion region = valueRegions.get(0);
-		value.setValue(CSSUtil.extractStringContents(getText(region)));
-
-		return value;
-
-	}
-
-	/**
-	 * 
-	 */
-	private CSSPrimitiveValueImpl createLocalValue(ITextRegionList regions) {
-		String funcName = getFunctionName(regions);
-		if (funcName == null || !funcName.toLowerCase().equals("local")) { //$NON-NLS-1$
-			return null;
-		}
-		String accepts[] = {CSSRegionContexts.CSS_DECLARATION_VALUE_STRING};
-		ITextRegionList valueRegions = getFunctionParameters(regions, accepts);
-		if (valueRegions.size() != 1) {
-			return null;
-		}
-
-		CSSPrimitiveValueImpl value = getCSSPrimitiveValue(ICSSPrimitiveValue.CSS_LOCAL);
-		if (value == null) {
-			return null;
-		}
-
-		ITextRegion region = valueRegions.get(0);
-		value.setValue(CSSUtil.extractStringContents(getText(region)));
-
-		return value;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSPrimitiveValueImpl createPrimitiveValue(ITextRegion region) {
-		if (region == null) {
-			return null;
-		}
-		CSSPrimitiveValueImpl value = null;
-		String type = region.getType();
-		String text = getText(region);
-		if (isBlank(type)) {
-			value = null;
-		}
-		else if (type == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || type == CSSRegionContexts.CSS_DECLARATION_VALUE_DIMENSION || type == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) {
-			value = createFloatValue(text, type);
-		}
-		else if (type == CSSRegionContexts.CSS_DECLARATION_VALUE_STRING || type == CSSRegionContexts.CSS_DECLARATION_VALUE_URI || type == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT || type == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) {
-			value = createStringValue(text, type);
-		}
-
-		if (value == null) {
-			value = createStringValue(text, type);
-		}
-
-		if (!fTempStructuredDocument && value != null) {
-			value.setRangeRegion(fParentRegion, region, region);
-		}
-
-		return value;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSPrimitiveValueImpl createPrimitiveValue(ITextRegionList regions) {
-		CSSPrimitiveValueImpl value = null;
-		CSSUtil.stripSurroundingSpace(regions);
-		if (regions.isEmpty()) {
-			return null;
-		}
-		ITextRegion region = regions.get(0);
-		if (region == null) {
-			return null;
-		}
-		String type = region.getType();
-		if (type == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-			String text = getText(region).toLowerCase();
-			if (text.equals("rgb(")) { //$NON-NLS-1$
-				value = createRgbValue(regions);
-			}
-			else if (text.equals("counter(")) { //$NON-NLS-1$
-				value = createCounterValue(regions);
-			}
-			else if (text.equals("counters(")) { //$NON-NLS-1$
-				value = createCountersValue(regions);
-			}
-			else if (text.equals("attr(")) { //$NON-NLS-1$
-				value = createAttrValue(regions);
-			}
-			else if (text.equals("format(")) { //$NON-NLS-1$
-				value = createFormatValue(regions);
-			}
-			else if (text.equals("local(")) { //$NON-NLS-1$
-				value = createLocalValue(regions);
-			}
-			else if (text.equals("rect(")) { //$NON-NLS-1$
-				value = createRectValue(regions);
-			}
-			if (value == null) {
-				value = createStringValue(regions);
-			}
-		}
-		else {
-			value = createStringValue(regions);
-		}
-
-		if (!fTempStructuredDocument && value != null) {
-			value.setRangeRegion(fParentRegion, regions.get(0), regions.get(regions.size() - 1));
-		}
-
-		return value;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSPrimitiveValueImpl createRectValue(ITextRegionList regions) {
-		String funcName = getFunctionName(regions);
-		if (funcName == null || !funcName.toLowerCase().equals("rect")) { //$NON-NLS-1$
-			return null;
-		}
-		String accepts[] = {CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER, CSSRegionContexts.CSS_DECLARATION_VALUE_DIMENSION, CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT}; // IDENT:
-																																												// for
-																																												// 'auto'
-		ITextRegionList valueRegions = getFunctionParameters(regions, accepts);
-		if (valueRegions.size() != 4) {
-			return null;
-		}
-
-		RectImpl value = getRect();
-		if (value == null) {
-			return null;
-		}
-
-		for (int i = 0; i < 4; i++) {
-			ITextRegion region = valueRegions.get(i);
-			CSSPrimitiveValueImpl childValue = null;
-			switch (i) {
-				case 0 :
-					childValue = (CSSPrimitiveValueImpl) value.getTop();
-					break;
-				case 1 :
-					childValue = (CSSPrimitiveValueImpl) value.getRight();
-					break;
-				case 2 :
-					childValue = (CSSPrimitiveValueImpl) value.getBottom();
-					break;
-				case 3 :
-					childValue = (CSSPrimitiveValueImpl) value.getLeft();
-					break;
-				default :
-					break;
-			}
-			if (childValue == null) {
-				return null;
-			}
-			String text = getText(region);
-			String type = region.getType();
-			if (type == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				setStringValue(childValue, text, type);
-			}
-			else {
-				setFloatValue(childValue, text, type);
-			}
-			if (!fTempStructuredDocument) {
-				childValue.setRangeRegion(fParentRegion, region, region);
-			}
-		}
-
-		return value;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSPrimitiveValueImpl createRgbValue(ITextRegionList regions) {
-		String funcName = getFunctionName(regions);
-		if (funcName == null || !funcName.toLowerCase().equals("rgb")) { //$NON-NLS-1$
-			return null;
-		}
-		String accepts[] = {CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER, CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE};
-		ITextRegionList valueRegions = getFunctionParameters(regions, accepts);
-		if (valueRegions.size() != 3) {
-			return null;
-		}
-
-		RGBColorImpl value = getRGBColor();
-		if (value == null) {
-			return null;
-		}
-
-		for (int i = 0; i < 3; i++) {
-			ITextRegion region = valueRegions.get(i);
-			CSSPrimitiveValueImpl childValue = null;
-			switch (i) {
-				case 0 :
-					childValue = (CSSPrimitiveValueImpl) value.getRed();
-					break;
-				case 1 :
-					childValue = (CSSPrimitiveValueImpl) value.getGreen();
-					break;
-				case 2 :
-					childValue = (CSSPrimitiveValueImpl) value.getBlue();
-					break;
-				default :
-					break;
-			}
-			if (childValue == null) {
-				return null;
-			}
-			setFloatValue(childValue, getText(region), region.getType());
-			if (!fTempStructuredDocument) {
-				childValue.setRangeRegion(fParentRegion, region, region);
-			}
-		}
-
-		return value;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSPrimitiveValueImpl createStringValue(String text, String type) {
-		short valueType = getStringValueType(text, type);
-		CSSPrimitiveValueImpl value = getCSSPrimitiveValue(valueType);
-		if (value != null) {
-			if (valueType == CSSPrimitiveValue.CSS_URI) {
-				text = CSSUtil.extractUriContents(text);
-			}
-			else if (valueType == CSSPrimitiveValue.CSS_STRING) {
-				text = CSSUtil.extractStringContents(text);
-			}
-			value.setValue(text);
-		}
-		return value;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSPrimitiveValueImpl createStringValue(ITextRegionList regions) {
-		String type = CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT;
-		if (regions.size() == 1) {
-			ITextRegion region = regions.get(0);
-			type = region.getType();
-		}
-		return createStringValue(makeString(regions), type);
-	}
-
-	/**
-	 * 
-	 */
-	private CounterImpl getCounter() {
-		CounterImpl node;
-		if (fUpdateContext != null && fUpdateContext.isActive()) {
-			node = fUpdateContext.getCounter();
-		}
-		else {
-			node = (CounterImpl) fDocument.createCSSPrimitiveValue(CSSPrimitiveValue.CSS_COUNTER);
-		}
-		return node;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSPrimitiveValueImpl getCSSPrimitiveValue(short type) {
-		CSSPrimitiveValueImpl node;
-		if (fUpdateContext != null && fUpdateContext.isActive()) {
-			node = fUpdateContext.getCSSPrimitiveValue(type);
-		}
-		else {
-			node = (CSSPrimitiveValueImpl) fDocument.createCSSPrimitiveValue(type);
-		}
-		return node;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSStyleDeclItemImpl getCSSStyleDeclItem(String propertyName) {
-		CSSStyleDeclItemImpl node;
-		if (fUpdateContext != null && fUpdateContext.isActive()) {
-			node = fUpdateContext.getCSSStyleDeclItem(propertyName);
-		}
-		else {
-			node = (CSSStyleDeclItemImpl) fDocument.createCSSStyleDeclItem(propertyName);
-		}
-		return node;
-	}
-
-	/**
-	 * 
-	 */
-	static short getFloatValueType(String ident) {
-		ident = ident.toLowerCase();
-		short valueType;
-		if (ident.length() == 0) {
-			valueType = CSSPrimitiveValue.CSS_NUMBER;
-		}
-		else if (ident.equals("%")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_PERCENTAGE;
-		}
-		else if (ident.equalsIgnoreCase("em")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_EMS;
-		}
-		else if (ident.equalsIgnoreCase("ex")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_EXS;
-		}
-		else if (ident.equalsIgnoreCase("px")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_PX;
-		}
-		else if (ident.equalsIgnoreCase("cm")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_CM;
-		}
-		else if (ident.equalsIgnoreCase("mm")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_MM;
-		}
-		else if (ident.equalsIgnoreCase("in")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_IN;
-		}
-		else if (ident.equalsIgnoreCase("pt")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_PT;
-		}
-		else if (ident.equalsIgnoreCase("pc")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_PC;
-		}
-		else if (ident.equalsIgnoreCase("deg")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_DEG;
-		}
-		else if (ident.equalsIgnoreCase("rad")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_RAD;
-		}
-		else if (ident.equalsIgnoreCase("grad")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_GRAD;
-		}
-		else if (ident.equalsIgnoreCase("ms")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_MS;
-		}
-		else if (ident.equalsIgnoreCase("s")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_S;
-		}
-		else if (ident.equalsIgnoreCase("hz")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_HZ;
-		}
-		else if (ident.equalsIgnoreCase("khz")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_KHZ;
-		}
-		else {
-			valueType = CSSPrimitiveValue.CSS_DIMENSION;
-		}
-		return valueType;
-	}
-
-	/**
-	 * 
-	 */
-	static short getFloatValueType(String value, String ident) {
-		ident = ident.toLowerCase();
-		short valueType;
-		if (ident.length() == 0) {
-			if (0 <= value.indexOf('.')) {
-				valueType = CSSPrimitiveValue.CSS_NUMBER;
-			}
-			else {
-				valueType = ICSSPrimitiveValue.CSS_INTEGER;
-			}
-		}
-		else if (ident.equals("%")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_PERCENTAGE;
-		}
-		else if (ident.equalsIgnoreCase("em")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_EMS;
-		}
-		else if (ident.equalsIgnoreCase("ex")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_EXS;
-		}
-		else if (ident.equalsIgnoreCase("px")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_PX;
-		}
-		else if (ident.equalsIgnoreCase("cm")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_CM;
-		}
-		else if (ident.equalsIgnoreCase("mm")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_MM;
-		}
-		else if (ident.equalsIgnoreCase("in")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_IN;
-		}
-		else if (ident.equalsIgnoreCase("pt")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_PT;
-		}
-		else if (ident.equalsIgnoreCase("pc")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_PC;
-		}
-		else if (ident.equalsIgnoreCase("deg")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_DEG;
-		}
-		else if (ident.equalsIgnoreCase("rad")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_RAD;
-		}
-		else if (ident.equalsIgnoreCase("grad")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_GRAD;
-		}
-		else if (ident.equalsIgnoreCase("ms")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_MS;
-		}
-		else if (ident.equalsIgnoreCase("s")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_S;
-		}
-		else if (ident.equalsIgnoreCase("hz")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_HZ;
-		}
-		else if (ident.equalsIgnoreCase("khz")) { //$NON-NLS-1$
-			valueType = CSSPrimitiveValue.CSS_KHZ;
-		}
-		else {
-			valueType = CSSPrimitiveValue.CSS_DIMENSION;
-		}
-		return valueType;
-	}
-
-	/**
-	 * 
-	 */
-	private String getFunctionName(ITextRegionList regions) {
-		if (regions == null || regions.size() < 2) {
-			return null;
-		}
-		ITextRegion firstRegion = regions.get(0);
-		if (firstRegion.getType() != CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-			return null;
-		}
-		ITextRegion lastRegion = regions.get(regions.size() - 1);
-		if (lastRegion.getType() != CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE) {
-			return null;
-		}
-		String text = getText(firstRegion);
-		return text.substring(0, text.length() - 1);
-	}
-
-	/**
-	 * this method has no validation check, then regions must be passed
-	 * getFunctionName()...
-	 */
-	private ITextRegionList getFunctionParameters(ITextRegionList regions, String[] accepts) {
-		ITextRegionList newRegions = new TextRegionListImpl();
-		int nAccepts = (accepts != null) ? accepts.length : 0;
-		Iterator i = regions.iterator();
-		i.next(); // skip FUNCTION
-		while (i.hasNext()) {
-			ITextRegion region = (ITextRegion) i.next();
-			if (region == null) {
-				continue;
-			}
-			String type = region.getType();
-			if (isBlank(type)) {
-				continue;
-			}
-			if (nAccepts == 0) {
-				newRegions.add(region);
-			}
-			else {
-				for (int iAccept = 0; iAccept < nAccepts; iAccept++) {
-					if (type == accepts[iAccept]) {
-						newRegions.add(region);
-						break;
-					}
-				}
-			}
-		}
-		return newRegions;
-	}
-
-	/**
-	 * 
-	 */
-	// private String getPropertyName(IStructuredDocumentRegion flatNode) {
-	// Vector nodeRegions = new Vector(flatNode.getRegions());
-	// return getPropertyName(nodeRegions);
-	// }
-	/**
-	 * 
-	 */
-	private String getPropertyName(ITextRegionList nodeRegions) {
-		ITextRegionList nameRegions = new TextRegionListImpl();
-		String name = null;
-		while (!nodeRegions.isEmpty()) {
-			ITextRegion region = nodeRegions.remove(0);
-			if (region == null) {
-				continue;
-			}
-			String type = region.getType();
-			if (type == CSSRegionContexts.CSS_DECLARATION_SEPARATOR) {
-				CSSUtil.stripSurroundingSpace(nameRegions);
-				name = makeString(nameRegions);
-				break;
-			}
-			else {
-				nameRegions.add(region);
-			}
-		}
-		return name;
-	}
-
-	/**
-	 * 
-	 */
-	private RectImpl getRect() {
-		RectImpl node;
-		if (fUpdateContext != null && fUpdateContext.isActive()) {
-			node = fUpdateContext.getRect();
-		}
-		else {
-			node = (RectImpl) fDocument.createCSSPrimitiveValue(CSSPrimitiveValue.CSS_RECT);
-		}
-		return node;
-	}
-
-	/**
-	 * 
-	 */
-	private RGBColorImpl getRGBColor() {
-		RGBColorImpl node;
-		if (fUpdateContext != null && fUpdateContext.isActive()) {
-			node = fUpdateContext.getRGBColor();
-		}
-		else {
-			node = (RGBColorImpl) fDocument.createCSSPrimitiveValue(CSSPrimitiveValue.CSS_RGBCOLOR);
-		}
-		return node;
-	}
-
-	/**
-	 * 
-	 */
-	private short getStringValueType(String text, String type) {
-		short valueType;
-		if (text.toLowerCase().equals("inherit")) { //$NON-NLS-1$
-			valueType = ICSSPrimitiveValue.CSS_INHERIT_PRIMITIVE;
-		}
-		else if (type == CSSRegionContexts.CSS_DECLARATION_VALUE_URI) {
-			valueType = CSSPrimitiveValue.CSS_URI;
-		}
-		else if (type == CSSRegionContexts.CSS_DECLARATION_VALUE_STRING) {
-			valueType = CSSPrimitiveValue.CSS_STRING;
-		}
-		else if (type == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) {
-			valueType = ICSSPrimitiveValue.CSS_HASH;
-		}
-		else if (type == CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR && text.equals(",")) { //$NON-NLS-1$
-			valueType = ICSSPrimitiveValue.CSS_COMMA;
-		}
-		else if (type == CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR && text.equals("/")) { //$NON-NLS-1$
-			valueType = ICSSPrimitiveValue.CSS_SLASH;
-		}
-		else if (type == CSSRegionContexts.CSS_DECLARATION_VALUE_UNICODE_RANGE) {
-			valueType = ICSSPrimitiveValue.CSS_URANGE;
-		}
-		else {
-			valueType = CSSPrimitiveValue.CSS_IDENT;
-		}
-		return valueType;
-	}
-
-	/**
-	 * 
-	 */
-	private String makeString(ITextRegionList regions) {
-		StringBuffer buf = new StringBuffer();
-		boolean bSpace = false;
-		for (Iterator i = regions.iterator(); i.hasNext();) {
-			ITextRegion region = (ITextRegion) i.next();
-			String type = region.getType();
-			if (!bSpace && isBlank(type)) {
-				buf.append(" "); //$NON-NLS-1$
-				bSpace = true;
-			}
-			else {
-				buf.append(getText(region));
-				bSpace = false;
-			}
-		}
-
-		return buf.toString();
-	}
-
-	/**
-	 * 
-	 */
-	void setStructuredDocumentTemporary(boolean bTemp) {
-		fTempStructuredDocument = bTemp;
-	}
-
-	/**
-	 * 
-	 */
-	private void setFloatValue(CSSPrimitiveValueImpl value, String text, String type) {
-		FloatInfo info = new FloatInfo(text);
-		value.setFloatValue(info.getValueType(), info.getValue());
-	}
-
-	/**
-	 * 
-	 */
-	private void setStringValue(CSSPrimitiveValueImpl value, String text, String type) {
-		short valueType = getStringValueType(text, type);
-		value.setStringValue(valueType, text);
-	}
-
-	/**
-	 * @param item
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSStyleDeclItem
-	 * @param nodeRegions
-	 *            java.util.Vector
-	 */
-	private void setupImportantAttribute(ICSSStyleDeclItem item, ITextRegionList nodeRegions) {
-		if (item == null || nodeRegions == null || nodeRegions.isEmpty()) {
-			return;
-		}
-		ITextRegion region = nodeRegions.get(nodeRegions.size() - 1);
-		if (region != null && region.getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_IMPORTANT) {
-			item.setPriority(getText(region));
-			CSSAttrImpl attr = ((CSSStyleDeclItemImpl) item).getAttributeNode(ICSSStyleDeclItem.IMPORTANT);
-			attr.setRangeRegion(fParentRegion, region, region);
-			nodeRegions.remove(region);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	void setUpdateContext(CSSModelUpdateContext updateContext) {
-		fUpdateContext = updateContext;
-	}
-
-	/**
-	 * 
-	 */
-	public static boolean hasColonSeparator(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null) {
-			return false;
-		}
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null || regions.size() == 0) {
-			return false;
-		}
-
-		for (Iterator i = regions.iterator(); i.hasNext();) {
-			ITextRegion region = (ITextRegion) i.next();
-			if (region == null) {
-				continue;
-			}
-			if (region.getType() == CSSRegionContexts.CSS_DECLARATION_SEPARATOR) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	CSSStyleDeclItemImpl setupDeclarationItem(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null) {
-			return null;
-		}
-		if (!hasColonSeparator(flatNode)) {
-			return null;
-		}
-
-		fParentRegion = flatNode;
-
-		ITextRegionList nodeRegions = new TextRegionListImpl(flatNode.getRegions()); // make
-		// copy
-		CSSStyleDeclItemImpl newItem = createDeclarationItem(nodeRegions);
-		if (newItem == null) {
-			return null;
-		}
-		if (!fTempStructuredDocument && flatNode != null) {
-			newItem.setRangeStructuredDocumentRegion(flatNode, flatNode);
-		}
-
-		CSSUtil.stripSurroundingSpace(nodeRegions);
-		setupImportantAttribute(newItem, nodeRegions);
-		// Now, nodeRegions just has regions for value.
-		setupValues(newItem, nodeRegions);
-		return newItem;
-	}
-
-	void setupValues(ICSSStyleDeclItem item, IStructuredDocumentRegion parentRegion, ITextRegionList nodeRegions) {
-		fParentRegion = parentRegion;
-		setupValues(item, nodeRegions);
-	}
-
-	/**
-	 * nodeRegions must be broken. If you need after, make copy of them.
-	 */
-	private void setupValues(ICSSStyleDeclItem item, ITextRegionList nodeRegions) {
-		if (item == null) {
-			return;
-		}
-
-		ICSSPrimitiveValue value;
-		ITextRegionList regionBuf = new TextRegionListImpl();
-
-		String propertyName = item.getPropertyName().toLowerCase();
-		boolean bFont = (propertyName.equals(PropCMProperty.P_FONT));
-		// (short-hand) font
-		int status = (propertyName.equals(PropCMProperty.P_VOICE_FAMILY) || propertyName.equals(PropCMProperty.P_FONT_FAMILY)) ? S_COMMA_SEPARATION : S_NORMAL;
-		while (!nodeRegions.isEmpty()) {
-			value = null;
-			ITextRegion region = nodeRegions.remove(0);
-			if (region == null) {
-				continue;
-			}
-			String type = region.getType();
-			// if (type == CSSRegionContexts.CSS_DECLARATION_DELIMITER || type
-			// == CSSRegionContexts.CSS_RBRACE) {
-			// break;
-			// }
-			switch (status) {
-				case S_NORMAL :
-					if (type == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-						regionBuf.add(region);
-						status = S_FUNCTION;
-					}
-					else if (bFont && type == CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR && fParentRegion.getText(region).equals("/")) { //$NON-NLS-1$
-						value = createPrimitiveValue(region);
-						status = S_FONT_SLASH;
-					}
-					else if (!isBlank(type)) {
-						value = createPrimitiveValue(region);
-					}
-					break;
-				case S_FUNCTION :
-					if (type == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE) {
-						regionBuf.add(region);
-						value = createPrimitiveValue(regionBuf);
-						regionBuf.clear();
-						status = S_NORMAL;
-					}
-					else if (!isBlank(type)) {
-						regionBuf.add(region);
-					}
-					break;
-				case S_FONT_SLASH :
-					if (type == CSSRegionContexts.CSS_DECLARATION_VALUE_DIMENSION) {
-						value = createPrimitiveValue(region);
-						status = S_COMMA_SEPARATION;
-					}
-					else if (!isBlank(type)) {
-						value = createPrimitiveValue(region);
-					}
-					break;
-				case S_COMMA_SEPARATION :
-					if (type == CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR && fParentRegion.getText(region).equals(",")) { //$NON-NLS-1$
-						value = createPrimitiveValue(regionBuf);
-						regionBuf.clear();
-						if (value != null) {
-							if (fUpdateContext == null || !fUpdateContext.isActive()) {
-								item.appendValue(value);
-							}
-						}
-						value = createPrimitiveValue(region);
-					}
-					else {
-						regionBuf.add(region);
-					}
-					break;
-				default :
-					break;
-			}
-			if (value != null) {
-				if (fUpdateContext == null || !fUpdateContext.isActive()) {
-					item.appendValue(value);
-				}
-			}
-		}
-		if (!regionBuf.isEmpty()) {
-			value = createPrimitiveValue(regionBuf);
-			if (fUpdateContext == null || !fUpdateContext.isActive()) {
-				item.appendValue(value);
-			}
-		}
-	}
-
-	private String getText(ITextRegion region) {
-		return (fParentRegion != null) ? fParentRegion.getText(region) : ""; //$NON-NLS-1$ 
-	}
-
-	private static boolean isBlank(String type) {
-		return (type == CSSRegionContexts.CSS_S || type == CSSRegionContexts.CSS_COMMENT || type == CSSRegionContexts.CSS_DECLARATION_VALUE_S);
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSDocumentImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSDocumentImpl.java
deleted file mode 100644
index c0a688e..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSDocumentImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSCharsetRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.w3c.dom.css.CSSFontFaceRule;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSUnknownRule;
-import org.w3c.dom.stylesheets.MediaList;
-
-
-/**
- * 
- */
-abstract class CSSDocumentImpl extends CSSStructuredDocumentRegionContainer implements ICSSDocument {
-
-	private CSSModelImpl fModel = null;
-
-	/**
-	 * CSSDocumentImpl constructor comment.
-	 */
-	CSSDocumentImpl() {
-		super();
-	}
-
-
-	CSSDocumentImpl(CSSDocumentImpl that) {
-		super(that);
-	}
-
-	ICSSNode createCSSAttr(String name) {
-		CSSAttrImpl attr = new CSSAttrImpl(name);
-		attr.setOwnerDocument(this);
-
-		return attr;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSCharsetRule
-	 */
-	public ICSSCharsetRule createCSSCharsetRule() {
-		return null;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSFontFaceRule
-	 */
-	public CSSFontFaceRule createCSSFontFaceRule() {
-		return null;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSImportRule
-	 */
-	public ICSSImportRule createCSSImportRule() {
-		return null;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.ICSSMediaRule
-	 */
-	public ICSSMediaRule createCSSMediaRule() {
-		return null;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSPageRule
-	 */
-	public ICSSPageRule createCSSPageRule() {
-		return null;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSPrimitiveValue
-	 */
-	public ICSSPrimitiveValue createCSSPrimitiveValue(short primitiveType) {
-		CSSPrimitiveValueImpl value = null;
-		if (primitiveType == CSSPrimitiveValue.CSS_COUNTER)
-			value = new CounterImpl();
-		else if (primitiveType == CSSPrimitiveValue.CSS_RECT)
-			value = new RectImpl();
-		else if (primitiveType == CSSPrimitiveValue.CSS_RGBCOLOR)
-			value = new RGBColorImpl();
-		else
-			value = new CSSPrimitiveValueImpl(primitiveType);
-		value.setOwnerDocument(this);
-
-		return value;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSRule
-	 * @param rule
-	 *            java.lang.String
-	 */
-	public CSSRule createCSSRule(String rule) {
-		return null;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSStyleDeclaration
-	 */
-	public ICSSStyleDeclaration createCSSStyleDeclaration() {
-		return null;
-	}
-
-	public ICSSStyleDeclItem createCSSStyleDeclItem(String propertyName) {
-		CSSStyleDeclItemImpl item = new CSSStyleDeclItemImpl(propertyName);
-		item.setOwnerDocument(this);
-
-		return item;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSStyleRule
-	 */
-	public ICSSStyleRule createCSSStyleRule() {
-		return null;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSUnknownRule
-	 */
-	public CSSUnknownRule createCSSUnknownRule() {
-		return null;
-	}
-
-	/**
-	 * @return org.w3c.dom.stylesheets.MediaList
-	 */
-	public MediaList createMediaList() {
-		return null;
-	}
-
-	public ICSSModel getModel() {
-		return fModel;
-	}
-
-	void setModel(CSSModelImpl model) {
-		this.fModel = model;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSFontFaceRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSFontFaceRuleImpl.java
deleted file mode 100644
index 5dcdc28..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSFontFaceRuleImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.w3c.dom.css.CSSFontFaceRule;
-
-
-/**
- * 
- */
-class CSSFontFaceRuleImpl extends CSSRuleDeclContainer implements CSSFontFaceRule {
-
-	/**
-	 * 
-	 */
-	CSSFontFaceRuleImpl() {
-		super();
-	}
-
-	CSSFontFaceRuleImpl(CSSFontFaceRuleImpl that) {
-		super(that);
-	}
-
-	public ICSSNode cloneNode(boolean deep) {
-		CSSFontFaceRuleImpl cloned = new CSSFontFaceRuleImpl(this);
-
-		if (deep)
-			cloneChildNodes(cloned, deep);
-
-		return cloned;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	String extractPreString() {
-		return "@font-face";//$NON-NLS-1$
-	}
-
-	/**
-	 * @return short
-	 */
-	public short getNodeType() {
-		return FONTFACERULE_NODE;
-	}
-
-	/**
-	 * The type of the rule, as defined above. The expectation is that
-	 * binding-specific casting methods can be used to cast down from an
-	 * instance of the <code>CSSRule</code> interface to the specific
-	 * derived interface implied by the <code>type</code>.
-	 */
-	public short getType() {
-		return FONT_FACE_RULE;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSImportRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSImportRuleImpl.java
deleted file mode 100644
index db425d2..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSImportRuleImpl.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.Logger;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IModelProvideAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.internal.util.CSSLinkConverter;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.css.core.internal.util.URLModelProviderCSS;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.stylesheets.MediaList;
-
-
-/**
- * 
- */
-class CSSImportRuleImpl extends CSSRuleImpl implements ICSSImportRule {
-
-	private boolean fDirty = true;
-	private ICSSStyleSheet fStyleSheet;
-
-	/**
-	 * 
-	 */
-	CSSImportRuleImpl() {
-		super();
-	}
-
-	CSSImportRuleImpl(CSSImportRuleImpl that) {
-		super(that);
-	}
-
-	public ICSSNode cloneNode(boolean deep) {
-		CSSImportRuleImpl cloned = new CSSImportRuleImpl(this);
-
-		if (deep)
-			cloneChildNodes(cloned, deep);
-
-		return cloned;
-	}
-
-	/**
-	 * 
-	 */
-	void closeStyleSheet() {
-		if (fStyleSheet != null) {
-			ICSSStyleSheet sheet = fStyleSheet;
-			fStyleSheet = null; // to prevent loop, we must reset fStyleSheet
-								// before all closing action
-
-			sheet.getModel().removeStyleListener(getOwnerDocument().getModel());
-			// get ModelProvideAdapter
-			IModelProvideAdapter adapter = (IModelProvideAdapter) getAdapterFor(IModelProvideAdapter.class);
-			// if (getOwnerDocument().getModel().getStyleSheetType() ==
-			// ICSSModel.EMBEDDED) { // case STYLE tag
-			// adapter = (ModelProvideAdapter)
-			// ((INodeNotifier)getOwnerDocument().getModel().getOwnerDOMNode()).getAdapterFor(ModelProvideAdapter.class);
-			// }
-			if (adapter != null)
-				adapter.modelRemoved(sheet.getModel());
-
-			sheet.getModel().releaseFromRead();
-		}
-	}
-
-	/**
-	 * The location of the style sheet to be imported. The attribute will not
-	 * contain the <code>"url(...)"</code> specifier around the URI.
-	 */
-	public String getHref() {
-		return CSSUtil.extractUriContents(getAttribute(HREF));
-	}
-
-	/**
-	 * A list of media types for which this style sheet may be used.
-	 */
-	public org.w3c.dom.stylesheets.MediaList getMedia() {
-		ICSSNode media = getFirstChild();
-		if (media != null) {
-			if (media instanceof MediaList) {
-				return (MediaList) media;
-			}
-		}
-
-		// THIS CASE IS ERROR CASE
-		return null;
-	}
-
-	/**
-	 * @return short
-	 */
-	public short getNodeType() {
-		return IMPORTRULE_NODE;
-	}
-
-	/**
-	 * The style sheet referred to by this rule, if it has been loaded. The
-	 * value of this attribute is <code>null</code> if the style sheet has
-	 * not yet been loaded or if it will not be loaded (e.g. if the style
-	 * sheet is for a media type not supported by the user agent).
-	 */
-	public CSSStyleSheet getStyleSheet() {
-
-		if (fDirty) {
-			// NOTE: try/catch block is a TEMP fix to avoid compile errors:
-			try {
-				closeStyleSheet();
-
-				if (getHref() == null || getHref().length() <= 0) {
-					fDirty = false;
-					return null;
-				}
-
-				IStructuredModel baseModel = getOwnerDocument().getModel();
-				if (getOwnerDocument().getModel().getStyleSheetType() == ICSSModel.EMBEDDED) { // case
-																								// STYLE
-																								// tag
-					baseModel = ((IDOMNode) getOwnerDocument().getModel().getOwnerDOMNode()).getModel();
-				}
-				// get ModelProvideAdapter
-				IModelProvideAdapter adapter = (IModelProvideAdapter) getAdapterFor(IModelProvideAdapter.class);
-				// if (getOwnerDocument().getModel().getStyleSheetType() ==
-				// ICSSModel.EMBEDDED) { // case STYLE tag
-				// adapter = (ModelProvideAdapter)
-				// ((INodeNotifier)getOwnerDocument().getModel().getOwnerDOMNode()).getAdapterFor(ModelProvideAdapter.class);
-				// }
-
-				// load model from IModelManager
-				URLModelProviderCSS provider = new URLModelProviderCSS();
-				IStructuredModel newModel = provider.getModelForRead(baseModel, getHref());
-				fDirty = false;
-
-				if (newModel == null)
-					return null;
-				if (!(newModel instanceof ICSSModel)) {
-					newModel.releaseFromRead();
-					return null;
-				}
-
-				// notify adapter
-				if (adapter != null)
-					adapter.modelProvided(newModel);
-
-				fStyleSheet = (ICSSStyleSheet) ((ICSSModel) newModel).getDocument();
-				if (fStyleSheet != null)
-					fStyleSheet.getModel().addStyleListener(getOwnerDocument().getModel());
-			}
-			catch (java.io.IOException e) {
-				Logger.logException(e);
-			}
-		}
-		return fStyleSheet;
-	}
-
-	/**
-	 * The type of the rule, as defined above. The expectation is that
-	 * binding-specific casting methods can be used to cast down from an
-	 * instance of the <code>CSSRule</code> interface to the specific
-	 * derived interface implied by the <code>type</code>.
-	 */
-	public short getType() {
-		return IMPORT_RULE;
-	}
-
-	/**
-	 * 
-	 */
-	public void refreshStyleSheet() {
-		if (!fDirty) {
-			closeStyleSheet();
-			fDirty = true;
-			notify(INodeNotifier.CHANGE, getAttributeNode(HREF), null, null, getStartOffset());
-		}
-	}
-
-	/**
-	 */
-	void releaseRule() {
-		if (fStyleSheet != null) {
-			ICSSStyleSheet sheet = fStyleSheet;
-			fStyleSheet = null; // to prevent loop, we must reset fStyleSheet
-								// before all closing action
-
-			sheet.getModel().removeStyleListener(getOwnerDocument().getModel());
-			// get ModelProvideAdapter
-			IModelProvideAdapter adapter = (IModelProvideAdapter) getAdapterFor(IModelProvideAdapter.class);
-			// if (getOwnerDocument().getModel().getStyleSheetType() ==
-			// ICSSModel.EMBEDDED) { // case STYLE tag
-			// adapter = (ModelProvideAdapter)
-			// ((INodeNotifier)getOwnerDocument().getModel().getOwnerDOMNode()).getAdapterFor(ModelProvideAdapter.class);
-			// }
-			if (adapter != null)
-				adapter.modelReleased(sheet.getModel());
-
-			sheet.getModel().releaseFromRead();
-		}
-	}
-
-	/**
-	 * @param href
-	 *            java.lang.String
-	 */
-	public void setHref(String href) throws DOMException {
-		fDirty = true;
-		setAttribute(HREF, CSSLinkConverter.addFunc(href));
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSMediaRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSMediaRuleImpl.java
deleted file mode 100644
index 492c836..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSMediaRuleImpl.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.stylesheets.MediaList;
-
-
-/**
- * 
- */
-class CSSMediaRuleImpl extends CSSRuleImpl implements ICSSMediaRule {
-
-	/**
-	 * 
-	 */
-	CSSMediaRuleImpl() {
-		super();
-	}
-
-	CSSMediaRuleImpl(CSSMediaRuleImpl that) {
-		super(that);
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSRule
-	 * @param rule
-	 *            org.w3c.dom.css.CSSRule
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	public org.w3c.dom.css.CSSRule appendRule(org.w3c.dom.css.CSSRule rule) throws org.w3c.dom.DOMException {
-		if (rule == null)
-			return null;
-
-		CSSRule ret = (CSSRule) appendChild((CSSNodeImpl) rule);
-		return ret;
-	}
-
-	public ICSSNode cloneNode(boolean deep) {
-		CSSMediaRuleImpl cloned = new CSSMediaRuleImpl(this);
-
-		if (deep)
-			cloneChildNodes(cloned, deep);
-
-		return cloned;
-	}
-
-	/**
-	 * Used to delete a rule from the media block.
-	 * 
-	 * @param index
-	 *            The index within the media block's rule collection of the
-	 *            rule to remove.
-	 * @exception DOMException
-	 *                INDEX_SIZE_ERR: Raised if the specified index does not
-	 *                correspond to a rule in the media rule list. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this media rule
-	 *                is readonly.
-	 */
-	public void deleteRule(int index) throws DOMException {
-		CSSNodeImpl node = getIndexedRule(index);
-		if (node != null)
-			removeChild(node);
-	}
-
-	/**
-	 * A list of all CSS rules contained within the media block.
-	 */
-	public CSSRuleList getCssRules() {
-		CSSRuleListImpl list = new CSSRuleListImpl();
-
-		for (ICSSNode node = getFirstChild(); node != null; node = node.getNextSibling()) {
-			if (node instanceof CSSRule)
-				list.appendNode(node);
-		}
-
-		return list;
-	}
-
-	CSSRuleImpl getIndexedRule(int index) {
-		if (index < 0)
-			return null;
-
-		int i = 0;
-		for (ICSSNode node = getFirstChild(); node != null; node = node.getNextSibling()) {
-			if (node instanceof CSSRule) {
-				if (i++ == index)
-					return (CSSRuleImpl) node;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * A list of media types for this rule.
-	 */
-	public MediaList getMedia() {
-		for (ICSSNode node = getFirstChild(); node != null; node = node.getNextSibling()) {
-			if (node instanceof MediaListImpl)
-				return (MediaList) node;
-		}
-
-		return null;
-	}
-
-	/**
-	 * @return short
-	 */
-	public short getNodeType() {
-		return MEDIARULE_NODE;
-	}
-
-	/**
-	 * The type of the rule, as defined above. The expectation is that
-	 * binding-specific casting methods can be used to cast down from an
-	 * instance of the <code>CSSRule</code> interface to the specific
-	 * derived interface implied by the <code>type</code>.
-	 */
-	public short getType() {
-		return MEDIA_RULE;
-	}
-
-	/**
-	 * Used to insert a new rule into the media block.
-	 * 
-	 * @param rule
-	 *            The parsable text representing the rule. For rule sets this
-	 *            contains both the selector and the style declaration. For
-	 *            at-rules, this specifies both the at-identifier and the rule
-	 *            content.
-	 * @param index
-	 *            The index within the media block's rule collection of the
-	 *            rule before which to insert the specified rule. If the
-	 *            specified index is equal to the length of the media blocks's
-	 *            rule collection, the rule will be added to the end of the
-	 *            media block.
-	 * @return The index within the media block's rule collection of the newly
-	 *         inserted rule.
-	 * @exception DOMException
-	 *                HIERARCHY_REQUEST_ERR: Raised if the rule cannot be
-	 *                inserted at the specified index, e.g., if an
-	 *                <code>@import</code> rule is inserted after a standard rule set or other
-	 *         at-rule. <br>
-	 *         INDEX_SIZE_ERR: Raised if the specified index is not a valid
-	 *         insertion point. <br>
-	 *         NO_MODIFICATION_ALLOWED_ERR: Raised if this media rule is
-	 *         readonly. <br>
-	 *         SYNTAX_ERR: Raised if the specified rule has a syntax error and
-	 *         is unparsable.
-	 */
-	public int insertRule(String rule, int index) throws DOMException {
-		int length = getCssRules().getLength();
-		if (index < 0 || length < index)
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, "");//$NON-NLS-1$
-
-		CSSRuleImpl refRule = (length != index) ? getIndexedRule(index) : null;
-
-		CSSRuleImpl newRule = (CSSRuleImpl) getOwnerDocument().createCSSRule(rule);
-
-		// prevent from nesting @media rule
-		if (newRule.getType() == CSSRule.MEDIA_RULE)
-			throw new DOMException(DOMException.SYNTAX_ERR, "");//$NON-NLS-1$
-
-		insertBefore(newRule, refRule);
-
-		return index;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSRule
-	 * @param newRule
-	 *            org.w3c.dom.css.CSSRule
-	 * @param refRule
-	 *            org.w3c.dom.css.CSSRule
-	 */
-	public org.w3c.dom.css.CSSRule insertRuleBefore(org.w3c.dom.css.CSSRule newRule, org.w3c.dom.css.CSSRule refRule) throws org.w3c.dom.DOMException {
-		if (newRule == null && refRule == null)
-			return null;
-
-		CSSRule ret = (CSSRule) insertBefore((CSSNodeImpl) newRule, (CSSNodeImpl) refRule);
-		return ret;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSRule
-	 * @param rule
-	 *            org.w3c.dom.css.CSSRule
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	public org.w3c.dom.css.CSSRule removeRule(org.w3c.dom.css.CSSRule rule) throws org.w3c.dom.DOMException {
-		if (rule == null)
-			return null;
-
-		CSSRule ret = (CSSRule) removeChild((CSSNodeImpl) rule);
-		return ret;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSRule
-	 * @param newChild
-	 *            org.w3c.dom.css.CSSRule
-	 * @param oldChild
-	 *            org.w3c.dom.css.CSSRule
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	public org.w3c.dom.css.CSSRule replaceRule(org.w3c.dom.css.CSSRule newRule, org.w3c.dom.css.CSSRule oldRule) throws org.w3c.dom.DOMException {
-		if (newRule == null && oldRule == null)
-			return null;
-
-		CSSRule ret = (CSSRule) replaceChild((CSSNodeImpl) newRule, (CSSNodeImpl) oldRule);
-		return ret;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelCreationContext.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelCreationContext.java
deleted file mode 100644
index 313f28c..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelCreationContext.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-
-/**
- * 
- */
-class CSSModelCreationContext {
-
-	private CSSNodeImpl fRootNode = null;
-	private CSSNodeImpl fTargetNode = null;
-	private CSSNodeImpl fNextNode = null;
-	private int fReparseStart = -1;
-	private int fReparseEnd = -1;
-
-	/**
-	 * CSSModelContext constructor comment.
-	 */
-	CSSModelCreationContext(CSSNodeImpl rootNode) {
-		super();
-
-		fRootNode = rootNode;
-	}
-
-	/**
-	 * 
-	 */
-	void clear() {
-		fNextNode = null;
-		fTargetNode = null;
-		resetReparseRange();
-	}
-
-	/**
-	 * 
-	 */
-	CSSNodeImpl getNextNode() {
-		return fNextNode;
-	}
-
-	/**
-	 * 
-	 */
-	int getReparseEnd() {
-		return fReparseEnd;
-	}
-
-	/**
-	 * 
-	 */
-	int getReparseStart() {
-		return fReparseStart;
-	}
-
-	/**
-	 * 
-	 */
-	CSSNodeImpl getRootNode() {
-		return fRootNode;
-	}
-
-	/**
-	 * 
-	 */
-	CSSNodeImpl getTargetNode() {
-		return fTargetNode;
-	}
-
-	/**
-	 * 
-	 */
-	boolean isToReparse() {
-		return (0 <= getReparseStart() && 0 <= getReparseEnd());
-	}
-
-	/**
-	 * 
-	 */
-	void resetReparseRange() {
-		fReparseStart = fReparseEnd = -1;
-	}
-
-	/**
-	 * 
-	 */
-	void setLast() {
-		fNextNode = null;
-
-		if (!(fRootNode instanceof CSSStructuredDocumentRegionContainer)) {
-			fTargetNode = fRootNode;
-		}
-		else {
-			IStructuredDocumentRegion lastStructuredDocumentRegion = ((CSSStructuredDocumentRegionContainer) fRootNode).getLastStructuredDocumentRegion();
-			CSSNodeImpl node = fRootNode;
-			while (node != null) {
-				ICSSNode lastChild = node.getLastChild();
-				if (lastChild instanceof CSSStructuredDocumentRegionContainer && ((CSSStructuredDocumentRegionContainer) lastChild).getLastStructuredDocumentRegion() == lastStructuredDocumentRegion) {
-					node = (CSSNodeImpl) lastChild;
-				}
-				else {
-					break;
-				}
-			}
-			fTargetNode = node;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	void setNextNode(ICSSNode node) {
-		fNextNode = (CSSNodeImpl) node;
-		if (fNextNode != null) {
-			fTargetNode = (CSSNodeImpl) fNextNode.getParentNode();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	void setReparseEnd(int end) {
-		fReparseEnd = end;
-	}
-
-	/**
-	 * 
-	 */
-	void setReparseStart(int start) {
-		fReparseStart = start;
-	}
-
-	/**
-	 * 
-	 */
-	void setTargetNode(ICSSNode node) {
-		fTargetNode = (CSSNodeImpl) node;
-		if (fNextNode != null && fNextNode.getParentNode() != fTargetNode) {
-			fNextNode = null;
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelDeletionContext.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelDeletionContext.java
deleted file mode 100644
index c458e5c..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelDeletionContext.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-
-
-/**
- * 
- */
-class CSSModelDeletionContext {
-
-	private int fOldStart = -1;
-	private int fOldLength = 0;
-	private int fNewStart = -1;
-	private int fNewLength = 0;
-	private int fLengthDifference = 0;
-	private IStructuredDocumentRegionList fOldStructuredDocumentRegions = null;
-	// private ICSSNode fRootNode = null;
-	private int fRemovedRangeBegin = -1;
-	private int fRemovedRangeEnd = -1;
-	private CSSNodeListImpl fNodesToBeRemoved = new CSSNodeListImpl();
-
-	/**
-	 * CSSModelDeletionContext constructor comment.
-	 */
-	CSSModelDeletionContext(ICSSNode rootNode) {
-		super();
-
-		// fRootNode = rootNode;
-	}
-
-	/**
-	 * 
-	 */
-	boolean addNodeToBeRemoved(ICSSNode node) {
-		int nNodes = fNodesToBeRemoved.getLength();
-		for (int i = 0; i < nNodes; i++) {
-			ICSSNode parent = fNodesToBeRemoved.item(i);
-			if (CSSModelUtil.isParentOf(parent, node)) {
-				return false;
-			}
-		}
-		fNodesToBeRemoved.appendNode(node);
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	void expandRemovedRangeBegin(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null) {
-			return;
-		}
-		int newBegin = flatNode.getStart(); // fOldStart == fNewStart, right??
-		if (fRemovedRangeBegin < 0 || newBegin < fRemovedRangeBegin) {
-			fRemovedRangeBegin = newBegin;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	void expandRemovedRangeEnd(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null) {
-			return;
-		}
-		int newEnd = flatNode.getEnd() + ((isOldNode(flatNode)) ? fLengthDifference : 0);
-		if (fRemovedRangeEnd < 0 || fRemovedRangeEnd < newEnd) {
-			fRemovedRangeEnd = newEnd;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private CSSStructuredDocumentRegionContainer findContainer(CSSNodeImpl parent, IStructuredDocumentRegion flatNode) {
-		if (parent instanceof CSSStructuredDocumentRegionContainer) {
-			// Am i a container of flatNode?
-			IStructuredDocumentRegion firstNode = ((CSSStructuredDocumentRegionContainer) parent).getFirstStructuredDocumentRegion();
-			IStructuredDocumentRegion lastNode = ((CSSStructuredDocumentRegionContainer) parent).getLastStructuredDocumentRegion();
-			int firstStart = getOriginalOffset(firstNode);
-			int lastStart = getOriginalOffset(lastNode);
-			int start = flatNode.getStart();
-
-			if (firstStart <= start && start <= lastStart) {
-				// I am a container, is my child a container ?
-				for (ICSSNode node = parent.getFirstChild(); node != null; node = node.getNextSibling()) {
-					if (node instanceof CSSNodeImpl) {
-						CSSStructuredDocumentRegionContainer container = findContainer((CSSNodeImpl) node, flatNode);
-						if (container != null) {
-							return container;
-						}
-					}
-				}
-				return (CSSStructuredDocumentRegionContainer) parent;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * 
-	 */
-	CSSStructuredDocumentRegionContainer findDeletionTarget(CSSNodeImpl parent, IStructuredDocumentRegion flatNode) {
-		CSSStructuredDocumentRegionContainer target = findContainer(parent, flatNode);
-		if (target == null) {
-			return null;
-		}
-
-		// System.out.print(flatNode.toString() + ": ");
-
-		// child a(=====)b(=====)c
-		// parent (================) a,c can remove parent, but b cannot.
-
-		ICSSNode child;
-
-		for (child = target.getFirstChild(); child != null && !(child instanceof CSSStructuredDocumentRegionContainer); child = child.getNextSibling()) {
-			// just advancing
-		}
-
-		if (child == null) {
-			// System.out.println("target has no children."); // TESTBYCOZY
-			return target; // has no child containers.
-		}
-		else {
-			IStructuredDocumentRegion firstNode = ((CSSStructuredDocumentRegionContainer) child).getFirstStructuredDocumentRegion();
-			if (flatNode.getStart() < getOriginalOffset(firstNode)) {
-				// System.out.println("flatNode is in front of first child");
-				// // TESTBYCOZY
-				return target; // a
-			}
-		}
-
-		for (child = target.getLastChild(); child != null && !(child instanceof CSSStructuredDocumentRegionContainer); child = child.getPreviousSibling()) {
-			// just advancing
-		}
-
-		if (child == null) {
-			// System.out.println("target has no children."); // TESTBYCOZY
-			return target; // has no child containers.
-		}
-		else {
-			IStructuredDocumentRegion firstNode = ((CSSStructuredDocumentRegionContainer) child).getFirstStructuredDocumentRegion();
-			if (getOriginalOffset(firstNode) < flatNode.getStart()) {
-				// System.out.println("flatNode is in after of last child");
-				// // TESTBYCOZY
-				return target; // c
-			}
-		}
-
-		// System.out.println("flatNode inner of children"); // TESTBYCOZY
-		return null; // b
-	}
-
-	/**
-	 * 
-	 */
-	Iterator getNodesToBeRemoved() {
-		Collection nodes = new ArrayList();
-		int nNodes = fNodesToBeRemoved.getLength();
-		for (int i = 0; i < nNodes; i++) {
-			nodes.add(fNodesToBeRemoved.item(i));
-		}
-		return nodes.iterator();
-	}
-
-	/**
-	 * 
-	 */
-	private int getOriginalOffset(IStructuredDocumentRegion flatNode) {
-		int offset = 0;
-		if (flatNode != null) {
-			offset = flatNode.getStart();
-			if (0 <= fLengthDifference) {
-				if (fNewStart + fNewLength < offset) {
-					offset -= fLengthDifference;
-				}
-			}
-			else {
-				if (fOldStart + fOldLength <= offset || (fNewStart < 0 && fOldStart <= offset && !isOldNode(flatNode)) || (0 <= fNewStart && fNewStart + fNewLength <= offset && !isOldNode(flatNode))) {
-					offset -= fLengthDifference;
-				}
-			}
-		}
-
-		return offset;
-	}
-
-	/**
-	 * 
-	 */
-	int getRemovedRangeBegin() {
-		return fRemovedRangeBegin;
-	}
-
-	/**
-	 * 
-	 */
-	int getRemovedRangeEnd() {
-		return fRemovedRangeEnd;
-	}
-
-	/**
-	 * 
-	 */
-	private boolean isOldNode(IStructuredDocumentRegion flatNode) {
-		if (fOldStructuredDocumentRegions != null) {
-			for (Enumeration e = fOldStructuredDocumentRegions.elements(); e.hasMoreElements();) {
-				if (e.nextElement() == flatNode) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	void setupContext(IStructuredDocumentRegionList newStructuredDocumentRegions, IStructuredDocumentRegionList oldStructuredDocumentRegions) {
-		IStructuredDocumentRegion flatNode = null;
-		fOldLength = CSSUtil.getTextLength(oldStructuredDocumentRegions);
-		if (oldStructuredDocumentRegions != null && 0 < oldStructuredDocumentRegions.getLength() && (flatNode = oldStructuredDocumentRegions.item(0)) != null) {
-			fOldStart = flatNode.getStart();
-		}
-		else {
-			fOldStart = -1;
-		}
-		fNewLength = CSSUtil.getTextLength(newStructuredDocumentRegions);
-		if (newStructuredDocumentRegions != null && 0 < newStructuredDocumentRegions.getLength() && (flatNode = newStructuredDocumentRegions.item(0)) != null) {
-			fNewStart = flatNode.getStart();
-			fRemovedRangeBegin = fNewStart;
-			fRemovedRangeEnd = fNewStart + fNewLength;
-		}
-		else {
-			fNewStart = -1;
-			fRemovedRangeBegin = fRemovedRangeEnd = -1;
-		}
-		fLengthDifference = fNewLength - fOldLength;
-		fOldStructuredDocumentRegions = oldStructuredDocumentRegions;
-
-		// cleanup nodes
-		while (0 < fNodesToBeRemoved.getLength()) {
-			fNodesToBeRemoved.removeNode(0);
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelImpl.java
deleted file mode 100644
index c130c40..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelImpl.java
+++ /dev/null
@@ -1,624 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.css.core.internal.event.ICSSStyleListener;
-import org.eclipse.wst.css.core.internal.eventimpl.CSSEmbededStyleNotifyAdapter;
-import org.eclipse.wst.css.core.internal.eventimpl.CSSStyleNotifyAdapter;
-import org.eclipse.wst.css.core.internal.parser.CSSSourceParser;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue;
-import org.eclipse.wst.css.core.internal.util.ImportRuleCollector;
-import org.eclipse.wst.css.core.internal.util.ImportedCollector;
-import org.eclipse.wst.css.core.internal.util.SelectorsCollector;
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-import org.eclipse.wst.sse.core.internal.model.AbstractStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.util.Assert;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-
-public class CSSModelImpl extends AbstractStructuredModel implements ICSSModel, IStructuredDocumentListener {
-
-	private CSSDocumentImpl document = null;
-	private org.w3c.dom.Node ownerNode = null;
-	private CSSStyleNotifyAdapter styleNotifier = null;
-	private CSSModelParser fParser = null;
-	private CSSModelUpdater fUpdater = null;
-	private boolean fStructuredDocumentUpdate = false;
-	private final static String ID_NON_EXTERNAL_CSS = "**_NON_EXTERNAL_CSS_***";//$NON-NLS-1$
-
-	/**
-	 * CSSModelImpl constructor comment.
-	 * 
-	 */
-	public CSSModelImpl() {
-		super();
-	}
-
-	/**
-	 * @param listener
-	 *            org.eclipse.wst.css.core.event.CSSStyleListener
-	 */
-	public void addStyleListener(ICSSStyleListener listener) {
-		getStyleNotifier().addStyleListener(listener);
-	}
-
-	void attrReplaced(CSSNodeImpl parentNode, CSSNodeImpl newAttr, CSSNodeImpl oldAttr) {
-		if (!fStructuredDocumentUpdate) {
-			CSSModelUpdater updater = getUpdater();
-			updater.attrReplaced(parentNode, newAttr, oldAttr);
-		}
-
-		ICSSSelector removed[] = null, added[] = null;
-		if (oldAttr != null && oldAttr.getNodeType() == ICSSNode.ATTR_NODE && ((CSSAttrImpl) oldAttr).getName().equals(ICSSStyleRule.SELECTOR)) {
-			CSSAttrImpl attr = (CSSAttrImpl) oldAttr;
-			// collect changed selector
-			ICSSSelectorList list = new CSSSelectorListImpl(attr.getValue());
-			removed = new ICSSSelector[list.getLength()];
-			for (int i = 0; i < list.getLength(); i++)
-				removed[i] = list.getSelector(i);
-		}
-		if (newAttr != null && newAttr.getNodeType() == ICSSNode.ATTR_NODE && ((CSSAttrImpl) newAttr).getName().equals(ICSSStyleRule.SELECTOR)) {
-			CSSAttrImpl attr = (CSSAttrImpl) newAttr;
-			// collect changed selector
-			ICSSSelectorList list = new CSSSelectorListImpl(attr.getValue());
-			added = new ICSSSelector[list.getLength()];
-			for (int i = 0; i < list.getLength(); i++)
-				added[i] = list.getSelector(i);
-		}
-		if (removed != null || added != null || getDocument().getNodeType() == ICSSNode.STYLEDECLARATION_NODE) {
-			getStyleNotifier().fire(removed, added, null);
-		}
-		// for href attribute
-		if (getStyleListeners() != null && getStyleListeners().size() > 0) {
-			boolean update = false;
-			if (oldAttr != null && oldAttr.getNodeType() == ICSSNode.ATTR_NODE && ((CSSAttrImpl) oldAttr).getName().equals(ICSSImportRule.HREF)) {
-				update = true;
-			}
-			if (newAttr != null && newAttr.getNodeType() == ICSSNode.ATTR_NODE && ((CSSAttrImpl) newAttr).getName().equals(ICSSImportRule.HREF)) {
-				update = true;
-			}
-			if (update)
-				((ICSSImportRule) parentNode).getStyleSheet();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void beginRecording(Object requester, String label, String description) {
-		getStyleNotifier().beginRecording();
-
-		Node node = getOwnerDOMNode();
-		if (node != null && node instanceof IDOMNode) {
-			IStructuredModel model = ((IDOMNode) node).getModel();
-			if (model != null) {
-				model.beginRecording(requester, label, description);
-				return;
-			}
-		}
-		super.beginRecording(requester, label, description);
-	}
-
-	void childReplaced(CSSNodeImpl parentNode, CSSNodeImpl newChild, CSSNodeImpl oldChild) {
-		if (!fStructuredDocumentUpdate) {
-			CSSModelUpdater updater = getUpdater();
-			updater.childReplaced(parentNode, newChild, oldChild);
-		}
-
-		// always check and send selector event
-		ICSSSelector removed[] = null, added[] = null;
-		if (parentNode.getNodeType() == ICSSNode.STYLESHEET_NODE || parentNode.getNodeType() == ICSSNode.MEDIARULE_NODE) {
-			// collect old selectors
-			SelectorsCollector selTrav = new SelectorsCollector();
-			selTrav.apply(oldChild);
-			int nSel = selTrav.getSelectors().size();
-			if (nSel > 0) {
-				removed = new ICSSSelector[nSel];
-				for (int i = 0; i < nSel; i++)
-					removed[i] = (ICSSSelector) selTrav.getSelectors().get(i);
-			}
-			// collect new selectors
-			selTrav = new SelectorsCollector();
-			selTrav.apply(newChild);
-			nSel = selTrav.getSelectors().size();
-			if (nSel > 0) {
-				added = new ICSSSelector[nSel];
-				for (int i = 0; i < nSel; i++)
-					added[i] = (ICSSSelector) selTrav.getSelectors().get(i);
-			}
-		}
-		else {
-			// modification
-			ICSSNode rule = parentNode;
-			while (rule != null) {
-				if (rule instanceof ICSSStyleRule)
-					break;
-				rule = rule.getParentNode();
-			}
-			if (rule != null) {
-				ICSSSelectorList list = ((ICSSStyleRule) rule).getSelectors();
-				added = new ICSSSelector[list.getLength()];
-				for (int i = 0; i < list.getLength(); i++)
-					added[i] = list.getSelector(i);
-			}
-		}
-		if (removed != null || added != null || getDocument().getNodeType() == ICSSNode.STYLEDECLARATION_NODE) {
-			// send selector changed event
-			getStyleNotifier().fire(removed, added, null);
-		}
-		// close removed import-rule's external style sheets
-		{
-			ImportRuleCollector trav = new ImportRuleCollector();
-			trav.apply(oldChild);
-			Iterator it = trav.getRules().iterator();
-			while (it.hasNext()) {
-				((CSSImportRuleImpl) it.next()).closeStyleSheet();
-			}
-		}
-		// send events to listener for new import-rules
-		if (getStyleListeners() != null && getStyleListeners().size() > 0) {
-			ImportedCollector trav = new ImportedCollector();
-			trav.apply(newChild);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void closeImported() {
-		if (!isShared()) {
-			// release listeners
-			if (getStyleListeners() != null) {
-				Vector toRemove = new Vector(getStyleListeners());
-				Iterator it = toRemove.iterator();
-				while (it.hasNext()) {
-					removeStyleListener((ICSSStyleListener) it.next());
-				}
-			}
-			// close import rules
-			ImportRuleCollector trav = new ImportRuleCollector();
-			trav.apply(getDocument());
-			Iterator it2 = trav.getRules().iterator();
-			while (it2.hasNext()) {
-				((CSSImportRuleImpl) it2.next()).releaseRule();
-			}
-		}
-	}
-
-	private CSSDocumentImpl createDocument() {
-		CSSDocumentImpl doc = null;
-		int parserMode = CSSSourceParser.MODE_STYLESHEET;
-		if (ownerNode == null) {
-			// this case is external CSS file
-			doc = (CSSStyleSheetImpl) DOMCSSImpl.createCSSStyleSheet(null, null); // parameters
-			// are
-			// for
-			// STYLE-tag
-			parserMode = CSSSourceParser.MODE_STYLESHEET;
-		}
-		else if (ownerNode instanceof org.w3c.dom.Element && ((Element) ownerNode).getTagName().toUpperCase().equals("STYLE")) {//$NON-NLS-1$
-			// this case is STYLE-tag
-			Element style = (Element) ownerNode;
-			doc = (CSSStyleSheetImpl) DOMCSSImpl.createCSSStyleSheet(style.getAttribute("TITLE"), //$NON-NLS-1$
-						style.getAttribute("MEDIA"));//$NON-NLS-1$
-			parserMode = CSSSourceParser.MODE_STYLESHEET;
-		}
-		else if (ownerNode instanceof org.w3c.dom.Element || ownerNode instanceof org.w3c.dom.Attr) {
-			// Inline attributes
-			doc = (CSSStyleDeclarationImpl) DOMCSSImpl.createCSSStyleDeclaration();
-			parserMode = CSSSourceParser.MODE_DECLARATION;
-		}
-		RegionParser regionParser = getStructuredDocument().getParser();
-		if (regionParser instanceof CSSSourceParser) {
-			((CSSSourceParser) regionParser).setParserMode(parserMode);
-		}
-		return doc;
-	}
-
-	/**
-	 * 
-	 */
-	public void endRecording(Object requester) {
-		Node node = getOwnerDOMNode();
-		if (node != null && node instanceof IDOMNode) {
-			IStructuredModel model = ((IDOMNode) node).getModel();
-			if (model != null) {
-				model.endRecording(requester);
-				return;
-			}
-		}
-		super.endRecording(requester);
-
-		getStyleNotifier().endRecording();
-	}
-
-	public ICSSDocument getDocument() {
-		if (document == null) {
-			this.document = createDocument();
-			this.document.setModel(this);
-		}
-		return this.document;
-	}
-
-	public IStructuredDocument getStructuredDocument() {
-		IStructuredDocument structuredDocument = super.getStructuredDocument();
-		if (structuredDocument != null)
-			return structuredDocument;
-
-		// the first time
-		Assert.isNotNull(getModelHandler());
-		structuredDocument = (IStructuredDocument) getModelHandler().getDocumentLoader().createNewStructuredDocument();
-
-		setStructuredDocument(structuredDocument);
-
-		return structuredDocument;
-	}
-
-	/**
-	 * getNode method comment.
-	 */
-	public IndexedRegion getIndexedRegion(int offset) {
-		if (getDocument() == null)
-			return null;
-		return ((CSSStructuredDocumentRegionContainer) getDocument()).getContainerNode(offset);
-	}
-
-	/**
-	 * @return org.w3c.dom.Node
-	 */
-	public Node getOwnerDOMNode() {
-		return ownerNode;
-	}
-
-	/**
-	 * @param ownerNode
-	 *            org.w3c.dom.Node if the case of external CSS model, you
-	 *            should set null, else if internal css, you should set
-	 *            STYLE-tag node, else if inline css, you should set the
-	 *            element that is the owner of style-attribute.
-	 */
-	public void setOwnerDOMNode(Node node) {
-		// prohibit owner change
-		Assert.isTrue(ownerNode == null);
-		ownerNode = node;
-		if (ownerNode != null) { // for internal/inline CSS context
-			try {
-				setId(ID_NON_EXTERNAL_CSS);
-			}
-			catch (ResourceInUse e) {
-				// impossible
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private CSSModelParser getParser() {
-		if (fParser == null) {
-			if (getDocument() != null) {
-				fParser = new CSSModelParser(document);
-			}
-		}
-		return fParser;
-	}
-
-	/**
-	 * @return java.util.List
-	 */
-	public List getStyleListeners() {
-		return getStyleNotifier().getStyleListeners();
-	}
-
-	/**
-	 * 
-	 * @return java.lang.Object
-	 */
-	public java.lang.Object getStyleSheetType() {
-		if (getDocument() instanceof ICSSStyleDeclaration)
-			return INLINE;
-		if (getOwnerDOMNode() != null)
-			return EMBEDDED;
-		else
-			return EXTERNAL;
-	}
-
-	private CSSStyleNotifyAdapter getStyleNotifier() {
-		if (styleNotifier == null) {
-			styleNotifier = (ownerNode != null) ? new CSSEmbededStyleNotifyAdapter(this) : new CSSStyleNotifyAdapter(this);
-		}
-		return styleNotifier;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSModelUpdater getUpdater() {
-		if (fUpdater == null) {
-			fUpdater = new CSSModelUpdater(this);
-			fUpdater.setParser(getParser());
-		}
-		return fUpdater;
-	}
-
-	/**
-	 */
-	public boolean isRecording() {
-		return getStyleNotifier().isRecording();
-	}
-
-	/**
-	 * This function returns true if there are other references to the
-	 * underlying model.
-	 */
-	public boolean isShared() {
-		return (getStyleSheetType() == EXTERNAL) && super.isShared();
-	}
-
-	public void newModel(NewDocumentEvent structuredDocumentEvent) {
-		if (structuredDocumentEvent == null)
-			return;
-		IStructuredDocument structuredDocument = structuredDocumentEvent.getStructuredDocument();
-		if (structuredDocument == null)
-			return;
-		// this should not happen, but for the case
-		if (structuredDocument != getStructuredDocument())
-			setStructuredDocument(structuredDocument);
-		IStructuredDocumentRegionList flatNodes = structuredDocument.getRegionList();
-		if (flatNodes == null)
-			return;
-		if (getDocument() == null)
-			return;
-
-		fStructuredDocumentUpdate = true;
-
-		((CSSStructuredDocumentRegionContainer) getDocument()).removeChildNodes();
-
-		CSSModelParser parser = getParser();
-		parser.setStructuredDocumentEvent(structuredDocumentEvent);
-		parser.replaceStructuredDocumentRegions(flatNodes, null);
-
-		fStructuredDocumentUpdate = false;
-	}
-
-	/**
-	 * noChange method comment.
-	 */
-	public void noChange(NoChangeEvent structuredDocumentEvent) {
-		// nop
-	}
-
-	public void nodesReplaced(StructuredDocumentRegionsReplacedEvent structuredDocumentEvent) {
-		if (structuredDocumentEvent == null) {
-			return;
-		}
-		IStructuredDocumentRegionList oldStructuredDocumentRegions = structuredDocumentEvent.getOldStructuredDocumentRegions();
-		IStructuredDocumentRegionList newStructuredDocumentRegions = structuredDocumentEvent.getNewStructuredDocumentRegions();
-		if (oldStructuredDocumentRegions == null && newStructuredDocumentRegions == null) {
-			return;
-		}
-
-		fStructuredDocumentUpdate = true;
-
-		CSSModelParser parser = getParser();
-		parser.setStructuredDocumentEvent(structuredDocumentEvent);
-		parser.replaceStructuredDocumentRegions(newStructuredDocumentRegions, oldStructuredDocumentRegions);
-
-		fStructuredDocumentUpdate = false;
-	}
-
-	/**
-	 * cleanup -> rebuild CSS Nodes This is pre-beta fix for 178176.
-	 */
-	public void refreshNodes() {
-		// cleanup old nodes
-		fStructuredDocumentUpdate = true;
-		((CSSStructuredDocumentRegionContainer) getDocument()).removeChildNodes();
-		fStructuredDocumentUpdate = false;
-
-		getParser().cleanupUpdateContext();
-
-		IStructuredDocument structuredDocument = getStructuredDocument();
-		String source = structuredDocument.getText();
-
-		structuredDocument.replaceText(this, 0, source.length(), null);
-		structuredDocument.replaceText(this, 0, 0, source);
-	}
-
-	public void regionChanged(RegionChangedEvent structuredDocumentEvent) {
-		if (structuredDocumentEvent == null) {
-			return;
-		}
-		IStructuredDocumentRegion flatNode = structuredDocumentEvent.getStructuredDocumentRegion();
-		if (flatNode == null) {
-			return;
-		}
-		ITextRegion region = structuredDocumentEvent.getRegion();
-		if (region == null) {
-			return;
-		}
-
-		fStructuredDocumentUpdate = true;
-
-		CSSModelParser parser = getParser();
-		parser.setStructuredDocumentEvent(structuredDocumentEvent);
-		parser.changeRegion(flatNode, region);
-
-		fStructuredDocumentUpdate = false;
-	}
-
-	public void regionsReplaced(RegionsReplacedEvent structuredDocumentEvent) {
-		if (structuredDocumentEvent == null)
-			return;
-		IStructuredDocumentRegion flatNode = structuredDocumentEvent.getStructuredDocumentRegion();
-		if (flatNode == null)
-			return;
-		ITextRegionList oldRegions = structuredDocumentEvent.getOldRegions();
-		ITextRegionList newRegions = structuredDocumentEvent.getNewRegions();
-		if (oldRegions == null && newRegions == null)
-			return;
-
-		fStructuredDocumentUpdate = true;
-
-		CSSModelParser parser = getParser();
-		parser.setStructuredDocumentEvent(structuredDocumentEvent);
-		parser.replaceRegions(flatNode, newRegions, oldRegions);
-
-		fStructuredDocumentUpdate = false;
-
-	}
-
-	/**
-	 * 
-	 */
-	public void releaseFromEdit() {
-		closeImported();
-		if (getStyleSheetType() == EXTERNAL) {
-			super.releaseFromEdit();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void releaseFromRead() {
-		closeImported();
-		if (getStyleSheetType() == EXTERNAL) {
-			super.releaseFromRead();
-		}
-	}
-
-	/**
-	 * @param listener
-	 *            org.eclipse.wst.css.core.event.CSSStyleListener
-	 */
-	public void removeStyleListener(ICSSStyleListener listener) {
-		getStyleNotifier().removeStyleListener(listener);
-	}
-
-	public void setStructuredDocument(IStructuredDocument newStructuredDocument) {
-		IStructuredDocument oldStructuredDocument = super.getStructuredDocument();
-		if (newStructuredDocument == oldStructuredDocument)
-			return; // noting to do
-
-		if (oldStructuredDocument != null)
-			oldStructuredDocument.removeDocumentChangingListener(this);
-		super.setStructuredDocument(newStructuredDocument);
-
-		if (newStructuredDocument != null) {
-			if (newStructuredDocument.getLength() > 0) {
-				newModel(new NewDocumentEvent(newStructuredDocument, this));
-			}
-			newStructuredDocument.addDocumentChangingListener(this);
-		}
-	}
-
-	/**
-	 * @param srcModel
-	 *            com.imb.sed.css.mode.intefaces.ICSSModel
-	 * @param removed
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSSelector[]
-	 * @param added
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSSelector[]
-	 */
-	public void styleChanged(ICSSModel srcModel, ICSSSelector[] removed, ICSSSelector[] added, String media) {
-		getStyleNotifier().styleChanged(srcModel, removed, added, media);
-	}
-
-	/**
-	 * @param srcModel
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSModel
-	 */
-	public void styleUpdate(ICSSModel srcModel) {
-		getStyleNotifier().styleUpdate(srcModel);
-	}
-
-	void valueChanged(CSSNodeImpl node, String oldValue) {
-		if (!fStructuredDocumentUpdate) {
-			CSSModelUpdater updater = getUpdater();
-			updater.valueChanged(node, oldValue);
-		}
-
-		ICSSSelector removed[] = null, added[] = null;
-		if (node != null) {
-			if (node.getNodeType() == ICSSNode.ATTR_NODE && ((CSSAttrImpl) node).getName().equals(ICSSStyleRule.SELECTOR)) {
-				CSSAttrImpl attr = (CSSAttrImpl) node;
-				// collect changed selector
-				ICSSSelectorList list = new CSSSelectorListImpl(attr.getValue());
-				added = new ICSSSelector[list.getLength()];
-				for (int i = 0; i < list.getLength(); i++)
-					added[i] = list.getSelector(i);
-
-				// get old value
-				list = new CSSSelectorListImpl(oldValue);
-				removed = new ICSSSelector[list.getLength()];
-				for (int i = 0; i < list.getLength(); i++)
-					removed[i] = list.getSelector(i);
-			}
-			else if (node instanceof ICSSValue) {
-				ICSSNode rule = node;
-				while (rule != null) {
-					if (rule instanceof ICSSStyleRule)
-						break;
-					rule = rule.getParentNode();
-				}
-				if (rule != null) {
-					ICSSSelectorList list = ((ICSSStyleRule) rule).getSelectors();
-					added = new ICSSSelector[list.getLength()];
-					for (int i = 0; i < list.getLength(); i++)
-						added[i] = list.getSelector(i);
-				}
-			}
-		}
-		if (removed != null || added != null || getDocument().getNodeType() == ICSSNode.STYLEDECLARATION_NODE) {
-			// send selector changed event
-			getStyleNotifier().fire(removed, added, null);
-		}
-		// for href attribute
-		if (getStyleListeners() != null && getStyleListeners().size() > 0) {
-			if (node != null && node.getNodeType() == ICSSNode.ATTR_NODE && ((CSSAttrImpl) node).getName().equals(ICSSImportRule.HREF)) {
-				((ICSSImportRule) ((ICSSAttr) node).getOwnerCSSNode()).getStyleSheet();
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelNodeFeeder.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelNodeFeeder.java
deleted file mode 100644
index 0f50a99..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelNodeFeeder.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-/**
- * 
- */
-class CSSModelNodeFeeder {
-
-	CSSDocumentImpl fDocument = null;
-	CSSModelUpdateContext fUpdateContext = null;
-
-	/**
-	 * CSSModelNodeFeeder constructor comment.
-	 */
-	CSSModelNodeFeeder() {
-		super();
-	}
-
-	/**
-	 * CSSModelNodeFeeder constructor comment.
-	 */
-	CSSModelNodeFeeder(CSSDocumentImpl document, CSSModelUpdateContext updateContext) {
-		super();
-		fDocument = document;
-		fUpdateContext = updateContext;
-	}
-
-	/**
-	 * 
-	 */
-	CSSCharsetRuleImpl getCSSCharsetRule() {
-		CSSCharsetRuleImpl node;
-		if (fUpdateContext.isActive()) {
-			node = fUpdateContext.getCSSCharsetRule();
-		}
-		else {
-			node = (CSSCharsetRuleImpl) fDocument.createCSSCharsetRule();
-		}
-		return node;
-	}
-
-	/**
-	 * 
-	 */
-	CSSFontFaceRuleImpl getCSSFontFaceRule() {
-		CSSFontFaceRuleImpl node;
-		if (fUpdateContext.isActive()) {
-			node = fUpdateContext.getCSSFontFaceRule();
-		}
-		else {
-			node = (CSSFontFaceRuleImpl) fDocument.createCSSFontFaceRule();
-		}
-		return node;
-	}
-
-	/**
-	 * 
-	 */
-	CSSImportRuleImpl getCSSImportRule() {
-		CSSImportRuleImpl node;
-		if (fUpdateContext.isActive()) {
-			node = fUpdateContext.getCSSImportRule();
-		}
-		else {
-			node = (CSSImportRuleImpl) fDocument.createCSSImportRule();
-		}
-		return node;
-	}
-
-	/**
-	 * 
-	 */
-	CSSMediaRuleImpl getCSSMediaRule() {
-		CSSMediaRuleImpl node;
-		if (fUpdateContext.isActive()) {
-			node = fUpdateContext.getCSSMediaRule();
-		}
-		else {
-			node = (CSSMediaRuleImpl) fDocument.createCSSMediaRule();
-		}
-		return node;
-	}
-
-	/**
-	 * 
-	 */
-	CSSPageRuleImpl getCSSPageRule() {
-		CSSPageRuleImpl node;
-		if (fUpdateContext.isActive()) {
-			node = fUpdateContext.getCSSPageRule();
-		}
-		else {
-			node = (CSSPageRuleImpl) fDocument.createCSSPageRule();
-		}
-		return node;
-	}
-
-	/**
-	 * 
-	 */
-	CSSStyleRuleImpl getCSSStyleRule() {
-		CSSStyleRuleImpl node;
-		if (fUpdateContext.isActive()) {
-			node = fUpdateContext.getCSSStyleRule();
-		}
-		else {
-			node = (CSSStyleRuleImpl) fDocument.createCSSStyleRule();
-		}
-		return node;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelParser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelParser.java
deleted file mode 100644
index 99a4009..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelParser.java
+++ /dev/null
@@ -1,1275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSCharsetRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSRuleContainer;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.core.internal.text.StructuredDocumentWalker;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.text.CoreNodeList;
-import org.eclipse.wst.sse.core.internal.text.TextRegionListImpl;
-import org.eclipse.wst.sse.core.internal.util.Assert;
-import org.w3c.dom.css.CSSFontFaceRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSStyleDeclaration;
-
-
-/**
- * 
- */
-class CSSModelParser {
-
-	private CSSDocumentImpl fDocument = null;
-	private CSSModelCreationContext fCreationContext = null;
-	private CSSModelDeletionContext fDeletionContext = null;
-	private CSSModelUpdateContext fUpdateContext = null;
-	private CSSModelNodeFeeder fFeeder = null;
-	private StructuredDocumentWalker fStructuredDocumentWalker = null;
-	private boolean fParseFloating = false;
-
-	/**
-	 * CSSModelParser constructor comment.
-	 */
-	private CSSModelParser() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	CSSModelParser(CSSDocumentImpl doc) {
-		super();
-		fDocument = doc;
-		fCreationContext = new CSSModelCreationContext(doc);
-		fDeletionContext = new CSSModelDeletionContext(doc);
-		fUpdateContext = new CSSModelUpdateContext();
-		fFeeder = new CSSModelNodeFeeder(doc, fUpdateContext);
-	}
-
-	/**
-	 * 
-	 */
-	void changeStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		replaceStructuredDocumentRegions(new CoreNodeList(flatNode, flatNode), new CoreNodeList(flatNode, flatNode));
-	}
-
-	/**
-	 * 
-	 */
-	void changeRegion(IStructuredDocumentRegion flatNode, ITextRegion region) {
-		if (flatNode == null || region == null) {
-			return;
-		}
-		if (fDocument == null) {
-			return;
-		}
-
-		changeStructuredDocumentRegion(flatNode);
-	}
-
-	/**
-	 * 
-	 */
-	private void checkNextNode(IStructuredDocumentRegion flatNode, String type) {
-		IStructuredDocumentRegion next = CSSUtil.findNextSignificantNode(flatNode);
-		if (CSSUtil.getStructuredDocumentRegionType(next) == type) {
-			fCreationContext.setReparseStart(flatNode.getEnd());
-			fCreationContext.setReparseEnd(next.getEnd());
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void cleanupDeletionContext() {
-		// setupDeletionContext(null);
-	}
-
-	/**
-	 * 
-	 */
-	boolean cleanupFirstNode(IStructuredDocumentRegion firstNode, CSSStructuredDocumentRegionContainer target) {
-		if (firstNode == null || target == null) {
-			return false;
-		}
-
-		if (firstNode == target.getFirstStructuredDocumentRegion()) {
-			IStructuredDocumentRegion nextNode = fStructuredDocumentWalker.getNextNodeInCurrent(firstNode);
-			IStructuredDocumentRegion lastNode = target.getLastStructuredDocumentRegion();
-			if (lastNode == null || fStructuredDocumentWalker.isOldNode(lastNode) || nextNode == null || lastNode.getStartOffset() < nextNode.getStartOffset()) {
-				target.setRangeStructuredDocumentRegion(null, null);
-			}
-			else {
-				target.setFirstStructuredDocumentRegion(nextNode);
-			}
-			ICSSNode parent = target.getParentNode();
-			if (parent instanceof CSSStructuredDocumentRegionContainer) {
-				cleanupFirstNode(firstNode, (CSSStructuredDocumentRegionContainer) parent);
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	boolean cleanupLastNode(IStructuredDocumentRegion lastNode, CSSStructuredDocumentRegionContainer target) {
-		if (lastNode == null || target == null) {
-			return false;
-		}
-
-		if (lastNode == target.getLastStructuredDocumentRegion()) {
-			IStructuredDocumentRegion prevNode = fStructuredDocumentWalker.getPrevNodeInCurrent(lastNode);
-			IStructuredDocumentRegion firstNode = target.getFirstStructuredDocumentRegion();
-			if (firstNode == null || fStructuredDocumentWalker.isOldNode(firstNode) || prevNode == null || prevNode.getStartOffset() < firstNode.getStartOffset()) {
-				target.setRangeStructuredDocumentRegion(null, null);
-			}
-			else {
-				target.setLastStructuredDocumentRegion(prevNode);
-			}
-			ICSSNode parent = target.getParentNode();
-			if (parent instanceof CSSStructuredDocumentRegionContainer) {
-				cleanupLastNode(lastNode, (CSSStructuredDocumentRegionContainer) parent);
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	int cleanupUpdateContext() {
-		int remains = fUpdateContext.getNodeCount();
-		fUpdateContext.cleanupContext();
-		return remains;
-	}
-
-	/**
-	 * create floating CSS rule (owner document will be set) this is for
-	 * CSSStyleSheet.createCSSRule(String)
-	 * 
-	 * @return org.w3c.dom.css.CSSRule
-	 */
-	CSSRule createCSSRule(IStructuredDocumentRegionList flatNodes) {
-		if (flatNodes == null) {
-			return null;
-		}
-
-		fParseFloating = true;
-
-		// setup creation context
-		fCreationContext.clear();
-		fCreationContext.setTargetNode(null);
-		fCreationContext.setNextNode(null);
-		CSSRuleImpl parentRule = null;
-
-		for (Enumeration e = flatNodes.elements(); e.hasMoreElements();) {
-			IStructuredDocumentRegion flatNode = (IStructuredDocumentRegion) e.nextElement();
-			if (flatNode == null) {
-				continue;
-			}
-			CSSNodeImpl modified = insertStructuredDocumentRegion(flatNode);
-			if (parentRule == null && modified instanceof CSSRuleImpl) {
-				parentRule = (CSSRuleImpl) modified;
-			}
-		}
-
-		fParseFloating = false;
-
-		if (parentRule != null) {
-			CSSModelUtil.cleanupContainer(parentRule);
-		}
-
-		return parentRule;
-	}
-
-	/**
-	 * 
-	 */
-	private IStructuredDocumentRegion findBraceClose(int depth, IStructuredDocumentRegion start, boolean bBreakSibling) {
-		IStructuredDocumentRegion result = null;
-		int braceLevel = 0;
-		IStructuredDocumentRegion prevNode = null;
-		IStructuredDocumentRegion region = start.getNext();
-		for (; region != null; region = region.getNext()) {
-			int offset = region.getStart();
-			if (offset < 0) {
-				Assert.isTrue(false);
-				break;
-			}
-			CSSNodeImpl node = getNodeAt(offset);
-			int depthHit = (node != null) ? CSSModelUtil.getDepth(node) : -1;
-			if (depth <= depthHit) {
-				// sibling is found before "}"
-				if (bBreakSibling) {
-					CSSNodeImpl parent = (CSSNodeImpl) node.getParentNode();
-					while (depth <= CSSModelUtil.getDepth(parent)) {
-						node = parent;
-						parent = (CSSNodeImpl) parent.getParentNode();
-					}
-					if (parent != null && node != null) {
-						parent.removeChild(node);
-					}
-				}
-				else {
-					result = prevNode;
-					break;
-				}
-			}
-			String type = CSSUtil.getStructuredDocumentRegionType(region);
-			if (type == CSSRegionContexts.CSS_LBRACE) {
-				braceLevel++;
-			}
-			if (type == CSSRegionContexts.CSS_RBRACE) {
-				braceLevel--;
-				if (braceLevel < 0) {
-					result = region;
-					break;
-				}
-			}
-			prevNode = region;
-		}
-
-		if (result == null && region == null) {
-			// reach the end of document
-			result = prevNode;
-		}
-
-		return result;
-	}
-
-	/**
-	 * 
-	 */
-	private IStructuredDocumentRegionList getStructuredDocumentRegionList(int start, int end) {
-		IStructuredDocumentRegionList nodeList = null;
-		if (0 <= start && start <= end) {
-			ICSSModel model = fDocument.getModel();
-			if (model instanceof CSSModelImpl) {
-				IStructuredDocument structuredDocument = ((CSSModelImpl) model).getStructuredDocument();
-				if (structuredDocument != null) {
-					IStructuredDocumentRegion startNode = structuredDocument.getRegionAtCharacterOffset(start);
-					IStructuredDocumentRegion endNode = structuredDocument.getRegionAtCharacterOffset(end - 1);
-					if (startNode != null && endNode != null) {
-						nodeList = new CoreNodeList(startNode, endNode);
-					}
-				}
-			}
-		}
-
-		return nodeList;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSNodeImpl getNodeAt(int offset) {
-		CSSNodeImpl rootNode = fCreationContext.getRootNode();
-		ICSSNode target = rootNode.getNodeAt(offset);
-		if (target instanceof CSSNodeImpl) {
-			return (CSSNodeImpl) target;
-		}
-		else {
-			return null;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private CSSNodeImpl insertBraceClose(IStructuredDocumentRegion region) {
-		ICSSNode target = CSSModelUtil.findBraceContainer(fCreationContext.getTargetNode());
-
-		if (!(target instanceof CSSStructuredDocumentRegionContainer)) {
-			return null;
-		}
-
-		CSSStructuredDocumentRegionContainer parent = (CSSStructuredDocumentRegionContainer) target;
-		if (CSSModelUtil.isInterruption(parent, region)) {
-			ICSSNode node = parent.getParentNode();
-			if (node instanceof CSSNodeImpl) {
-				fCreationContext.setReparseStart(parent.getStartOffset());
-				fCreationContext.setReparseEnd(parent.getEndOffset());
-				((CSSNodeImpl) node).removeChild(parent);
-			}
-			return null;
-		}
-
-		if (parent instanceof ICSSPageRule || parent instanceof ICSSMediaRule || parent instanceof CSSFontFaceRule || parent instanceof ICSSStyleRule) {
-			CSSModelUtil.expandStructuredDocumentRegionContainer(parent, region);
-			if (!CSSModelUtil.isBraceClosed(target)) {
-				fCreationContext.setTargetNode(parent.getParentNode());
-				fCreationContext.setNextNode(parent.getNextSibling());
-				return parent;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSNodeImpl insertBraceOpen(IStructuredDocumentRegion region) {
-		IStructuredDocumentRegion keyRegion = CSSUtil.findPreviousSignificantNode(region);
-		if (keyRegion == null) {
-			return null;
-		}
-		if (!fParseFloating) {
-			CSSNodeImpl node = getNodeAt(keyRegion.getStartOffset());
-			if (node != null && !(node instanceof ICSSRuleContainer)) {
-				return null;
-			}
-		}
-		String type = CSSUtil.getStructuredDocumentRegionType(keyRegion);
-
-		CSSNodeImpl inserted = null;
-		if (type == CSSRegionContexts.CSS_PAGE) {
-			inserted = insertPageRule(keyRegion, region);
-		}
-		else if (type == CSSRegionContexts.CSS_MEDIA) {
-			inserted = insertMediaRule(keyRegion, region);
-		}
-		else if (type == CSSRegionContexts.CSS_FONT_FACE) {
-			inserted = insertFontFaceRule(keyRegion, region);
-		}
-		else if (CSSUtil.isSelectorText(keyRegion)) {
-			inserted = insertStyleRule(keyRegion, region);
-		}
-
-		if (inserted instanceof CSSStructuredDocumentRegionContainer) {
-			// CSSModelUtil.expandStructuredDocumentRegionContainer((CSSStructuredDocumentRegionContainer)inserted,
-			// flatNode);
-			IStructuredDocumentRegion braceClose = findBraceClose(CSSModelUtil.getDepth(inserted), region, (type == CSSRegionContexts.CSS_MEDIA));
-			if (braceClose != null) {
-				fCreationContext.setReparseStart(region.getEnd());
-				fCreationContext.setReparseEnd(braceClose.getEnd());
-			}
-		}
-
-		return inserted;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSNodeImpl insertCharsetRule(IStructuredDocumentRegion beginDocRegion, IStructuredDocumentRegion endDocRegion) {
-		CSSNodeImpl parent = fCreationContext.getTargetNode();
-		if (!fParseFloating && !(parent instanceof ICSSRuleContainer)) {
-			return null;
-		}
-
-		ITextRegionList regions = new TextRegionListImpl(beginDocRegion.getRegions());
-		regions.remove(0); // must be "@charset"
-		ITextRegion encodingRegion = null;
-		while (!regions.isEmpty()) {
-			ITextRegion textRegion = regions.remove(0);
-			if (textRegion == null) {
-				continue;
-			}
-			String type = textRegion.getType();
-			if (type == CSSRegionContexts.CSS_S || type == CSSRegionContexts.CSS_COMMENT) {
-				continue;
-			}
-			if (type == CSSRegionContexts.CSS_STRING) {
-				encodingRegion = textRegion;
-				break;
-			}
-			else {
-				break;
-			}
-		}
-		if (encodingRegion == null) {
-			return null;
-		}
-
-		CSSCharsetRuleImpl rule = fFeeder.getCSSCharsetRule();
-		if (rule == null) {
-			return null;
-		}
-
-		if (!fUpdateContext.isActive()) {
-			rule.setAttribute(ICSSCharsetRule.ENCODING, beginDocRegion.getText(encodingRegion));
-		}
-
-		// setup flat container
-		rule.setRangeStructuredDocumentRegion(beginDocRegion, endDocRegion);
-		CSSAttrImpl attr = rule.getAttributeNode(ICSSCharsetRule.ENCODING);
-		if (attr != null) {
-			attr.setRangeRegion(beginDocRegion, encodingRegion, encodingRegion);
-		}
-
-		// insert to tree
-		if (!fUpdateContext.isActive() && parent != null) {
-			propagateRangePreInsert(parent, rule);
-			CSSNodeImpl next = fCreationContext.getNextNode();
-			if (next != null) {
-				parent.insertBefore(rule, next);
-			}
-			else {
-				parent.appendChild(rule);
-			}
-		}
-
-		return rule;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSNodeImpl insertStructuredDocumentRegion(IStructuredDocumentRegion region) {
-		if (fCreationContext == null || region == null) {
-			return null;
-		}
-
-		String type = ((BasicStructuredDocumentRegion) region).getType();
-		CSSNodeImpl modified = null;
-
-		ICSSNode target = fCreationContext.getTargetNode();
-
-		if ((fParseFloating && target == null) || target instanceof ICSSRuleContainer) {
-			if (type == CSSRegionContexts.CSS_DELIMITER) {
-				modified = insertSemiColonForRule(region);
-			}
-			else if (type == CSSRegionContexts.CSS_LBRACE) {
-				modified = insertBraceOpen(region);
-			}
-			else if (type == CSSRegionContexts.CSS_RBRACE) {
-				modified = insertBraceClose(region);
-			}
-			else if (type == CSSRegionContexts.CSS_MEDIA || type == CSSRegionContexts.CSS_PAGE || type == CSSRegionContexts.CSS_FONT_FACE || CSSUtil.isSelectorText(region)) {
-				checkNextNode(region, CSSRegionContexts.CSS_LBRACE);
-			}
-			else if (type == CSSRegionContexts.CSS_IMPORT || type == CSSRegionContexts.CSS_CHARSET) {
-				checkNextNode(region, CSSRegionContexts.CSS_DELIMITER);
-			}
-		}
-		else if ((target instanceof CSSRuleDeclContainer || target instanceof CSSStyleDeclaration) && type == CSSRegionContexts.CSS_DECLARATION_PROPERTY) {
-			modified = insertStyleDeclarationItem(region);
-		}
-		else if (target instanceof ICSSStyleDeclItem && type == CSSRegionContexts.CSS_DECLARATION_DELIMITER) {
-			modified = insertSemiColonForStyleDeclarationItem(region);
-		}
-		else if (type == CSSRegionContexts.CSS_RBRACE) {
-			modified = insertBraceClose(region);
-		}
-
-		// post process
-		if (modified != null) {
-			if (modified instanceof CSSStructuredDocumentRegionContainer) {
-				((CSSStructuredDocumentRegionContainer) modified).propagateRangeStructuredDocumentRegion();
-			}
-		}
-
-		return modified;
-	}
-
-	/**
-	 * 
-	 */
-	private void insertStructuredDocumentRegions(IStructuredDocumentRegionList regionList) {
-		for (Enumeration e = regionList.elements(); e.hasMoreElements();) {
-			IStructuredDocumentRegion region = (IStructuredDocumentRegion) e.nextElement();
-			if (region == null) {
-				continue;
-			}
-			insertStructuredDocumentRegion(region);
-			if (fCreationContext.isToReparse()) {
-				int origStart = region.getEnd();
-				int origEnd = regionList.item(regionList.getLength() - 1).getEnd();
-				int newStart = fCreationContext.getReparseStart();
-				int newEnd = fCreationContext.getReparseEnd();
-				if (newStart < origStart || origEnd < newEnd) {
-					IStructuredDocumentRegionList newNodeList = getStructuredDocumentRegionList(newStart, newEnd);
-					setupCreationContext(newNodeList.item(0));
-					insertStructuredDocumentRegions(newNodeList);
-					return;
-				}
-				else {
-					fCreationContext.resetReparseRange();
-				}
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private CSSNodeImpl insertFontFaceRule(IStructuredDocumentRegion region, IStructuredDocumentRegion braceNode) {
-		CSSNodeImpl parent = fCreationContext.getTargetNode();
-		if (!fParseFloating && !(parent instanceof ICSSRuleContainer)) {
-			return null;
-		}
-
-		CSSFontFaceRuleImpl rule = fFeeder.getCSSFontFaceRule();
-		if (rule == null) {
-			return null;
-		}
-
-		// setup flat container
-		rule.setRangeStructuredDocumentRegion(region, braceNode);
-
-		// insert to tree
-		if (!fUpdateContext.isActive() && parent != null) {
-			propagateRangePreInsert(parent, rule);
-			CSSNodeImpl next = fCreationContext.getNextNode();
-			if (next != null) {
-				parent.insertBefore(rule, next);
-			}
-			else {
-				parent.appendChild(rule);
-			}
-		}
-
-		fCreationContext.setTargetNode(rule);
-		// TargetNext is set to null automatically
-
-		return rule;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSNodeImpl insertImportRule(IStructuredDocumentRegion beginDocRegion, IStructuredDocumentRegion endDocRegion) {
-		CSSNodeImpl parent = fCreationContext.getTargetNode();
-		if (!fParseFloating && !(parent instanceof ICSSRuleContainer)) {
-			return null;
-		}
-
-		ITextRegionList regions = new TextRegionListImpl(beginDocRegion.getRegions());
-		regions.remove(0); // must be "@import"
-		ITextRegion hrefRegion = null;
-		while (!regions.isEmpty()) {
-			ITextRegion textRegion = regions.remove(0);
-			if (textRegion == null) {
-				continue;
-			}
-			String type = textRegion.getType();
-			if (type == CSSRegionContexts.CSS_S || type == CSSRegionContexts.CSS_COMMENT) {
-				continue;
-			}
-			if (type == CSSRegionContexts.CSS_URI || type == CSSRegionContexts.CSS_STRING) {
-				hrefRegion = textRegion;
-				break;
-			}
-			else {
-				break;
-			}
-		}
-		if (hrefRegion == null) {
-			return null;
-		}
-
-		CSSImportRuleImpl rule = fFeeder.getCSSImportRule();
-		if (rule == null) {
-			return null;
-		}
-
-		CSSUtil.stripSurroundingSpace(regions);
-		MediaListImpl mediaList = (MediaListImpl) rule.getMedia();
-		setMediaList(mediaList, beginDocRegion, regions);
-
-		if (!fUpdateContext.isActive()) {
-			rule.setAttribute(ICSSImportRule.HREF, beginDocRegion.getText(hrefRegion));
-		}
-
-		// setup flat container
-		rule.setRangeStructuredDocumentRegion(beginDocRegion, endDocRegion);
-		CSSAttrImpl attr = rule.getAttributeNode(ICSSImportRule.HREF);
-		if (attr != null) {
-			attr.setRangeRegion(beginDocRegion, hrefRegion, hrefRegion);
-		}
-
-		// insert to tree
-		if (!fUpdateContext.isActive() && parent != null) {
-			propagateRangePreInsert(parent, rule);
-			CSSNodeImpl next = fCreationContext.getNextNode();
-			if (next != null) {
-				parent.insertBefore(rule, next);
-			}
-			else {
-				parent.appendChild(rule);
-			}
-		}
-
-		return rule;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSNodeImpl insertMediaRule(IStructuredDocumentRegion flatNode, IStructuredDocumentRegion braceNode) {
-		CSSNodeImpl parent = fCreationContext.getTargetNode();
-		if (!fParseFloating && !(parent instanceof ICSSRuleContainer)) {
-			return null;
-		}
-
-		CSSMediaRuleImpl rule = fFeeder.getCSSMediaRule();
-		if (rule == null) {
-			return null;
-		}
-
-		ITextRegionList regions = new TextRegionListImpl(flatNode.getRegions());
-		regions.remove(0); // must be "@media"
-
-		CSSUtil.stripSurroundingSpace(regions);
-		MediaListImpl mediaList = (MediaListImpl) rule.getMedia();
-		setMediaList(mediaList, flatNode, regions);
-
-		// setup flat container
-		rule.setRangeStructuredDocumentRegion(flatNode, braceNode);
-
-		// insert to tree
-		if (!fUpdateContext.isActive() && parent != null) {
-			propagateRangePreInsert(parent, rule);
-			CSSNodeImpl next = fCreationContext.getNextNode();
-			if (next != null) {
-				parent.insertBefore(rule, next);
-			}
-			else {
-				parent.appendChild(rule);
-			}
-		}
-
-		fCreationContext.setTargetNode(rule);
-		// TargetNext is set to null automatically
-
-		return rule;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSNodeImpl insertPageRule(IStructuredDocumentRegion flatNode, IStructuredDocumentRegion braceNode) {
-		CSSNodeImpl parent = fCreationContext.getTargetNode();
-		if (!fParseFloating && !(parent instanceof ICSSRuleContainer)) {
-			return null;
-		}
-
-		// get selector regions
-		ITextRegionList selectorRegions = new TextRegionListImpl(flatNode.getRegions());
-		selectorRegions.remove(0); // must be "@page"
-		CSSUtil.stripSurroundingSpace(selectorRegions);
-
-		CSSPageRuleImpl rule = fFeeder.getCSSPageRule();
-		if (rule == null) {
-			return null;
-		}
-
-		if (!fUpdateContext.isActive()) {
-			String selectorStr = CSSUtil.getRegionText(flatNode, selectorRegions);
-			if (0 < selectorStr.length()) {
-				rule.setSelectorText(selectorStr);
-			}
-		}
-
-		// setup flat container
-		rule.setRangeStructuredDocumentRegion(flatNode, braceNode);
-		CSSAttrImpl attr = rule.getAttributeNode(ICSSPageRule.SELECTOR);
-		if (attr != null && selectorRegions != null && !selectorRegions.isEmpty()) {
-			attr.setRangeRegion(flatNode, selectorRegions.get(0), selectorRegions.get(selectorRegions.size() - 1));
-		}
-
-		// insert to tree
-		if (!fUpdateContext.isActive() && parent != null) {
-			propagateRangePreInsert(parent, rule);
-			CSSNodeImpl next = fCreationContext.getNextNode();
-			if (next != null) {
-				parent.insertBefore(rule, next);
-			}
-			else {
-				parent.appendChild(rule);
-			}
-		}
-
-		fCreationContext.setTargetNode(rule);
-		// TargetNext is set to null automatically
-
-		return rule;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSNodeImpl insertSemiColonForRule(IStructuredDocumentRegion region) {
-		IStructuredDocumentRegion keyRegion = CSSUtil.findPreviousSignificantNode(region);
-		String type = CSSUtil.getStructuredDocumentRegionType(keyRegion);
-
-		CSSNodeImpl inserted = null;
-		if (type == CSSRegionContexts.CSS_IMPORT) {
-			inserted = insertImportRule(keyRegion, region);
-		}
-		else if (type == CSSRegionContexts.CSS_CHARSET) {
-			inserted = insertCharsetRule(keyRegion, region);
-		}
-
-		return inserted;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSNodeImpl insertSemiColonForStyleDeclarationItem(IStructuredDocumentRegion region) {
-		// only target/net node is changed. nothing to do.
-
-		CSSNodeImpl targetNode = fCreationContext.getTargetNode();
-		if (targetNode instanceof ICSSStyleDeclItem) {
-			int offset = targetNode.getStartOffset();
-			// widen document region range
-			// ((CSSStyleDeclItemImpl)targetNode).setLastStructuredDocumentRegion(region);
-			CSSModelUtil.expandStructuredDocumentRegionContainer((CSSStyleDeclItemImpl) targetNode, region);
-			// psStructuredDocumentRegion indicates CSSStyleDeclItem
-			ICSSNode parentNode = targetNode.getParentNode();
-			fCreationContext.setTargetNode(parentNode);
-			ICSSNode next = null;
-			if (parentNode.hasChildNodes()) {
-				for (ICSSNode child = targetNode.getFirstChild(); child != null; child = child.getNextSibling()) {
-					if (child instanceof CSSStructuredDocumentRegionContainer && offset < ((CSSStructuredDocumentRegionContainer) child).getStartOffset()) {
-						next = child;
-						break;
-					}
-				}
-			}
-			fCreationContext.setNextNode(next);
-
-			return targetNode;
-		}
-
-		return null;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSNodeImpl insertStyleDeclarationItem(IStructuredDocumentRegion docRegion) {
-		CSSStyleDeclarationImpl parent = null;
-		CSSNodeImpl node = fCreationContext.getTargetNode();
-		if (node instanceof CSSRuleDeclContainer) {
-			CSSRuleDeclContainer declContainer = (CSSRuleDeclContainer) node;
-			parent = (CSSStyleDeclarationImpl) declContainer.getStyle();
-		}
-		else if (node instanceof CSSStyleDeclarationImpl) {
-			parent = (CSSStyleDeclarationImpl) node;
-		}
-
-		CSSDeclarationItemParser itemParser = new CSSDeclarationItemParser(parent.getOwnerDocument());
-		itemParser.setStructuredDocumentTemporary(false);
-		itemParser.setUpdateContext(fUpdateContext);
-		CSSStyleDeclItemImpl declItem = itemParser.setupDeclarationItem(docRegion);
-		if (declItem == null) {
-			return null;
-		}
-
-		// setup flat container
-		declItem.setRangeStructuredDocumentRegion(docRegion, docRegion);
-
-		// insert to tree
-		if (!fUpdateContext.isActive()) {
-			propagateRangePreInsert(parent, declItem);
-			CSSNodeImpl next = fCreationContext.getNextNode();
-			if (next != null) {
-				parent.insertBefore(declItem, next);
-			}
-			else {
-				parent.appendChild(declItem);
-			}
-		}
-
-		fCreationContext.setTargetNode(declItem);
-		// TargetNext is set to null automatically
-
-		return declItem;
-	}
-
-	/**
-	 * 
-	 */
-	private CSSNodeImpl insertStyleRule(IStructuredDocumentRegion flatNode, IStructuredDocumentRegion braceNode) {
-		CSSNodeImpl parent = fCreationContext.getTargetNode();
-		if (!fParseFloating && !(parent instanceof ICSSRuleContainer)) {
-			return null;
-		}
-
-		// get selector regions
-		ITextRegionList selectorRegions = new TextRegionListImpl(flatNode.getRegions());
-		CSSUtil.stripSurroundingSpace(selectorRegions);
-
-		CSSStyleRuleImpl rule = fFeeder.getCSSStyleRule();
-		if (rule == null) {
-			return null;
-		}
-
-		if (!fUpdateContext.isActive()) {
-			String selectorStr = CSSUtil.getRegionText(flatNode, selectorRegions);
-			if (selectorStr != null && 0 < selectorStr.length()) {
-				rule.setSelectorText(selectorStr);
-			}
-		}
-
-		// setup flat container
-		rule.setRangeStructuredDocumentRegion(flatNode, braceNode);
-		CSSAttrImpl attr = rule.getAttributeNode(ICSSPageRule.SELECTOR);
-		if (attr != null && selectorRegions != null && !selectorRegions.isEmpty()) {
-			attr.setRangeRegion(flatNode, selectorRegions.get(0), selectorRegions.get(selectorRegions.size() - 1));
-		}
-
-		// insert to tree
-		if (!fUpdateContext.isActive() && parent != null) {
-			propagateRangePreInsert(parent, rule);
-			CSSNodeImpl next = fCreationContext.getNextNode();
-			if (next != null) {
-				parent.insertBefore(rule, next);
-			}
-			else {
-				parent.appendChild(rule);
-			}
-		}
-
-		fCreationContext.setTargetNode(rule);
-		// TargetNext is set to null automatically
-
-		return rule;
-	}
-
-	/**
-	 * 
-	 */
-	private void pretendRemoveNode() {
-		CSSStructuredDocumentRegionContainer node = (CSSStructuredDocumentRegionContainer) fUpdateContext.getDeletionTarget();
-		if (node == null) {
-			return;
-		}
-
-		IStructuredDocumentRegion firstNode = node.getFirstStructuredDocumentRegion();
-		if (firstNode != null) {
-			fDeletionContext.expandRemovedRangeBegin(firstNode);
-		}
-		IStructuredDocumentRegion lastNode = node.getLastStructuredDocumentRegion();
-		if (lastNode != null) {
-			fDeletionContext.expandRemovedRangeEnd(lastNode);
-		}
-
-		shrinkContainer((CSSStructuredDocumentRegionContainer) fUpdateContext.getDeletionTargetParent(), node);
-	}
-
-	/**
-	 * @param parent
-	 *            org.eclipse.wst.css.core.model.CSSNodeImpl
-	 * @param child
-	 *            org.eclipse.wst.css.core.model.CSSNodeImpl
-	 */
-	private void propagateRangePreInsert(CSSNodeImpl parent, CSSNodeImpl child) {
-		if (!(child instanceof CSSStructuredDocumentRegionContainer) || !(parent instanceof CSSStructuredDocumentRegionContainer)) {
-			return;
-		}
-
-		CSSStructuredDocumentRegionContainer parentContainer = (CSSStructuredDocumentRegionContainer) parent;
-		CSSStructuredDocumentRegionContainer childContainer = (CSSStructuredDocumentRegionContainer) child;
-		IStructuredDocumentRegion firstNode = childContainer.getFirstStructuredDocumentRegion();
-		IStructuredDocumentRegion lastNode = childContainer.getLastStructuredDocumentRegion();
-		if (firstNode == null || lastNode == null) {
-			return;
-		}
-
-		boolean bModified = parentContainer.includeRangeStructuredDocumentRegion(firstNode, lastNode);
-		if (bModified) {
-			parentContainer.propagateRangeStructuredDocumentRegion();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void removeStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		String type = CSSUtil.getStructuredDocumentRegionType(flatNode);
-		if (type == CSSRegionContexts.CSS_DELIMITER || type == CSSRegionContexts.CSS_DECLARATION_DELIMITER) {
-			do {
-				flatNode = fStructuredDocumentWalker.getPrevNode(flatNode);
-				type = (flatNode != null) ? CSSUtil.getStructuredDocumentRegionType(flatNode) : null;
-			}
-			while (type != null && (type == CSSRegionContexts.CSS_S || type == CSSRegionContexts.CSS_COMMENT));
-		}
-		if (flatNode == null) {
-			return;
-		}
-
-		// if (fDeletionContext.isInRemovedRange(flatNode)) { // already
-		// removed
-		// return;
-		// }
-
-		CSSStructuredDocumentRegionContainer node = fDeletionContext.findDeletionTarget(fDocument, flatNode);
-		if (node == null || node == fDocument) {
-			return; // not attached with any treeNode
-		}
-
-		if (node instanceof CSSStyleDeclarationImpl) {
-			ICSSNode rule = node.getParentNode();
-			if (rule instanceof CSSStyleRuleImpl) {
-				node = (CSSStructuredDocumentRegionContainer) rule;
-			}
-			else {
-				return;
-			}
-		}
-
-		// ICSSNode p = node.getParentNode();
-		// if (p == null || ! (p instanceof
-		// CSSStructuredDocumentRegionContainer)) {
-		// return;
-		// }
-		// CSSStructuredDocumentRegionContainer parent =
-		// (CSSStructuredDocumentRegionContainer)p;
-
-		if (fDeletionContext.addNodeToBeRemoved(node)) {
-			IStructuredDocumentRegion firstNode = node.getFirstStructuredDocumentRegion();
-			if (firstNode != null) {
-				fDeletionContext.expandRemovedRangeBegin(firstNode);
-			}
-			IStructuredDocumentRegion lastNode = node.getLastStructuredDocumentRegion();
-			if (lastNode != null) {
-				fDeletionContext.expandRemovedRangeEnd(lastNode);
-			}
-		}
-
-		// shrinkContainer(node);
-		// parent.removeChild(node);
-	}
-
-	/**
-	 * 
-	 */
-	private void removeStructuredDocumentRegions(IStructuredDocumentRegionList flatNodes) {
-		for (Enumeration e = flatNodes.elements(); e.hasMoreElements();) {
-			IStructuredDocumentRegion flatNode = (IStructuredDocumentRegion) e.nextElement();
-			if (flatNode == null) {
-				continue;
-			}
-			removeStructuredDocumentRegion(flatNode);
-		}
-
-		Iterator i = fDeletionContext.getNodesToBeRemoved();
-		while (i.hasNext()) {
-			CSSNodeImpl node = (CSSNodeImpl) i.next();
-			if (!(node instanceof CSSStructuredDocumentRegionContainer)) {
-				continue;
-			}
-			CSSNodeImpl parent = (CSSNodeImpl) node.getParentNode();
-			if (!(parent instanceof CSSStructuredDocumentRegionContainer)) {
-				continue;
-			}
-			shrinkContainer((CSSStructuredDocumentRegionContainer) parent, (CSSStructuredDocumentRegionContainer) node);
-			parent.removeChild(node);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	void replaceStructuredDocumentRegions(IStructuredDocumentRegionList newStructuredDocumentRegions, IStructuredDocumentRegionList oldStructuredDocumentRegions) {
-		if (fDocument == null || fCreationContext == null) {
-			return;
-		}
-
-		if (oldStructuredDocumentRegions != null && 0 < oldStructuredDocumentRegions.getLength()) {
-			setupDeletionContext(newStructuredDocumentRegions, oldStructuredDocumentRegions);
-			short updateMode = fUpdateContext.getUpdateMode();
-			if (updateMode == CSSModelUpdateContext.UPDATE_IDLE) {
-				removeStructuredDocumentRegions(oldStructuredDocumentRegions);
-			}
-			else {
-				pretendRemoveNode();
-			}
-			newStructuredDocumentRegions = getStructuredDocumentRegionList(fDeletionContext.getRemovedRangeBegin(), fDeletionContext.getRemovedRangeEnd());
-			cleanupDeletionContext();
-		}
-
-		if (newStructuredDocumentRegions != null && 0 < newStructuredDocumentRegions.getLength()) {
-			setupCreationContext(newStructuredDocumentRegions.item(0));
-			insertStructuredDocumentRegions(newStructuredDocumentRegions);
-		}
-
-		// make document hold whole structuredDocument
-		/*
-		 * boolean bUpdate = false; IStructuredDocumentRegion flatNode;
-		 * flatNode = fDocument.getFirstStructuredDocumentRegion(); bUpdate =
-		 * bUpdate || (flatNode == null ||
-		 * fStructuredDocumentWalker.isOldNode(flatNode) ||
-		 * flatNode.getPrevious() != null); flatNode =
-		 * fDocument.getLastStructuredDocumentRegion(); bUpdate = bUpdate ||
-		 * (flatNode == null || fStructuredDocumentWalker.isOldNode(flatNode) ||
-		 * flatNode.getNext() != null);
-		 */
-		IStructuredDocument structuredDocument = fStructuredDocumentWalker.getStructuredDocument();
-		fDocument.setRangeStructuredDocumentRegion(structuredDocument.getFirstStructuredDocumentRegion(), structuredDocument.getLastStructuredDocumentRegion());
-		/* } */
-
-		// remove in official release
-		// CSSModelUtil.diagnoseTree(fDocument,
-		// fStructuredDocumentWalker.getStructuredDocument());
-	}
-
-	/**
-	 * 
-	 */
-	void replaceRegions(IStructuredDocumentRegion flatNode, ITextRegionList newRegions, ITextRegionList oldRegions) {
-		if (flatNode == null) {
-			return;
-		}
-		if (newRegions == null || oldRegions == null) {
-			return;
-		}
-		if (fDocument == null) {
-			return;
-		}
-
-		changeStructuredDocumentRegion(flatNode);
-	}
-
-	/**
-	 */
-	private void resetCreationTarget(IStructuredDocumentRegion newStructuredDocumentRegion) {
-		if (newStructuredDocumentRegion == null || newStructuredDocumentRegion.getStartOffset() <= 0) {
-			// top of document
-			fCreationContext.setTargetNode(fDocument);
-			fCreationContext.setNextNode(fDocument.getFirstChild());
-			return;
-		}
-
-		int cursorPos = newStructuredDocumentRegion.getStartOffset();
-		CSSNodeImpl cursorNode = getNodeAt(cursorPos);
-		if (cursorNode == null) { // end of document
-			cursorNode = fDocument;
-		}
-
-		// find edge of tree node
-		CSSNodeImpl node = null;
-		// boolean bOverSemiColon = false;
-		boolean bOverOpenBrace = false;
-		IStructuredDocumentRegion flatNode;
-		for (flatNode = newStructuredDocumentRegion; flatNode != null; flatNode = flatNode.getPrevious()) {
-			node = getNodeAt(flatNode.getStartOffset());
-			if (node == null) {
-				node = fDocument;
-			}
-			if (node != cursorNode || node.getStartOffset() == flatNode.getStartOffset()) {
-				break;
-			}
-			if (flatNode != newStructuredDocumentRegion) {
-				String type = CSSUtil.getStructuredDocumentRegionType(flatNode);
-				// if (type == CSSRegionContexts.CSS_DELIMITER ||
-				// type == CSSRegionContexts.CSS_DECLARATION_DELIMITER) {
-				// bOverSemiColon = true;
-				// } else
-				if (type == CSSRegionContexts.CSS_LBRACE) {
-					bOverOpenBrace = true;
-				}
-			}
-		}
-
-		CSSNodeImpl targetNode = null;
-
-		// if (flatNode == null) {
-		// v<--|
-		// AAAAAA
-		// BBBBBBBBBB cursorNode:A , node:B -> target is A
-		// targetNode = (node == null) ? fDocument : node;
-		// } else
-		if (cursorNode == node) {
-			// v<--|
-			// AAAAAA
-			// BBBBBBBBBB cursorNode:A , node:B -> target is A
-			if (bOverOpenBrace && cursorNode instanceof CSSRuleDeclContainer) {
-				targetNode = (CSSNodeImpl) ((CSSRuleDeclContainer) cursorNode).getStyle();
-			}
-			else {
-				targetNode = cursorNode;
-			}
-		}
-		else {
-			// v<--|
-			// AAA
-			// BBBBBBBBBB cursorNode:B , node:A -> depend on A's node type
-			short nodeType = node.getNodeType();
-			if (nodeType == ICSSNode.STYLEDECLITEM_NODE || nodeType == ICSSNode.CHARSETRULE_NODE || nodeType == ICSSNode.IMPORTRULE_NODE) {
-				// targetNode = (CSSNodeImpl)((bOverSemiColon) ?
-				// node.getParentNode() : node); // NP
-				String regionType = CSSUtil.getStructuredDocumentRegionType(flatNode);
-				if (regionType == CSSRegionContexts.CSS_DELIMITER || regionType == CSSRegionContexts.CSS_DECLARATION_DELIMITER) {
-					targetNode = (CSSNodeImpl) node.getParentNode();
-				}
-				else {
-					targetNode = node;
-				}
-			}
-			else if (CSSUtil.getStructuredDocumentRegionType(flatNode) == CSSRegionContexts.CSS_RBRACE) {
-				targetNode = (CSSNodeImpl) node.getParentNode();
-			}
-			else {
-				targetNode = node;
-			}
-		}
-
-		fCreationContext.setTargetNode(targetNode);
-		ICSSNode next = null;
-		if (targetNode.hasChildNodes()) {
-			for (ICSSNode child = targetNode.getFirstChild(); child != null; child = child.getNextSibling()) {
-				if (child instanceof CSSStructuredDocumentRegionContainer && cursorPos < ((CSSStructuredDocumentRegionContainer) child).getStartOffset()) {
-					next = child;
-					break;
-				}
-			}
-		}
-		fCreationContext.setNextNode(next);
-
-	}
-
-	/**
-	 */
-	private void resetReparseRange() {
-		fCreationContext.clear();
-	}
-
-	void setStructuredDocumentEvent(StructuredDocumentEvent event) {
-		if (fStructuredDocumentWalker == null) {
-			fStructuredDocumentWalker = new StructuredDocumentWalker();
-		}
-		fStructuredDocumentWalker.initialize(event);
-	}
-
-	/**
-	 * regions: surrounding spaces should be removed. Q. Why did you set
-	 * mediaTable ? A. MediaList may have two or more medium that have same
-	 * value, then searcing in MediaList is not perfect. Q.
-	 * fUpdateContext.isActive() is not care. Are you OK? A. OK.
-	 */
-	private void setMediaList(MediaListImpl mediaList, IStructuredDocumentRegion region, ITextRegionList textRegions) {
-		if (mediaList == null || textRegions == null) {
-			return;
-		}
-		Collection mediaTable = new HashSet();
-		CSSNodeListImpl attrs = mediaList.getMedia();
-		for (int i = 0; i != attrs.getLength(); i++) {
-			mediaTable.add(attrs.item(i));
-		}
-
-		ITextRegion start = null;
-		ITextRegion end = null;
-
-		Iterator i = textRegions.iterator();
-		ITextRegion textRegion = (ITextRegion) ((i.hasNext()) ? i.next() : null);
-		while (textRegion != null) {
-			if (textRegion.getType() == CSSRegionContexts.CSS_MEDIUM) {
-				String mediumStr = region.getText(textRegion);
-				if (0 < mediumStr.length()) {
-					CSSAttrImpl attr = null;
-					// is the medium already set ?
-					Iterator iTable = mediaTable.iterator();
-					while (iTable.hasNext()) {
-						CSSAttrImpl cai = (CSSAttrImpl) iTable.next();
-						if (mediumStr.equalsIgnoreCase(cai.getValue())) {
-							attr = cai;
-							mediaTable.remove(cai);
-							break;
-						}
-					}
-					if (attr == null) {
-						// is not set. create new attribute
-						String key = "mediumP" + mediaList.mediumCounter++; //$NON-NLS-1$
-						mediaList.setAttribute(key, mediumStr);
-						attr = mediaList.getAttributeNode(key);
-					}
-					attr.setRangeRegion(region, textRegion, textRegion);
-					if (start == null) {
-						start = textRegion;
-					}
-					end = textRegion;
-				}
-			}
-			textRegion = (ITextRegion) ((i.hasNext()) ? i.next() : null);
-		}
-
-		if (start != null && end != null) {
-			mediaList.setRangeRegion(region, start, end);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void setupCreationContext(IStructuredDocumentRegion region) {
-		resetReparseRange();
-		resetCreationTarget(region);
-	}
-
-	/**
-	 * 
-	 */
-	private void setupDeletionContext(IStructuredDocumentRegionList newStructuredDocumentRegions, IStructuredDocumentRegionList oldStructuredDocumentRegions) {
-		fDeletionContext.setupContext(newStructuredDocumentRegions, oldStructuredDocumentRegions);
-	}
-
-	/**
-	 * 
-	 */
-	void setupUpdateContext(short updateMode, ICSSNode parentNode, ICSSNode targetNode) {
-		fUpdateContext.setupContext(updateMode, parentNode, targetNode);
-	}
-
-	/**
-	 * 
-	 */
-	void shrinkContainer(CSSStructuredDocumentRegionContainer parent, CSSStructuredDocumentRegionContainer child) {
-		if (child == null) {
-			return;
-		}
-
-		boolean bModified = false;
-		bModified = bModified || cleanupLastNode(child.getLastStructuredDocumentRegion(), parent);
-		bModified = bModified || cleanupFirstNode(child.getFirstStructuredDocumentRegion(), parent);
-
-		if (bModified) {
-			if (parent != null) {
-				for (ICSSNode node = parent.getFirstChild(); node != null; node = node.getNextSibling()) {
-					if (child != node && node instanceof CSSStructuredDocumentRegionContainer) {
-						((CSSStructuredDocumentRegionContainer) node).propagateRangeStructuredDocumentRegion();
-					}
-				}
-			}
-		}
-
-		child.setRangeStructuredDocumentRegion(null, null);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUpdateContext.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUpdateContext.java
deleted file mode 100644
index 6344998..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUpdateContext.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import java.util.LinkedList;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.internal.util.AbstractCssTraverser;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.css.CSSPrimitiveValue;
-
-
-/**
- * 
- */
-class CSSModelUpdateContext {
-
-
-	class CSSNodeUpdateTraverser extends AbstractCssTraverser {
-		public CSSNodeUpdateTraverser() {
-			super();
-			setTraverseImported(false);
-			setTraverseImportFirst(false);
-		}
-
-		public LinkedList getNodeList() {
-			return fTravNodeList;
-		}
-
-		protected void begin(ICSSNode node) {
-			fTravNodeList = new LinkedList();
-		}
-
-		protected short preNode(ICSSNode node) {
-			if (node instanceof CSSStyleDeclarationImpl || node instanceof CSSAttrImpl || node instanceof MediaListImpl) {
-				// skip
-			}
-			else {
-				fTravNodeList.add(node);
-			}
-			if (node instanceof CSSPrimitiveContainer) {
-				return TRAV_PRUNE;
-			}
-			else {
-				return TRAV_CONT;
-			}
-		}
-
-		LinkedList fTravNodeList = null;
-	}
-
-	ICSSNode fLastNode = null;
-	ICSSNode fDeletionTargetParent = null;
-	ICSSNode fDeletionTarget = null;
-	LinkedList fNodeList = null;
-	private short fUpdateMode = UPDATE_IDLE;
-	static final short UPDATE_IDLE = 0;
-	static final short UPDATE_INSERT_FNCONTAINER = 1;
-	static final short UPDATE_INSERT_RCONTAINER = 2;
-	static final short UPDATE_REMOVE_FNCONTAINER = 3;
-	static final short UPDATE_REMOVE_RCONTAINER = 4;
-	static final short UPDATE_CHANGE_RCONTAINER = 5;
-
-	/**
-	 * CSSNodeUpdateQueue constructor comment.
-	 */
-	CSSModelUpdateContext() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	void cleanupContext() {
-		fNodeList = null;
-		fDeletionTarget = null;
-		fDeletionTargetParent = null;
-		fUpdateMode = UPDATE_IDLE;
-	}
-
-	/**
-	 * 
-	 */
-	CounterImpl getCounter() {
-		ICSSNode node = getNode();
-		if (node instanceof CounterImpl) {
-			return (CounterImpl) node;
-		}
-		else {
-			CSSUtil.debugOut("CounterImpl is expected, but " + //$NON-NLS-1$
-						CSSUtil.getClassString(node));
-			ungetNode();
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	CSSCharsetRuleImpl getCSSCharsetRule() {
-		ICSSNode node = getNode();
-		if (node instanceof CSSCharsetRuleImpl) {
-			return (CSSCharsetRuleImpl) node;
-		}
-		else {
-			CSSUtil.debugOut("CSSCharsetRuleImpl is expected, but " + //$NON-NLS-1$
-						CSSUtil.getClassString(node));
-			ungetNode();
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	CSSFontFaceRuleImpl getCSSFontFaceRule() {
-		ICSSNode node = getNode();
-		if (node instanceof CSSFontFaceRuleImpl) {
-			return (CSSFontFaceRuleImpl) node;
-		}
-		else {
-			CSSUtil.debugOut("CSSFontFaceRuleImpl is expected, but " + //$NON-NLS-1$
-						CSSUtil.getClassString(node));
-			ungetNode();
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	CSSImportRuleImpl getCSSImportRule() {
-		ICSSNode node = getNode();
-		if (node instanceof CSSImportRuleImpl) {
-			return (CSSImportRuleImpl) node;
-		}
-		else {
-			CSSUtil.debugOut("CSSImportRuleImpl is expected, but " + //$NON-NLS-1$
-						CSSUtil.getClassString(node));
-			ungetNode();
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	CSSMediaRuleImpl getCSSMediaRule() {
-		ICSSNode node = getNode();
-		if (node instanceof CSSMediaRuleImpl) {
-			return (CSSMediaRuleImpl) node;
-		}
-		else {
-			CSSUtil.debugOut("CSSMediaRuleImpl is expected, but " + //$NON-NLS-1$
-						CSSUtil.getClassString(node));
-			ungetNode();
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	CSSPageRuleImpl getCSSPageRule() {
-		ICSSNode node = getNode();
-		if (node instanceof CSSPageRuleImpl) {
-			return (CSSPageRuleImpl) node;
-		}
-		else {
-			CSSUtil.debugOut("CSSPageRuleImpl is expected, but " + //$NON-NLS-1$
-						CSSUtil.getClassString(node));
-			ungetNode();
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	CSSPrimitiveValueImpl getCSSPrimitiveValue(short type) {
-		ICSSNode node = getNode();
-		if (node instanceof CSSPrimitiveValueImpl) {
-			short nodeType = ((CSSPrimitiveValueImpl) node).getPrimitiveType();
-			if (nodeType == type || ((nodeType == CSSPrimitiveValue.CSS_NUMBER || nodeType == ICSSPrimitiveValue.CSS_INTEGER) && (type == CSSPrimitiveValue.CSS_NUMBER || type == ICSSPrimitiveValue.CSS_INTEGER))) {
-				return (CSSPrimitiveValueImpl) node;
-			}
-		}
-
-		if (node instanceof CSSPrimitiveValueImpl) {
-			CSSPrimitiveValueImpl value = (CSSPrimitiveValueImpl) node;
-			CSSUtil.debugOut("CSSPrimitiveValueImpl [" + type + //$NON-NLS-1$
-						"] is expected, but type is [" + //$NON-NLS-1$
-						value.getPrimitiveType() + "]: \"" + value.generateSource() + "\"");//$NON-NLS-2$//$NON-NLS-1$
-		}
-		else {
-			CSSUtil.debugOut("CSSPrimitiveValueImpl(" + type + //$NON-NLS-1$
-						") is expected, but " + //$NON-NLS-1$
-						CSSUtil.getClassString(node));
-		}
-
-		ungetNode();
-		throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 */
-	CSSPrimitiveValueImpl getCSSPrimitiveValueAny() {
-		ICSSNode node = getNode();
-		if (node instanceof CSSPrimitiveValueImpl) {
-			return (CSSPrimitiveValueImpl) node;
-		}
-		else {
-			CSSUtil.debugOut("CSSPrimitiveValueImpl is expected, but " + //$NON-NLS-1$
-						CSSUtil.getClassString(node));
-			ungetNode();
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	CSSStyleDeclItemImpl getCSSStyleDeclItem(String propertyName) {
-		ICSSNode node = getNode();
-		if (node instanceof CSSStyleDeclItemImpl && ((CSSStyleDeclItemImpl) node).getPropertyName().equalsIgnoreCase(propertyName)) {
-			return (CSSStyleDeclItemImpl) node;
-		}
-		else {
-			CSSUtil.debugOut("CSSStyleDeclItemImpl(" + propertyName + //$NON-NLS-1$
-						") is expected, but " + CSSUtil.getClassString(node));//$NON-NLS-1$
-			ungetNode();
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	CSSStyleRuleImpl getCSSStyleRule() {
-		ICSSNode node = getNode();
-		if (node instanceof CSSStyleRuleImpl) {
-			return (CSSStyleRuleImpl) node;
-		}
-		else {
-			CSSUtil.debugOut("CSSStyleRuleImpl is expected, but " + //$NON-NLS-1$
-						CSSUtil.getClassString(node));
-			ungetNode();
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @return org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 */
-	ICSSNode getDeletionTarget() {
-		return fDeletionTarget;
-	}
-
-	/**
-	 * @return org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 */
-	ICSSNode getDeletionTargetParent() {
-		return fDeletionTargetParent;
-	}
-
-	/**
-	 * 
-	 */
-	private ICSSNode getNode() {
-		ICSSNode node = null;
-		if (fNodeList != null && 0 < fNodeList.size()) {
-			node = (ICSSNode) fNodeList.removeFirst();
-		}
-		fLastNode = node;
-		return node;
-	}
-
-	/**
-	 * 
-	 */
-	int getNodeCount() {
-		if (fNodeList != null) {
-			return fNodeList.size();
-		}
-		else {
-			return -1;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	// ICSSNode getParentNode() {
-	// return fParentNode;
-	// }
-	/**
-	 * 
-	 */
-	RectImpl getRect() {
-		ICSSNode node = getNode();
-		if (node instanceof RectImpl) {
-			return (RectImpl) node;
-		}
-		else {
-			CSSUtil.debugOut("RectImpl is expected, but " + //$NON-NLS-1$
-						CSSUtil.getClassString(node));
-			ungetNode();
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	RGBColorImpl getRGBColor() {
-		ICSSNode node = getNode();
-		if (node instanceof RGBColorImpl) {
-			return (RGBColorImpl) node;
-		}
-		else {
-			CSSUtil.debugOut("RGBColorImpl is expected, but " + //$NON-NLS-1$
-						CSSUtil.getClassString(node));
-			ungetNode();
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @return short
-	 */
-	short getUpdateMode() {
-		return fUpdateMode;
-	}
-
-	/**
-	 * 
-	 */
-	boolean isActive() {
-		return (fNodeList != null);
-	}
-
-	/**
-	 * 
-	 */
-	void setupContext(short updateMode, ICSSNode parentNode, ICSSNode targetNode) {
-		fUpdateMode = updateMode;
-
-		ICSSNode traverseRoot;
-		if (updateMode == UPDATE_REMOVE_RCONTAINER || updateMode == UPDATE_INSERT_RCONTAINER || updateMode == UPDATE_CHANGE_RCONTAINER) {
-			traverseRoot = parentNode;
-			while (traverseRoot instanceof CSSRegionContainer) {
-				traverseRoot = traverseRoot.getParentNode();
-			}
-		}
-		else {
-			traverseRoot = targetNode;
-		}
-
-		if (updateMode == UPDATE_REMOVE_RCONTAINER || updateMode == UPDATE_INSERT_RCONTAINER || // region
-																								// insert
-																								// =>
-																								// replace
-																								// flat
-																								// node
-					updateMode == UPDATE_CHANGE_RCONTAINER || updateMode == UPDATE_REMOVE_FNCONTAINER) {
-			fDeletionTarget = traverseRoot;
-			if (fDeletionTarget == targetNode) {
-				fDeletionTargetParent = parentNode;
-			}
-			else {
-				fDeletionTargetParent = fDeletionTarget.getParentNode();
-			}
-		}
-		else {
-			fDeletionTarget = null;
-			fDeletionTargetParent = null;
-		}
-
-		if (updateMode == UPDATE_INSERT_RCONTAINER || updateMode == UPDATE_INSERT_FNCONTAINER || updateMode == UPDATE_REMOVE_RCONTAINER || // region
-																																			// remove
-																																			// =>
-																																			// re-insert
-																																			// flat
-																																			// node
-					updateMode == UPDATE_CHANGE_RCONTAINER) {
-			CSSNodeUpdateTraverser traverser = new CSSNodeUpdateTraverser();
-			traverser.apply(traverseRoot);
-			fNodeList = traverser.getNodeList();
-		}
-		else {
-			fNodeList = null;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void ungetNode() {
-		if (fNodeList != null && fLastNode != null) {
-			fNodeList.addFirst(fLastNode);
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUpdater.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUpdater.java
deleted file mode 100644
index cbd8058..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUpdater.java
+++ /dev/null
@@ -1,561 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.formatter.AttrChangeContext;
-import org.eclipse.wst.css.core.internal.formatter.CSSSourceFormatterFactory;
-import org.eclipse.wst.css.core.internal.formatter.CSSSourceGenerator;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.w3c.dom.DOMException;
-
-
-/**
- * 
- */
-class CSSModelUpdater {
-
-	private CSSModelImpl fModel = null;
-	private CSSModelParser fParser = null;
-
-	/**
-	 * CSSModelUpdater constructor comment.
-	 */
-	CSSModelUpdater() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	CSSModelUpdater(CSSModelImpl model) {
-		super();
-		fModel = model;
-	}
-
-	/**
-	 * @param parentNode
-	 *            org.eclipse.wst.css.core.model.CSSNodeImpl
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.CSSNodeImpl
-	 */
-	private void attrInserted(CSSNodeImpl parentNode, CSSAttrImpl attr) {
-		CSSSourceGenerator formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter(parentNode);
-
-		if (formatter == null) {
-			CSSUtil.debugOut("Cannot get format adapter : " + parentNode.getClass().toString());//$NON-NLS-1$
-			return;
-		}
-
-		short updateMode = CSSModelUpdateContext.UPDATE_INSERT_RCONTAINER;
-		fParser.setupUpdateContext(updateMode, parentNode, attr);
-
-		// get formatted info
-		AttrChangeContext region = new AttrChangeContext();
-		String text = new String(formatter.formatAttrChanged(parentNode, attr, true, region));
-
-		// set text
-		StructuredDocumentEvent result = insertText(region.start, region.end - region.start, text);
-
-		int nRemains = fParser.cleanupUpdateContext();
-
-		if (0 < nRemains && !(result instanceof NoChangeEvent)) {
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$		
-		}
-	}
-
-	/**
-	 * @param parentNode
-	 *            org.eclipse.wst.css.core.model.CSSNodeImpl
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.CSSNodeImpl
-	 */
-	private void attrRemoved(CSSNodeImpl parentNode, CSSAttrImpl attr) {
-		CSSSourceGenerator formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter(parentNode);
-
-		if (formatter == null) {
-			CSSUtil.debugOut("Cannot get format adapter : " + parentNode.getClass().toString());//$NON-NLS-1$
-			return;
-		}
-
-		short updateMode = CSSModelUpdateContext.UPDATE_REMOVE_RCONTAINER;
-		fParser.setupUpdateContext(updateMode, parentNode, attr);
-
-		// get formatted info
-		AttrChangeContext region = new AttrChangeContext();
-		String text = new String(formatter.formatAttrChanged(parentNode, attr, false, region));
-
-		// set text
-		StructuredDocumentEvent result = insertText(region.start, region.end - region.start, text);
-
-		int nRemains = fParser.cleanupUpdateContext();
-
-		if (0 < nRemains && !(result instanceof NoChangeEvent)) {
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$		
-		}
-	}
-
-	/**
-	 * 
-	 */
-	void attrReplaced(CSSNodeImpl parentNode, CSSNodeImpl newAttr, CSSNodeImpl oldAttr) {
-		if (parentNode == null) {
-			return;
-		}
-
-		if (oldAttr != null) {
-			attrRemoved(parentNode, (CSSAttrImpl) oldAttr);
-		}
-
-		if (newAttr != null) {
-			attrInserted(parentNode, (CSSAttrImpl) newAttr);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void childInserted(CSSNodeImpl parentNode, CSSNodeImpl node) {
-		short updateMode = CSSModelUpdateContext.UPDATE_IDLE;
-
-		if (node instanceof CSSStructuredDocumentRegionContainer) {
-			updateMode = CSSModelUpdateContext.UPDATE_INSERT_FNCONTAINER;
-		}
-		else if (node instanceof CSSRegionContainer) {
-			updateMode = CSSModelUpdateContext.UPDATE_INSERT_RCONTAINER;
-		}
-		else {
-			CSSUtil.debugOut("What's this node? : " + node.getClass().toString());//$NON-NLS-1$
-			return;
-		}
-
-		fParser.setupUpdateContext(updateMode, parentNode, node);
-
-		StructuredDocumentEvent result = defaultInserted(parentNode, node);
-
-		int nRemains = fParser.cleanupUpdateContext();
-
-		if (0 < nRemains && !(result instanceof NoChangeEvent)) {
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$		
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void childRemoved(CSSNodeImpl parentNode, CSSNodeImpl node) {
-		short updateMode = CSSModelUpdateContext.UPDATE_IDLE;
-
-		if (node instanceof CSSStructuredDocumentRegionContainer) {
-			updateMode = CSSModelUpdateContext.UPDATE_REMOVE_FNCONTAINER;
-		}
-		else if (node instanceof CSSRegionContainer) {
-			updateMode = CSSModelUpdateContext.UPDATE_REMOVE_RCONTAINER;
-		}
-		else {
-			CSSUtil.debugOut("What's this node? : " + node.getClass().toString());//$NON-NLS-1$
-			return;
-		}
-
-		fParser.setupUpdateContext(updateMode, parentNode, node);
-
-		CSSNodeImpl prev = getOldPrevious(parentNode, node);
-		CSSNodeImpl next = getOldNext(parentNode, node);
-		int insertPos = -1, endPos = -1;
-		String source = "";//$NON-NLS-1$
-		if (prev != null) {
-			insertPos = prev.getEndOffset();
-		}
-		else {
-			insertPos = node.getStartOffset();
-			insertPos -= nearestSpaceLengthBefore(parentNode, insertPos);
-		}
-		if (next != null) {
-			endPos = next.getStartOffset();
-		}
-		else {
-			endPos = node.getEndOffset();
-			endPos += nearestSpaceLengthAfter(parentNode, endPos);
-		}
-		source = getSpaceBefore(parentNode, next, node);
-		StructuredDocumentEvent result;
-		if (source.length() > 0) {
-			result = insertText(insertPos, endPos - insertPos, source);
-		}
-		else {
-			result = removeText(insertPos, endPos - insertPos);
-		}
-
-		int nRemains = fParser.cleanupUpdateContext();
-
-		if (0 < nRemains && !(result instanceof NoChangeEvent)) {
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$		
-		}
-
-		/*
-		 * int removeStart = -1; int removeEnd = -1; if (node instanceof
-		 * CSSStructuredDocumentRegionContainer) {
-		 * CSSStructuredDocumentRegionContainer container =
-		 * (CSSStructuredDocumentRegionContainer)node;
-		 * IStructuredDocumentRegion firstNode =
-		 * container.getFirstStructuredDocumentRegion();
-		 * IStructuredDocumentRegion lastNode =
-		 * container.getLastStructuredDocumentRegion(); if (firstNode != null &&
-		 * lastNode != null) { removeStart = firstNode.getStart(); removeEnd =
-		 * lastNode.getEnd(); } } else if (node instanceof CSSRegionContainer) {
-		 * CSSRegionContainer container = (CSSRegionContainer)node;
-		 * ITextRegion firstRegion = container.getFirstRegion(); ITextRegion
-		 * lastRegion = container.getLastRegion(); if (firstRegion != null &&
-		 * lastRegion != null) { removeStart = firstRegion.getStartOffset();
-		 * removeEnd = lastRegion.getEndOffset(); } } if (0 <= removeStart &&
-		 * 0 <= removeEnd) { removeText(removeStart, removeEnd - removeStart +
-		 * 1); }
-		 */
-	}
-
-	/**
-	 * 
-	 */
-	void childReplaced(CSSNodeImpl parentNode, CSSNodeImpl newChild, CSSNodeImpl oldChild) {
-		if (parentNode == null) {
-			return;
-		}
-
-		if (oldChild != null) {
-			childRemoved(parentNode, oldChild);
-		}
-
-		if (newChild != null) {
-			childInserted(parentNode, newChild);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private StructuredDocumentEvent defaultInserted(CSSNodeImpl parentNode, CSSNodeImpl node) {
-		int insertPos = -1;
-		ICSSNode sibling;
-		String preSpace = "", postSpace = "";//$NON-NLS-2$//$NON-NLS-1$
-		int length = 0;
-
-		if (insertPos < 0) {
-			if ((sibling = node.getPreviousSibling()) != null) {
-				// after previous child
-				insertPos = getTextEnd(sibling);
-			}
-		}
-
-		if (insertPos < 0) {
-			if ((sibling = node.getNextSibling()) != null) {
-				// before next child
-				insertPos = getTextStart(sibling);
-			}
-		}
-
-		if (insertPos < 0) {
-			// position of parent
-			insertPos = getChildInsertPos(parentNode);
-		}
-
-		if (insertPos < 0) {
-			// firsttime
-			insertPos = 0;
-		}
-
-		// format previous spaces
-		length = nearestSpaceLengthBefore(parentNode, insertPos);
-		insertPos -= length;
-		preSpace = getSpaceBefore(parentNode, node, null);
-		// format post spaces
-		length += nearestSpaceLengthAfter(parentNode, insertPos + length);
-		postSpace = getSpaceBefore(parentNode, node.getNextSibling(), null);
-
-		// set text
-		String text = preSpace + node.generateSource().trim() + postSpace;
-		return insertText(insertPos, length, text);
-	}
-
-	/**
-	 * @return int
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.CSSNodeImpl
-	 */
-	private int getChildInsertPos(CSSNodeImpl node) {
-		CSSSourceGenerator formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter(node);
-		if (formatter != null)
-			return formatter.getChildInsertPos(node);
-		else
-			return node.getEndOffset();
-	}
-
-	/**
-	 * @return org.eclipse.wst.css.core.model.CSSNodeImpl
-	 * @param parentNode
-	 *            org.eclipse.wst.css.core.model.CSSNodeImpl
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.CSSNodeImpl
-	 */
-	private CSSNodeImpl getOldNext(CSSNodeImpl parentNode, CSSNodeImpl node) {
-		CSSNodeImpl child = (CSSNodeImpl) parentNode.getLastChild();
-		CSSNodeImpl ret = null;
-		while (child != null) {
-			if (node.getEndOffset() < child.getEndOffset())
-				ret = child;
-			else
-				break;
-			child = (CSSNodeImpl) child.getPreviousSibling();
-		}
-		return ret;
-	}
-
-	/**
-	 * @return org.eclipse.wst.css.core.model.CSSNodeImpl
-	 * @param parentNode
-	 *            org.eclipse.wst.css.core.model.CSSNodeImpl
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.CSSNodeImpl
-	 */
-	private CSSNodeImpl getOldPrevious(CSSNodeImpl parentNode, CSSNodeImpl node) {
-		CSSNodeImpl child = (CSSNodeImpl) parentNode.getFirstChild();
-		CSSNodeImpl ret = null;
-		while (child != null) {
-			if (child.getStartOffset() < node.getStartOffset())
-				ret = child;
-			else
-				break;
-			child = (CSSNodeImpl) child.getNextSibling();
-		}
-		return ret;
-	}
-
-	/**
-	 * @return java.lang.String
-	 * @param parentNode
-	 *            org.eclipse.wst.css.core.model.CSSNodeImpl
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.CSSNodeImpl
-	 */
-	private String getSpaceBefore(ICSSNode parentNode, ICSSNode node, ICSSNode toRemove) {
-		CSSSourceGenerator formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter((INodeNotifier) parentNode);
-
-		if (formatter != null) {
-			org.eclipse.jface.text.IRegion exceptFor = null;
-			if (toRemove != null) {
-				CSSNodeImpl remove = (CSSNodeImpl) toRemove;
-				exceptFor = new org.eclipse.jface.text.Region(remove.getStartOffset(), remove.getEndOffset() - remove.getStartOffset());
-			}
-			return formatter.formatBefore(parentNode, node, exceptFor).toString();
-		}
-		else
-			return "";//$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 */
-	private int getTextEnd(ICSSNode node) {
-		int end = -1;
-		if (node != null) {
-			if (node instanceof CSSStructuredDocumentRegionContainer) {
-				end = ((CSSStructuredDocumentRegionContainer) node).getEndOffset();
-			}
-			else if (node instanceof CSSRegionContainer) {
-				end = ((CSSRegionContainer) node).getEndOffset();
-			}
-		}
-		return end;
-	}
-
-	/**
-	 * 
-	 */
-	private int getTextStart(ICSSNode node) {
-		int start = -1;
-		if (node != null) {
-			if (node instanceof CSSStructuredDocumentRegionContainer) {
-				start = ((CSSStructuredDocumentRegionContainer) node).getStartOffset();
-			}
-			else if (node instanceof CSSRegionContainer) {
-				start = ((CSSRegionContainer) node).getStartOffset();
-			}
-		}
-		return start;
-	}
-
-	/**
-	 * 
-	 */
-	private StructuredDocumentEvent insertText(int start, int oldLength, String text) {
-		StructuredDocumentEvent result = null;
-		BasicStructuredDocument structuredDocument = (BasicStructuredDocument) fModel.getStructuredDocument();
-		if (structuredDocument != null) {
-			if (text != null && 0 < oldLength && start + oldLength <= structuredDocument.getLength()) {
-				// minimize text change
-				String delText = structuredDocument.get(start, oldLength);
-				int newLength = text.length();
-				int shorterLen = Math.min(oldLength, newLength);
-				int stMatchLen;
-				for (stMatchLen = 0; stMatchLen < shorterLen && text.charAt(stMatchLen) == delText.charAt(stMatchLen); stMatchLen++) {
-					// 
-				}
-				if (0 < stMatchLen && stMatchLen < shorterLen && text.charAt(stMatchLen - 1) == 0x000d && (text.charAt(stMatchLen) == 0x000a || delText.charAt(stMatchLen) == 0x000a)) {
-					// must not divide 0d->0a sequence
-					stMatchLen--;
-				}
-				if (stMatchLen == shorterLen) {
-					if (oldLength < newLength) { // just insert
-						oldLength = 0;
-						start += stMatchLen;
-						text = text.substring(stMatchLen);
-					}
-					else if (newLength < oldLength) { // just remove
-						oldLength -= stMatchLen;
-						start += stMatchLen;
-						text = null;
-					}
-					else { // nothing to do
-						oldLength = 0;
-						text = null;
-					}
-				}
-				else {
-					int edMatchLen;
-					for (edMatchLen = 0; stMatchLen + edMatchLen < shorterLen && text.charAt(newLength - edMatchLen - 1) == delText.charAt(oldLength - edMatchLen - 1); edMatchLen++) {
-						//
-					}
-					if (0 < edMatchLen && text.charAt(newLength - edMatchLen) == 0x000a && ((edMatchLen < newLength && text.charAt(newLength - edMatchLen - 1) == 0x000d) || (edMatchLen < oldLength && delText.charAt(oldLength - edMatchLen - 1) == 0x000d))) {
-						// must not divide 0d->0a sequence
-						edMatchLen--;
-					}
-					oldLength -= stMatchLen + edMatchLen;
-					start += stMatchLen;
-					if (stMatchLen + edMatchLen < newLength) {
-						text = text.substring(stMatchLen, newLength - edMatchLen);
-					}
-					else {
-						text = null;
-					}
-				}
-			}
-			if (0 < oldLength || text != null) {
-				// String delText = structuredDocument.get(start, oldLength);
-				result = structuredDocument.replaceText(fModel, start, oldLength, text);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @return int
-	 * @param insertPos
-	 *            int
-	 */
-	private int nearestSpaceLengthAfter(CSSNodeImpl node, int insertPos) {
-		CSSSourceGenerator formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter(node);
-		if (formatter != null) {
-			return formatter.getLengthToReformatAfter(node, insertPos);
-		}
-		else
-			return 0;
-	}
-
-	/**
-	 * @return int
-	 * @param insertPos
-	 *            int
-	 */
-	private int nearestSpaceLengthBefore(CSSNodeImpl node, int insertPos) {
-		CSSSourceGenerator formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter(node);
-		if (formatter != null) {
-			return formatter.getLengthToReformatBefore(node, insertPos);
-		}
-		else
-			return 0;
-	}
-
-	/**
-	 * 
-	 */
-	private StructuredDocumentEvent removeText(int start, int length) {
-		StructuredDocumentEvent result = null;
-		IStructuredDocument structuredDocument = fModel.getStructuredDocument();
-		if (structuredDocument != null) {
-			result = structuredDocument.replaceText(fModel, start, length, new String(""));//$NON-NLS-1$
-		}
-		return result;
-	}
-
-	/**
-	 * 
-	 */
-	void setParser(CSSModelParser parser) {
-		fParser = parser;
-	}
-
-	/**
-	 * 
-	 */
-	void valueChanged(CSSNodeImpl node, String oldValue) {
-		if (!(node instanceof CSSRegionContainer)) {
-			CSSUtil.debugOut("Too Bad.." + //$NON-NLS-1$
-						((node == null) ? "null" : node.getClass().toString()));//$NON-NLS-1$
-			return;
-		}
-
-		int start = node.getStartOffset();
-
-		if (node.getNodeType() == ICSSNode.ATTR_NODE) {
-			ICSSAttr attr = (ICSSAttr) node;
-			CSSSourceGenerator formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter((INodeNotifier) attr.getOwnerCSSNode());
-			if (formatter != null)
-				start = formatter.getAttrInsertPos(attr.getOwnerCSSNode(), attr.getName());
-		}
-
-		int oldLength = (oldValue == null) ? 0 : oldValue.length();
-		// flash old IStructuredDocumentRegion/ITextRegion
-		if (node instanceof CSSStructuredDocumentRegionContainer) {
-			((CSSStructuredDocumentRegionContainer) node).setFirstStructuredDocumentRegion(null);
-			((CSSStructuredDocumentRegionContainer) node).setLastStructuredDocumentRegion(null);
-		}
-		else if (node instanceof CSSRegionContainer) {
-			((CSSRegionContainer) node).setRangeRegion(null, null, null);
-		}
-		// generate new source
-		String newValue = node.generateSource();
-
-		ICSSNode parent;
-		if (node.getNodeType() == ICSSNode.ATTR_NODE) {
-			parent = ((ICSSAttr) node).getOwnerCSSNode();
-		}
-		else {
-			parent = node.getParentNode();
-		}
-
-		fParser.setupUpdateContext(CSSModelUpdateContext.UPDATE_CHANGE_RCONTAINER, parent, node);
-
-		StructuredDocumentEvent result = insertText(start, oldLength, newValue);
-
-		int nRemains = fParser.cleanupUpdateContext();
-
-		if (0 < nRemains && !(result instanceof NoChangeEvent)) {
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$		
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUtil.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUtil.java
deleted file mode 100644
index 8d4e5d0..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUtil.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.css.core.internal.CSSCoreMessages;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNodeList;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSRuleContainer;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-/**
- * 
- */
-class CSSModelUtil {
-
-	/**
-	 * 
-	 */
-	static boolean canContainBrace(ICSSNode node) {
-		return (node != null && (node instanceof ICSSRuleContainer || node instanceof CSSRuleDeclContainer)) ? true : false;
-	}
-
-	/**
-	 * @param parent
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 */
-	static void cleanupContainer(ICSSNode parent) {
-		if (parent == null) {
-			return;
-		}
-		for (ICSSNode child = parent.getFirstChild(); child != null; child = child.getNextSibling()) {
-			cleanupContainer(child);
-		}
-		if (parent instanceof CSSStructuredDocumentRegionContainer) {
-			((CSSStructuredDocumentRegionContainer) parent).setRangeStructuredDocumentRegion(null, null);
-		}
-		else if (parent instanceof CSSRegionContainer) {
-			((CSSRegionContainer) parent).setRangeRegion(null, null, null);
-		}
-	}
-
-	static boolean diagnoseNode(ICSSNode parent, IStructuredDocument structuredDocument) {
-		// check this
-		Vector errors = new Vector();
-		if (parent instanceof CSSStructuredDocumentRegionContainer) {
-			CSSStructuredDocumentRegionContainer node = (CSSStructuredDocumentRegionContainer) parent;
-			String nodeText = CSSUtil.getClassString(node) + ": ";//$NON-NLS-1$
-			IStructuredDocumentRegion flatNode = node.getFirstStructuredDocumentRegion();
-			if (flatNode == null && (!(node instanceof CSSStyleDeclarationImpl || node instanceof CSSStyleSheetImpl) || node.getFirstChild() != null)) {
-				errors.add(NLS.bind(CSSCoreMessages._1concat_ERROR_, (new Object[]{nodeText}))); //$NON-NLS-1$ = "{0}first flat node is null."
-			}
-			else if (flatNode != null) {
-				IStructuredDocumentRegion modelNode = structuredDocument.getRegionAtCharacterOffset(flatNode.getStart());
-				if (flatNode != modelNode) {
-					errors.add(NLS.bind(CSSCoreMessages._2concat_ERROR_, (new Object[]{nodeText}))); //$NON-NLS-1$ = "{0}first flat node is not in model."
-				}
-			}
-			flatNode = node.getLastStructuredDocumentRegion();
-			if (flatNode == null && (!(node instanceof CSSStyleDeclarationImpl || node instanceof CSSStyleSheetImpl) || node.getFirstChild() != null)) {
-				errors.add(NLS.bind(CSSCoreMessages._3concat_ERROR_, (new Object[]{nodeText}))); //$NON-NLS-1$ = "{0}last flat node is null."
-			}
-			else if (flatNode != null) {
-				IStructuredDocumentRegion modelNode = structuredDocument.getRegionAtCharacterOffset(flatNode.getStart());
-				if (flatNode != modelNode) {
-					errors.add(NLS.bind(CSSCoreMessages._4concat_ERROR_, (new Object[]{nodeText}))); //$NON-NLS-1$ = "{0}last flat node is not in model."
-				}
-			}
-		}
-		else if (parent instanceof CSSRegionContainer) {
-			CSSRegionContainer node = (CSSRegionContainer) parent;
-			String nodeText = CSSUtil.getClassString(node) + ": ";//$NON-NLS-1$
-			ITextRegion region = node.getFirstRegion();
-			IStructuredDocumentRegion parentRegion = node.getDocumentRegion();
-			if (region == null && (!(node instanceof MediaListImpl) || node.getFirstChild() != null)) {
-				errors.add(NLS.bind(CSSCoreMessages._25concat_ERROR_, (new Object[]{nodeText}))); //$NON-NLS-1$ = "{0}first region is null."
-			}
-			else if (region != null) {
-				int offset = parentRegion.getStartOffset(region);
-				IStructuredDocumentRegion modelNode = structuredDocument.getRegionAtCharacterOffset(offset);
-				ITextRegion modelRegion = modelNode.getRegionAtCharacterOffset(offset);
-				if (region != modelRegion) {
-					errors.add(NLS.bind(CSSCoreMessages._26concat_ERROR_, (new Object[]{nodeText}))); //$NON-NLS-1$ = "{0}first region is not in model."
-				}
-			}
-			region = node.getLastRegion();
-			if (region == null && (!(node instanceof MediaListImpl) || node.getFirstChild() != null)) {
-				errors.add(NLS.bind(CSSCoreMessages._27concat_ERROR_, (new Object[]{nodeText}))); //$NON-NLS-1$ = "{0}last region is null."
-			}
-			else if (region != null) {
-				int offset = parentRegion.getStartOffset(region);
-				IStructuredDocumentRegion modelNode = structuredDocument.getRegionAtCharacterOffset(offset);
-				ITextRegion modelRegion = modelNode.getRegionAtCharacterOffset(offset);
-				if (region != modelRegion) {
-					errors.add(NLS.bind(CSSCoreMessages._28concat_ERROR_, (new Object[]{nodeText}))); //$NON-NLS-1$ = "{0}last region is not in model."
-				}
-			}
-		}
-
-		ICSSNodeList attrs = parent.getAttributes();
-		int nAttrs = attrs.getLength();
-		for (int i = 0; i < nAttrs; i++) {
-			ICSSAttr attr = (ICSSAttr) attrs.item(i);
-			CSSRegionContainer node = (CSSRegionContainer) attr;
-			String nodeText = CSSUtil.getClassString(node) + "(" + attr.getName() + "): ";//$NON-NLS-2$//$NON-NLS-1$
-			ITextRegion region = node.getFirstRegion();
-			IStructuredDocumentRegion parentRegion = node.getDocumentRegion();
-			if (region == null && 0 < attr.getValue().length()) {
-				errors.add(NLS.bind(CSSCoreMessages._5concat_ERROR_, (new Object[]{nodeText}))); //$NON-NLS-1$ = "{0}first region is null."
-			}
-			else if (region != null) {
-				int offset = parentRegion.getStartOffset(region);
-				IStructuredDocumentRegion modelNode = structuredDocument.getRegionAtCharacterOffset(offset);
-				ITextRegion modelRegion = modelNode.getRegionAtCharacterOffset(offset);
-				if (region != modelRegion) {
-					errors.add(NLS.bind(CSSCoreMessages._6concat_ERROR_, (new Object[]{nodeText}))); //$NON-NLS-1$ = "{0}first region is not in model."
-				}
-			}
-			region = node.getLastRegion();
-			if (region == null && 0 < attr.getValue().length()) {
-				errors.add(NLS.bind(CSSCoreMessages._7concat_ERROR_, (new Object[]{nodeText}))); //$NON-NLS-1$ = "{0}last region is null."
-			}
-			else if (region != null) {
-				int offset = parentRegion.getStartOffset(region);
-				IStructuredDocumentRegion modelNode = structuredDocument.getRegionAtCharacterOffset(offset);
-				ITextRegion modelRegion = modelNode.getRegionAtCharacterOffset(offset);
-				if (region != modelRegion) {
-					errors.add(NLS.bind(CSSCoreMessages._8concat_ERROR_, (new Object[]{nodeText}))); //$NON-NLS-1$ = "{0}last region is not in model."
-				}
-			}
-		}
-
-		if (!errors.isEmpty()) {
-			Iterator i = errors.iterator();
-			while (i.hasNext()) {
-				CSSUtil.debugOut((String) i.next());
-			}
-			return false;
-		}
-		else {
-			return true;
-		}
-	}
-
-	/**
-	 * @return boolean
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 */
-	static boolean diagnoseTree(ICSSNode parent, IStructuredDocument structuredDocument) {
-		if (parent == null) {
-			return false;
-		}
-		// check children
-		for (ICSSNode child = parent.getFirstChild(); child != null; child = child.getNextSibling()) {
-			diagnoseTree(child, structuredDocument);
-		}
-
-		diagnoseNode(parent, structuredDocument);
-
-		return true;
-	}
-
-	/**
-	 * If needed, modify last flat node
-	 */
-	static void expandStructuredDocumentRegionContainer(CSSStructuredDocumentRegionContainer target, IStructuredDocumentRegion flatNode) {
-		if (target == null || flatNode == null) {
-			return;
-		}
-
-		IStructuredDocumentRegion lastNode = target.getLastStructuredDocumentRegion();
-		if (lastNode == flatNode) {
-			return;
-		}
-		if (lastNode == null || lastNode.getStart() < flatNode.getStart()) {
-			target.setLastStructuredDocumentRegion(flatNode);
-		}
-	}
-
-	/*
-	 * 
-	 */
-	static ICSSNode findBraceContainer(ICSSNode node) {
-		for (ICSSNode i = node; i != null; i = i.getParentNode()) {
-			if (CSSModelUtil.canContainBrace(i)) {
-				return i;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * 
-	 */
-	static int getDepth(ICSSNode node) {
-		int depth = -1;
-		while (node != null) {
-			depth++;
-			node = node.getParentNode();
-		}
-		return depth;
-	}
-
-	/**
-	 * 
-	 */
-	static boolean isBraceClosed(ICSSNode node) {
-		boolean bClosed = true;
-		if (!(node instanceof CSSStructuredDocumentRegionContainer)) {
-			return bClosed;
-		}
-
-		IStructuredDocumentRegion first = ((CSSStructuredDocumentRegionContainer) node).getFirstStructuredDocumentRegion();
-		IStructuredDocumentRegion last = ((CSSStructuredDocumentRegionContainer) node).getLastStructuredDocumentRegion();
-		if (first == null || last == null) {
-			return bClosed;
-		}
-		if (last.getStart() < first.getStart()) {
-			return bClosed;
-		}
-
-		IStructuredDocumentRegion flatNode = first;
-		int nOpen = 0;
-		int nClose = 0;
-		do {
-			String type = CSSUtil.getStructuredDocumentRegionType(flatNode);
-			if (type == CSSRegionContexts.CSS_LBRACE) {
-				nOpen++;
-			}
-			else if (type == CSSRegionContexts.CSS_RBRACE) {
-				nClose++;
-			}
-			flatNode = flatNode.getNext();
-		}
-		while (flatNode != null && flatNode != last);
-
-		if ((nOpen == 0 && nClose == 0) || nClose < nOpen) {
-			bClosed = false;
-		}
-
-		return bClosed;
-	}
-
-	/**
-	 * only for insertion..
-	 */
-	static boolean isInterruption(CSSStructuredDocumentRegionContainer target, IStructuredDocumentRegion flatNode) {
-		if (target == null || flatNode == null) {
-			return false;
-		}
-		int start = flatNode.getStart();
-		IStructuredDocumentRegion firstNode = target.getFirstStructuredDocumentRegion();
-		IStructuredDocumentRegion lastNode = target.getLastStructuredDocumentRegion();
-		if (firstNode != null && firstNode.getStart() < start && lastNode != null && start < lastNode.getStart()) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	static boolean isParentOf(ICSSNode parent, ICSSNode child) {
-		if (parent == null || child == null) {
-			return false;
-		}
-
-		for (ICSSNode node = child; node != null; node = node.getParentNode()) {
-			if (parent == node) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNamedNodeMapImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNamedNodeMapImpl.java
deleted file mode 100644
index 8ad512a..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNamedNodeMapImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNamedNodeMap;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-
-
-/**
- * 
- */
-public class CSSNamedNodeMapImpl extends CSSNodeListImpl implements ICSSNamedNodeMap {
-
-	/**
-	 * CSSNamedNodeMapImpl constructor comment.
-	 */
-	CSSNamedNodeMapImpl() {
-		super();
-	}
-
-	/**
-	 * @return org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param name
-	 *            java.lang.String
-	 */
-	public ICSSNode getNamedItem(String name) {
-		Iterator it = nodes.iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-			if (obj instanceof CSSAttrImpl && ((CSSAttrImpl) obj).getName().compareToIgnoreCase(name) == 0) {
-				return (ICSSNode) obj;
-			}
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNodeImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNodeImpl.java
deleted file mode 100644
index 8f6f9f7..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNodeImpl.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.formatter.CSSSourceFormatterFactory;
-import org.eclipse.wst.css.core.internal.formatter.CSSSourceGenerator;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNamedNodeMap;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNodeList;
-import org.eclipse.wst.css.core.internal.util.ImportRuleCollector;
-import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
-import org.eclipse.wst.sse.core.internal.provisional.AbstractNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.w3c.dom.DOMException;
-
-
-/**
- * 
- */
-abstract class CSSNodeImpl extends AbstractNotifier implements ICSSNode, IndexedRegion {
-
-	private CSSDocumentImpl fOwnerDocument = null;
-	private CSSNodeImpl fParentNode = null;
-	private CSSNodeImpl fNextSibling = null;
-	private CSSNodeImpl fPreviousSibling = null;
-	private CSSNodeImpl fFirstChild = null;
-	private CSSNodeImpl fLastChild = null;
-	protected CSSNamedNodeMapImpl fAttrs = null;
-
-	/**
-	 * CSSNodeImpl constructor comment.
-	 */
-	CSSNodeImpl() {
-		super();
-	}
-
-	CSSNodeImpl(CSSNodeImpl that) {
-		if (that != null) {
-			this.fOwnerDocument = that.fOwnerDocument;
-			if (that.fAttrs != null) {
-				int nAttrs = that.fAttrs.getLength();
-				for (int i = 0; i < nAttrs; i++) {
-					CSSAttrImpl attr = (CSSAttrImpl) that.fAttrs.item(i);
-					setAttribute(attr.getName(), attr.getValue());
-				}
-			}
-		}
-	}
-
-	protected CSSNodeImpl appendChild(CSSNodeImpl newChild) throws org.w3c.dom.DOMException {
-		return insertBefore(newChild, null);
-	}
-
-	void cloneChildNodes(ICSSNode newParent, boolean deep) {
-		if (newParent == null || newParent == this)
-			return;
-
-		CSSNodeImpl container = (CSSNodeImpl) newParent;
-		container.removeChildNodes();
-
-		for (ICSSNode child = getFirstChild(); child != null; child = child.getNextSibling()) {
-			CSSNodeImpl cloned = (CSSNodeImpl) child.cloneNode(deep);
-			if (cloned != null)
-				container.appendChild(cloned);
-		}
-	}
-
-	/**
-	 * @return boolean
-	 * @param offset
-	 *            int
-	 */
-	public boolean contains(int offset) {
-		return (getStartOffset() <= offset && offset < getEndOffset());
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	String generateSource() {
-		CSSSourceGenerator formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter(this);
-		return formatter.format(this).toString();
-	}
-
-	/**
-	 * @return java.lang.String
-	 * @param name
-	 *            java.lang.String
-	 */
-	String getAttribute(String name) {
-		CSSAttrImpl attr = getAttributeNode(name);
-		if (attr != null)
-			return attr.getValue();
-		return null;
-	}
-
-	protected CSSAttrImpl getAttributeNode(String name) {
-		if (fAttrs == null)
-			return null;
-
-		int nAttrs = fAttrs.getLength();
-		for (int i = 0; i < nAttrs; i++) {
-			CSSAttrImpl attr = (CSSAttrImpl) fAttrs.item(i);
-			if (attr.matchName(name))
-				return attr;
-		}
-		return null;
-	}
-
-	/**
-	 * @return org.eclipse.wst.css.core.model.interfaces.ICSSNamedNodeMap
-	 */
-	public ICSSNamedNodeMap getAttributes() {
-		if (fAttrs == null)
-			fAttrs = new CSSNamedNodeMapImpl();
-		return fAttrs;
-	}
-
-	public ICSSNodeList getChildNodes() {
-		CSSNodeListImpl list = new CSSNodeListImpl();
-		for (ICSSNode node = getFirstChild(); node != null; node = node.getNextSibling()) {
-			list.appendNode(node);
-		}
-		return list;
-	}
-
-	ICSSNode getCommonAncestor(ICSSNode node) {
-		if (node == null)
-			return null;
-
-		for (ICSSNode na = node; na != null; na = na.getParentNode()) {
-			for (ICSSNode ta = this; ta != null; ta = ta.getParentNode()) {
-				if (ta == na)
-					return ta;
-			}
-		}
-
-		return null; // not found
-	}
-
-	CSSDocumentImpl getContainerDocument() {
-		for (ICSSNode node = this; node != null; node = node.getParentNode()) {
-			if (node instanceof CSSDocumentImpl) {
-				CSSDocumentImpl doc = (CSSDocumentImpl) node;
-				if (doc.isDocument())
-					return doc;
-			}
-		}
-		return null;
-	}
-
-	CSSNodeImpl getContainerNode(int offset) {
-		if (!contains(offset))
-			return null;
-
-		for (ICSSNode child = getFirstChild(); child != null; child = child.getNextSibling()) {
-			ICSSNode found = ((CSSNodeImpl) child).getContainerNode(offset);
-			if (found != null)
-				return (CSSNodeImpl) found;
-		}
-
-		return this;
-	}
-
-	/**
-	 */
-	public FactoryRegistry getFactoryRegistry() {
-		ICSSModel model = getOwnerDocument().getModel();
-		if (model != null) {
-			FactoryRegistry reg = model.getFactoryRegistry();
-			if (reg != null)
-				return reg;
-		}
-		return null;
-	}
-
-	public ICSSNode getFirstChild() {
-		return this.fFirstChild;
-	}
-
-	public ICSSNode getLastChild() {
-		return this.fLastChild;
-	}
-
-	public ICSSNode getNextSibling() {
-		return this.fNextSibling;
-	}
-
-	ICSSNode getNodeAt(int offset) {
-		// the same as getContainerNode()
-		return getContainerNode(offset);
-	}
-
-	public ICSSDocument getOwnerDocument() {
-		return this.fOwnerDocument;
-	}
-
-	public ICSSNode getParentNode() {
-		return this.fParentNode;
-	}
-
-	public ICSSNode getPreviousSibling() {
-		return this.fPreviousSibling;
-	}
-
-	ICSSNode getRootNode() {
-		CSSNodeImpl parent = (CSSNodeImpl) getParentNode();
-		if (parent == null)
-			return this;
-		return parent.getRootNode();
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public boolean hasChildNodes() {
-		return (this.fFirstChild != null);
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public boolean hasProperties() {
-		return false;
-	}
-
-	protected CSSNodeImpl insertBefore(CSSNodeImpl newChild, CSSNodeImpl refChild) throws org.w3c.dom.DOMException {
-		if (newChild == null)
-			return null;
-
-		CSSNodeImpl child = newChild;
-		CSSNodeImpl next = refChild;
-		CSSNodeImpl prev = null;
-		if (next == null) {
-			prev = this.fLastChild;
-			this.fLastChild = child;
-		}
-		else {
-			prev = (CSSNodeImpl) next.getPreviousSibling();
-			next.setPreviousSibling(child);
-		}
-
-		if (prev == null)
-			this.fFirstChild = child;
-		else
-			prev.setNextSibling(child);
-		child.setPreviousSibling(prev);
-		child.setNextSibling(next);
-		child.setParentNode(this);
-
-		notifyChildReplaced(child, null);
-
-		return newChild;
-	}
-
-	protected void notifyAttrReplaced(CSSNodeImpl newAttr, CSSNodeImpl oldAttr) {
-		// for model
-		ICSSDocument doc = getContainerDocument();
-		if (doc == null)
-			return;
-		CSSModelImpl model = (CSSModelImpl) doc.getModel();
-		if (model == null)
-			return;
-		model.attrReplaced(this, newAttr, oldAttr);
-
-		// for adapters
-		int type = CHANGE;
-		if (newAttr == null)
-			type = REMOVE;
-		else if (oldAttr == null)
-			type = ADD;
-		notify(type, oldAttr, oldAttr, newAttr, getStartOffset());
-	}
-
-	protected void notifyChildReplaced(CSSNodeImpl newChild, CSSNodeImpl oldChild) {
-		// for model
-		ICSSDocument doc = getContainerDocument();
-		if (doc == null)
-			return;
-		CSSModelImpl model = (CSSModelImpl) doc.getModel();
-		if (model == null)
-			return;
-		model.childReplaced(this, newChild, oldChild);
-
-		// for adapters
-		int type = CHANGE;
-		if (newChild == null)
-			type = REMOVE;
-		else if (oldChild == null)
-			type = ADD;
-		notify(type, oldChild, oldChild, newChild, getStartOffset());
-	}
-
-	void removeAttributeNode(CSSNodeImpl attr) {
-		// find
-		int nAttrs = fAttrs.getLength();
-		for (int i = 0; i < nAttrs; i++) {
-			if (fAttrs.item(i) == attr) {
-				fAttrs.removeNode(i);
-				notifyAttrReplaced(null, attr);
-				return;
-			}
-		}
-	}
-
-	protected CSSNodeImpl removeChild(CSSNodeImpl oldChild) throws org.w3c.dom.DOMException {
-		if (oldChild == null)
-			return null;
-		if (oldChild.getParentNode() != this)
-			return null;
-
-		// close import rules
-		ImportRuleCollector trav = new ImportRuleCollector();
-		trav.apply(oldChild);
-		Iterator it = trav.getRules().iterator();
-		while (it.hasNext()) {
-			((CSSImportRuleImpl) it.next()).closeStyleSheet();
-		}
-
-		CSSNodeImpl child = oldChild;
-		CSSNodeImpl prev = (CSSNodeImpl) child.getPreviousSibling();
-		CSSNodeImpl next = (CSSNodeImpl) child.getNextSibling();
-
-		if (prev == null)
-			this.fFirstChild = next;
-		else
-			prev.setNextSibling(next);
-
-		if (next == null)
-			this.fLastChild = prev;
-		else
-			next.setPreviousSibling(prev);
-
-		child.setPreviousSibling(null);
-		child.setNextSibling(null);
-		child.setParentNode(null);
-
-		notifyChildReplaced(null, child);
-
-		return child;
-	}
-
-	/**
-	 * 
-	 */
-	void removeChildNodes() {
-		ICSSNode nextChild = null;
-		for (ICSSNode child = getFirstChild(); child != null; child = nextChild) {
-			nextChild = child.getNextSibling();
-			removeChild((CSSNodeImpl) child);
-		}
-	}
-
-	protected CSSNodeImpl replaceChild(CSSNodeImpl newChild, CSSNodeImpl oldChild) throws org.w3c.dom.DOMException {
-		if (oldChild == null)
-			return newChild;
-		if (newChild != null)
-			insertBefore(newChild, oldChild);
-		return removeChild(oldChild);
-	}
-
-	/**
-	 * @param name
-	 *            java.lang.String
-	 * @param value
-	 *            java.lang.String
-	 */
-	void setAttribute(String name, String value) {
-		if (name == null)
-			return;
-
-		CSSAttrImpl attr = getAttributeNode(name);
-		if (attr != null) {
-			String oldValue = attr.getValue();
-			if (value != null && value.equals(oldValue))
-				return;
-			if (value == null) {
-				if (oldValue != null) {
-					removeAttributeNode(attr);
-				}
-				return;
-			}
-		}
-		else {
-			if (value == null)
-				return;
-			if (fAttrs == null)
-				fAttrs = new CSSNamedNodeMapImpl();
-			CSSDocumentImpl doc = (CSSDocumentImpl) getOwnerDocument();
-			if (doc == null)
-				return;
-			attr = (CSSAttrImpl) doc.createCSSAttr(name);
-			attr.setOwnerCSSNode(this);
-			fAttrs.appendNode(attr);
-			notifyAttrReplaced(attr, null);
-		}
-		attr.setValue(value);
-	}
-
-	/**
-	 * @param cssText
-	 *            java.lang.String
-	 */
-	public void setCssText(String cssText) {
-		// TODO : call flat model parser and replace myself with new three!!
-		throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$
-	}
-
-	private void setNextSibling(ICSSNode nextSibling) {
-		this.fNextSibling = (CSSNodeImpl) nextSibling;
-	}
-
-	void setOwnerDocument(ICSSDocument ownerDocument) {
-		this.fOwnerDocument = (CSSDocumentImpl) ownerDocument;
-	}
-
-	private void setParentNode(ICSSNode parentNode) {
-		this.fParentNode = (CSSNodeImpl) parentNode;
-	}
-
-	private void setPreviousSibling(ICSSNode previousSibling) {
-		this.fPreviousSibling = (CSSNodeImpl) previousSibling;
-	}
-
-	public int getLength() {
-		int result = -1;
-		int start = getStartOffset();
-		if (start >= 0) {
-			int end = getEndOffset();
-			if (end >= 0) {
-				result = end - start;
-				if (result < -1) {
-					result = -1;
-				}
-			}
-		}
-		return result;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNodeListImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNodeListImpl.java
deleted file mode 100644
index dd1c410..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNodeListImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNodeList;
-
-class CSSNodeListImpl extends AbstractCSSNodeList implements ICSSNodeList {
-
-	CSSNodeListImpl() {
-		super();
-	}
-
-	public ICSSNode item(int index) {
-		return itemImpl(index);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPageRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPageRuleImpl.java
deleted file mode 100644
index c23190c..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPageRuleImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList;
-
-
-/**
- * 
- */
-class CSSPageRuleImpl extends CSSRuleDeclContainer implements ICSSPageRule {
-
-	ICSSSelectorList fSelectorList = new CSSSelectorListImpl(null);
-
-	/**
-	 * 
-	 */
-	CSSPageRuleImpl() {
-		super();
-	}
-
-	CSSPageRuleImpl(CSSPageRuleImpl that) {
-		super(that);
-	}
-
-	public ICSSNode cloneNode(boolean deep) {
-		CSSPageRuleImpl cloned = new CSSPageRuleImpl(this);
-
-		if (deep)
-			cloneChildNodes(cloned, deep);
-
-		return cloned;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	String extractPreString() {
-		StringBuffer preStr = new StringBuffer("@page ");//$NON-NLS-1$
-		preStr.append(getSelectorText());
-
-		return preStr.toString();
-	}
-
-	/**
-	 * @return short
-	 */
-	public short getNodeType() {
-		return PAGERULE_NODE;
-	}
-
-	public ICSSSelectorList getSelectors() {
-		return fSelectorList;
-	}
-
-	/**
-	 * The parsable textual representation of the page selector for the rule.
-	 * 
-	 * @exception org.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the specified CSS string value has
-	 *                a syntax error and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this rule is
-	 *                readonly.
-	 */
-	public String getSelectorText() {
-		return getAttribute(SELECTOR);
-	}
-
-	/**
-	 * The type of the rule, as defined above. The expectation is that
-	 * binding-specific casting methods can be used to cast down from an
-	 * instance of the <code>CSSRule</code> interface to the specific
-	 * derived interface implied by the <code>type</code>.
-	 */
-	public short getType() {
-		return PAGE_RULE;
-	}
-
-	/**
-	 * 
-	 */
-	public void setSelectorText(String selectorText) throws org.w3c.dom.DOMException {
-		setAttribute(SELECTOR, selectorText);
-		fSelectorList = new CSSSelectorListImpl(selectorText);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPrimitiveContainer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPrimitiveContainer.java
deleted file mode 100644
index af89f7f..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPrimitiveContainer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-
-/**
- * 
- */
-abstract class CSSPrimitiveContainer extends CSSPrimitiveValueImpl {
-
-	CSSPrimitiveContainer(CSSPrimitiveContainer that) {
-		super(that);
-	}
-
-	CSSPrimitiveContainer(short primitiveType) {
-		super(primitiveType);
-	}
-
-	protected abstract void initPrimitives();
-
-	void setOwnerDocument(ICSSDocument ownerDocument) {
-		super.setOwnerDocument(ownerDocument);
-
-		initPrimitives();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPrimitiveValueImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPrimitiveValueImpl.java
deleted file mode 100644
index 1c2ca80..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPrimitiveValueImpl.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.css.Counter;
-import org.w3c.dom.css.RGBColor;
-import org.w3c.dom.css.Rect;
-
-
-/**
- * 
- */
-class CSSPrimitiveValueImpl extends CSSRegionContainer implements ICSSPrimitiveValue {
-
-	protected short fPrimitiveType = CSS_UNKNOWN;
-	private float fFloatValue = 0.0f;
-	private String fStringValue = null;
-
-	CSSPrimitiveValueImpl(CSSPrimitiveValueImpl that) {
-		super(that);
-
-		this.fPrimitiveType = that.fPrimitiveType;
-		this.fFloatValue = that.fFloatValue;
-		this.fStringValue = that.fStringValue;
-	}
-
-	CSSPrimitiveValueImpl(short primitiveType) {
-		super();
-		fPrimitiveType = primitiveType;
-	}
-
-	public ICSSNode cloneNode(boolean deep) {
-		CSSPrimitiveValueImpl cloned = new CSSPrimitiveValueImpl(this);
-
-		return cloned;
-	}
-
-	/**
-	 * This method is used to get the Counter value. If this CSS value doesn't
-	 * contain a counter value, a <code>DOMException</code> is raised.
-	 * Modification to the corresponding style property can be achieved using
-	 * the <code>Counter</code> interface.
-	 * 
-	 * @return The Counter value.
-	 * @exception DOMException
-	 *                INVALID_ACCESS_ERR: Raised if the CSS value doesn't
-	 *                contain a Counter value (e.g. this is not
-	 *                <code>CSS_COUNTER</code>).
-	 */
-	public Counter getCounterValue() throws DOMException {
-		throw new DOMException(DOMException.INVALID_ACCESS_ERR, "");//$NON-NLS-1$
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public java.lang.String getCSSValueText() {
-		return getCssText();
-	}
-
-	/**
-	 * A code defining the type of the value as defined above.
-	 */
-	public short getCssValueType() {
-		if (getPrimitiveType() == CSS_INHERIT_PRIMITIVE) {
-			return CSS_INHERIT;
-		}
-		else {
-			return CSS_PRIMITIVE_VALUE;
-		}
-	}
-
-	/**
-	 * This method is used to get a float value in a specified unit. If this
-	 * CSS value doesn't contain a float value or can't be converted into the
-	 * specified unit, a <code>DOMException</code> is raised.
-	 * 
-	 * @param unitType
-	 *            A unit code to get the float value. The unit code can only
-	 *            be a float unit type (i.e. <code>CSS_NUMBER</code>,
-	 *            <code>CSS_PERCENTAGE</code>,<code>CSS_EMS</code>,
-	 *            <code>CSS_EXS</code>,<code>CSS_PX</code>,
-	 *            <code>CSS_CM</code>,<code>CSS_MM</code>,
-	 *            <code>CSS_IN</code>,<code>CSS_PT</code>,
-	 *            <code>CSS_PC</code>,<code>CSS_DEG</code>,
-	 *            <code>CSS_RAD</code>,<code>CSS_GRAD</code>,
-	 *            <code>CSS_MS</code>,<code>CSS_S</code>,
-	 *            <code>CSS_HZ</code>,<code>CSS_KHZ</code>,
-	 *            <code>CSS_DIMENSION</code>).
-	 * @return The float value in the specified unit.
-	 * @exception DOMException
-	 *                INVALID_ACCESS_ERR: Raised if the CSS value doesn't
-	 *                contain a float value or if the float value can't be
-	 *                converted into the specified unit.
-	 */
-	public float getFloatValue(short unitType) throws DOMException {
-		switch (fPrimitiveType) {
-			case CSS_NUMBER :
-			case CSS_PERCENTAGE :
-			case CSS_EMS :
-			case CSS_EXS :
-			case CSS_PX :
-			case CSS_CM :
-			case CSS_MM :
-			case CSS_IN :
-			case CSS_PT :
-			case CSS_PC :
-			case CSS_DEG :
-			case CSS_RAD :
-			case CSS_GRAD :
-			case CSS_MS :
-			case CSS_S :
-			case CSS_HZ :
-			case CSS_KHZ :
-			case CSS_DIMENSION :
-			case CSS_INTEGER :
-			case CSS_HASH :
-				return fFloatValue;
-			default :
-				throw new DOMException(DOMException.INVALID_ACCESS_ERR, "");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (2001/01/17
-	 * 12:12:18)
-	 * 
-	 * @return short
-	 */
-	public short getNodeType() {
-		return PRIMITIVEVALUE_NODE;
-	}
-
-	/**
-	 * The type of the value as defined by the constants specified above.
-	 */
-	public short getPrimitiveType() {
-		return fPrimitiveType;
-	}
-
-	/**
-	 * This method is used to get the Rect value. If this CSS value doesn't
-	 * contain a rect value, a <code>DOMException</code> is raised.
-	 * Modification to the corresponding style property can be achieved using
-	 * the <code>Rect</code> interface.
-	 * 
-	 * @return The Rect value.
-	 * @exception DOMException
-	 *                INVALID_ACCESS_ERR: Raised if the CSS value doesn't
-	 *                contain a Rect value. (e.g. this is not
-	 *                <code>CSS_RECT</code>).
-	 */
-	public Rect getRectValue() throws DOMException {
-		throw new DOMException(DOMException.INVALID_ACCESS_ERR, "");//$NON-NLS-1$
-	}
-
-	/**
-	 * This method is used to get the RGB color. If this CSS value doesn't
-	 * contain a RGB color value, a <code>DOMException</code> is raised.
-	 * Modification to the corresponding style property can be achieved using
-	 * the <code>RGBColor</code> interface.
-	 * 
-	 * @return the RGB color value.
-	 * @exception DOMException
-	 *                INVALID_ACCESS_ERR: Raised if the attached property
-	 *                can't return a RGB color value (e.g. this is not
-	 *                <code>CSS_RGBCOLOR</code>).
-	 */
-	public RGBColor getRGBColorValue() throws DOMException {
-		throw new DOMException(DOMException.INVALID_ACCESS_ERR, "");//$NON-NLS-1$
-	}
-
-	/**
-	 * This method is used to get the string value. If the CSS value doesn't
-	 * contain a string value, a <code>DOMException</code> is raised. Some
-	 * properties (like 'font-family' or 'voice-family') convert a whitespace
-	 * separated list of idents to a string.
-	 * 
-	 * @return The string value in the current unit. The current
-	 *         <code>primitiveType</code> can only be a string unit type
-	 *         (i.e. <code>CSS_STRING</code>,<code>CSS_URI</code>,
-	 *         <code>CSS_IDENT</code> and <code>CSS_ATTR</code>).
-	 * @exception DOMException
-	 *                INVALID_ACCESS_ERR: Raised if the CSS value doesn't
-	 *                contain a string value.
-	 */
-	public String getStringValue() throws DOMException {
-		switch (fPrimitiveType) {
-			case CSS_STRING :
-			case CSS_URI :
-			case CSS_IDENT :
-			case CSS_ATTR :
-			case CSS_URANGE :
-			case CSS_FORMAT :
-			case CSS_LOCAL :
-			case CSS_HASH :
-			case CSS_COMMA :
-			case CSS_SLASH :
-			case CSS_INHERIT_PRIMITIVE :
-				return fStringValue;
-			default :
-				throw new DOMException(DOMException.INVALID_ACCESS_ERR, "");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void notifyValueChanged(String oldValue) {
-		// for model
-		ICSSDocument doc = getContainerDocument();
-		if (doc == null)
-			return;
-		CSSModelImpl model = (CSSModelImpl) doc.getModel();
-		if (model == null)
-			return;
-		model.valueChanged(this, oldValue);
-
-		// for adapters
-		notify(CHANGE, new Short(fPrimitiveType), null, null, getStartOffset());
-	}
-
-	/**
-	 * A method to set the float value with a specified unit. If the property
-	 * attached with this value can not accept the specified unit or the float
-	 * value, the value will be unchanged and a <code>DOMException</code>
-	 * will be raised.
-	 * 
-	 * @param unitType
-	 *            A unit code as defined above. The unit code can only be a
-	 *            float unit type (i.e. <code>CSS_NUMBER</code>,
-	 *            <code>CSS_PERCENTAGE</code>,<code>CSS_EMS</code>,
-	 *            <code>CSS_EXS</code>,<code>CSS_PX</code>,
-	 *            <code>CSS_CM</code>,<code>CSS_MM</code>,
-	 *            <code>CSS_IN</code>,<code>CSS_PT</code>,
-	 *            <code>CSS_PC</code>,<code>CSS_DEG</code>,
-	 *            <code>CSS_RAD</code>,<code>CSS_GRAD</code>,
-	 *            <code>CSS_MS</code>,<code>CSS_S</code>,
-	 *            <code>CSS_HZ</code>,<code>CSS_KHZ</code>,
-	 *            <code>CSS_DIMENSION</code>).
-	 * @param floatValue
-	 *            The new float value.
-	 * @exception DOMException
-	 *                INVALID_ACCESS_ERR: Raised if the attached property
-	 *                doesn't support the float value or the unit type. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public void setFloatValue(short unitType, float floatValue) throws DOMException {
-		switch (unitType) {
-			case CSS_NUMBER :
-			case CSS_PERCENTAGE :
-			case CSS_EMS :
-			case CSS_EXS :
-			case CSS_PX :
-			case CSS_CM :
-			case CSS_MM :
-			case CSS_IN :
-			case CSS_PT :
-			case CSS_PC :
-			case CSS_DEG :
-			case CSS_RAD :
-			case CSS_GRAD :
-			case CSS_MS :
-			case CSS_S :
-			case CSS_HZ :
-			case CSS_KHZ :
-			case CSS_DIMENSION :
-			case CSS_INTEGER :
-				String oldValue = getCSSValueText();
-				fPrimitiveType = unitType;
-				fFloatValue = floatValue;
-				notifyValueChanged(oldValue);
-				break;
-			default :
-				throw new DOMException(DOMException.INVALID_ACCESS_ERR, "");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * A method to set the string value with the specified unit. If the
-	 * property attached to this value can't accept the specified unit or the
-	 * string value, the value will be unchanged and a
-	 * <code>DOMException</code> will be raised.
-	 * 
-	 * @param stringType
-	 *            A string code as defined above. The string code can only be
-	 *            a string unit type (i.e. <code>CSS_STRING</code>,
-	 *            <code>CSS_URI</code>,<code>CSS_IDENT</code>, and
-	 *            <code>CSS_ATTR</code>).
-	 * @param stringValue
-	 *            The new string value.
-	 * @exception DOMException
-	 *                INVALID_ACCESS_ERR: Raised if the CSS value doesn't
-	 *                contain a string value or if the string value can't be
-	 *                converted into the specified unit. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public void setStringValue(short stringType, String stringValue) throws DOMException {
-		switch (stringType) {
-			case CSS_STRING :
-			case CSS_URI :
-			case CSS_IDENT :
-			case CSS_ATTR :
-			case CSS_URANGE :
-			case CSS_FORMAT :
-			case CSS_LOCAL :
-			case CSS_HASH :
-			case CSS_COMMA :
-			case CSS_SLASH :
-			case CSS_INHERIT_PRIMITIVE :
-				String oldValue = getCSSValueText();
-				fPrimitiveType = stringType;
-				fStringValue = stringValue;
-				notifyValueChanged(oldValue);
-				break;
-			default :
-				throw new DOMException(DOMException.INVALID_ACCESS_ERR, "");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (2001/01/24
-	 * 15:06:25)
-	 * 
-	 * @param floatValue
-	 *            float
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	public void setValue(float floatValue) throws org.w3c.dom.DOMException {
-		setFloatValue(getPrimitiveType(), floatValue);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (2001/01/24
-	 * 15:06:25)
-	 * 
-	 * @param stringValue
-	 *            java.lang.String
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	public void setValue(java.lang.String stringValue) throws org.w3c.dom.DOMException {
-		setStringValue(getPrimitiveType(), stringValue);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRegionContainer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRegionContainer.java
deleted file mode 100644
index 34256e7..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRegionContainer.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-/**
- * 
- */
-abstract class CSSRegionContainer extends CSSNodeImpl {
-
-	private ITextRegion fFirstRegion = null;
-	private ITextRegion fLastRegion = null;
-	private IStructuredDocumentRegion fParentRegion = null;
-
-	/**
-	 * CSSRegionContainer constructor comment.
-	 */
-	CSSRegionContainer() {
-		super();
-	}
-
-	CSSRegionContainer(CSSRegionContainer that) {
-		super(that);
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getCssText() {
-		if (fFirstRegion == null || fLastRegion == null)
-			return generateSource();
-
-		ITextRegionList regions = fParentRegion.getRegions();
-		StringBuffer source = new StringBuffer();
-		boolean bIn = false;
-		for (int i = 0; i < regions.size(); i++) {
-			ITextRegion current = regions.get(i);
-			if (bIn) {
-				source.append(fParentRegion.getText(current));
-				if (current == fLastRegion)
-					break;
-			}
-			else {
-				if (current == fFirstRegion) {
-					bIn = true;
-					source.append(fParentRegion.getText(current));
-					if (current == fLastRegion)
-						break;
-				}
-			}
-		}
-
-		return source.toString();
-	}
-
-	/**
-	 * @return int
-	 */
-	public int getEndOffset() {
-		int result = -1;
-		ITextRegion region = getLastRegion();
-		if (!(region == null || fParentRegion == null)) {
-			result = fParentRegion.getEndOffset(region);
-		}
-		return result;
-	}
-
-	IStructuredDocumentRegion getDocumentRegion() {
-		return fParentRegion;
-	}
-
-	ITextRegion getFirstRegion() {
-		return fFirstRegion;
-	}
-
-	ITextRegion getLastRegion() {
-		return fLastRegion;
-	}
-
-	ITextRegion getRegion(int index) {
-		if (getFirstRegion() == null)
-			return null;
-		ITextRegionList regions = fParentRegion.getRegions();
-
-		for (int i = 0; i < regions.size(); i++) {
-			if (regions.get(i) == getFirstRegion()) {
-				if (i + index < regions.size()) {
-					ITextRegion target = regions.get(i + index);
-					if (target.getStart() <= getLastRegion().getStart())
-						return target;
-				}
-				return null;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @return int
-	 */
-	int getRegionCount() {
-		validateRange();
-
-		if (getFirstRegion() == null)
-			return 0;
-		if (getFirstRegion() == getLastRegion())
-			return 1;
-		ITextRegionList regions = fParentRegion.getRegions();
-
-		int j = 0;
-		for (int i = 0; i < regions.size(); i++) {
-			ITextRegion current = regions.get(i);
-			if (j != 0 || current == getFirstRegion())
-				j++;
-			if (current == getLastRegion())
-				break;
-		}
-		return j;
-	}
-
-	/**
-	 * @return int
-	 */
-	public int getStartOffset() {
-		int result = -1;
-		ITextRegion region = getFirstRegion();
-		if (!(region == null || fParentRegion == null)) {
-			result = fParentRegion.getStartOffset(region);
-		}
-		return result;
-	}
-
-
-
-	/**
-	 * @deprecated
-	 */
-	ITextRegion setFirstRegion(ITextRegion region) {
-		this.fFirstRegion = region;
-		return region;
-	}
-
-	/**
-	 * @deprecated
-	 */
-	ITextRegion setLastRegion(ITextRegion lastRegion) {
-		this.fLastRegion = lastRegion;
-		return lastRegion;
-	}
-
-	void setRangeRegion(IStructuredDocumentRegion parentRegion, ITextRegion firstRegion, ITextRegion lastRegion) {
-		this.fParentRegion = parentRegion;
-		this.fFirstRegion = firstRegion;
-		this.fLastRegion = lastRegion;
-
-		if (firstRegion == null && lastRegion == null) {
-			setFirstRegion(null);
-			setLastRegion(null);
-		}
-		else { // range validation
-			validateRange();
-		}
-	}
-
-	/**
-	 * @return boolean
-	 */
-	private boolean validateRange() {
-		boolean bModified = false;
-
-		if (this.fFirstRegion != null || this.fLastRegion != null) {
-			if (this.fFirstRegion == null) {
-				this.fFirstRegion = this.fLastRegion;
-				bModified = true;
-			}
-			else if (this.fLastRegion == null) {
-				this.fLastRegion = this.fFirstRegion;
-				bModified = true;
-			}
-			else if (this.fFirstRegion.getStart() > this.fLastRegion.getStart()) {
-				// need to swap first for last
-				ITextRegion reg = fFirstRegion;
-				fFirstRegion = fLastRegion;
-				fLastRegion = reg;
-				bModified = true;
-			}
-		}
-		return bModified;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleDeclContainer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleDeclContainer.java
deleted file mode 100644
index ab4914b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleDeclContainer.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.w3c.dom.css.CSSStyleDeclaration;
-
-
-/**
- * 
- */
-abstract class CSSRuleDeclContainer extends CSSRuleImpl {
-
-	/**
-	 * CSSRuleDeclContainer constructor comment.
-	 */
-	CSSRuleDeclContainer() {
-		super();
-	}
-
-	/**
-	 * CSSRuleDeclContainer constructor comment.
-	 * 
-	 */
-	CSSRuleDeclContainer(CSSRuleDeclContainer that) {
-		super(that);
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	abstract String extractPreString();
-
-	/**
-	 * @return org.w3c.dom.css.CSSStyleDeclaration
-	 */
-	public CSSStyleDeclaration getStyle() {
-
-		for (ICSSNode node = getFirstChild(); node != null; node = node.getNextSibling()) {
-			if (node instanceof CSSStyleDeclaration)
-				return (CSSStyleDeclaration) node;
-		}
-
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleImpl.java
deleted file mode 100644
index fd7d337..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSStyleSheet;
-
-
-/**
- * 
- */
-abstract class CSSRuleImpl extends CSSStructuredDocumentRegionContainer implements CSSRule {
-
-	/**
-	 * 
-	 */
-	CSSRuleImpl() {
-		super();
-	}
-
-	CSSRuleImpl(CSSRuleImpl that) {
-		super(that);
-	}
-
-	/**
-	 * If this rule is contained inside another rule (e.g. a style rule inside
-	 * an
-	 * 
-	 * @media block), this is the containing rule. If this rule is not nested
-	 *        inside any other rules, this returns <code>null</code>.
-	 */
-	public CSSRule getParentRule() {
-		ICSSNode rule = getParentNode();
-
-		// parent rule is used only if parent is media rule
-		if (rule instanceof CSSMediaRuleImpl)
-			return (CSSRule) rule;
-
-		return null;
-	}
-
-	/**
-	 * The style sheet that contains this rule.
-	 */
-	public CSSStyleSheet getParentStyleSheet() {
-		ICSSNode parent = getParentNode();
-		while (parent != null) {
-			if (parent instanceof CSSStyleSheetImpl)
-				return (CSSStyleSheet) parent;
-			parent = parent.getParentNode();
-		}
-		return null;
-	}
-
-	/**
-	 * The type of the rule, as defined above. The expectation is that
-	 * binding-specific casting methods can be used to cast down from an
-	 * instance of the <code>CSSRule</code> interface to the specific
-	 * derived interface implied by the <code>type</code>.
-	 */
-	public abstract short getType();
-
-	/**
-	 * @return boolean
-	 */
-	public boolean hasProperties() {
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleListImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleListImpl.java
deleted file mode 100644
index 51f15a4..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleListImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-
-/**
- * 
- */
-public class CSSRuleListImpl extends AbstractCSSNodeList implements CSSRuleList {
-
-	/**
-	 * 
-	 */
-	CSSRuleListImpl() {
-		super();
-	}
-
-	/**
-	 * Used to retrieve a CSS rule by ordinal index. The order in this
-	 * collection represents the order of the rules in the CSS style sheet. If
-	 * index is greater than or equal to the number of rules in the list, this
-	 * returns <code>null</code>.
-	 * 
-	 * @param indexIndex
-	 *            into the collection
-	 * @return The style rule at the <code>index</code> position in the
-	 *         <code>CSSRuleList</code>, or <code>null</code> if that is
-	 *         not a valid index.
-	 */
-	public CSSRule item(int index) {
-		return (CSSRule) itemImpl(index);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelector.java
deleted file mode 100644
index 031a046..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelector.java
+++ /dev/null
@@ -1,422 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSelectorAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorCombinator;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.NameValidator;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * 
- */
-class CSSSelector implements ICSSSelector {
-
-	private int fSpecificity = -1;
-	private String fCachedString = null;
-	private List fTokens = null;
-	private List fItems = null;
-	private List fParseErrors = null;
-	private List fNameErrors = null;
-
-	CSSSelector(List tokens) {
-		fTokens = new ArrayList(tokens);
-	}
-
-	/**
-	 * @return boolean
-	 * @param obj
-	 *            java.lang.Object
-	 */
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-
-		if (obj == null || this.getClass() != obj.getClass())
-			return false;
-
-		CSSSelector foreign = (CSSSelector) obj;
-
-		// if (fSpecificity != foreign.fSpecificity) return false;
-
-		if (getLength() != foreign.getLength())
-			return false;
-
-		for (int i = 0; i < getLength(); i++) {
-			if (!getItem(i).equals(foreign.getItem(i)))
-				return false;
-		}
-
-		return true;
-	}
-
-	public ICSSSelectorItem getItem(int index) {
-		if (fItems == null) {
-			fItems = parseSelector(fTokens);
-		}
-		if (fItems != null && 0 <= index && index < fItems.size()) {
-			return (ICSSSelectorItem) fItems.get(index);
-		}
-		else {
-			return null;
-		}
-	}
-
-	/**
-	 * @return java.util.Iterator
-	 */
-	public Iterator getIterator() {
-		if (fItems == null) {
-			fItems = parseSelector(fTokens);
-		}
-		return (fItems != null) ? fItems.iterator() : null;
-	}
-
-	/**
-	 * @return int
-	 */
-	public int getLength() {
-		if (fItems == null) {
-			fItems = parseSelector(fTokens);
-		}
-		return (fItems != null) ? fItems.size() : 0;
-	}
-
-	/**
-	 * @return org.w3c.dom.Element
-	 */
-	private Element getParentElement(Element element) {
-		try {
-			element = (Element) element.getParentNode();
-		}
-		catch (Exception ex) {
-			// cast error or null pointer ...
-			element = null;
-		}
-		return element;
-	}
-
-	/**
-	 * @return org.w3c.dom.Element
-	 */
-	private Element getPreviousElement(Element element) {
-		Element p = null;
-		for (Node node = element.getPreviousSibling(); node != null; node = node.getPreviousSibling()) {
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				p = (Element) node;
-				break;
-			}
-		}
-		return p;
-	}
-
-	/**
-	 * Calculate a selector's specificity a = the number of ID attributes in
-	 * the selector b = the number of other attributes and pseudo-classes in
-	 * the selector c = the number of element names in the selector (ignore
-	 * pseudo-elements) Concatenating the three numbers a-b-c (in a number
-	 * system with a large base) gives the specificity.
-	 * 
-	 * @return int
-	 */
-	public int getSpecificity() {
-		if (fSpecificity < 0) {
-			int nIDs = 0;
-			int nAttributes = 0;
-			int nElements = 0;
-			Iterator i = getIterator();
-			while (i.hasNext()) {
-				ICSSSelectorItem item = (ICSSSelectorItem) i.next();
-				if (item instanceof CSSSimpleSelector) {
-					CSSSimpleSelector selector = (CSSSimpleSelector) item;
-					nIDs += selector.getNumOfIDs();
-					nAttributes += selector.getNumOfAttributes();
-					nAttributes += selector.getNumOfClasses();
-					nAttributes += selector.getNumOfPseudoNames();
-					if (!selector.isUniversal()) {
-						nElements++;
-					}
-				}
-			}
-			fSpecificity = nIDs * 10000 + nAttributes * 100 + nElements;
-		}
-
-		return fSpecificity;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getString() {
-		if (fCachedString == null) {
-			StringBuffer buf = new StringBuffer();
-			Iterator i = getIterator();
-			while (i.hasNext()) {
-				ICSSSelectorItem item = (ICSSSelectorItem) i.next();
-				if (item instanceof CSSSelectorCombinator) {
-					// If item is DESCENDANT combinator, it is just single
-					// space.
-					// Then, you dont have to append string..
-					if (((CSSSelectorCombinator) item).getCombinatorType() != ICSSSelectorCombinator.DESCENDANT) {
-						buf.append(" ");//$NON-NLS-1$
-						buf.append(item.getString());
-					}
-					buf.append(" ");//$NON-NLS-1$
-				}
-				else {
-					buf.append(item.getString());
-				}
-			}
-			fCachedString = buf.toString();
-		}
-
-		return fCachedString;
-	}
-
-	/**
-	 * @return boolean
-	 * @param element
-	 *            org.w3c.dom.Element
-	 */
-	public boolean match(org.w3c.dom.Element element, java.lang.String pseudoName) {
-		Element target = element;
-		char combinatorType = ICSSSelectorCombinator.UNKNOWN;
-		Element chunkStartElement = null; // for CHILD and ADJACENT
-											// combinator
-		int chunkStartItem = -1; // for CHILD and ADJACENT combinator
-		int numItems = getLength();
-		for (int iItem = numItems - 1; iItem >= 0; iItem--) {
-			// Check Selector Items
-			ICSSSelectorItem item = getItem(iItem);
-			if (item instanceof ICSSSimpleSelector) {
-				// Simple Selector
-				if (target == null)
-					return false;
-				if (!matchExactly((ICSSSimpleSelector) item, target, pseudoName)) {
-					switch (combinatorType) {
-						case ICSSSelectorCombinator.DESCENDANT :
-							do {
-								target = getParentElement(target);
-								if (target == null)
-									return false;
-							}
-							while (!matchExactly((ICSSSimpleSelector) item, target, pseudoName));
-							break;
-						case ICSSSelectorCombinator.CHILD :
-						case ICSSSelectorCombinator.ADJACENT :
-							if (chunkStartElement != null && chunkStartElement != element) {
-								// previous conbinator must be DESCENDENT.
-								// goto parent
-								target = getParentElement(chunkStartElement);
-								iItem = chunkStartItem + 1;
-								chunkStartElement = null;
-								chunkStartItem = -1;
-								break;
-							}
-						default :
-							// other combinators are not supported yet.
-							return false;
-					}
-				}
-			}
-			else if (item instanceof ICSSSelectorCombinator) {
-				// Combinator ( "+", ">", " ", ...)
-				if (iItem == numItems - 1)
-					return false; // last item is combinator
-
-				ICSSSelectorCombinator sc = (ICSSSelectorCombinator) item;
-				combinatorType = sc.getCombinatorType();
-				switch (combinatorType) {
-					case ICSSSelectorCombinator.DESCENDANT :
-						target = getParentElement(target);
-						break;
-					case ICSSSelectorCombinator.CHILD :
-					case ICSSSelectorCombinator.ADJACENT :
-						if (chunkStartElement == null) {
-							chunkStartElement = target;
-							chunkStartItem = iItem + 1; // safe because this
-														// is not a last item.
-						}
-						if (combinatorType == ICSSSelectorCombinator.CHILD) {
-							target = getParentElement(target);
-						}
-						else {
-							target = getPreviousElement(target);
-						}
-						break;
-				}
-			}
-			else {
-				// what is this item ???
-				return false;
-			}
-		}
-		// OK this selector maches the element.
-		return true;
-
-	}
-
-	/**
-	 * @return boolean
-	 */
-	private boolean matchExactly(ICSSSimpleSelector selector, Element element, String pseudoName) {
-		IStyleSelectorAdapter adapter = (IStyleSelectorAdapter) ((INodeNotifier) element).getAdapterFor(IStyleSelectorAdapter.class);
-		if (adapter != null) {
-			return adapter.match(selector, element, pseudoName);
-		}
-
-		if (element == null)
-			return false;
-		int i;
-		String key;
-
-		// TODO: PseudoName
-
-		// check tag name
-		if (!selector.isUniversal() && !element.getNodeName().equals(selector.getName()))
-			return false;
-
-		// check id
-		i = selector.getNumOfIDs();
-		if (i > 0) {
-			if (i > 1)
-				return false;
-			key = element.getAttribute("id");//$NON-NLS-1$
-			if (key == null)
-				return false;
-			if (!selector.getID(0).equals(key))
-				return false;
-		}
-
-		// check class
-		i = selector.getNumOfClasses();
-		if (i > 0) {
-			key = element.getAttribute("class");//$NON-NLS-1$
-			if (key == null)
-				return false;
-			StringTokenizer tokenizer = new StringTokenizer(key);
-			for (i = i - 1; i >= 0; i--) {
-				boolean ok = false;
-				while (tokenizer.hasMoreTokens()) {
-					if (selector.getClass(i).equals(tokenizer.nextToken())) {
-						ok = true;
-						break;
-					}
-				}
-				if (!ok)
-					return false;
-			}
-		}
-
-		// check attributes
-		for (i = selector.getNumOfAttributes() - 1; i >= 0; i--) {
-			StringTokenizer tokenizer = new StringTokenizer(selector.getAttribute(i), "=~| \t\r\n\f");//$NON-NLS-1$
-			int countTokens = tokenizer.countTokens();
-			if (countTokens > 0) {
-				String attrValue = element.getAttribute(tokenizer.nextToken());
-				if (attrValue == null)
-					return false;
-				if (countTokens > 1) {
-					String token = tokenizer.nextToken("= \t\r\n\f");//$NON-NLS-1$
-					StringTokenizer attrValueTokenizer = null;
-					if (token.equals("~")) {//$NON-NLS-1$
-						attrValueTokenizer = new StringTokenizer(attrValue);
-					}
-					else if (token.equals("|")) {//$NON-NLS-1$
-						attrValueTokenizer = new StringTokenizer(attrValue, "-");//$NON-NLS-1$
-					}
-					if (attrValueTokenizer != null) {
-						if (tokenizer.hasMoreTokens()) {
-							token = tokenizer.nextToken();
-							boolean ok = false;
-							while (attrValueTokenizer.hasMoreTokens()) {
-								if (token.equals(attrValueTokenizer.nextToken())) {
-									ok = true;
-									break;
-								}
-							}
-							if (!ok)
-								return false;
-						}
-					}
-					else {
-						if (!attrValue.equals(token))
-							return false;
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
-	private List parseSelector(List tokens) {
-		CSSSelectorParser parser = new CSSSelectorParser(tokens);
-		List selector = parser.getSelector();
-		Iterator i = parser.getErrors();
-		fParseErrors = new ArrayList();
-		while (i.hasNext()) {
-			fParseErrors.add(i.next());
-		}
-		return selector;
-	}
-
-	public Iterator getErrors() {
-		if (fNameErrors == null) {
-			fNameErrors = new ArrayList();
-			Iterator iItem = getIterator();
-			while (iItem.hasNext()) {
-				ICSSSelectorItem item = (ICSSSelectorItem) iItem.next();
-				if (item instanceof ICSSSimpleSelector) {
-					if (!((ICSSSimpleSelector) item).isUniversal()) {
-						String name = ((ICSSSimpleSelector) item).getName();
-						if (!NameValidator.isValid(name)) {
-							fNameErrors.add(item);
-						}
-					}
-				}
-			}
-		}
-		List errors = new ArrayList(fParseErrors);
-		errors.addAll(fNameErrors);
-		return errors.iterator();
-	}
-
-	public String toString() {
-		return getString();
-	}
-
-	/**
-	 * @see ICSSSelector#getErrorCount()
-	 */
-	public int getErrorCount() {
-		int nErrors = 0;
-		Iterator i = getErrors();
-		while (i.hasNext()) {
-			nErrors++;
-			i.next();
-		}
-		return nErrors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorCombinator.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorCombinator.java
deleted file mode 100644
index 5df2594..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorCombinator.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorCombinator;
-
-/**
- * 
- */
-class CSSSelectorCombinator extends CSSSelectorItem implements ICSSSelectorCombinator {
-
-	char fType = ICSSSelectorCombinator.UNKNOWN;
-
-	/**
-	 * CSSSelectorCombinator constructor comment.
-	 */
-	public CSSSelectorCombinator(char type) {
-		super();
-		setCombinatorType(type);
-	}
-
-	/**
-	 * @return boolean
-	 * @param obj
-	 *            java.lang.Object
-	 */
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-
-		if (obj == null || this.getClass() != obj.getClass())
-			return false;
-
-		CSSSelectorCombinator foreign = (CSSSelectorCombinator) obj;
-
-		return (getCombinatorType() == foreign.getCombinatorType());
-
-	}
-
-	/**
-	 * @return int
-	 */
-	public char getCombinatorType() {
-		return fType;
-	}
-
-	/**
-	 * @return int
-	 */
-	public int getItemType() {
-		return COMBINATOR;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getString() {
-		StringBuffer buf = new StringBuffer();
-		buf.append(fType);
-		return buf.toString();
-	}
-
-	void setCombinatorType(char type) {
-		fType = type;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorItem.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorItem.java
deleted file mode 100644
index 1134bcc..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorItem.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem;
-
-/**
- * 
- */
-abstract class CSSSelectorItem implements ICSSSelectorItem {
-
-	/**
-	 * CSSSelectorItem constructor comment.
-	 */
-	public CSSSelectorItem() {
-		super();
-	}
-
-	/**
-	 * @return int
-	 */
-	public int getItemType() {
-		return 0;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getString() {
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorListImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorListImpl.java
deleted file mode 100644
index de4a0bc..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorListImpl.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList;
-import org.w3c.dom.Element;
-
-
-/**
- * 
- */
-public class CSSSelectorListImpl implements ICSSSelectorList {
-
-	private String fText = null;
-	private String fCachedString = null; // normalized string
-	private List fSelectors = null;
-
-	public CSSSelectorListImpl(String cssText) {
-		super();
-		fText = cssText;
-		parseSelectorText();
-	}
-
-	/**
-	 * @return boolean
-	 * @param obj
-	 *            java.lang.Object
-	 */
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-
-		if (obj == null || this.getClass() != obj.getClass())
-			return false;
-
-		CSSSelectorListImpl foreign = (CSSSelectorListImpl) obj;
-
-		if (getLength() != foreign.getLength())
-			return false;
-
-		for (int i = 0; i < getLength(); i++) {
-			if (!getSelector(i).equals(foreign.getSelector(i)))
-				return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @return java.util.Iterator
-	 */
-	public Iterator getIterator() {
-		return getSelectors().iterator();
-	}
-
-	/**
-	 * @return int
-	 */
-	public int getLength() {
-		return getSelectors().size();
-	}
-
-	public ICSSSelector getSelector(int index) {
-		List selectors = getSelectors();
-		if (0 <= index && index < selectors.size()) {
-			return (ICSSSelector) selectors.get(index);
-		}
-		else {
-			return null;
-		}
-	}
-
-	private List getSelectors() {
-		if (fSelectors == null) {
-			parseSelectorText();
-		}
-		return fSelectors;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getString() {
-		if (fCachedString == null) {
-			StringBuffer buf = new StringBuffer();
-			boolean bFirst = true;
-			// groups is list of comma-separated selectors
-			Iterator i = getSelectors().iterator();
-			while (i.hasNext()) {
-				if (!bFirst) {
-					buf.append(", ");//$NON-NLS-1$
-				}
-				ICSSSelector item = (ICSSSelector) i.next();
-				buf.append(item.getString());
-				bFirst = false;
-			}
-			fCachedString = buf.toString();
-		}
-		return fCachedString;
-	}
-
-	/**
-	 * @return boolean
-	 * @param element
-	 *            org.w3c.dom.Element
-	 */
-	public boolean match(Element element, String pseudoName) {
-		int nSelectors = getLength();
-		selectorListLoop : for (int iSelector = 0; iSelector < nSelectors; iSelector++) {
-			// Check each Selector Lists
-			ICSSSelector selector = getSelector(iSelector);
-			if (selector.match(element, pseudoName))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	private void parseSelectorText() {
-		fSelectors = new ArrayList();
-		if (fText == null) {
-			return;
-		}
-
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_STYLESHEET, fText);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return;
-		}
-
-		List tokenGroup = new ArrayList();
-		for (int i = 0; i < tokens.length; i++) {
-			CSSTextToken token = tokens[i];
-			if (token.kind == CSSRegionContexts.CSS_SELECTOR_SEPARATOR && 0 < tokenGroup.size()) {
-				ICSSSelector selector = new CSSSelector(tokenGroup);
-				if (selector != null) {
-					fSelectors.add(selector);
-				}
-				tokenGroup.clear();
-			}
-			else {
-				tokenGroup.add(tokens[i]);
-			}
-		}
-		if (0 < tokenGroup.size()) {
-			ICSSSelector selector = new CSSSelector(tokenGroup);
-			if (selector != null) {
-				fSelectors.add(selector);
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public String toString() {
-		return getString();
-	}
-
-	/**
-	 * 
-	 */
-	public Iterator getErrors() {
-		List errors = new ArrayList();
-		Iterator iSelector = getSelectors().iterator();
-		while (iSelector.hasNext()) {
-			Iterator iError = ((ICSSSelector) iSelector.next()).getErrors();
-			while (iError.hasNext()) {
-				errors.add(iError.next());
-			}
-		}
-		return errors.iterator();
-	}
-
-	/**
-	 * 
-	 */
-	public int getErrorCount() {
-		int nErrors = 0;
-		Iterator i = getErrors();
-		while (i.hasNext()) {
-			nErrors++;
-			i.next();
-		}
-		return nErrors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorParser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorParser.java
deleted file mode 100644
index 7f00342..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorParser.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorCombinator;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem;
-
-
-/**
- * 
- */
-public class CSSSelectorParser {
-
-	private final static int IDLE = 0;
-	private final static int ATTRIBUTE = 1;
-	private final static int SIMPLE = 2;
-
-	private List fTokens = null;
-	private List fItems = null;
-	private List fErrors = null;
-
-	/**
-	 * 
-	 */
-	CSSSelectorParser(List tokens) {
-		super();
-		fTokens = new ArrayList(tokens);
-	}
-
-	/**
-	 * 
-	 */
-	List getSelector() {
-		if (fItems == null) {
-			parseSelector();
-		}
-		return fItems;
-	}
-
-	/**
-	 * 
-	 */
-	private void parseSelector() {
-		fItems = new ArrayList();
-
-		List attrBuf = null;
-		CSSSimpleSelector item = null;
-
-		int status = IDLE;
-		Iterator i = fTokens.iterator();
-		while (i.hasNext()) {
-			CSSTextToken token = (CSSTextToken) i.next();
-			if (token == null || token.kind == CSSRegionContexts.CSS_S || token.kind == CSSRegionContexts.CSS_COMMENT) {
-				continue;
-			}
-			switch (status) {
-				case IDLE :
-					if (isTag(token)) {
-						item = createSimple();
-						appendTag(item, token);
-						status = SIMPLE;
-					}
-					else if (isID(token)) {
-						item = createSimple();
-						appendID(item, token);
-						status = SIMPLE;
-					}
-					else if (isClass(token)) {
-						item = createSimple();
-						appendClass(item, token);
-						status = SIMPLE;
-					}
-					else if (isPseudo(token)) {
-						item = createSimple();
-						appendPseudo(item, token);
-						status = SIMPLE;
-					}
-					else if (isAttributeBegin(token)) {
-						item = createSimple();
-						status = ATTRIBUTE;
-					}
-					else {
-						addError(token);
-					}
-					break;
-				case SIMPLE :
-					if (isID(token)) {
-						appendID(item, token);
-					}
-					else if (isClass(token)) {
-						appendClass(item, token);
-					}
-					else if (isPseudo(token)) {
-						appendPseudo(item, token);
-					}
-					else if (isAttributeBegin(token)) {
-						status = ATTRIBUTE;
-					}
-					else if (isCombinator(token)) { // combinator
-						closeItem(item);
-						closeItem(createCombinator(token));
-						status = IDLE;
-					}
-					else {
-						addError(token);
-					}
-					break;
-				case ATTRIBUTE :
-					if (isAttributeEnd(token)) {
-						appendAttribute(item, attrBuf);
-						attrBuf = null;
-						status = SIMPLE;
-					}
-					else {
-						if (attrBuf == null) {
-							attrBuf = new ArrayList();
-						}
-						attrBuf.add(token);
-						if (!isAttributeContent(token)) {
-							addError(token);
-						}
-					}
-					break;
-				default :
-					break;
-			}
-		}
-
-		closeItem(item);
-	}
-
-	/**
-	 * @param token
-	 * @return
-	 */
-	private boolean isAttributeContent(CSSTextToken token) {
-		String type = token.kind;
-		return (type == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_NAME || type == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_OPERATOR || type == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_VALUE);
-	}
-
-	/**
-	 * @param token
-	 * @return
-	 */
-	private boolean isAttributeEnd(CSSTextToken token) {
-		String type = token.kind;
-		return (type == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_END);
-	}
-
-	/**
-	 * @param token
-	 * @return
-	 */
-	private boolean isAttributeBegin(CSSTextToken token) {
-		String type = token.kind;
-		return (type == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_START);
-	}
-
-	/**
-	 * @param token
-	 * @return
-	 */
-	private boolean isCombinator(CSSTextToken token) {
-		String type = token.kind;
-		return (type == CSSRegionContexts.CSS_SELECTOR_COMBINATOR);
-	}
-
-	/**
-	 * @param token
-	 * @return
-	 */
-	private boolean isPseudo(CSSTextToken token) {
-		String type = token.kind;
-		return (type == CSSRegionContexts.CSS_SELECTOR_PSEUDO);
-	}
-
-	/**
-	 * @param token
-	 * @return
-	 */
-	private boolean isClass(CSSTextToken token) {
-		String type = token.kind;
-		return (type == CSSRegionContexts.CSS_SELECTOR_CLASS);
-	}
-
-	/**
-	 * @param token
-	 * @return
-	 */
-	private boolean isID(CSSTextToken token) {
-		String type = token.kind;
-		return (type == CSSRegionContexts.CSS_SELECTOR_ID);
-	}
-
-	/**
-	 * @param token
-	 * @return
-	 */
-	private boolean isTag(CSSTextToken token) {
-		String type = token.kind;
-		return (type == CSSRegionContexts.CSS_SELECTOR_ELEMENT_NAME || type == CSSRegionContexts.CSS_SELECTOR_UNIVERSAL || type == CSSRegionContexts.CSS_UNKNOWN);
-	}
-
-	private CSSSimpleSelector createSimple() {
-		return new CSSSimpleSelector();
-	}
-
-	/**
-	 * if " " or "+" or ">" appeared, close simpleselector and add new
-	 * combinator
-	 */
-	private CSSSelectorCombinator createCombinator(CSSTextToken token) {
-		char type = 0;
-
-		String str = token.image;
-		if (str.trim().length() == 0) { // space
-			type = ICSSSelectorCombinator.DESCENDANT;
-		}
-		else if (str.equals("+")) { //$NON-NLS-1$
-			type = ICSSSelectorCombinator.ADJACENT;
-		}
-		else if (str.equals(">")) { //$NON-NLS-1$
-			type = ICSSSelectorCombinator.CHILD;
-		}
-
-		if (0 < type) {
-			return new CSSSelectorCombinator(type);
-		}
-		else {
-			return null;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void closeItem(ICSSSelectorItem item) {
-		if (item != null) {
-			fItems.add(item);
-		}
-	}
-
-	private void appendTag(CSSSimpleSelector item, CSSTextToken token) {
-		item.setName(token.image);
-		if (token.kind == CSSRegionContexts.CSS_UNKNOWN) {
-			addError(token);
-		}
-	}
-
-	/**
-	 * if "#xxxx" appeared, add ID to current selector
-	 */
-	private void appendID(CSSSimpleSelector item, CSSTextToken token) {
-		String text = token.toString();
-		String idContent = text.substring(1, text.length());
-		item.addID(idContent);
-	}
-
-	/**
-	 * if ".xxxx" appeared, add Class to current selector
-	 */
-	private void appendClass(CSSSimpleSelector item, CSSTextToken token) {
-		String text = token.toString();
-		String classContent = text.substring(1, text.length());
-		item.addClass(classContent);
-		if (Character.isDigit(classContent.charAt(0))) {
-			addError(token);
-		}
-	}
-
-	/**
-	 * if ":xxxx" appeared, add Pseudo(element/class) to current selector
-	 */
-	private void appendPseudo(CSSSimpleSelector item, CSSTextToken token) {
-		String text = token.toString();
-		String pseudoContent = text.substring(1, text.length());
-		item.addPseudoName(pseudoContent);
-	}
-
-	/**
-	 * 
-	 */
-	private void appendAttribute(CSSSimpleSelector item, List tokens) {
-		StringBuffer buf = new StringBuffer();
-
-		CSSTextToken token;
-		Iterator i = tokens.iterator();
-		while (i.hasNext()) {
-			token = (CSSTextToken) i.next();
-			buf.append(token.image);
-		}
-
-		item.addAttribute(buf.toString());
-	}
-
-	/**
-	 * 
-	 */
-	List getSelectorTags() {
-		List tagList = new ArrayList();
-		return tagList;
-	}
-
-	/**
-	 * 
-	 */
-	private void addError(CSSTextToken token) {
-		if (fErrors == null) {
-			fErrors = new ArrayList();
-		}
-		fErrors.add(token);
-	}
-
-	/**
-	 * 
-	 */
-	Iterator getErrors() {
-		return (fErrors == null) ? Collections.EMPTY_LIST.iterator() : fErrors.iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSimpleSelector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSimpleSelector.java
deleted file mode 100644
index 9f76ea3..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSimpleSelector.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector;
-
-
-/**
- * 
- */
-class CSSSimpleSelector extends CSSSelectorItem implements ICSSSimpleSelector {
-
-	private String fName = null;
-	private String fCachedString = null;
-	private StringBuffer fStringBuf = null;
-	private List fPseudoName = null;
-	private List fAttribute = null;
-	private List fClass = null;
-	private List fID = null;
-
-	/**
-	 * CSSSimpleSelector constructor comment.
-	 */
-	public CSSSimpleSelector() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	void addAttribute(String attribute) {
-		if (fAttribute == null) {
-			fAttribute = new ArrayList();
-		}
-		fAttribute.add(attribute);
-		addToBuf("[");//$NON-NLS-1$
-		addToBuf(attribute);
-		addToBuf("]");//$NON-NLS-1$
-		fCachedString = null;
-	}
-
-	/**
-	 * 
-	 */
-	void addClass(String cls) {
-		if (fClass == null) {
-			fClass = new ArrayList();
-		}
-		fClass.add(cls);
-		addToBuf(".");//$NON-NLS-1$
-		addToBuf(cls);
-		fCachedString = null;
-	}
-
-	/**
-	 * 
-	 */
-	void addID(String id) {
-		if (fID == null) {
-			fID = new ArrayList();
-		}
-		fID.add(id);
-		addToBuf("#");//$NON-NLS-1$
-		addToBuf(id);
-		fCachedString = null;
-	}
-
-	/**
-	 * 
-	 */
-	void addPseudoName(String cls) {
-		if (fPseudoName == null) {
-			fPseudoName = new ArrayList();
-		}
-		fPseudoName.add(cls);
-		addToBuf(":");//$NON-NLS-1$
-		addToBuf(cls);
-		fCachedString = null;
-	}
-
-	/**
-	 * 
-	 */
-	private void addToBuf(String str) {
-		if (fStringBuf == null) {
-			fStringBuf = new StringBuffer();
-		}
-		fStringBuf.append(str);
-	}
-
-	/**
-	 * @return boolean
-	 * @param obj
-	 *            java.lang.Object
-	 */
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-
-		if (obj == null || this.getClass() != obj.getClass())
-			return false;
-
-		CSSSimpleSelector foreign = (CSSSimpleSelector) obj;
-
-		if (getName().compareToIgnoreCase(foreign.getName()) != 0)
-			return false;
-
-		int i;
-
-		// compare pseudo-classes / pseudo-elements
-		if (getNumOfPseudoNames() != foreign.getNumOfPseudoNames())
-			return false;
-		for (i = 0; i < getNumOfPseudoNames(); i++) {
-			if (getPseudoName(i).compareToIgnoreCase(foreign.getPseudoName(i)) != 0)
-				return false;
-		}
-
-		// compare classes
-		if (getNumOfClasses() != foreign.getNumOfClasses())
-			return false;
-		for (i = 0; i < getNumOfClasses(); i++) {
-			if (getClass(i).compareToIgnoreCase(foreign.getClass(i)) != 0)
-				return false;
-		}
-
-		// compare IDs
-		if (getNumOfIDs() != foreign.getNumOfIDs())
-			return false;
-		for (i = 0; i < getNumOfIDs(); i++) {
-			if (getID(i).compareToIgnoreCase(foreign.getID(i)) != 0)
-				return false;
-		}
-
-		// compare Attributes
-		if (getNumOfAttributes() != foreign.getNumOfAttributes())
-			return false;
-		for (i = 0; i < getNumOfAttributes(); i++) {
-			if (getAttribute(i).compareToIgnoreCase(foreign.getAttribute(i)) != 0)
-				return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @return java.lang.String
-	 * @param index
-	 *            int
-	 */
-	public String getAttribute(int index) {
-		if (fAttribute != null && 0 <= index && index < fAttribute.size()) {
-			return (String) fAttribute.get(index);
-		}
-		else {
-			return "";//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @return java.lang.String
-	 * @param index
-	 *            int
-	 */
-	public String getClass(int index) {
-		if (fClass != null && 0 <= index && index < fClass.size()) {
-			return (String) fClass.get(index);
-		}
-		else {
-			return "";//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @return java.lang.String
-	 * @param index
-	 *            int
-	 */
-	public String getID(int index) {
-		if (fID != null && 0 <= index && index < fID.size()) {
-			return (String) fID.get(index);
-		}
-		else {
-			return "";//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @return int
-	 */
-	public int getItemType() {
-		return SIMPLE;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getName() {
-		return (fName != null) ? fName : "";//$NON-NLS-1$
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public int getNumOfAttributes() {
-		return (fAttribute != null) ? fAttribute.size() : 0;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public int getNumOfClasses() {
-		return (fClass != null) ? fClass.size() : 0;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public int getNumOfIDs() {
-		return (fID != null) ? fID.size() : 0;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public int getNumOfPseudoNames() {
-		return (fPseudoName != null) ? fPseudoName.size() : 0;
-	}
-
-	/**
-	 * @return java.lang.String
-	 * @param index
-	 *            int
-	 */
-	public String getPseudoName(int index) {
-		if (fPseudoName != null && 0 <= index && index < fPseudoName.size()) {
-			return (String) fPseudoName.get(index);
-		}
-		else {
-			return "";//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getString() {
-		if (fCachedString == null) {
-			StringBuffer buf = new StringBuffer(getName());
-			if (fStringBuf != null) {
-				buf.append(fStringBuf.toString());
-			}
-			fCachedString = buf.toString();
-		}
-		return fCachedString;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public boolean isUniversal() {
-		return (fName == null || fName.equals("*"));//$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 */
-	void setName(String name) {
-		fName = name;
-		fCachedString = null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStructuredDocumentRegionContainer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStructuredDocumentRegionContainer.java
deleted file mode 100644
index 2f16772..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStructuredDocumentRegionContainer.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-/**
- * 
- */
-abstract class CSSStructuredDocumentRegionContainer extends CSSNodeImpl {
-
-	private IStructuredDocumentRegion firstStructuredDocumentRegion = null;
-	private IStructuredDocumentRegion lastStructuredDocumentRegion = null;
-
-	/**
-	 * CSSContainer constructor comment.
-	 */
-	CSSStructuredDocumentRegionContainer() {
-		super();
-	}
-
-	CSSStructuredDocumentRegionContainer(CSSStructuredDocumentRegionContainer that) {
-		super(that);
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getCssText() {
-		if (getFirstStructuredDocumentRegion() == null)
-			return generateSource();
-
-		StringBuffer str = new StringBuffer(getFirstStructuredDocumentRegion().getText());
-		IStructuredDocumentRegion node = getFirstStructuredDocumentRegion();
-
-		while (node != getLastStructuredDocumentRegion()) {
-			node = node.getNext();
-			str.append(node.getText());
-		}
-
-		return str.toString();
-	}
-
-	/**
-	 * @return int
-	 */
-	public int getEndOffset() {
-		IStructuredDocumentRegion flatNode = getLastStructuredDocumentRegion();
-		if (flatNode != null)
-			return flatNode.getEnd();
-		return -1;
-	}
-
-	IStructuredDocumentRegion getFirstStructuredDocumentRegion() {
-		return firstStructuredDocumentRegion;
-	}
-
-	IStructuredDocumentRegion getStructuredDocumentRegion(int index) {
-		IStructuredDocumentRegion node = firstStructuredDocumentRegion;
-		for (int i = index; i > 0; i--) {
-			if (node == null)
-				return null;
-			node = node.getNext();
-		}
-		return node;
-	}
-
-	/**
-	 * @return int
-	 */
-	int getStructuredDocumentRegionCount() {
-		if (firstStructuredDocumentRegion == null)
-			return 0;
-
-		IStructuredDocumentRegion node = firstStructuredDocumentRegion;
-		int i = 0;
-		for (; node != null; i++)
-			node = node.getNext();
-		return i;
-	}
-
-	IStructuredDocumentRegion getLastStructuredDocumentRegion() {
-		return lastStructuredDocumentRegion;
-	}
-
-	/**
-	 * @return int
-	 */
-	public int getStartOffset() {
-		IStructuredDocumentRegion flatNode = getFirstStructuredDocumentRegion();
-		if (flatNode != null)
-			return flatNode.getStart();
-		return -1;
-	}
-
-	boolean includeRangeStructuredDocumentRegion(IStructuredDocumentRegion first, IStructuredDocumentRegion last) {
-		boolean bModified = false;
-
-		// validate range of parameters
-		if (first != null && last != null) {
-			if (first.getStart() > last.getStart()) {
-				IStructuredDocumentRegion node = first;
-				first = last;
-				last = node;
-			}
-		}
-
-		// validate mine
-		boolean b = validateRange();
-		bModified = b || bModified;
-
-		if (first != null) {
-			if (getFirstStructuredDocumentRegion() == null || getFirstStructuredDocumentRegion().getStart() > first.getStart()) {
-				setFirstStructuredDocumentRegion(first);
-				bModified = true;
-			}
-		}
-
-		if (last != null) {
-			if (getLastStructuredDocumentRegion() == null || getLastStructuredDocumentRegion().getStart() < last.getStart()) {
-				setLastStructuredDocumentRegion(last);
-				bModified = true;
-			}
-		}
-
-		// re-validate
-		if (bModified)
-			validateRange();
-
-		return bModified;
-	}
-
-	/**
-	 * 
-	 */
-	boolean propagateRangeStructuredDocumentRegion() {
-		boolean bModified = false;
-
-		CSSStructuredDocumentRegionContainer parent = (CSSStructuredDocumentRegionContainer) getParentNode();
-		if (parent == null)
-			return bModified;
-
-		boolean b = parent.includeRangeStructuredDocumentRegion(getFirstStructuredDocumentRegion(), getLastStructuredDocumentRegion());
-		bModified = b || bModified;
-
-		if (b)
-			parent.propagateRangeStructuredDocumentRegion();
-		// else need not update range of ancestors
-
-		return bModified;
-	}
-
-	/**
-	 * @param cssText
-	 *            java.lang.String
-	 */
-	public void setCssText(String cssText) {
-		if (firstStructuredDocumentRegion != null) {
-			getOwnerDocument().getModel().getStructuredDocument().replaceText(this, getStartOffset(), getEndOffset() - getStartOffset(), cssText);
-		}
-		else
-			super.setCssText(cssText);
-	}
-
-	IStructuredDocumentRegion setFirstStructuredDocumentRegion(IStructuredDocumentRegion node) {
-		firstStructuredDocumentRegion = node;
-		return node;
-	}
-
-	IStructuredDocumentRegion setLastStructuredDocumentRegion(IStructuredDocumentRegion node) {
-		lastStructuredDocumentRegion = node;
-		return node;
-	}
-
-	void setRangeStructuredDocumentRegion(IStructuredDocumentRegion firstNode, IStructuredDocumentRegion lastNode) {
-		if (firstNode != null)
-			setFirstStructuredDocumentRegion(firstNode);
-		if (lastNode != null)
-			setLastStructuredDocumentRegion(lastNode);
-
-		if (firstNode == null && lastNode == null) {
-			setFirstStructuredDocumentRegion(null);
-			setLastStructuredDocumentRegion(null);
-		}
-		else { // range validation
-			validateRange();
-		}
-	}
-
-	/**
-	 * @return boolean
-	 */
-	private boolean validateRange() {
-		boolean bModified = false;
-
-		if (firstStructuredDocumentRegion != null || lastStructuredDocumentRegion != null) {
-			if (this.firstStructuredDocumentRegion == null) {
-				this.firstStructuredDocumentRegion = this.lastStructuredDocumentRegion;
-				bModified = true;
-			}
-			else if (this.lastStructuredDocumentRegion == null) {
-				this.lastStructuredDocumentRegion = this.firstStructuredDocumentRegion;
-				bModified = true;
-			}
-			else if (this.firstStructuredDocumentRegion.getStart() > this.lastStructuredDocumentRegion.getStart()) {
-				// need to swap first for last
-				IStructuredDocumentRegion node = firstStructuredDocumentRegion;
-				firstStructuredDocumentRegion = lastStructuredDocumentRegion;
-				lastStructuredDocumentRegion = node;
-				bModified = true;
-			}
-		}
-
-		return bModified;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclItemImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclItemImpl.java
deleted file mode 100644
index 208b951..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclItemImpl.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader;
-import org.eclipse.wst.css.core.internal.formatter.CSSSourceFormatterFactory;
-import org.eclipse.wst.css.core.internal.formatter.CSSSourceGenerator;
-import org.eclipse.wst.css.core.internal.formatter.StyleDeclItemFormatter;
-import org.eclipse.wst.css.core.internal.parser.CSSSourceParser;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.css.CSSValue;
-
-
-/**
- * 
- */
-class CSSStyleDeclItemImpl extends CSSStructuredDocumentRegionContainer implements ICSSStyleDeclItem {
-
-	private java.lang.String fPropertyName;
-
-	/**
-	 * CSSStyleDeclItemImpl constructor comment.
-	 * 
-	 */
-	CSSStyleDeclItemImpl(CSSStyleDeclItemImpl that) {
-		super(that);
-		this.fPropertyName = that.fPropertyName;
-	}
-
-	/**
-	 * CSSStyleDeclItemImpl constructor comment.
-	 */
-	CSSStyleDeclItemImpl(String propertyName) {
-		super();
-		this.fPropertyName = propertyName;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSPrimitiveValue
-	 * @param value
-	 *            org.w3c.dom.css.CSSPrimitiveValue
-	 */
-	public ICSSPrimitiveValue appendValue(ICSSPrimitiveValue value) throws DOMException {
-		return insertValueBefore(value, null);
-	}
-
-	/**
-	 * @param deep
-	 *            boolean
-	 */
-	public ICSSNode cloneNode(boolean deep) {
-		CSSStyleDeclItemImpl cloned = new CSSStyleDeclItemImpl(this);
-
-		if (deep)
-			cloneChildNodes(cloned, deep);
-
-		return cloned;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	String generateValueSource() {
-		CSSSourceGenerator formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter(this);
-		if (formatter != null && formatter instanceof StyleDeclItemFormatter)
-			return ((StyleDeclItemFormatter) formatter).formatValue(this).toString();
-		else
-			return "";//$NON-NLS-1$
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSValue
-	 */
-	public CSSValue getCSSValue() {
-		int nValue = getLength();
-		if (nValue <= 0)
-			return null;
-		else if (nValue == 1)
-			return item(0);
-		else
-			return this;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public java.lang.String getCSSValueText() {
-		if (getFirstChild() == null)
-			return "";//$NON-NLS-1$
-		// check whether children has flatnodes
-		ICSSNode child = getFirstChild();
-		while (child != null) {
-			if (((IndexedRegion) child).getEndOffset() <= 0)
-				return generateValueSource();
-			child = child.getNextSibling();
-		}
-
-		IStructuredDocumentRegion node = getFirstStructuredDocumentRegion();
-		int start = ((IndexedRegion) getFirstChild()).getStartOffset() - node.getStartOffset();
-		int end = ((IndexedRegion) getLastChild()).getEndOffset() - node.getStartOffset();
-		return node.getText().substring(start, end);
-	}
-
-	/**
-	 * @return short
-	 */
-	public short getCssValueType() {
-		return CSS_VALUE_LIST;
-	}
-
-	/**
-	 * @return int
-	 */
-	public int getLength() {
-		int i = 0;
-		for (ICSSNode node = getFirstChild(); node != null; node = node.getNextSibling()) {
-			if (node instanceof CSSPrimitiveValueImpl)
-				i++;
-		}
-		return i;
-	}
-
-	/**
-	 * @return short
-	 */
-	public short getNodeType() {
-		return STYLEDECLITEM_NODE;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public java.lang.String getPriority() {
-		return getAttribute(IMPORTANT);
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getPropertyName() {
-		return fPropertyName.trim().toLowerCase();
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSPrimitiveValue
-	 * @param newValue
-	 *            org.w3c.dom.css.CSSPrimitiveValue
-	 * @param refValue
-	 *            org.w3c.dom.css.CSSPrimitiveValue
-	 */
-	ICSSPrimitiveValue insertValueBefore(ICSSPrimitiveValue newValue, ICSSPrimitiveValue refValue) {
-		ICSSNode node = insertBefore((CSSNodeImpl) newValue, (CSSNodeImpl) refValue);
-		return (ICSSPrimitiveValue) node;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSValue
-	 * @param index
-	 *            int
-	 */
-	public CSSValue item(int index) {
-		int i = 0;
-		for (ICSSNode node = getFirstChild(); node != null; node = node.getNextSibling()) {
-			if (node instanceof CSSPrimitiveValueImpl) {
-				if (i++ == index)
-					return (CSSValue) node;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSPrimitiveValue
-	 * @param value
-	 *            org.w3c.dom.css.CSSPrimitiveValue
-	 */
-	public ICSSPrimitiveValue removeValue(ICSSPrimitiveValue value) throws DOMException {
-		ICSSNode node = removeChild((CSSNodeImpl) value);
-		return (ICSSPrimitiveValue) node;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSPrimitiveValue
-	 * @param newValue
-	 *            org.w3c.dom.css.CSSPrimitiveValue
-	 * @param oldValue
-	 *            org.w3c.dom.css.CSSPrimitiveValue
-	 */
-	public ICSSPrimitiveValue replaceValue(ICSSPrimitiveValue newValue, ICSSPrimitiveValue oldValue) throws DOMException {
-		if (oldValue == null)
-			return newValue;
-		if (newValue != null)
-			insertValueBefore(newValue, oldValue);
-		return removeValue(oldValue);
-	}
-
-	/**
-	 * @param value
-	 *            java.lang.String
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	public void setCssValueText(String value) throws DOMException {
-		ICSSNode child = getFirstChild();
-		while (child != null) {
-			ICSSNode next = child.getNextSibling();
-			if (child instanceof ICSSPrimitiveValue) {
-				removeChild((CSSNodeImpl) child);
-			}
-			child = next;
-		}
-		setCssValueTextCore(value);
-	}
-	private void setCssValueTextCore(String value) throws DOMException {
-		// use temporary document
-		synchronized(CSSStyleDeclarationImpl.class) {
-			if (sharedStructuredDocument == null) {
-				IDocumentLoader loader = new CSSDocumentLoader();
-				sharedStructuredDocument = (IStructuredDocument) loader.createNewStructuredDocument();
-				((CSSSourceParser) sharedStructuredDocument.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-				
-			}
-			sharedStructuredDocument.set(value);
-			IStructuredDocumentRegion node = sharedStructuredDocument.getFirstStructuredDocumentRegion();
-			
-			if (node == null) {
-				return;
-			}
-			if (node.getNext() != null) {
-				throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, "");//$NON-NLS-1$
-			}
-			
-			CSSDeclarationItemParser itemParser = new CSSDeclarationItemParser(getOwnerDocument());
-			itemParser.setStructuredDocumentTemporary(true);
-			itemParser.setupValues(this, node, node.getRegions());
-		}
-	}
-	private static IStructuredDocument sharedStructuredDocument; 
-
-	/**
-	 * @param newPriority
-	 *            java.lang.String
-	 */
-	public void setPriority(java.lang.String newPriority) throws DOMException {
-		setAttribute(IMPORTANT, newPriority);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclarationFactoryContext.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclarationFactoryContext.java
deleted file mode 100644
index 3d6142f..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclarationFactoryContext.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-
-public abstract class CSSStyleDeclarationFactoryContext {
-
-	protected ICSSDocument fOwnerDocument = null;
-
-	/**
-	 * 
-	 */
-	protected void cloneChildNodes(ICSSNode src, ICSSNode dest) {
-		if (fOwnerDocument == null) {
-			return;
-		}
-		if (!(dest instanceof CSSNodeImpl)) {
-			return;
-		}
-
-		CSSNodeImpl container = (CSSNodeImpl) dest;
-		container.removeChildNodes();
-
-		for (ICSSNode child = src.getFirstChild(); child != null; child = child.getNextSibling()) {
-			if (child instanceof CSSStyleDeclItemImpl) {
-				// extract shorthand property ..
-				// --> Temp
-				ICSSNode cloned = child.cloneNode(false);
-				if (cloned instanceof CSSNodeImpl) {
-					((CSSNodeImpl) cloned).setOwnerDocument(fOwnerDocument);
-					container.appendChild((CSSNodeImpl) cloned);
-					cloneChildNodes(child, cloned);
-				}
-				// <-- Temp
-			}
-			else {
-				ICSSNode cloned = child.cloneNode(false);
-				if (cloned instanceof CSSNodeImpl) {
-					((CSSNodeImpl) cloned).setOwnerDocument(fOwnerDocument);
-					container.appendChild((CSSNodeImpl) cloned);
-					cloneChildNodes(child, cloned);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @return org.eclipse.wst.css.core.model.interfaces.ICSSStyleDeclaration
-	 */
-	public ICSSStyleDeclaration createStyleDeclaration() {
-		CSSStyleDeclarationImpl decl = new CSSStyleDeclarationImpl(true);
-		decl.setOwnerDocument(decl);
-		return decl;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclarationImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclarationImpl.java
deleted file mode 100644
index 8ca7f10..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclarationImpl.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSValue;
-
-
-/**
- * 
- */
-class CSSStyleDeclarationImpl extends CSSDocumentImpl implements ICSSStyleDeclaration {
-
-	private boolean fIsDocument;
-
-	CSSStyleDeclarationImpl(CSSStyleDeclarationImpl that) {
-		super(that);
-		this.fIsDocument = that.fIsDocument;
-		if (fIsDocument) {
-			setOwnerDocument(this);
-		}
-	}
-
-	CSSStyleDeclarationImpl(boolean isDocument) {
-		super();
-		fIsDocument = isDocument;
-		if (fIsDocument) {
-			setOwnerDocument(this);
-		}
-	}
-
-	public ICSSNode cloneNode(boolean deep) {
-		CSSStyleDeclarationImpl cloned = new CSSStyleDeclarationImpl(this);
-
-		if (deep)
-			cloneChildNodes(cloned, deep);
-
-		return cloned;
-	}
-
-	public ICSSStyleDeclItem getDeclItemNode(String propertyName) {
-		ICSSNode node = getLastChild();
-		propertyName = propertyName.trim();
-		while (node != null) {
-			if (node instanceof CSSStyleDeclItemImpl) {
-				ICSSStyleDeclItem item = (ICSSStyleDeclItem) node;
-				if (propertyName.compareToIgnoreCase(item.getPropertyName().trim()) == 0)
-					return item;
-			}
-			node = node.getPreviousSibling();
-		}
-		return null;
-	}
-
-	/**
-	 * @return int
-	 */
-	public int getLength() {
-		int i = 0;
-		ICSSNode node = getFirstChild();
-		while (node != null) {
-			if (node instanceof CSSStyleDeclItemImpl)
-				i++;
-			node = node.getNextSibling();
-		}
-		return i;
-	}
-
-	/**
-	 * @return short
-	 */
-	public short getNodeType() {
-		return STYLEDECLARATION_NODE;
-	}
-
-	/**
-	 * The CSS rule that contains this declaration block or <code>null</code>
-	 * if this <code>CSSStyleDeclaration</code> is not attached to a
-	 * <code>CSSRule</code>.
-	 */
-	public CSSRule getParentRule() {
-		ICSSNode parent = getParentNode();
-		if (parent instanceof CSSRule)
-			return (CSSRule) parent;
-		return null;
-	}
-
-	/**
-	 * Used to retrieve the object representation of the value of a CSS
-	 * property if it has been explicitly set within this declaration block.
-	 * This method returns <code>null</code> if the property is a shorthand
-	 * property. Shorthand property values can only be accessed and modified
-	 * as strings, using the <code>getPropertyValue</code> and
-	 * <code>setProperty</code> methods.
-	 * 
-	 * @param propertyName
-	 *            The name of the CSS property. See the CSS property index.
-	 * @return Returns the value of the property if it has been explicitly set
-	 *         for this declaration block. Returns <code>null</code> if the
-	 *         property has not been set.
-	 */
-	public CSSValue getPropertyCSSValue(String propertyName) {
-		ICSSStyleDeclItem item = getDeclItemNode(propertyName);
-		if (item != null)
-			return item.getCSSValue();
-		return null;
-	}
-
-	/**
-	 * Used to retrieve the priority of a CSS property (e.g. the
-	 * <code>"important"</code> qualifier) if the property has been
-	 * explicitly set in this declaration block.
-	 * 
-	 * @param propertyName
-	 *            The name of the CSS property. See the CSS property index.
-	 * @return A string representing the priority (e.g.
-	 *         <code>"important"</code>) if one exists. The empty string if
-	 *         none exists.
-	 */
-	public String getPropertyPriority(String propertyName) {
-		ICSSStyleDeclItem item = getDeclItemNode(propertyName);
-		if (item != null)
-			return item.getPriority();
-		return null;
-	}
-
-	/**
-	 * Used to retrieve the value of a CSS property if it has been explicitly
-	 * set within this declaration block.
-	 * 
-	 * @param propertyName
-	 *            The name of the CSS property. See the CSS property index.
-	 * @return Returns the value of the property if it has been explicitly set
-	 *         for this declaration block. Returns the empty string if the
-	 *         property has not been set.
-	 */
-	public String getPropertyValue(String propertyName) {
-		CSSValue value = getPropertyCSSValue(propertyName);
-		if (value != null)
-			return ((ICSSValue) value).getCSSValueText();
-		return null;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public boolean isDocument() {
-		return fIsDocument;
-	}
-
-	/**
-	 * Used to retrieve the properties that have been explicitly set in this
-	 * declaration block. The order of the properties retrieved using this
-	 * method does not have to be the order in which they were set. This
-	 * method can be used to iterate over all properties in this declaration
-	 * block.
-	 * 
-	 * @param index
-	 *            Index of the property name to retrieve.
-	 * @return The name of the property at this ordinal position. The empty
-	 *         string if no property exists at this position.
-	 */
-	public String item(int index) {
-		if (index < 0)
-			return null;
-
-		int i = 0;
-		ICSSNode node = getFirstChild();
-		while (node != null) {
-			if (node instanceof CSSStyleDeclItemImpl) {
-				if (i != index)
-					i++;
-				else {
-					CSSStyleDeclItemImpl item = (CSSStyleDeclItemImpl) node;
-					return item.getPropertyName();
-				}
-			}
-			node = node.getNextSibling();
-		}
-		return null;
-	}
-
-	public ICSSStyleDeclItem removeDeclItemNode(ICSSStyleDeclItem oldDecl) throws DOMException {
-		return (ICSSStyleDeclItem) removeChild((CSSNodeImpl) oldDecl);
-	}
-
-	/**
-	 * Used to remove a CSS property if it has been explicitly set within this
-	 * declaration block.
-	 * 
-	 * @param propertyName
-	 *            The name of the CSS property. See the CSS property index.
-	 * @return Returns the value of the property if it has been explicitly set
-	 *         for this declaration block. Returns the empty string if the
-	 *         property has not been set or the property name does not
-	 *         correspond to a known CSS property.
-	 * @exception DOMException
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this declaration
-	 *                is readonly or the property is readonly.
-	 */
-	public String removeProperty(String propertyName) throws DOMException {
-		ICSSStyleDeclItem item = getDeclItemNode(propertyName);
-		if (item != null) {
-			removeChild((CSSNodeImpl) item);
-			return item.getCssText();
-		}
-		return null;
-	}
-
-	public ICSSStyleDeclItem setDeclItemNode(ICSSStyleDeclItem newDecl) throws DOMException {
-		if (newDecl == null)
-			return null;
-
-		ICSSStyleDeclItem item = getDeclItemNode(newDecl.getPropertyName());
-		if (item != null)
-			return (ICSSStyleDeclItem) replaceChild((CSSNodeImpl) newDecl, (CSSNodeImpl) item);
-		else
-			return (ICSSStyleDeclItem) appendChild((CSSNodeImpl) newDecl);
-	}
-
-	/**
-	 * Used to set a property value and priority within this declaration
-	 * block.
-	 * 
-	 * @param propertyName
-	 *            The name of the CSS property. See the CSS property index.
-	 * @param value
-	 *            The new value of the property.
-	 * @param priority
-	 *            The new priority of the property (e.g.
-	 *            <code>"important"</code>).
-	 * @exception DOMException
-	 *                SYNTAX_ERR: Raised if the specified value has a syntax
-	 *                error and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this declaration
-	 *                is readonly or the property is readonly.
-	 */
-	public void setProperty(String propertyName, String value, String priority) throws DOMException {
-		if (propertyName.equals("")) //$NON-NLS-1$
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); //$NON-NLS-1$
-
-		// You can use this only if CSSValue.setCssText() is implemented
-		CSSStyleDeclItemImpl item = (CSSStyleDeclItemImpl) getDeclItemNode(propertyName);
-		if (item == null) {
-			item = (CSSStyleDeclItemImpl) getOwnerDocument().createCSSStyleDeclItem(propertyName);
-			appendChild(item);
-		}
-
-		// ICSSNode next = item.getNextSibling();
-		// removeChild(item);
-
-		item.setCssValueText(value);
-		item.setPriority(priority);
-
-		// insertBefore(item, (CSSNodeImpl)next);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleRuleImpl.java
deleted file mode 100644
index 16add17..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleRuleImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.w3c.dom.DOMException;
-
-
-/**
- * 
- */
-class CSSStyleRuleImpl extends CSSRuleDeclContainer implements ICSSStyleRule {
-
-	ICSSSelectorList fSelectorList = new CSSSelectorListImpl(null);
-
-	/**
-	 * 
-	 */
-	CSSStyleRuleImpl() {
-		super();
-	}
-
-	CSSStyleRuleImpl(CSSStyleRuleImpl that) {
-		super(that);
-	}
-
-	public ICSSNode cloneNode(boolean deep) {
-		CSSStyleRuleImpl cloned = new CSSStyleRuleImpl(this);
-
-		if (deep)
-			cloneChildNodes(cloned, deep);
-
-		return cloned;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	String extractPreString() {
-		return getSelectorText();
-	}
-
-	/**
-	 * @return short
-	 */
-	public short getNodeType() {
-		return STYLERULE_NODE;
-	}
-
-	public ICSSSelectorList getSelectors() {
-		return fSelectorList;
-	}
-
-	/**
-	 * The textual representation of the selector for the rule set. The
-	 * implementation may have stripped out insignificant whitespace while
-	 * parsing the selector.
-	 * 
-	 * @exception DOMException
-	 *                SYNTAX_ERR: Raised if the specified CSS string value has
-	 *                a syntax error and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this rule is
-	 *                readonly.
-	 */
-	public String getSelectorText() {
-		return getAttribute(SELECTOR);
-	}
-
-	/**
-	 * The type of the rule, as defined above. The expectation is that
-	 * binding-specific casting methods can be used to cast down from an
-	 * instance of the <code>CSSRule</code> interface to the specific
-	 * derived interface implied by the <code>type</code>.
-	 */
-	public short getType() {
-		return STYLE_RULE;
-	}
-
-	/**
-	 * 
-	 */
-	public void setSelectorText(String selectorText) throws DOMException {
-		setAttribute(SELECTOR, selectorText);
-		fSelectorList = new CSSSelectorListImpl(selectorText);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleSheetImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleSheetImpl.java
deleted file mode 100644
index 50a2520..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleSheetImpl.java
+++ /dev/null
@@ -1,611 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.css.core.internal.CSSCoreMessages;
-import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSCharsetRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.internal.util.ImportRuleCollector;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.Assert;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.css.CSSFontFaceRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSUnknownRule;
-import org.w3c.dom.stylesheets.MediaList;
-import org.w3c.dom.stylesheets.StyleSheet;
-import org.w3c.dom.stylesheets.StyleSheetList;
-
-/**
- * 
- */
-class CSSStyleSheetImpl extends CSSDocumentImpl implements ICSSStyleSheet {
-
-
-	class InternalNodeList implements NodeList {
-
-		Vector nodes = new Vector();
-
-		public int getLength() {
-			if (nodes == null)
-				return 0;
-			else
-				return nodes.size();
-		}
-
-		public Node item(int i) {
-			if (nodes == null)
-				return null;
-			if (i < 0 || nodes.size() <= i)
-				return null;
-			return (Node) nodes.get(i);
-		}
-	}
-
-	class InternalStyleSheetList extends AbstractCSSNodeList implements StyleSheetList {
-
-		public ICSSNode appendNode(ICSSNode node) {
-			if (nodes == null || !nodes.contains(node))
-				return super.appendNode(node);
-			else
-				return node;
-		}
-
-		public StyleSheet item(int i) {
-			return (StyleSheet) itemImpl(i);
-		}
-	}
-
-	private boolean fDisabled = false;
-
-	/**
-	 * 
-	 */
-	CSSStyleSheetImpl() {
-		super();
-		setOwnerDocument(this);
-	}
-
-	CSSStyleSheetImpl(CSSStyleSheetImpl that) {
-		super(that);
-		setOwnerDocument(this);
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSRule
-	 * @param rule
-	 *            org.w3c.dom.css.CSSRule
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	public org.w3c.dom.css.CSSRule appendRule(org.w3c.dom.css.CSSRule rule) throws org.w3c.dom.DOMException {
-		if (rule == null)
-			return null;
-
-		CSSRule ret = (CSSRule) appendChild((CSSNodeImpl) rule);
-		return ret;
-	}
-
-	public ICSSNode cloneNode(boolean deep) {
-		CSSStyleSheetImpl cloned = new CSSStyleSheetImpl(this);
-
-		if (deep)
-			cloneChildNodes(cloned, deep);
-
-		return cloned;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSCharsetRule
-	 */
-	public ICSSCharsetRule createCSSCharsetRule() {
-		CSSCharsetRuleImpl rule = new CSSCharsetRuleImpl();
-		rule.setOwnerDocument(this);
-		return rule;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSFontFaceRule
-	 */
-	public CSSFontFaceRule createCSSFontFaceRule() {
-		CSSFontFaceRuleImpl rule = new CSSFontFaceRuleImpl();
-		CSSStyleDeclarationImpl style = (CSSStyleDeclarationImpl) createCSSStyleDeclaration();
-
-		rule.appendChild(style);
-		rule.setOwnerDocument(this);
-
-		return rule;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSImportRule
-	 */
-	public ICSSImportRule createCSSImportRule() {
-		CSSImportRuleImpl rule = new CSSImportRuleImpl();
-		MediaListImpl media = (MediaListImpl) createMediaList();
-
-		rule.appendChild(media);
-		rule.setOwnerDocument(this);
-
-		return rule;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.ICSSMediaRule
-	 */
-	public ICSSMediaRule createCSSMediaRule() {
-		CSSMediaRuleImpl rule = new CSSMediaRuleImpl();
-		MediaListImpl media = (MediaListImpl) createMediaList();
-
-		rule.insertBefore(media, (CSSNodeImpl) rule.getFirstChild()); // media
-																		// must
-																		// be
-																		// the
-																		// top
-																		// of
-																		// children
-																		// list
-		rule.setOwnerDocument(this);
-
-		return rule;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSPageRule
-	 */
-	public ICSSPageRule createCSSPageRule() {
-		CSSPageRuleImpl rule = new CSSPageRuleImpl();
-		CSSStyleDeclarationImpl style = (CSSStyleDeclarationImpl) createCSSStyleDeclaration();
-
-		rule.appendChild(style);
-		rule.setOwnerDocument(this);
-
-		return rule;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSRule
-	 * @param rule
-	 *            java.lang.String
-	 */
-	public CSSRule createCSSRule(String rule) {
-		CSSDocumentLoader loader = new CSSDocumentLoader();
-		IStructuredDocument structuredDocument = (IStructuredDocument) loader.createNewStructuredDocument();
-		structuredDocument.set(rule);
-
-		CSSModelParser modelParser = new CSSModelParser((CSSDocumentImpl) getOwnerDocument());
-		return modelParser.createCSSRule(structuredDocument.getRegionList());
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSStyleDeclaration
-	 */
-	public ICSSStyleDeclaration createCSSStyleDeclaration() {
-		CSSStyleDeclarationImpl decl = new CSSStyleDeclarationImpl(false);
-		decl.setOwnerDocument(this);
-
-		return decl;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSStyleRule
-	 */
-	public ICSSStyleRule createCSSStyleRule() {
-		CSSStyleRuleImpl rule = new CSSStyleRuleImpl();
-		CSSStyleDeclarationImpl style = (CSSStyleDeclarationImpl) createCSSStyleDeclaration();
-
-		rule.appendChild(style);
-		rule.setOwnerDocument(this);
-
-		return rule;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSUnknownRule
-	 */
-	public CSSUnknownRule createCSSUnknownRule() {
-		CSSUnknownRuleImpl rule = new CSSUnknownRuleImpl();
-		rule.setOwnerDocument(this);
-
-		return rule;
-	}
-
-	/**
-	 * @return org.w3c.dom.stylesheets.MediaList
-	 */
-	public MediaList createMediaList() {
-		MediaListImpl media = new MediaListImpl();
-		media.setOwnerDocument(this);
-
-		return media;
-	}
-
-	/**
-	 * Used to delete a rule from the style sheet.
-	 * 
-	 * @param index
-	 *            The index within the style sheet's rule list of the rule to
-	 *            remove.
-	 * @exception DOMException
-	 *                INDEX_SIZE_ERR: Raised if the specified index does not
-	 *                correspond to a rule in the style sheet's rule list.
-	 *                <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this style sheet
-	 *                is readonly.
-	 */
-	public void deleteRule(int index) throws DOMException {
-		CSSNodeImpl node = getIndexedRule(index);
-		if (node != null)
-			removeChild(node);
-	}
-
-	/**
-	 * The list of all CSS rules contained within the style sheet. This
-	 * includes both rule sets and at-rules.
-	 */
-	public CSSRuleList getCssRules() {
-		CSSRuleListImpl list = new CSSRuleListImpl();
-
-		for (ICSSNode node = getFirstChild(); node != null; node = node.getNextSibling()) {
-			if (node instanceof CSSRule) {
-				list.appendNode(node);
-			}
-		}
-
-		return list;
-	}
-
-	/**
-	 * <code>false</code> if the style sheet is applied to the document.
-	 * <code>true</code> if it is not. Modifying this attribute may cause a
-	 * new resolution of style for the document. A stylesheet only applies if
-	 * both an appropriate medium definition is present and the disabled
-	 * attribute is false. So, if the media doesn't apply to the current user
-	 * agent, the <code>disabled</code> attribute is ignored.
-	 */
-	public boolean getDisabled() {
-		return fDisabled;
-	}
-
-	/**
-	 * If the style sheet is a linked style sheet, the value of its attribute
-	 * is its location. For inline style sheets, the value of this attribute
-	 * is <code>null</code>. See the href attribute definition for the
-	 * <code>LINK</code> element in HTML 4.0, and the href pseudo-attribute
-	 * for the XML style sheet processing instruction.
-	 */
-	public String getHref() {
-		ICSSModel model = getModel();
-		if (model != null && model.getStyleSheetType() == ICSSModel.EXTERNAL) {
-			return model.getBaseLocation();
-			/*
-			 * Object id = model.getId(); if (id != null) { if (id instanceof
-			 * IResource) { // TODO: need to check whether this is correct or
-			 * not, later. return ((IResource)id).getFullPath().toString(); }
-			 * return id.toString(); }
-			 */}
-		return null;
-	}
-
-	CSSRuleImpl getIndexedRule(int index) {
-		if (index < 0)
-			return null;
-
-		int i = 0;
-		for (ICSSNode node = getFirstChild(); node != null; node = node.getNextSibling()) {
-			if (node instanceof CSSRule) {
-				if (i++ == index)
-					return (CSSRuleImpl) node;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * The intended destination media for style information. The media is
-	 * often specified in the <code>ownerNode</code>. If no media has been
-	 * specified, the <code>MediaList</code> will be empty. See the media
-	 * attribute definition for the <code>LINK</code> element in HTML 4.0,
-	 * and the media pseudo-attribute for the XML style sheet processing
-	 * instruction . Modifying the media list may cause a change to the
-	 * attribute <code>disabled</code>.
-	 */
-	public MediaList getMedia() {
-		return null;
-	}
-
-	/**
-	 * @return short
-	 */
-	public short getNodeType() {
-		return STYLESHEET_NODE;
-	}
-
-	/**
-	 * The node that associates this style sheet with the document. For HTML,
-	 * this may be the corresponding <code>LINK</code> or <code>STYLE</code>
-	 * element. For XML, it may be the linking processing instruction. For
-	 * style sheets that are included by other style sheets, the value of this
-	 * attribute is <code>null</code>.
-	 */
-	public Node getOwnerNode() {
-		// for <LINK> tag or <STYLE> tag
-		ICSSModel model = getModel();
-		if (model != null)
-			return model.getOwnerDOMNode();
-		return null;
-	}
-
-	/**
-	 * @return org.w3c.dom.NodeList
-	 */
-	public org.w3c.dom.NodeList getOwnerNodes() {
-		List list = (getModel().getStyleListeners() != null) ? new Vector(getModel().getStyleListeners()) : null;
-		if (list == null)
-			return null;
-		InternalNodeList nodes = new InternalNodeList();
-		Iterator it = list.iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-			if (obj instanceof IStyleSheetAdapter) {
-				nodes.nodes.add(((IStyleSheetAdapter) obj).getElement());
-			}
-		}
-		if (nodes.getLength() > 0)
-			return nodes;
-		else
-			return null;
-	}
-
-	/**
-	 * @return org.w3c.dom.NodeList
-	 * @param doc
-	 *            org.w3c.dom.Document
-	 */
-	public NodeList getOwnerNodes(Document doc) {
-		List list = (getModel().getStyleListeners() != null) ? new Vector(getModel().getStyleListeners()) : null;
-		if (list == null)
-			return null;
-		InternalNodeList nodes = new InternalNodeList();
-		Iterator it = list.iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-			if (obj instanceof IStyleSheetAdapter) {
-				Element ele = ((IStyleSheetAdapter) obj).getElement();
-				if (ele.getOwnerDocument() == doc)
-					nodes.nodes.add(ele);
-			}
-		}
-		if (nodes.getLength() > 0)
-			return nodes;
-		else
-			return null;
-	}
-
-	/**
-	 * If this style sheet comes from an <code>@import</code> rule, the <code>ownerRule</code> attribute will
-	 *         contain the <code>CSSImportRule</code>. In that case, the
-	 *         <code>ownerNode</code> attribute in the
-	 *         <code>StyleSheet</code> interface will be <code>null</code>.
-	 *         If the style sheet comes from an element or a processing
-	 *         instruction, the <code>ownerRule</code> attribute will be
-	 *         <code>null</code> and the <code>ownerNode</code> attribute
-	 *         will contain the <code>Node</code>.
-	 */
-	public CSSRule getOwnerRule() {
-		Assert.isTrue(false, CSSCoreMessages.You_cannot_use_CSSStyleShe_UI_); //$NON-NLS-1$ = "You cannot use CSSStyleSheet.getOwnerRule() because of many referencers of this rule\nPlease use getOnwerRules()"
-		// for @import
-		return null;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSRuleList
-	 */
-	public org.w3c.dom.css.CSSRuleList getOwnerRules() {
-		StyleSheetList list = getParentStyleSheets();
-		if (list == null)
-			return null;
-		CSSRuleListImpl ruleList = new CSSRuleListImpl();
-		for (int i = 0; i < list.getLength(); i++) {
-			ImportRuleCollector trav = new ImportRuleCollector(this);
-			trav.apply((ICSSStyleSheet) list.item(i));
-			ruleList.nodes.addAll(trav.getRules());
-		}
-		return ruleList;
-	}
-
-	/**
-	 * For style sheet languages that support the concept of style sheet
-	 * inclusion, this attribute represents the including style sheet, if one
-	 * exists. If the style sheet is a top-level style sheet, or the style
-	 * sheet language does not support inclusion, the value of this attribute
-	 * is <code>null</code>.
-	 */
-	public StyleSheet getParentStyleSheet() {
-		CSSRule owner = getOwnerRule();
-		if (owner != null)
-			return owner.getParentStyleSheet();
-		return null;
-	}
-
-	/**
-	 * @return org.w3c.dom.stylesheets.StyleSheetList
-	 */
-	public org.w3c.dom.stylesheets.StyleSheetList getParentStyleSheets() {
-		List list = (getModel().getStyleListeners() != null) ? new Vector(getModel().getStyleListeners()) : null;
-		if (list == null)
-			return null;
-		InternalStyleSheetList sheets = new InternalStyleSheetList();
-		Iterator it = list.iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-			if (obj instanceof ICSSModel) {
-				sheets.appendNode(((ICSSModel) obj).getDocument());
-			}
-		}
-		if (sheets.getLength() > 0)
-			return sheets;
-		else
-			return null;
-	}
-
-	/**
-	 * The advisory title. The title is often specified in the
-	 * <code>ownerNode</code>. See the title attribute definition for the
-	 * <code>LINK</code> element in HTML 4.0, and the title pseudo-attribute
-	 * for the XML style sheet processing instruction.
-	 */
-	public String getTitle() {
-		Node node = getOwnerNode();
-		if (node instanceof Element) {
-			return ((Element) node).getAttribute("TITLE");//$NON-NLS-1$
-		}
-		return null;
-	}
-
-	/**
-	 * This specifies the style sheet language for this style sheet. The style
-	 * sheet language is specified as a content type (e.g. "text/css"). The
-	 * content type is often specified in the <code>ownerNode</code>. Also
-	 * see the type attribute definition for the <code>LINK</code> element
-	 * in HTML 4.0, and the type pseudo-attribute for the XML style sheet
-	 * processing instruction.
-	 */
-	public String getType() {
-		Node node = getOwnerNode();
-		if (node instanceof Element) {
-			return ((Element) node).getAttribute("TYPE");//$NON-NLS-1$
-		}
-		return null;
-	}
-
-	/**
-	 * Used to insert a new rule into the style sheet. The new rule now
-	 * becomes part of the cascade.
-	 * 
-	 * @param rule
-	 *            The parsable text representing the rule. For rule sets this
-	 *            contains both the selector and the style declaration. For
-	 *            at-rules, this specifies both the at-identifier and the rule
-	 *            content.
-	 * @param index
-	 *            The index within the style sheet's rule list of the rule
-	 *            before which to insert the specified rule. If the specified
-	 *            index is equal to the length of the style sheet's rule
-	 *            collection, the rule will be added to the end of the style
-	 *            sheet.
-	 * @return The index within the style sheet's rule collection of the newly
-	 *         inserted rule.
-	 * @exception DOMException
-	 *                HIERARCHY_REQUEST_ERR: Raised if the rule cannot be
-	 *                inserted at the specified index e.g. if an
-	 *                <code>@import</code> rule is inserted after a standard rule set or other
-	 *         at-rule. <br>
-	 *         INDEX_SIZE_ERR: Raised if the specified index is not a valid
-	 *         insertion point. <br>
-	 *         NO_MODIFICATION_ALLOWED_ERR: Raised if this style sheet is
-	 *         readonly. <br>
-	 *         SYNTAX_ERR: Raised if the specified rule has a syntax error and
-	 *         is unparsable.
-	 */
-	public int insertRule(String rule, int index) throws DOMException {
-		int length = getCssRules().getLength();
-		if (index < 0 || length < index)
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, "");//$NON-NLS-1$
-
-		IStructuredDocument doc = getModel().getStructuredDocument();
-		CSSRuleImpl refRule = (length != index) ? getIndexedRule(index) : null;
-		int offset = (refRule != null) ? refRule.getStartOffset() : doc.getLength();
-		doc.replaceText(this, offset, 0, rule);
-
-		// insertBefore((CSSNodeImpl) createCSSRule(rule),refRule);
-		return index;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSRule
-	 * @param newRule
-	 *            org.w3c.dom.css.CSSRule
-	 * @param refRule
-	 *            org.w3c.dom.css.CSSRule
-	 */
-	public org.w3c.dom.css.CSSRule insertRuleBefore(org.w3c.dom.css.CSSRule newRule, org.w3c.dom.css.CSSRule refRule) throws org.w3c.dom.DOMException {
-		if (newRule == null && refRule == null)
-			return null;
-
-		CSSRule ret = (CSSRule) insertBefore((CSSNodeImpl) newRule, (CSSNodeImpl) refRule);
-		return ret;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public boolean isDocument() {
-		return true;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSRule
-	 * @param rule
-	 *            org.w3c.dom.css.CSSRule
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	public org.w3c.dom.css.CSSRule removeRule(org.w3c.dom.css.CSSRule rule) throws org.w3c.dom.DOMException {
-		if (rule == null)
-			return null;
-
-		CSSRule ret = (CSSRule) removeChild((CSSNodeImpl) rule);
-		return ret;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSRule
-	 * @param newChild
-	 *            org.w3c.dom.css.CSSRule
-	 * @param oldChild
-	 *            org.w3c.dom.css.CSSRule
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	public org.w3c.dom.css.CSSRule replaceRule(org.w3c.dom.css.CSSRule newRule, org.w3c.dom.css.CSSRule oldRule) throws org.w3c.dom.DOMException {
-		if (newRule == null && oldRule == null)
-			return null;
-
-		CSSRule ret = (CSSRule) replaceChild((CSSNodeImpl) newRule, (CSSNodeImpl) oldRule);
-		return ret;
-	}
-
-	/**
-	 * setDisabled method comment.
-	 */
-	public void setDisabled(boolean disabled) {
-		this.fDisabled = disabled;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSUnknownRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSUnknownRuleImpl.java
deleted file mode 100644
index b68da6b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSUnknownRuleImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.w3c.dom.css.CSSUnknownRule;
-
-
-/**
- * 
- */
-class CSSUnknownRuleImpl extends CSSRuleImpl implements CSSUnknownRule {
-
-	// TODO: This field is never read
-	String fCssText = null;
-
-	/**
-	 * 
-	 */
-	CSSUnknownRuleImpl() {
-		super();
-	}
-
-	CSSUnknownRuleImpl(CSSUnknownRuleImpl that) {
-		super(that);
-	}
-
-	public ICSSNode cloneNode(boolean deep) {
-		CSSUnknownRuleImpl cloned = new CSSUnknownRuleImpl(this);
-
-		return cloned;
-	}
-
-	/**
-	 * @return short
-	 */
-	public short getNodeType() {
-		return UNKNOWNRULE_NODE;
-	}
-
-	/**
-	 * The type of the rule, as defined above. The expectation is that
-	 * binding-specific casting methods can be used to cast down from an
-	 * instance of the <code>CSSRule</code> interface to the specific
-	 * derived interface implied by the <code>type</code>.
-	 */
-	public short getType() {
-		return UNKNOWN_RULE;
-	}
-
-	/**
-	 * @param cssText
-	 *            java.lang.String
-	 */
-	public void setCssText(String cssText) {
-		this.fCssText = cssText;
-
-		super.setCssText(cssText);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CounterImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CounterImpl.java
deleted file mode 100644
index 106ae66..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CounterImpl.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICounter;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.css.Counter;
-
-
-/**
- * 
- */
-class CounterImpl extends CSSPrimitiveContainer implements ICounter {
-
-	/**
-	 * 
-	 */
-	CounterImpl() {
-		super(CSS_COUNTER);
-	}
-
-	CounterImpl(CounterImpl that) {
-		super(that);
-	}
-
-	/**
-	 * @return org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param deep
-	 *            boolean
-	 */
-	public ICSSNode cloneNode(boolean deep) {
-		CounterImpl cloned = new CounterImpl(this);
-
-		if (deep)
-			cloneChildNodes(cloned, deep);
-
-		return cloned;
-	}
-
-	/**
-	 * This method is used to get the Counter value. If this CSS value doesn't
-	 * contain a counter value, a <code>DOMException</code> is raised.
-	 * Modification to the corresponding style property can be achieved using
-	 * the <code>Counter</code> interface.
-	 * 
-	 * @return The Counter value.
-	 * @exception DOMException
-	 *                INVALID_ACCESS_ERR: Raised if the CSS value doesn't
-	 *                contain a Counter value (e.g. this is not
-	 *                <code>CSS_COUNTER</code>).
-	 */
-	public Counter getCounterValue() throws DOMException {
-		return this;
-	}
-
-	/**
-	 * This attribute is used for the identifier of the counter.
-	 */
-	public String getIdentifier() {
-		return getAttribute(IDENTIFIER);
-	}
-
-	/**
-	 * This attribute is used for the style of the list.
-	 */
-	public String getListStyle() {
-		return getAttribute(LISTSTYLE);
-	}
-
-	/**
-	 * This attribute is used for the separator of the nested counters.
-	 */
-	public String getSeparator() {
-		return getAttribute(SEPARATOR);
-	}
-
-	/**
-	 * 
-	 */
-	protected void initPrimitives() {
-		return;
-	}
-
-	/**
-	 * @param identifier
-	 *            java.lang.String
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	public void setIdentifier(String identifier) throws DOMException {
-		setAttribute(IDENTIFIER, identifier);
-	}
-
-	/**
-	 * @param listStyle
-	 *            java.lang.String
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	public void setListStyle(String listStyle) throws DOMException {
-		setAttribute(LISTSTYLE, listStyle);
-	}
-
-	/**
-	 * @param Separator
-	 *            java.lang.String
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	public void setSeparator(String Separator) throws org.w3c.dom.DOMException {
-		setAttribute(SEPARATOR, Separator);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/DOMCSSImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/DOMCSSImpl.java
deleted file mode 100644
index d428a5a..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/DOMCSSImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleSheet;
-
-
-/**
- * 
- */
-public class DOMCSSImpl {
-
-	/**
-	 * DOMCSSImpl constructor comment.
-	 */
-	public DOMCSSImpl() {
-		super();
-	}
-
-	public static ICSSStyleDeclaration createCSSStyleDeclaration() throws org.w3c.dom.DOMException {
-		CSSStyleDeclarationImpl document = new CSSStyleDeclarationImpl(true);
-
-		return document;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.CSSStyleSheet
-	 * @param title
-	 *            java.lang.String
-	 * @param media
-	 *            java.lang.String
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	public static CSSStyleSheet createCSSStyleSheet(String title, String media) throws org.w3c.dom.DOMException {
-		return new CSSStyleSheetImpl();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/MediaListImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/MediaListImpl.java
deleted file mode 100644
index d5ffb6b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/MediaListImpl.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.stylesheets.MediaList;
-
-
-/**
- * 
- */
-class MediaListImpl extends CSSRegionContainer implements MediaList {
-
-	int mediumCounter;
-
-	/**
-	 * MediaListImpl constructor comment.
-	 */
-	MediaListImpl() {
-		super();
-	}
-
-	/**
-	 * MediaListImpl constructor comment.
-	 */
-	MediaListImpl(MediaListImpl that) {
-		super(that);
-	}
-
-	/**
-	 * Adds the medium <code>newMedium</code> to the end of the list. If the
-	 * <code>newMedium</code> is already used, it is first removed.
-	 * 
-	 * @param newMediumThe
-	 *            new medium to add.
-	 * @exception DOMException
-	 *                INVALID_CHARACTER_ERR: If the medium contains characters
-	 *                that are invalid in the underlying style language. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this list is
-	 *                readonly.
-	 */
-	public void appendMedium(String newMedium) throws DOMException {
-		if (newMedium == null)
-			return;
-
-		CSSNodeListImpl m = getMedia();
-		for (int i = 0; i != m.getLength(); i++) {
-			if (newMedium.equals(item(i)))
-				return;
-		}
-
-		setAttribute("medium" + Integer.toString(mediumCounter++), newMedium);//$NON-NLS-1$
-	}
-
-	public ICSSNode cloneNode(boolean deep) {
-		MediaListImpl cloned = new MediaListImpl(this);
-		return cloned;
-	}
-
-	/**
-	 * Deletes the medium indicated by <code>oldMedium</code> from the list.
-	 * 
-	 * @param oldMediumThe
-	 *            medium to delete in the media list.
-	 * @exception DOMException
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this list is
-	 *                readonly. <br>
-	 *                NOT_FOUND_ERR: Raised if <code>oldMedium</code> is not
-	 *                in the list.
-	 */
-	public void deleteMedium(String oldMedium) throws DOMException {
-		for (int i = 0; i != getLength(); i++) {
-			if (oldMedium.equals(item(i))) {
-				removeAttributeNode((CSSAttrImpl) fAttrs.item(i));
-			}
-		}
-	}
-
-	/**
-	 * The number of media in the list. The range of valid media is
-	 * <code>0</code> to <code>length-1</code> inclusive.
-	 */
-	public int getLength() {
-		return getMedia().getLength();
-	}
-
-	/**
-	 * @return CSSNodeListImpl
-	 */
-	CSSNodeListImpl getMedia() {
-		if (fAttrs == null)
-			fAttrs = new CSSNamedNodeMapImpl();
-		return fAttrs;
-	}
-
-	/**
-	 * The parsable textual representation of the media list. This is a
-	 * comma-separated list of media.
-	 * 
-	 * @exception DOMException
-	 *                SYNTAX_ERR: Raised if the specified string value has a
-	 *                syntax error and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this media list
-	 *                is readonly.
-	 */
-	public String getMediaText() {
-		return getCssText();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (2001/01/17
-	 * 18:50:29)
-	 * 
-	 * @return short
-	 */
-	public short getNodeType() {
-		return MEDIALIST_NODE;
-	}
-
-	/**
-	 * Returns the <code>index</code> th in the list. If <code>index</code>
-	 * is greater than or equal to the number of media in the list, this
-	 * returns <code>null</code>.
-	 * 
-	 * @param index
-	 *            Index into the collection.
-	 * @return The medium at the <code>index</code> th position in the
-	 *         <code>MediaList</code>, or <code>null</code> if that is
-	 *         not a valid index.
-	 */
-	public String item(int index) {
-		if (index < 0 || getLength() <= index)
-			return null;
-
-		return ((CSSAttrImpl) getMedia().item(index)).getValue();
-	}
-
-	/**
-	 * setMediaText method comment.
-	 */
-	public void setMediaText(String mediaText) throws DOMException {
-		setCssText(mediaText);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/RGBColorImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/RGBColorImpl.java
deleted file mode 100644
index 87d4b84..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/RGBColorImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.RGBColor;
-
-
-/**
- * 
- */
-class RGBColorImpl extends CSSPrimitiveContainer implements RGBColor {
-
-	private CSSPrimitiveValueImpl fRed;
-	private CSSPrimitiveValueImpl fGreen;
-	private CSSPrimitiveValueImpl fBlue;
-
-	/**
-	 * 
-	 */
-	RGBColorImpl() {
-		super(CSS_RGBCOLOR);
-	}
-
-	RGBColorImpl(RGBColorImpl that) {
-		super(that);
-
-		fRed = new CSSPrimitiveValueImpl(that.fRed);
-		appendChild(fRed);
-
-		fGreen = new CSSPrimitiveValueImpl(that.fGreen);
-		appendChild(fGreen);
-
-		fBlue = new CSSPrimitiveValueImpl(that.fBlue);
-		appendChild(fBlue);
-	}
-
-	/**
-	 * @return org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param deep
-	 *            boolean
-	 */
-	public ICSSNode cloneNode(boolean deep) {
-		RGBColorImpl cloned = new RGBColorImpl(this);
-
-		return cloned;
-	}
-
-	/**
-	 * This attribute is used for the blue value of the RGB color.
-	 */
-	public CSSPrimitiveValue getBlue() {
-		return fBlue;
-	}
-
-	/**
-	 * This attribute is used for the green value of the RGB color.
-	 */
-	public CSSPrimitiveValue getGreen() {
-		return fGreen;
-	}
-
-	/**
-	 * This attribute is used for the red value of the RGB color.
-	 */
-	public CSSPrimitiveValue getRed() {
-		return fRed;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.RGBColor
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	public RGBColor getRGBColorValue() throws org.w3c.dom.DOMException {
-		return this;
-	}
-
-	/**
-	 * 
-	 */
-	protected void initPrimitives() {
-
-		fRed = (CSSPrimitiveValueImpl) getOwnerDocument().createCSSPrimitiveValue(CSS_NUMBER);
-		appendChild(fRed);
-
-		fGreen = (CSSPrimitiveValueImpl) getOwnerDocument().createCSSPrimitiveValue(CSS_NUMBER);
-		appendChild(fGreen);
-
-		fBlue = (CSSPrimitiveValueImpl) getOwnerDocument().createCSSPrimitiveValue(CSS_NUMBER);
-		appendChild(fBlue);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/RectImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/RectImpl.java
deleted file mode 100644
index afcc2d9..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/RectImpl.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.Rect;
-
-
-/**
- * 
- */
-class RectImpl extends CSSPrimitiveContainer implements Rect {
-
-	private CSSPrimitiveValueImpl fTop;
-	private CSSPrimitiveValueImpl fRight;
-	private CSSPrimitiveValueImpl fBottom;
-	private CSSPrimitiveValueImpl fLeft;
-
-	/**
-	 * 
-	 */
-	RectImpl() {
-		super(CSS_RECT);
-	}
-
-	RectImpl(RectImpl that) {
-		super(that);
-
-		fTop = new CSSPrimitiveValueImpl(that.fTop);
-		appendChild(fTop);
-
-		fRight = new CSSPrimitiveValueImpl(that.fRight);
-		appendChild(fRight);
-
-		fBottom = new CSSPrimitiveValueImpl(that.fBottom);
-		appendChild(fBottom);
-
-		fLeft = new CSSPrimitiveValueImpl(that.fLeft);
-		appendChild(fLeft);
-	}
-
-	/**
-	 * @return org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param deep
-	 *            boolean
-	 */
-	public ICSSNode cloneNode(boolean deep) {
-		RectImpl cloned = new RectImpl(this);
-
-		return cloned;
-	}
-
-	/**
-	 * This attribute is used for the bottom of the rect.
-	 */
-	public CSSPrimitiveValue getBottom() {
-		return fBottom;
-	}
-
-	/**
-	 * This attribute is used for the left of the rect.
-	 */
-	public CSSPrimitiveValue getLeft() {
-		return fLeft;
-	}
-
-	/**
-	 * @return org.w3c.dom.css.Rect
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	public Rect getRectValue() throws org.w3c.dom.DOMException {
-		return this;
-	}
-
-	/**
-	 * This attribute is used for the right of the rect.
-	 */
-	public CSSPrimitiveValue getRight() {
-		return fRight;
-	}
-
-	/**
-	 * This attribute is used for the top of the rect.
-	 */
-	public CSSPrimitiveValue getTop() {
-		return fTop;
-	}
-
-	/**
-	 * 
-	 */
-	protected void initPrimitives() {
-
-		fTop = (CSSPrimitiveValueImpl) getOwnerDocument().createCSSPrimitiveValue(CSS_NUMBER);
-		appendChild(fTop);
-
-		fRight = (CSSPrimitiveValueImpl) getOwnerDocument().createCSSPrimitiveValue(CSS_NUMBER);
-		appendChild(fRight);
-
-		fBottom = (CSSPrimitiveValueImpl) getOwnerDocument().createCSSPrimitiveValue(CSS_NUMBER);
-		appendChild(fBottom);
-
-		fLeft = (CSSPrimitiveValueImpl) getOwnerDocument().createCSSPrimitiveValue(CSS_NUMBER);
-		appendChild(fLeft);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/StyleSheetListImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/StyleSheetListImpl.java
deleted file mode 100644
index fea1bfc..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/StyleSheetListImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.document;
-
-
-
-import org.w3c.dom.stylesheets.StyleSheet;
-import org.w3c.dom.stylesheets.StyleSheetList;
-
-/**
- * 
- */
-class StyleSheetListImpl extends AbstractCSSNodeList implements StyleSheetList {
-
-	/**
-	 * StyleSheetListImpl constructor comment.
-	 */
-	StyleSheetListImpl() {
-		super();
-	}
-
-	/**
-	 * Used to retrieve a style sheet by ordinal index. If index is greater
-	 * than or equal to the number of style sheets in the list, this returns
-	 * <code>null</code>.
-	 * 
-	 * @param indexIndex
-	 *            into the collection
-	 * @return The style sheet at the <code>index</code> position in the
-	 *         <code>StyleSheetList</code>, or <code>null</code> if that
-	 *         is not a valid index.
-	 */
-	public StyleSheet item(int index) {
-		return (StyleSheet) itemImpl(index);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/CSSDocumentCharsetDetector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/CSSDocumentCharsetDetector.java
deleted file mode 100644
index 62034c5..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/CSSDocumentCharsetDetector.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.encoding;
-
-import java.util.Iterator;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.css.core.internal.contenttype.CSSResourceEncodingDetector;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.sse.core.internal.document.DocumentReader;
-import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-
-
-public class CSSDocumentCharsetDetector extends CSSResourceEncodingDetector implements IDocumentCharsetDetector {
-
-	public String getEncodingName(IStructuredDocument structuredDocument) {
-		String result = null;
-		// if the document is empty, then there will be no nodes,
-		// so no need to continue.
-		IStructuredDocumentRegionList nodes = structuredDocument.getRegionList();
-		if (nodes.getLength() > 0) {
-			IStructuredDocumentRegion node = null;
-			// skip any initial whitespace
-			// Note that @charset "encodingname";
-			// must appear at very beginning of document,
-			// to be valid.
-			// May have to test with "damaged" files (e.g.
-			// beginning EOLs, etc., to verify this works
-			// as expected.
-			for (int i = 0; i < nodes.getLength(); i++) {
-				node = nodes.item(i);
-				if (getType(node) != CSSRegionContexts.CSS_S) {
-					break;
-				}
-			}
-			Iterator regions = node.getRegions().iterator();
-			ITextRegion region = getNextRegionOfType(CSSRegionContexts.CSS_CHARSET, regions);
-			if (region != null) {
-				ITextRegion valueRegion = getNextRegionOfType(CSSRegionContexts.CSS_STRING, regions);
-				if (valueRegion == null) {
-					// if didn't find the region, its probably due to ill
-					// formed input, such as
-					// @charset "ISO-8859-6;
-					// so we'll try again for "unknown" region.
-					// If that fails, we'll give up?
-					regions = node.getRegions().iterator();
-					region = getNextRegionOfType(CSSRegionContexts.CSS_CHARSET, regions);
-					if (region != null) {
-						valueRegion = getNextRegionOfType(CSSRegionContexts.CSS_UNKNOWN, regions);
-						if (valueRegion != null) {
-							result = node.getText(valueRegion);
-						}
-					}
-				}
-				else {
-					result = node.getText(valueRegion);
-				}
-				result = StringUtils.stripNonLetterDigits(result);
-			}
-		}
-		return result;
-	}
-
-	public String getEncodingName(IDocument document) {
-		String enc = null;
-		if (document instanceof IStructuredDocument) {
-			enc = getEncodingName((IStructuredDocument) document);
-		}
-		else {
-			// TODO Important: need to implement some "raw" parser for
-			// IDocument level
-		}
-		return enc;
-	}
-
-	private String getType(IStructuredDocumentRegion node) {
-		if (node == null)
-			return null;
-		ITextRegionList regions = node.getRegions();
-		if (regions == null || regions.size() == 0)
-			return null;
-		ITextRegion region = regions.get(0);
-		String result = region.getType();
-		return result;
-	}
-
-	private ITextRegion getNextRegionOfType(String type, Iterator regions) {
-		if (type == null)
-			return null;
-		if (regions == null)
-			return null;
-		ITextRegion result = null;
-		while (regions.hasNext()) {
-			ITextRegion region = (ITextRegion) regions.next();
-			if (region.getType() == type) {
-				result = region;
-				break;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * 
-	 */
-
-	public void set(IDocument document) {
-		set(new DocumentReader(document, 0));
-
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/CSSDocumentLoader.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/CSSDocumentLoader.java
deleted file mode 100644
index 20c49e1..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/CSSDocumentLoader.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.encoding;
-
-
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.wst.css.core.internal.contenttype.EncodingGuesser;
-import org.eclipse.wst.css.core.internal.parser.CSSSourceParser;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.css.core.internal.text.CSSStructuredDocumentReParser;
-import org.eclipse.wst.css.core.internal.text.StructuredTextPartitionerForCSS;
-import org.eclipse.wst.sse.core.internal.document.AbstractDocumentLoader;
-import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-
-
-public class CSSDocumentLoader extends AbstractDocumentLoader {
-	private final static String CSS_ID = ContentTypeIdForCSS.ContentTypeID_CSS;
-	private IDocumentCharsetDetector documentEncodingDetector;
-
-
-	public CSSDocumentLoader() {
-		super();
-	}
-
-	protected String getEncodingNameByGuess(byte[] string, int length) {
-		String ianaEnc = null;
-		ianaEnc = EncodingGuesser.guessEncoding(string, length);
-		return ianaEnc;
-	}
-
-	/**
-	 * Default encoding. For CSS there is no spec'd default.
-	 */
-	protected String getSpecDefaultEncoding() {
-		return null;
-	}
-
-	protected IEncodedDocument newEncodedDocument() {
-		// DMW: I copied this from CSSModelImple ...
-		// but am not sure its right
-		IStructuredDocument structuredDocument = StructuredDocumentFactory.getNewStructuredDocumentInstance(getParser());
-		CSSStructuredDocumentReParser reParser = new CSSStructuredDocumentReParser();
-		reParser.setStructuredDocument(structuredDocument);
-		((BasicStructuredDocument) structuredDocument).setReParser(reParser);
-		return structuredDocument;
-	}
-
-	public RegionParser getParser() {
-		// return new CSSRegionParser();
-		return new CSSSourceParser();
-	}
-
-	protected String getPreferredNewLineDelimiter() {
-		return ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(CSS_ID);
-	}
-
-	public IDocumentCharsetDetector getDocumentEncodingDetector() {
-		if (documentEncodingDetector == null) {
-			documentEncodingDetector = new CSSDocumentCharsetDetector();
-		}
-		return documentEncodingDetector;
-	}
-
-	public IDocumentPartitioner getDefaultDocumentPartitioner() {
-		return new StructuredTextPartitionerForCSS();
-	}
-
-	public IDocumentLoader newInstance() {
-		return new CSSDocumentLoader();
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/ICSSStyleListener.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/ICSSStyleListener.java
deleted file mode 100644
index d44e94b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/ICSSStyleListener.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.event;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-
-
-
-/**
- * 
- */
-public interface ICSSStyleListener {
-
-	/**
-	 * 
-	 */
-	void styleChanged(ICSSModel srcModel, ICSSSelector[] removed, ICSSSelector[] added, String media);
-
-	/**
-	 * 
-	 */
-	void styleUpdate(ICSSModel srcModel);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/ICSSStyleNotifier.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/ICSSStyleNotifier.java
deleted file mode 100644
index 98655af..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/ICSSStyleNotifier.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.event;
-
-
-
-import java.util.List;
-
-/**
- * 
- */
-public interface ICSSStyleNotifier extends ICSSStyleListener {
-
-	/**
-	 * 
-	 */
-	void addStyleListener(ICSSStyleListener listener);
-
-	/**
-	 * 
-	 */
-	List getStyleListeners();
-
-	/**
-	 */
-	boolean isRecording();
-
-	/**
-	 * 
-	 */
-	void removeStyleListener(ICSSStyleListener listener);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/eventimpl/CSSEmbededStyleNotifyAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/eventimpl/CSSEmbededStyleNotifyAdapter.java
deleted file mode 100644
index 7bbc27b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/eventimpl/CSSEmbededStyleNotifyAdapter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.eventimpl;
-
-
-
-import org.eclipse.wst.css.core.internal.event.ICSSStyleListener;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-
-public class CSSEmbededStyleNotifyAdapter extends CSSStyleNotifyAdapter {
-
-	/**
-	 * CSSEmbeddedStyleNotifyAdapter constructor comment.
-	 * 
-	 * @param model
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSModel
-	 */
-	public CSSEmbededStyleNotifyAdapter(ICSSModel model) {
-		super(model);
-	}
-
-	/**
-	 * 
-	 */
-	public void styleChanged(ICSSModel srcModel, ICSSSelector[] removed, ICSSSelector[] added, String media) {
-		IDOMNode node = (IDOMNode) model.getOwnerDOMNode();
-		if (node != null)
-			return;
-		INodeAdapter adapter = node.getAdapterFor(IStyleSheetAdapter.class);
-		if (adapter instanceof ICSSStyleListener) {
-			((ICSSStyleListener) adapter).styleChanged(srcModel, removed, added, media);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void styleUpdate(ICSSModel srcModel) {
-		IDOMNode node = (IDOMNode) model.getOwnerDOMNode();
-		if (node != null)
-			return;
-		INodeAdapter adapter = node.getAdapterFor(IStyleSheetAdapter.class);
-		if (adapter instanceof ICSSStyleListener) {
-			((ICSSStyleListener) adapter).styleUpdate(srcModel);
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/eventimpl/CSSStyleEventDeliverer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/eventimpl/CSSStyleEventDeliverer.java
deleted file mode 100644
index 432b9db..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/eventimpl/CSSStyleEventDeliverer.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.eventimpl;
-
-
-
-import java.util.Vector;
-
-import org.eclipse.wst.css.core.internal.event.ICSSStyleListener;
-import org.eclipse.wst.css.core.internal.event.ICSSStyleNotifier;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-
-
-/**
- * 
- */
-public class CSSStyleEventDeliverer {
-
-	private Vector fVisited = new Vector();
-	private ICSSModel fSrcModel;
-	private ICSSSelector[] fRemoved;
-	private ICSSSelector[] fAdded;
-	private String fMedia;
-
-	/**
-	 * 
-	 */
-	public CSSStyleEventDeliverer() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public void fire(ICSSModel srcModel, ICSSSelector[] removed, ICSSSelector[] added, String media) {
-		if (srcModel == null || srcModel.getStyleListeners() == null)
-			return;
-
-		this.fSrcModel = srcModel;
-		this.fRemoved = removed;
-		this.fAdded = added;
-		this.fMedia = media;
-
-		// prohibit delivering to srcModel
-		fVisited.clear();
-		fVisited.add(srcModel);
-		Object[] listeners = srcModel.getStyleListeners().toArray();
-		for (int i = 0; i < listeners.length; i++) {
-			visit((ICSSStyleListener) listeners[i]);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void fireTo(ICSSStyleListener listener, ICSSModel srcModel, ICSSSelector[] removed, ICSSSelector[] added, String media) {
-		this.fSrcModel = srcModel;
-		this.fRemoved = removed;
-		this.fAdded = added;
-		this.fMedia = media;
-
-		// prohibit delivering to srcModel
-		fVisited.clear();
-		// visited.add(srcModel); : because looping problem
-		visit(listener);
-	}
-
-	/**
-	 * 
-	 */
-	public void fireUpdate(ICSSModel srcModel) {
-		if (srcModel == null || srcModel.getStyleListeners() == null)
-			return;
-
-		this.fSrcModel = srcModel;
-
-		// prohibit delivering to srcModel
-		fVisited.clear();
-		fVisited.add(srcModel);
-		Object[] listeners = srcModel.getStyleListeners().toArray();
-		for (int i = 0; i < listeners.length; i++) {
-			visitUpdate((ICSSStyleListener) listeners[i]);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void fireUpdateTo(ICSSStyleListener listener, ICSSModel srcModel) {
-		if (srcModel == null || srcModel.getStyleListeners() == null)
-			return;
-
-		this.fSrcModel = srcModel;
-
-		// prohibit delivering to srcModel
-		fVisited.clear();
-		// visited.add(srcModel);
-		visitUpdate(listener);
-	}
-
-	/**
-	 * 
-	 */
-	protected void visit(ICSSStyleListener listener) {
-		if (listener == null || fVisited.contains(listener))
-			return;
-
-		// fire event to listener
-		listener.styleChanged(fSrcModel, fRemoved, fAdded, fMedia);
-		fVisited.add(listener);
-
-		// traverse notifier
-		if (listener instanceof ICSSStyleNotifier) {
-			ICSSStyleNotifier notifier = (ICSSStyleNotifier) listener;
-			if (notifier.getStyleListeners() != null) {
-				Object[] listeners = notifier.getStyleListeners().toArray();
-				for (int i = 0; i < listeners.length; i++) {
-					visit((ICSSStyleListener) listeners[i]);
-				}
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void visitUpdate(ICSSStyleListener listener) {
-		if (listener == null || fVisited.contains(listener))
-			return;
-
-		// fire event to listener
-		listener.styleUpdate(fSrcModel);
-		fVisited.add(listener);
-
-		// traverse notifier
-		if (listener instanceof ICSSStyleNotifier) {
-			ICSSStyleNotifier notifier = (ICSSStyleNotifier) listener;
-			if (notifier.getStyleListeners() != null) {
-				Object[] listeners = notifier.getStyleListeners().toArray();
-				for (int i = 0; i < listeners.length; i++) {
-					visitUpdate((ICSSStyleListener) listeners[i]);
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/eventimpl/CSSStyleNotifyAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/eventimpl/CSSStyleNotifyAdapter.java
deleted file mode 100644
index 85c4e44..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/eventimpl/CSSStyleNotifyAdapter.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.eventimpl;
-
-
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.css.core.internal.event.ICSSStyleListener;
-import org.eclipse.wst.css.core.internal.event.ICSSStyleNotifier;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.internal.util.ImportedCollector;
-import org.eclipse.wst.css.core.internal.util.SelectorsCollector;
-
-
-/**
- * 
- */
-public class CSSStyleNotifyAdapter implements ICSSStyleNotifier {
-
-	protected java.util.Vector listeners;
-	protected final org.eclipse.wst.css.core.internal.provisional.document.ICSSModel model;
-	protected boolean recording = false;
-
-	/**
-	 * 
-	 */
-	public CSSStyleNotifyAdapter(ICSSModel model) {
-		super();
-		this.model = model;
-	}
-
-	/**
-	 * 
-	 */
-	public void addStyleListener(ICSSStyleListener listener) {
-		if (listener == null)
-			return;
-
-		if (listeners == null)
-			listeners = new Vector();
-		if (!listeners.contains(listener)) {
-
-			// send new selectors event to listener
-			ImportedCollector trav = new ImportedCollector();
-			trav.apply(model.getDocument());
-			Iterator it = trav.getExternals().iterator();
-			while (it.hasNext()) {
-				ICSSStyleSheet sheet = (ICSSStyleSheet) it.next();
-				// collect selectors
-				SelectorsCollector selTrav = new SelectorsCollector();
-				selTrav.apply(sheet);
-				int nSel = selTrav.getSelectors().size();
-				ICSSSelector[] added = new ICSSSelector[nSel];
-				for (int i = 0; i < nSel; i++)
-					added[i] = (ICSSSelector) selTrav.getSelectors().get(i);
-
-				// fire event
-				CSSStyleEventDeliverer deliverer = new CSSStyleEventDeliverer();
-				deliverer.fireTo(listener, sheet.getModel(), null, added, null/*
-																				 * media
-																				 * will
-																				 * be
-																				 * implemented
-																				 * in
-																				 * the
-																				 * future
-																				 */);
-			}
-
-			// add listener
-			listeners.add(listener);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void beginRecording() {
-		recording = true;
-	}
-
-	/**
-	 * 
-	 */
-	public void endRecording() {
-		recording = false;
-	}
-
-	/**
-	 * 
-	 */
-	public void fire(ICSSSelector[] removed, ICSSSelector[] added, String media) {
-		// send selector changed event
-		CSSStyleEventDeliverer deliv = new CSSStyleEventDeliverer();
-		deliv.fire(model, removed, added, null);
-
-	}
-
-	/**
-	 * 
-	 */
-	public java.util.List getStyleListeners() {
-		return listeners;
-	}
-
-	/**
-	 */
-	public boolean isRecording() {
-		return recording;
-	}
-
-	/**
-	 * 
-	 */
-	public void removeStyleListener(ICSSStyleListener listener) {
-		if (listener == null)
-			return;
-
-		if (listeners.contains(listener)) {
-			listeners.remove(listener);
-
-			// send old selectors event to listener
-			ImportedCollector trav = new ImportedCollector();
-			trav.apply(model.getDocument());
-			Iterator it = trav.getExternals().iterator();
-			while (it.hasNext()) {
-				ICSSStyleSheet sheet = (ICSSStyleSheet) it.next();
-				// collect selectors
-				SelectorsCollector selTrav = new SelectorsCollector();
-				selTrav.apply(sheet);
-				int nSel = selTrav.getSelectors().size();
-				ICSSSelector[] removed = new ICSSSelector[nSel];
-				for (int i = 0; i < nSel; i++)
-					removed[i] = (ICSSSelector) selTrav.getSelectors().get(i);
-
-				// fire event
-				CSSStyleEventDeliverer deliverer = new CSSStyleEventDeliverer();
-				deliverer.fireTo(listener, sheet.getModel(), removed, null, null/*
-																				 * media
-																				 * will
-																				 * be
-																				 * implemented
-																				 * in
-																				 * the
-																				 * future
-																				 */);
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void styleChanged(org.eclipse.wst.css.core.internal.provisional.document.ICSSModel srcModel, org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector[] removed, org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector[] added, java.lang.String media) {
-	}
-
-	/**
-	 * 
-	 */
-	public void styleUpdate(org.eclipse.wst.css.core.internal.provisional.document.ICSSModel srcModel) {
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/format/CSSSourceFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/format/CSSSourceFormatter.java
deleted file mode 100644
index 37fe679..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/format/CSSSourceFormatter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.format;
-
-
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-
-
-/**
- * @deprecated
- */
-public interface CSSSourceFormatter extends INodeAdapter {
-
-	/**
-	 * 
-	 */
-	StringBuffer cleanup(ICSSNode node);
-
-	/**
-	 * 
-	 * @return java.lang.StringBuffer
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param region
-	 *            org.eclipse.jface.text.IRegion
-	 */
-	StringBuffer cleanup(ICSSNode node, IRegion region);
-
-	/**
-	 * 
-	 */
-	StringBuffer format(ICSSNode node);
-
-	/**
-	 * 
-	 */
-	StringBuffer format(ICSSNode node, IRegion region);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/format/FormatProcessorCSS.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/format/FormatProcessorCSS.java
deleted file mode 100644
index cbba6da..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/format/FormatProcessorCSS.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.format;
-
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.formatter.CSSFormatUtil;
-import org.eclipse.wst.css.core.internal.formatter.CSSSourceFormatter;
-import org.eclipse.wst.css.core.internal.formatter.CSSSourceFormatterFactory;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.format.AbstractStructuredFormatProcessor;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-
-
-public class FormatProcessorCSS extends AbstractStructuredFormatProcessor {
-
-
-	protected String getFileExtension() {
-		return "css"; //$NON-NLS-1$
-	}
-
-	public void formatModel(IStructuredModel structuredModel) {
-		int start = 0;
-		int length = structuredModel.getStructuredDocument().getLength();
-
-		formatModel(structuredModel, start, length);
-	}
-
-	public void formatModel(IStructuredModel structuredModel, int start, int length) {
-		CSSFormatUtil formatUtil = CSSFormatUtil.getInstance();
-		if (structuredModel instanceof ICSSModel) {
-			ICSSDocument doc = ((ICSSModel) structuredModel).getDocument();
-			CSSSourceFormatter formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter((INodeNotifier) doc);
-			StringBuffer buf = formatter.format(doc);
-			if (buf != null) {
-				int startOffset = ((IndexedRegion) doc).getStartOffset();
-				int endOffset = ((IndexedRegion) doc).getEndOffset();
-				formatUtil.replaceSource(doc.getModel(), startOffset, endOffset - startOffset, buf.toString());
-			}
-		}
-		else if (structuredModel instanceof IDOMModel) {
-			List cssnodes = formatUtil.collectCSSNodes(structuredModel, start, length);
-			if (cssnodes != null && !cssnodes.isEmpty()) {
-				ICSSModel model = null;
-				for (int i = 0; i < cssnodes.size(); i++) {
-					ICSSNode node = (ICSSNode) cssnodes.get(i);
-					CSSSourceFormatter formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter((INodeNotifier) node);
-					StringBuffer buf = formatter.format(node);
-					if (buf != null) {
-						int startOffset = ((IndexedRegion) node).getStartOffset();
-						int endOffset = ((IndexedRegion) node).getEndOffset();
-						if (model == null) {
-							model = node.getOwnerDocument().getModel();
-						}
-						formatUtil.replaceSource(model, startOffset, endOffset - startOffset, buf.toString());
-					}
-				}
-			}
-		}
-	}
-
-	public IStructuredFormatPreferences getFormatPreferences() {
-		return null;
-	}
-
-	protected IStructuredFormatter getFormatter(Node node) {
-		return null;
-	}
-
-	protected void refreshFormatPreferences() {
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AbstractCSSSourceFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AbstractCSSSourceFormatter.java
deleted file mode 100644
index f81e9dc..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AbstractCSSSourceFormatter.java
+++ /dev/null
@@ -1,958 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.DefaultLineTracker;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategyImpl;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.internal.util.CSSLinkConverter;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.css.core.internal.util.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.util.Assert;
-
-/**
- * 
- */
-public abstract class AbstractCSSSourceFormatter implements CSSSourceGenerator {
-
-	protected final static short GENERATE = 0;
-	protected final static short FORMAT = 1;
-	protected final static short CLEANUP = 2;
-	protected static short strategy;
-
-	/**
-	 * 
-	 */
-	AbstractCSSSourceFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	protected void appendDelimBefore(ICSSNode node, CompoundRegion toAppend, StringBuffer source) {
-		if (node == null || source == null)
-			return;
-		if (isCleanup() && !getCleanupStrategy(node).isFormatSource())
-			return; // for not formatting case on cleanup action
-		String delim = getLineDelimiter(node);
-
-		boolean needIndent = !(node instanceof ICSSStyleSheet);
-		if (toAppend == null) {
-			source.append(delim);
-			source.append(getIndent(node));
-			if (needIndent)
-				source.append(getIndentString());
-		} else {
-			String type = toAppend.getType();
-			if (type == CSSRegionContexts.CSS_COMMENT) {
-				RegionIterator it = new RegionIterator(toAppend.getDocumentRegion(), toAppend.getTextRegion());
-				it.prev();
-				ITextRegion prev = it.prev();
-				if (prev == null || (prev.getType() == CSSRegionContexts.CSS_S && TextUtilities.indexOf(DefaultLineTracker.DELIMITERS, it.getStructuredDocumentRegion().getText(prev), 0)[0] >= 0)) {
-					source.append(delim);
-					source.append(getIndent(node));
-					if (needIndent)
-						source.append(getIndentString());
-				} else {
-					appendSpaceBefore(node, toAppend.getText(), source);
-				}
-			} else if (type == CSSRegionContexts.CSS_DELIMITER || type == CSSRegionContexts.CSS_DECLARATION_DELIMITER) {
-				RegionIterator it = new RegionIterator(toAppend.getDocumentRegion(), toAppend.getTextRegion());
-				it.prev();
-				ITextRegion prev = it.prev();
-
-				Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-
-				if (prev.getType() == CSSRegionContexts.CSS_S && TextUtilities.indexOf(DefaultLineTracker.DELIMITERS, it.getStructuredDocumentRegion().getText(prev), 0)[0] >= 0) {
-					source.append(delim);
-					source.append(getIndent(node));
-					if (needIndent)
-						source.append(getIndentString());
-				} else if (preferences.getInt(CSSCorePreferenceNames.LINE_WIDTH) > 0 && (!preferences.getBoolean(CSSCorePreferenceNames.WRAPPING_PROHIBIT_WRAP_ON_ATTR) || node.getOwnerDocument().getNodeType() != ICSSNode.STYLEDECLARATION_NODE)) {
-					int length = getLastLineLength(node, source);
-					int append = 1;
-					if (length + append > preferences.getInt(CSSCorePreferenceNames.LINE_WIDTH)) {
-						source.append(getLineDelimiter(node));
-						source.append(getIndent(node));
-						if (needIndent)
-							source.append(getIndentString());
-					}
-				}
-			} else if (type == CSSRegionContexts.CSS_RBRACE || type == CSSRegionContexts.CSS_LBRACE) {
-				source.append(delim);
-				source.append(getIndent(node));
-			} else {
-				source.append(delim);
-				source.append(getIndent(node));
-				if (needIndent)
-					source.append(getIndentString());
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void appendSpaceBefore(ICSSNode node, CompoundRegion toAppend, StringBuffer source) {
-		if (node == null || toAppend == null || source == null)
-			return;
-		if (isCleanup() && !getCleanupStrategy(node).isFormatSource())
-			return; // for not formatting case on cleanup action
-		String type = toAppend.getType();
-
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-
-		boolean needIndent = !(node instanceof ICSSStyleSheet);
-		if (type == CSSRegionContexts.CSS_COMMENT) {
-			// check whether previous region is 'S' and has CR-LF
-			String delim = getLineDelimiter(node);
-			RegionIterator it = new RegionIterator(toAppend.getDocumentRegion(), toAppend.getTextRegion());
-			it.prev();
-			ITextRegion prev = it.prev();
-			if (prev.getType() == CSSRegionContexts.CSS_S && TextUtilities.indexOf(DefaultLineTracker.DELIMITERS, it.getStructuredDocumentRegion().getText(prev), 0)[0] >= 0) {
-				source.append(delim);
-				source.append(getIndent(node));
-				if (needIndent)
-					source.append(getIndentString());
-			} else {
-				appendSpaceBefore(node, toAppend.getText(), source);
-			}
-		} else if (type == CSSRegionContexts.CSS_LBRACE && preferences.getBoolean(CSSCorePreferenceNames.WRAPPING_NEWLINE_ON_OPEN_BRACE)) {
-			String delim = getLineDelimiter(node);
-			source.append(delim);
-			source.append(getIndent(node));
-			// } else if (type == CSSRegionContexts.CSS_CURLY_BRACE_CLOSE) {
-			// } else if (type == CSSRegionContexts.CSS_INCLUDES || type ==
-			// CSSRegionContexts.CSS_DASHMATCH) {
-		} else if (type == CSSRegionContexts.CSS_DECLARATION_SEPARATOR && node instanceof ICSSStyleDeclItem) {
-			int n = preferences.getInt(CSSCorePreferenceNames.FORMAT_PROP_PRE_DELIM);
-			if (preferences.getInt(CSSCorePreferenceNames.LINE_WIDTH) > 0 && (!preferences.getBoolean(CSSCorePreferenceNames.WRAPPING_PROHIBIT_WRAP_ON_ATTR) || node.getOwnerDocument().getNodeType() != ICSSNode.STYLEDECLARATION_NODE)) {
-				int length = getLastLineLength(node, source);
-				int append = 1;
-				if (length + n + append > preferences.getInt(CSSCorePreferenceNames.LINE_WIDTH)) {
-					source.append(getLineDelimiter(node));
-					source.append(getIndent(node));
-					if (needIndent)
-						source.append(getIndentString());
-					n = 0; // no space is necessary
-				}
-			}
-			// no delimiter case
-			while (n-- > 0)
-				source.append(" ");//$NON-NLS-1$
-		} else if (type == CSSRegionContexts.CSS_DECLARATION_DELIMITER || type == CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR || type == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE) {
-			if (preferences.getInt(CSSCorePreferenceNames.LINE_WIDTH) > 0 && (!preferences.getBoolean(CSSCorePreferenceNames.WRAPPING_PROHIBIT_WRAP_ON_ATTR) || node.getOwnerDocument().getNodeType() != ICSSNode.STYLEDECLARATION_NODE)) {
-				int length = getLastLineLength(node, source);
-				int append = 1;
-				if (length + append > preferences.getInt(CSSCorePreferenceNames.LINE_WIDTH)) {
-					source.append(getLineDelimiter(node));
-					source.append(getIndent(node));
-					if (needIndent)
-						source.append(getIndentString());
-				}
-			}
-		} else
-			appendSpaceBefore(node, toAppend.getText(), source);
-	}
-
-	/**
-	 * 
-	 */
-	protected void appendSpaceBefore(ICSSNode node, String toAppend, StringBuffer source) {
-		if (node == null || source == null)
-			return;
-		if (isCleanup() && !getCleanupStrategy(node).isFormatSource())
-			return; // for not formatting case on cleanup action
-
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		if (toAppend != null && toAppend.startsWith("{") && preferences.getBoolean(CSSCorePreferenceNames.WRAPPING_NEWLINE_ON_OPEN_BRACE)) {//$NON-NLS-1$
-			source.append(getLineDelimiter(node));
-			source.append(getIndent(node));
-			return;
-		} else if (/* ! mgr.isOnePropertyPerLine() && */preferences.getInt(CSSCorePreferenceNames.LINE_WIDTH) > 0 && (!preferences.getBoolean(CSSCorePreferenceNames.WRAPPING_PROHIBIT_WRAP_ON_ATTR) || node.getOwnerDocument().getNodeType() != ICSSNode.STYLEDECLARATION_NODE)) {
-			int n = getLastLineLength(node, source);
-			int append = (toAppend != null) ? TextUtilities.indexOf(DefaultLineTracker.DELIMITERS, toAppend, 0)[0] : 0;
-			if (toAppend != null)
-				append = (append < 0) ? toAppend.length() : append;
-			if (n + append + 1 > preferences.getInt(CSSCorePreferenceNames.LINE_WIDTH)) {
-				source.append(getLineDelimiter(node));
-				source.append(getIndent(node));
-				source.append(getIndentString());
-				return;
-			}
-		}
-		source.append(" ");//$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 */
-	public final StringBuffer cleanup(ICSSNode node) {
-		short oldStrategy = strategy;
-		strategy = CLEANUP;
-		StringBuffer source = formatProc(node);
-		strategy = oldStrategy;
-
-		return source;
-	}
-
-	/**
-	 * 
-	 */
-	public final StringBuffer cleanup(ICSSNode node, IRegion region) {
-		short oldStrategy = strategy;
-		strategy = CLEANUP;
-		StringBuffer source = formatProc(node, region);
-		strategy = oldStrategy;
-
-		return source;
-	}
-
-	/**
-	 * 
-	 */
-	protected String decoratedIdentRegion(CompoundRegion region, CSSCleanupStrategy stgy) {
-		if (isFormat())
-			return region.getText();
-
-		String text = region.getText();
-		if (region.getType() == CSSRegionContexts.CSS_STRING || region.getType() == CSSRegionContexts.CSS_URI)
-			return decoratedRegion(region, 0, stgy);
-
-		if (isCleanup()) {
-			if (stgy.getIdentCase() == CSSCleanupStrategy.ASIS || region.getType() == CSSRegionContexts.CSS_COMMENT)
-				return text;
-			else if (stgy.getIdentCase() == CSSCleanupStrategy.UPPER)
-				return text.toUpperCase();
-			else
-				return text.toLowerCase();
-		}
-
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		if (region.getType() == CSSRegionContexts.CSS_COMMENT)
-			return text;
-		else if (preferences.getInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.UPPER)
-			return text.toUpperCase();
-		else
-			return text.toLowerCase();
-	}
-
-	/**
-	 * 
-	 */
-	protected String decoratedPropNameRegion(CompoundRegion region, CSSCleanupStrategy stgy) {
-		if (isFormat())
-			return region.getText();
-
-		String text = region.getText();
-		if (region.getType() == CSSRegionContexts.CSS_STRING || region.getType() == CSSRegionContexts.CSS_URI)
-			return decoratedRegion(region, 1, stgy);
-		if (isCleanup()) {
-			if (stgy.getPropNameCase() == CSSCleanupStrategy.ASIS || region.getType() != CSSRegionContexts.CSS_DECLARATION_PROPERTY)
-				return text;
-			else if (stgy.getPropNameCase() == CSSCleanupStrategy.UPPER)
-				return text.toUpperCase();
-			else
-				return text.toLowerCase();
-		}
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-
-		if (region.getType() != CSSRegionContexts.CSS_DECLARATION_PROPERTY)
-			return text;
-		else if (preferences.getInt(CSSCorePreferenceNames.CASE_PROPERTY_NAME) == CSSCorePreferenceNames.UPPER)
-			return text.toUpperCase();
-		else
-			return text.toLowerCase();
-	}
-
-	/**
-	 * 
-	 */
-	protected String decoratedPropValueRegion(CompoundRegion region, CSSCleanupStrategy stgy) {
-		if (isFormat())
-			return region.getText();
-
-		String text = region.getText();
-		String type = region.getType();
-		if (type == CSSRegionContexts.CSS_STRING || type == CSSRegionContexts.CSS_URI)
-			return decoratedRegion(region, 2, stgy);
-		if (isCleanup()) {
-			if (stgy.getPropValueCase() != CSSCleanupStrategy.ASIS) {
-				if (type == CSSRegionContexts.CSS_COMMENT) {
-				} else {
-					if (stgy.getPropValueCase() == CSSCleanupStrategy.UPPER)
-						text = text.toUpperCase();
-					else
-						text = text.toLowerCase();
-				}
-			}
-		}
-		return text;
-	}
-
-	/**
-	 * 
-	 */
-	protected String decoratedRegion(CompoundRegion region, int type, CSSCleanupStrategy stgy) {
-		if (isFormat())
-			return region.getText();
-
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		String text = region.getText();
-		if (region.getType() == CSSRegionContexts.CSS_URI) {
-			String uri = CSSLinkConverter.stripFunc(text);
-
-			boolean prefIsUpper = preferences.getInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.UPPER;
-			boolean upper = (type == 0) ? prefIsUpper : ((type == 1) ? preferences.getInt(CSSCorePreferenceNames.CASE_PROPERTY_NAME) == CSSCorePreferenceNames.UPPER : preferences.getInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.UPPER);
-			String func = text.substring(0, 4);
-			if (isCleanup()) {
-				upper = ((type == 0) ? stgy.getIdentCase() : ((type == 1) ? stgy.getPropNameCase() : stgy.getPropValueCase())) == CSSCleanupStrategy.UPPER;
-				func = ((type == 0) ? stgy.getIdentCase() : ((type == 1) ? stgy.getPropNameCase() : stgy.getPropValueCase())) == CSSCleanupStrategy.ASIS ? text.substring(0, 4) : (upper ? "URL(" : "url(");//$NON-NLS-2$//$NON-NLS-1$
-			}
-			if ((!isCleanup() && preferences.getBoolean(CSSCorePreferenceNames.FORMAT_QUOTE_IN_URI)) || (isCleanup() && stgy.isQuoteValues())) {
-				String quote = preferences.getString(CSSCorePreferenceNames.FORMAT_QUOTE);
-				quote = CSSUtil.detectQuote(uri, quote);
-				text = func + quote + uri + quote + ")";//$NON-NLS-1$
-			} else if (isCleanup() && !stgy.isQuoteValues()) {
-				text = func + CSSLinkConverter.removeFunc(text) + ")";//$NON-NLS-1$
-			} else {
-				text = func + uri + ")";//$NON-NLS-1$
-			}
-		} else if (region.getType() == CSSRegionContexts.CSS_STRING && (!isCleanup() || stgy.isQuoteValues())) {
-			String quote = preferences.getString(CSSCorePreferenceNames.FORMAT_QUOTE);
-			// begginning
-			if (!text.startsWith(quote)) {
-				if (text.startsWith("\"") || text.startsWith("\'")) //$NON-NLS-1$ //$NON-NLS-2$
-					text = quote + text.substring(1);
-				else
-					text = quote + text;
-			}
-			// ending
-			if (!text.endsWith(quote)) {
-				if (text.endsWith("\"") || text.endsWith("\'")) //$NON-NLS-1$ //$NON-NLS-2$
-					text = text.substring(0, text.length() - 1) + quote;
-				else
-					text = text + quote;
-			}
-		}
-		return text;
-	}
-
-	/**
-	 * 
-	 */
-	public final StringBuffer format(ICSSNode node) {
-		short oldStrategy = strategy;
-		strategy = FORMAT;
-		StringBuffer source = formatProc(node);
-		strategy = oldStrategy;
-
-		return source;
-	}
-
-	/**
-	 * 
-	 */
-	public final StringBuffer format(ICSSNode node, IRegion region) {
-		short oldStrategy = strategy;
-		strategy = FORMAT;
-		StringBuffer source = formatProc(node, region);
-		strategy = oldStrategy;
-
-		return source;
-	}
-
-	/**
-	 * 
-	 */
-	public StringBuffer formatAttrChanged(ICSSNode node, ICSSAttr attr, boolean insert, AttrChangeContext context) {
-		return new StringBuffer(insert && (attr != null) ? attr.getValue() : "");//$NON-NLS-1$
-	}
-
-	/**
-	 * Generate or format source between children('child' and its previous
-	 * sibling) and append to string buffer
-	 */
-	abstract protected void formatBefore(ICSSNode node, ICSSNode child, String toAppend, StringBuffer source, IRegion exceptFor);
-
-	/**
-	 * Generate or format source between children('child' and its previous
-	 * sibling) and append to string buffer
-	 */
-	public final StringBuffer formatBefore(ICSSNode node, ICSSNode child, IRegion exceptFor) {
-		Assert.isTrue(child == null || child.getParentNode() == node);
-		StringBuffer buf = new StringBuffer();
-		formatBefore(node, child, /* (child != null) ? (child.getCssText()) : */"", buf, exceptFor);//$NON-NLS-1$
-		return buf;
-	}
-
-	/**
-	 * Generate or format source between children('child' and its previous
-	 * sibling) and append to string buffer
-	 */
-	protected abstract void formatBefore(ICSSNode node, ICSSNode child, IRegion region, String toAppend, StringBuffer source);
-
-	/**
-	 * 
-	 */
-	protected final void formatChildren(ICSSNode node, StringBuffer source) {
-		ICSSNode child = node.getFirstChild();
-		boolean first = true;
-		while (child != null) {
-			// append child
-			CSSSourceFormatter formatter = (CSSSourceFormatter) ((INodeNotifier) child).getAdapterFor(CSSSourceFormatter.class);
-			if (formatter == null) {
-				formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter((INodeNotifier) child);
-			}
-			StringBuffer childSource = ((AbstractCSSSourceFormatter) formatter).formatProc(child);
-			if (!first) {
-				formatBefore(node, child, new String(childSource), source, null);
-			}
-			source.append(childSource);
-			// append between children
-			child = child.getNextSibling();
-			first = false;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected final void formatChildren(ICSSNode node, IRegion region, StringBuffer source) {
-		ICSSNode child = node.getFirstChild();
-		int start = region.getOffset();
-		int end = region.getOffset() + region.getLength();
-		boolean first = true;
-		while (child != null) {
-			int curEnd = ((IndexedRegion) child).getEndOffset();
-			StringBuffer childSource = null;
-			boolean toFinish = false;
-			if (start < curEnd) {
-				int curStart = ((IndexedRegion) child).getStartOffset();
-				if (curStart < end) {
-					// append child
-					CSSSourceFormatter formatter = (CSSSourceFormatter) ((INodeNotifier) child).getAdapterFor(CSSSourceFormatter.class);
-					if (formatter == null) {
-						formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter((INodeNotifier) child);
-					}
-					if (includes(region, curStart, curEnd))
-						childSource = ((AbstractCSSSourceFormatter) formatter).formatProc(child);
-					else
-						childSource = ((AbstractCSSSourceFormatter) formatter).formatProc(child, overlappedRegion(region, curStart, curEnd));
-				} else
-					toFinish = true;
-			}
-			// append between children
-			if (!first) {
-				curEnd = ((IndexedRegion) child).getStartOffset(); // change
-				// only
-				// start
-				if (start < curEnd) {
-					int curStart = ((IndexedRegion) child.getPreviousSibling()).getEndOffset();
-					if (curStart < end) {
-						String toAppend = (childSource != null) ? new String(childSource) : "";//$NON-NLS-1$
-						if (includes(region, curStart, curEnd))
-							formatBefore(node, child, toAppend, source, null);
-						else
-							formatBefore(node, child, overlappedRegion(region, curStart, curEnd), toAppend, source);
-					}
-				}
-			}
-			if (childSource != null) {
-				source.append(childSource);
-			}
-			first = false;
-			if (toFinish)
-				break;
-			child = child.getNextSibling();
-		}
-	}
-
-	/**
-	 * Generate or format source after the last child and append to string
-	 * buffer
-	 */
-	protected abstract void formatPost(ICSSNode node, StringBuffer source);
-
-	/**
-	 * Generate or format source after the last child and append to string
-	 * buffer
-	 */
-	protected abstract void formatPost(ICSSNode node, IRegion region, StringBuffer source);
-
-	/**
-	 * Generate or format source before the first child and append to string
-	 * buffer
-	 */
-	protected abstract void formatPre(ICSSNode node, StringBuffer source);
-
-	/**
-	 * Generate or format source before the first child and append to string
-	 * buffer
-	 */
-	abstract protected void formatPre(ICSSNode node, IRegion region, StringBuffer source);
-
-	/**
-	 * 
-	 * @return java.lang.StringBuffer
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 */
-	protected final StringBuffer formatProc(ICSSNode node) {
-		StringBuffer source = new StringBuffer();
-		formatPre(node, source);
-		formatChildren(node, source);
-		formatPost(node, source);
-		return source;
-	}
-
-	/**
-	 * 
-	 * @return java.lang.StringBuffer
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param region
-	 *            org.eclipse.jface.text.IRegion
-	 */
-	protected final StringBuffer formatProc(ICSSNode node, IRegion region) {
-		StringBuffer source = new StringBuffer();
-		int curStart = ((IndexedRegion) node).getStartOffset();
-		int curEnd = ((IndexedRegion) node).getEndOffset();
-		if (node.getChildNodes().getLength() > 0) {
-			curEnd = ((IndexedRegion) node.getFirstChild()).getStartOffset();
-			if (overlaps(region, curStart, curEnd)) {
-				if (includes(region, curStart, curEnd))
-					formatPre(node, source);
-				else
-					formatPre(node, overlappedRegion(region, curStart, curEnd), source);
-			}
-			curStart = curEnd;
-			curEnd = ((IndexedRegion) node.getLastChild()).getEndOffset();
-			if (overlaps(region, curStart, curEnd)) {
-				if (includes(region, curStart, curEnd))
-					formatChildren(node, source);
-				else
-					formatChildren(node, overlappedRegion(region, curStart, curEnd), source);
-			}
-			curStart = curEnd;
-			curEnd = ((IndexedRegion) node).getEndOffset();
-			if (overlaps(region, curStart, curEnd)) {
-				if (includes(region, curStart, curEnd))
-					formatPost(node, source);
-				else
-					formatPost(node, overlappedRegion(region, curStart, curEnd), source);
-			}
-		} else {
-			curEnd = getChildInsertPos(node);
-			if (overlaps(region, curStart, curEnd)) {
-				if (includes(region, curStart, curEnd))
-					formatPre(node, source);
-				else
-					formatPre(node, overlappedRegion(region, curStart, curEnd), source);
-			}
-			curStart = curEnd;
-			curEnd = ((IndexedRegion) node).getEndOffset();
-			if (overlaps(region, curStart, curEnd)) {
-				if (includes(region, curStart, curEnd))
-					formatPost(node, source);
-				else
-					formatPost(node, overlappedRegion(region, curStart, curEnd), source);
-			}
-		}
-		return source;
-	}
-
-	/**
-	 * 
-	 */
-	public int getAttrInsertPos(ICSSNode node, String attrName) {
-		return -1;
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * 
-	 * @return org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 */
-	protected CSSCleanupStrategy getCleanupStrategy(ICSSNode node) {
-		CSSCleanupStrategy currentStrategy = CSSCleanupStrategyImpl.getInstance();
-		ICSSDocument doc = node.getOwnerDocument();
-		if (doc == null)
-			return currentStrategy;
-		ICSSModel model = doc.getModel();
-		if (model == null)
-			return currentStrategy;
-		if (model.getStyleSheetType() != ICSSModel.EXTERNAL) {
-			// TODO - TRANSITION Nakamori-san, or Kit, how can we move to
-			// "HTML" plugin?
-			// can we subclass?
-			// currentStrategy = CSSInHTMLCleanupStrategyImpl.getInstance();
-		}
-		return currentStrategy;
-	}
-
-	/**
-	 * 
-	 */
-	protected String getIndent(ICSSNode node) {
-		if (node == null)
-			return "";//$NON-NLS-1$
-		ICSSNode parent = node.getParentNode();
-		if (node instanceof ICSSAttr)
-			parent = ((ICSSAttr) node).getOwnerCSSNode();
-		if (parent == null)
-			return "";//$NON-NLS-1$
-		if (node instanceof org.w3c.dom.css.CSSStyleDeclaration)
-			parent = parent.getParentNode();
-		if (parent == null)
-			return "";//$NON-NLS-1$
-
-		String parentIndent = getIndent(parent);
-		if (parent instanceof org.w3c.dom.css.CSSRule)
-			return parentIndent + getIndentString();
-		if (node.getParentNode() instanceof ICSSStyleDeclaration)
-			return parentIndent + getIndentString();
-		return parentIndent;
-	}
-
-	/**
-	 * 
-	 */
-	protected int getLastLineLength(ICSSNode node, StringBuffer source) {
-		if (node == null || source == null)
-			return 0;
-		String delim = getLineDelimiter(node);
-		String str = new String(source);
-		int n = str.lastIndexOf(delim);
-		if (n < 0)
-			return str.length();
-
-		return str.length() - n - delim.length();
-	}
-
-	/**
-	 * 
-	 * @return int
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param insertPos
-	 *            int
-	 */
-	public int getLengthToReformatAfter(ICSSNode node, int insertPos) {
-		if (node == null)
-			return 0;
-		IndexedRegion nnode = (IndexedRegion) node;
-		if (insertPos < 0 || !nnode.contains(insertPos))
-			return 0;
-
-		IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(insertPos);
-		if (flatNode == null)
-			return 0;
-		ITextRegion region = flatNode.getRegionAtCharacterOffset(insertPos);
-		if (region == null)
-			return 0;
-		RegionIterator it = new RegionIterator(flatNode, region);
-		boolean found = false;
-		while (it.hasNext()) {
-			region = it.next();
-			// if (region.getType() != CSSRegionContexts.CSS_S &&
-			// region.getType() != CSSRegionContexts.CSS_DELIMITER &&
-			// region.getType() !=
-			// CSSRegionContexts.CSS_DECLARATION_DELIMITER) {
-			if (region.getType() != CSSRegionContexts.CSS_S) {
-				found = true;
-				break;
-			}
-		}
-		int pos = (found ? it.getStructuredDocumentRegion().getStartOffset(region) : it.getStructuredDocumentRegion().getTextEndOffset(region)) - insertPos;
-		return (pos >= 0) ? pos : 0;
-	}
-
-	/**
-	 * 
-	 * @return int
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param insertPos
-	 *            int
-	 */
-	public int getLengthToReformatBefore(ICSSNode node, int insertPos) {
-		if (node == null)
-			return 0;
-		IndexedRegion nnode = (IndexedRegion) node;
-		if (insertPos <= 0 || !nnode.contains(insertPos - 1))
-			return 0;
-
-		IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(insertPos - 1);
-		if (flatNode == null)
-			return 0;
-		ITextRegion region = flatNode.getRegionAtCharacterOffset(insertPos - 1);
-		if (region == null)
-			return 0;
-		RegionIterator it = new RegionIterator(flatNode, region);
-		boolean found = false;
-		while (it.hasPrev()) {
-			region = it.prev();
-			// if (region.getType() != CSSRegionContexts.CSS_S &&
-			// region.getType() != CSSRegionContexts.CSS_DELIMITER &&
-			// region.getType() !=
-			// CSSRegionContexts.CSS_DECLARATION_DELIMITER) {
-			if (region.getType() != CSSRegionContexts.CSS_S) {
-				found = true;
-				break;
-			}
-		}
-		int pos = insertPos - (found ? it.getStructuredDocumentRegion().getTextEndOffset(region) : it.getStructuredDocumentRegion().getStartOffset(region));
-		// flatNode = it.getStructuredDocumentRegion();
-		// if (found) {
-		// if (region.getLength() != region.getTextLength()) {
-		// pos = insertPos - flatNode.getTextEndOffset(region);
-		// } else {
-		// pos = insertPos - flatNode.getEndOffset(region);
-		// }
-		// } else {
-		// pos = insertPos - flatNode.getStartOffset(region);
-		// }
-		return (pos >= 0) ? pos : 0;
-	}
-
-	/**
-	 * 
-	 */
-	String getLineDelimiter(ICSSNode node) {
-		ICSSModel model = (node != null) ? node.getOwnerDocument().getModel() : null;
-		return (model != null) ? model.getStructuredDocument().getLineDelimiter() : "\n"; //$NON-NLS-1$
-
-		// TODO : check whether to use model.getLineDelimiter() or
-		// model.getStructuredDocument().getLineDelimiter()
-	}
-
-	/**
-	 * 
-	 */
-	protected CompoundRegion[] getOutsideRegions(IStructuredDocument model, IRegion reg) {
-		CompoundRegion[] ret = new CompoundRegion[2];
-		RegionIterator it = new RegionIterator(model, reg.getOffset());
-		it.prev();
-		if (it.hasPrev()) {
-			ITextRegion textRegion = it.prev();
-			IStructuredDocumentRegion documentRegion = it.getStructuredDocumentRegion();
-			ret[0] = new CompoundRegion(documentRegion, textRegion);
-		} else {
-			ret[0] = null;
-		}
-		it.reset(model, reg.getOffset() + reg.getLength());
-		if (it.hasNext()) {
-			ITextRegion textRegion = it.next();
-			IStructuredDocumentRegion documentRegion = it.getStructuredDocumentRegion();
-			ret[1] = new CompoundRegion(documentRegion, textRegion);
-		} else {
-			ret[1] = null;
-		}
-		return ret;
-	}
-
-	/**
-	 */
-	protected CSSSourceGenerator getParentFormatter(ICSSNode node) {
-		ICSSNode parent = node.getParentNode();
-		if (parent != null) {
-			CSSSourceGenerator formatter = (CSSSourceGenerator) ((INodeNotifier) parent).getAdapterFor(CSSSourceFormatter.class);
-			if (formatter == null) {
-				formatter = CSSSourceFormatterFactory.getInstance().getSourceFormatter((INodeNotifier) parent);
-			}
-			return formatter;
-		}
-		return null;
-	}
-
-	/**
-	 * 
-	 */
-	protected CompoundRegion[] getRegions(IStructuredDocument model, IRegion reg, IRegion exceptFor, String pickupType) {
-		int start = reg.getOffset();
-		int end = reg.getOffset() + reg.getLength();
-		int startE = (exceptFor != null) ? exceptFor.getOffset() : -1;
-		int endE = (exceptFor != null) ? exceptFor.getOffset() + exceptFor.getLength() : 0;
-
-		ArrayList list = new ArrayList();
-		IStructuredDocumentRegion flatNode = model.getRegionAtCharacterOffset(start);
-		boolean pickuped = false;
-		while (flatNode != null && flatNode.getStartOffset() < end) {
-			ITextRegionList regionList = flatNode.getRegions();
-			Iterator it = regionList.iterator();
-			while (it.hasNext()) {
-				ITextRegion region = (ITextRegion) it.next();
-				if (flatNode.getStartOffset(region) < start)
-					continue;
-				if (end <= flatNode.getStartOffset(region))
-					break;
-				if (startE >= 0 && startE <= flatNode.getStartOffset(region) && flatNode.getEndOffset(region) <= endE)
-					continue;
-				if (region.getType() == CSSRegionContexts.CSS_COMMENT || region.getType() == CSSRegionContexts.CSS_CDC || region.getType() == CSSRegionContexts.CSS_CDO)
-					list.add(new CompoundRegion(flatNode, region));
-				else if (!pickuped && region.getType() == pickupType) {
-					list.add(new CompoundRegion(flatNode, region));
-					pickuped = true;
-				}
-			}
-			flatNode = flatNode.getNext();
-		}
-		if (list.size() > 0) {
-			CompoundRegion[] regions = new CompoundRegion[list.size()];
-			list.toArray(regions);
-			return regions;
-		}
-		return new CompoundRegion[0];
-	}
-
-	/**
-	 * 
-	 */
-	protected CompoundRegion[] getRegionsWithoutWhiteSpaces(IStructuredDocument model, IRegion reg, CSSCleanupStrategy stgy) {
-		int start = reg.getOffset();
-		int end = reg.getOffset() + reg.getLength() - 1;
-		ArrayList list = new ArrayList();
-		IStructuredDocumentRegion flatNode = model.getRegionAtCharacterOffset(start);
-		while (flatNode != null && flatNode.getStartOffset() <= end) {
-			ITextRegionList regionList = flatNode.getRegions();
-			Iterator it = regionList.iterator();
-			while (it.hasNext()) {
-				ITextRegion region = (ITextRegion) it.next();
-				if (flatNode.getStartOffset(region) < start)
-					continue;
-				if (end < flatNode.getStartOffset(region))
-					break;
-				if (region.getType() != CSSRegionContexts.CSS_S || (isCleanup() && !stgy.isFormatSource())) // for
-					// not
-					// formatting
-					// case
-					// on
-					// cleanup
-					// action
-					list.add(new CompoundRegion(flatNode, region));
-			}
-			flatNode = flatNode.getNext();
-		}
-		if (list.size() > 0) {
-			CompoundRegion[] regions = new CompoundRegion[list.size()];
-			list.toArray(regions);
-			return regions;
-		}
-		return new CompoundRegion[0];
-	}
-
-	/**
-	 * 
-	 */
-	public static boolean includes(IRegion region, int start, int end) {
-		if (region == null)
-			return false;
-
-		return (region.getOffset() <= start) && (end <= region.getOffset() + region.getLength());
-	}
-
-	/**
-	 * 
-	 * @return boolean
-	 */
-	protected static boolean isCleanup() {
-		return strategy == CLEANUP;
-	}
-
-	/**
-	 * 
-	 * @return boolean
-	 */
-	protected static boolean isFormat() {
-		return strategy == FORMAT;
-	}
-
-	/**
-	 * 
-	 */
-	protected boolean isIncludesPreEnd(ICSSNode node, IRegion region) {
-		return (node.getFirstChild() != null && ((IndexedRegion) node.getFirstChild()).getStartOffset() == (region.getOffset() + region.getLength()));
-	}
-
-	/**
-	 * 
-	 */
-	static protected boolean needS(CompoundRegion region) {
-		return (region != null && region.getType() != CSSRegionContexts.CSS_S);
-	}
-
-	/**
-	 * 
-	 */
-	public static IRegion overlappedRegion(IRegion region, int start, int end) {
-		if (overlaps(region, start, end)) {
-			int offset = (region.getOffset() <= start) ? start : region.getOffset();
-			int length = ((end <= region.getOffset() + region.getLength()) ? end : region.getOffset() + region.getLength()) - offset;
-			return new FormatRegion(offset, length);
-		}
-		return null;
-	}
-
-	/**
-	 * 
-	 */
-	public static boolean overlaps(IRegion region, int start, int end) {
-		if (region == null)
-			return false;
-
-		return (start < region.getOffset() + region.getLength()) && (region.getOffset() < end);
-	}
-
-	private String getIndentString() {
-		StringBuffer indent = new StringBuffer();
-
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		if (preferences != null) {
-			char indentChar = ' ';
-			String indentCharPref = preferences.getString(CSSCorePreferenceNames.INDENTATION_CHAR);
-			if (CSSCorePreferenceNames.TAB.equals(indentCharPref)) {
-				indentChar = '\t';
-			}
-			int indentationWidth = preferences.getInt(CSSCorePreferenceNames.INDENTATION_SIZE);
-
-			for (int i = 0; i < indentationWidth; i++) {
-				indent.append(indentChar);
-			}
-		}
-		return indent.toString();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AttrChangeContext.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AttrChangeContext.java
deleted file mode 100644
index 924a73e..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AttrChangeContext.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-/**
- * 
- */
-public class AttrChangeContext {
-
-	public int start, end;
-
-	/**
-	 * 
-	 */
-	public AttrChangeContext() {
-		super();
-		start = end = 0;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AttrFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AttrFormatter.java
deleted file mode 100644
index 6401d41..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AttrFormatter.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSCharsetRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-
-/**
- * 
- */
-public class AttrFormatter extends DefaultCSSSourceFormatter {
-
-	private static AttrFormatter instance;
-
-	/**
-	 * 
-	 */
-	AttrFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, StringBuffer source) {
-		ICSSAttr attr = (ICSSAttr) node;
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		int end = ((IndexedRegion) node).getEndOffset();
-		if (end > 0) { // format source
-			int start = ((IndexedRegion) node).getStartOffset();
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-
-			if (attr.getName().equals(ICSSStyleRule.SELECTOR) || attr.getName().equals(ICSSPageRule.SELECTOR)) {
-				for (int i = 0; i < regions.length; i++) {
-					if (i != 0)
-						appendSpaceBetween(node, regions[i - 1], regions[i], source);
-					source.append(decoratedRegion(regions[i], 0, stgy));
-				}
-			}
-			else if (attr.getName().equals(ICSSImportRule.HREF)) {
-				for (int i = 0; i < regions.length; i++) {
-					if (i != 0)
-						appendSpaceBefore(node, regions[i], source);
-					source.append(decoratedPropValueRegion(regions[i], stgy));
-				}
-			}
-			else if (attr.getName().equals(ICSSCharsetRule.ENCODING)) {
-				for (int i = 0; i < regions.length; i++) {
-					if (i != 0)
-						appendSpaceBefore(node, regions[i], source);
-					source.append(decoratedIdentRegion(regions[i], stgy));
-				}
-			}
-			else if (attr.getName().equals(ICSSStyleDeclItem.IMPORTANT)) {
-				for (int i = 0; i < regions.length; i++) {
-					if (i != 0)
-						appendSpaceBefore(node, regions[i], source);
-					source.append(decoratedPropValueRegion(regions[i], stgy));
-				}
-			}
-			else if (attr.getName() == null || attr.getName().length() == 0) {
-				for (int i = 0; i < regions.length; i++) {
-					if (i != 0)
-						appendSpaceBefore(node, regions[i], source);
-					source.append(decoratedIdentRegion(regions[i], stgy));
-				}
-			}
-			else {
-				// counter attributes
-				for (int i = 0; i < regions.length; i++) {
-					if (i != 0)
-						appendSpaceBefore(node, regions[i], source);
-					source.append(decoratedPropValueRegion(regions[i], stgy));
-				}
-			}
-		}
-		else { // generate source
-			Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-			
-			String value = attr.getValue();
-			if (value == null)
-				value = "";//$NON-NLS-1$
-			if (attr.getName().equals(ICSSStyleRule.SELECTOR) || attr.getName().equals(ICSSPageRule.SELECTOR)) {
-			}
-			else if (attr.getName().equals(ICSSImportRule.HREF)) {
-				String uri = org.eclipse.wst.css.core.internal.util.CSSLinkConverter.stripFunc(value);
-				String func = preferences.getInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.UPPER ? "URL(" : "url(";//$NON-NLS-2$//$NON-NLS-1$
-				if (preferences.getBoolean(CSSCorePreferenceNames.FORMAT_QUOTE_IN_URI)) {
-					String quote = preferences.getString(CSSCorePreferenceNames.FORMAT_QUOTE);
-					quote = CSSUtil.detectQuote(uri, quote);
-					value = func + quote + uri + quote + ")";//$NON-NLS-1$
-				}
-				else {
-					value = func + uri + ")";//$NON-NLS-1$
-				}
-			}
-			else if (attr.getName().equals(ICSSCharsetRule.ENCODING)) {
-				String quote = preferences.getString(CSSCorePreferenceNames.FORMAT_QUOTE);
-				if (!value.startsWith("\"") && !value.startsWith("\'"))//$NON-NLS-2$//$NON-NLS-1$
-					value = quote + value;
-				if (!value.endsWith("\"") && !value.endsWith("\'"))//$NON-NLS-2$//$NON-NLS-1$
-					value = value + quote;
-			}
-			else if (attr.getName().equals(ICSSStyleDeclItem.IMPORTANT)) {
-				if (preferences.getInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.UPPER)
-					value = value.toUpperCase();
-				else
-					value = value.toLowerCase();
-			}
-			else if (attr.getName() == null || attr.getName().length() == 0) {
-				if (CSSCorePlugin.getDefault().getPluginPreferences().getInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.UPPER)
-					value = value.toUpperCase();
-				else
-					value = value.toLowerCase();
-			}
-			else {
-				if (preferences.getInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.UPPER)
-					value = value.toUpperCase();
-				else
-					value = value.toLowerCase();
-			}
-			source.append(value);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, IRegion region, StringBuffer source) {
-		formatPre(node, source);
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static AttrFormatter getInstance() {
-		if (instance == null) {
-			instance = new AttrFormatter();
-		}
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSFormatUtil.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSFormatUtil.java
deleted file mode 100644
index 4d2dc00..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSFormatUtil.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.provisional.adapters.ICSSModelAdapter;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-
-public class CSSFormatUtil {
-	public List collectCSSNodes(IStructuredModel model, int start, int length) {
-		List nodes = new ArrayList();
-
-		IndexedRegion startNode = model.getIndexedRegion(start);
-		IndexedRegion endNode = model.getIndexedRegion(start + length - 1);
-
-		if (startNode == null || endNode == null) {
-			return nodes;
-		}
-
-		if (model instanceof ICSSModel && startNode instanceof ICSSNode && endNode instanceof ICSSNode) {
-			// CSS model
-			ICSSNode ca = getCommonAncestor((ICSSNode) startNode, (ICSSNode) endNode);
-			if (ca != null) {
-				for (ICSSNode node = ca.getFirstChild(); node != null && start + length < ((IndexedRegion) node).getStartOffset(); node = node.getNextSibling()) {
-					if (start < ((IndexedRegion) node).getEndOffset()) {
-						nodes.add(node);
-					}
-				}
-			}
-		}
-		else if (model instanceof IDOMModel && startNode instanceof IDOMNode && endNode instanceof IDOMNode) {
-			if (startNode instanceof Text) {
-				startNode = (IndexedRegion) ((Text) startNode).getParentNode();
-			}
-			if (endNode instanceof Text) {
-				endNode = (IndexedRegion) ((Text) endNode).getParentNode();
-			}
-			// HTML model, maybe
-			IDOMNode ca = (IDOMNode) getCommonAncestor((Node) startNode, (Node) endNode);
-			findCSS(nodes, ca);
-		}
-
-		return nodes;
-	}
-
-	/**
-	 * getCommonAncestor method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param node
-	 *            org.w3c.dom.Node
-	 */
-	private Node getCommonAncestor(Node node1, Node node2) {
-		if (node1 == null || node2 == null)
-			return null;
-
-		for (Node na = node2; na != null; na = na.getParentNode()) {
-			for (Node ta = node1; ta != null; ta = ta.getParentNode()) {
-				if (ta == na)
-					return ta;
-			}
-		}
-		return null; // not found
-	}
-
-	private void findCSS(List cssNodes, IDOMNode node) {
-		ICSSModelAdapter adapter;
-		adapter = (ICSSModelAdapter) node.getAdapterFor(IStyleSheetAdapter.class);
-		if (adapter != null) {
-			ICSSModel model = adapter.getModel();
-			if (model != null && model.getStyleSheetType() == ICSSModel.EMBEDDED) {
-				cssNodes.add(model.getDocument());
-			}
-		}
-		else {
-			adapter = (ICSSModelAdapter) node.getAdapterFor(IStyleDeclarationAdapter.class);
-			if (adapter != null) {
-				ICSSModel model = adapter.getModel();
-				if (model != null && model.getStyleSheetType() == ICSSModel.INLINE) {
-					cssNodes.add(model.getDocument());
-				}
-			}
-		}
-
-		for (IDOMNode child = (IDOMNode) node.getFirstChild(); child != null; child = (IDOMNode) child.getNextSibling()) {
-			findCSS(cssNodes, child);
-		}
-	}
-
-	private ICSSNode getCommonAncestor(ICSSNode nodeA, ICSSNode nodeB) {
-		if (nodeA == null || nodeB == null) {
-			return null;
-		}
-
-		for (ICSSNode na = nodeA; na != null; na = na.getParentNode()) {
-			for (ICSSNode ta = nodeB; ta != null; ta = ta.getParentNode()) {
-				if (ta == na) {
-					return ta;
-				}
-			}
-		}
-
-		return null; // not found
-	}
-
-	/**
-	 */
-	public void replaceSource(IStructuredModel model, int offset, int length, String source) {
-		if (model == null)
-			return;
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (structuredDocument == null)
-			return;
-		if (offset >= 0 && length >= 0 && offset + length <= structuredDocument.getLength()) {
-			if (structuredDocument.containsReadOnly(offset, length))
-				return;
-			if (source == null)
-				source = new String();
-			// We use 'structuredDocument' as the requester object just so
-			// this and the other
-			// format-related 'repalceText' (in replaceSource) can use the
-			// same requester.
-			// Otherwise, if requester is not identical,
-			// the undo group gets "broken" into multiple pieces based
-			// on the requesters being different. Technically, any unique,
-			// common
-			// requester object would work.
-			structuredDocument.replaceText(structuredDocument, offset, length, source);
-		}
-	}
-
-	public synchronized static CSSFormatUtil getInstance() {
-		if (fInstance == null) {
-			fInstance = new CSSFormatUtil();
-		}
-		return fInstance;
-	}
-
-	private CSSFormatUtil() {
-		super();
-	}
-
-	private static CSSFormatUtil fInstance;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceFormatter.java
deleted file mode 100644
index 4a9af06..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceFormatter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-
-
-/**
- * 
- */
-public interface CSSSourceFormatter {
-
-	/**
-	 * 
-	 */
-	StringBuffer cleanup(ICSSNode node);
-
-	/**
-	 * 
-	 * @return java.lang.StringBuffer
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param region
-	 *            org.eclipse.jface.text.IRegion
-	 */
-	StringBuffer cleanup(ICSSNode node, IRegion region);
-
-	/**
-	 * 
-	 */
-	StringBuffer format(ICSSNode node);
-
-	/**
-	 * 
-	 */
-	StringBuffer format(ICSSNode node, IRegion region);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceFormatterFactory.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceFormatterFactory.java
deleted file mode 100644
index e3bf596..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceFormatterFactory.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-
-/**
- * 
- */
-public class CSSSourceFormatterFactory {
-	/**
-	 * 
-	 */
-	private CSSSourceFormatterFactory() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public CSSSourceGenerator getSourceFormatter(INodeNotifier target) {
-		ICSSNode node = (ICSSNode) target;
-		short type = node.getNodeType();
-		switch (type) {
-			case ICSSNode.CHARSETRULE_NODE :
-				return CharsetRuleFormatter.getInstance();
-			case ICSSNode.FONTFACERULE_NODE :
-				return FontFaceRuleFormatter.getInstance();
-			case ICSSNode.IMPORTRULE_NODE :
-				return ImportRuleFormatter.getInstance();
-			case ICSSNode.MEDIALIST_NODE :
-				return MediaListFormatter.getInstance();
-			case ICSSNode.MEDIARULE_NODE :
-				return MediaRuleFormatter.getInstance();
-			case ICSSNode.PRIMITIVEVALUE_NODE :
-				ICSSPrimitiveValue value = (ICSSPrimitiveValue) node;
-				if (value.getPrimitiveType() == org.w3c.dom.css.CSSPrimitiveValue.CSS_COUNTER)
-					return CounterFormatter.getInstance();
-				else if (value.getPrimitiveType() == org.w3c.dom.css.CSSPrimitiveValue.CSS_RECT)
-					return RectFormatter.getInstance();
-				else if (value.getPrimitiveType() == org.w3c.dom.css.CSSPrimitiveValue.CSS_RGBCOLOR)
-					return RGBFormatter.getInstance();
-				else
-					return PrimitiveValueFormatter.getInstance();
-			case ICSSNode.PAGERULE_NODE :
-				return PageRuleFormatter.getInstance();
-			case ICSSNode.STYLEDECLARATION_NODE :
-				return StyleDeclarationFormatter.getInstance();
-			case ICSSNode.STYLEDECLITEM_NODE :
-				return StyleDeclItemFormatter.getInstance();
-			case ICSSNode.STYLERULE_NODE :
-				return StyleRuleFormatter.getInstance();
-			case ICSSNode.STYLESHEET_NODE :
-				return StyleSheetFormatter.getInstance();
-			case ICSSNode.ATTR_NODE :
-				return AttrFormatter.getInstance();
-			default :
-				return UnknownRuleFormatter.getInstance();
-		}
-	}
-
-	public synchronized static CSSSourceFormatterFactory getInstance() {
-		if (fInstance == null) {
-			fInstance = new CSSSourceFormatterFactory();
-		}
-		return fInstance;
-	}
-
-	private static CSSSourceFormatterFactory fInstance;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceGenerator.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceGenerator.java
deleted file mode 100644
index edfe8cb..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceGenerator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-
-
-public interface CSSSourceGenerator extends CSSSourceFormatter {
-
-	/**
-	 * 
-	 */
-	StringBuffer formatAttrChanged(ICSSNode node, ICSSAttr attr, boolean insert, AttrChangeContext region);
-
-	/**
-	 * 
-	 */
-	StringBuffer formatBefore(ICSSNode node, ICSSNode child, IRegion exceptFor);
-
-	/**
-	 * 
-	 */
-	int getAttrInsertPos(ICSSNode node, String attrName);
-
-	/**
-	 * 
-	 */
-	int getChildInsertPos(ICSSNode node);
-
-	/**
-	 * 
-	 * @return int
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param insertPos
-	 *            int
-	 */
-	int getLengthToReformatAfter(ICSSNode node, int insertPos);
-
-	/**
-	 * 
-	 * @return int
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param insertPos
-	 *            int
-	 */
-	int getLengthToReformatBefore(ICSSNode node, int insertPos);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CharsetRuleFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CharsetRuleFormatter.java
deleted file mode 100644
index 7190fc9..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CharsetRuleFormatter.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSCharsetRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.css.core.internal.util.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-/**
- * 
- */
-public class CharsetRuleFormatter extends DefaultCSSSourceFormatter {
-
-	public final static java.lang.String CHARSET = "@charset";//$NON-NLS-1$
-	private static CharsetRuleFormatter instance;
-
-	/**
-	 * 
-	 */
-	CharsetRuleFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public StringBuffer formatAttrChanged(ICSSNode node, ICSSAttr attr, boolean insert, AttrChangeContext context) {
-		StringBuffer buf = new StringBuffer();
-		if (node == null || attr == null)
-			return buf;
-
-		if (!ICSSCharsetRule.ENCODING.equalsIgnoreCase(attr.getName()))
-			return buf;
-
-		// get region to replace
-		if (context != null && ((IndexedRegion) node).getEndOffset() > 0) {
-			if (attr != null && ((IndexedRegion) attr).getEndOffset() > 0) {
-				IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(((IndexedRegion) attr).getStartOffset());
-				ITextRegion region = flatNode.getRegionAtCharacterOffset(((IndexedRegion) attr).getStartOffset());
-				RegionIterator it = new RegionIterator(flatNode, region);
-				it.prev();
-				if (it.hasPrev()) {
-					ITextRegion prev = it.prev();
-					if (prev.getType() == CSSRegionContexts.CSS_S)
-						context.start = it.getStructuredDocumentRegion().getStartOffset(prev);
-					else
-						context.start = it.getStructuredDocumentRegion().getStartOffset(region);
-				} else
-					context.start = it.getStructuredDocumentRegion().getStartOffset(region);
-				context.end = it.getStructuredDocumentRegion().getEndOffset(region);
-			} else {
-				IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(((IndexedRegion) node).getEndOffset() - 1);
-				ITextRegion region = flatNode.getRegionAtCharacterOffset(((IndexedRegion) node).getEndOffset() - 1);
-				if (region.getType() == CSSRegionContexts.CSS_S) {
-					context.start = flatNode.getStartOffset(region);
-					context.end = flatNode.getStartOffset(region);
-				} else {
-					context.start = flatNode.getEndOffset() + 1;
-					context.end = flatNode.getEndOffset();
-				}
-			}
-		}
-		// generate text
-		if (insert) {
-			appendSpaceBefore(node, attr.getValue(), buf);
-			buf.append(attr.getValue());
-		}
-		return buf;
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, StringBuffer source) {
-		int end = ((IndexedRegion) node).getEndOffset();
-		if (end > 0) { // format source
-			int start = ((IndexedRegion) node).getStartOffset();
-			formatPre(node, new FormatRegion(start, end - start), source);
-		} else { // generate source
-			Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-
-			String quote = preferences.getString(CSSCorePreferenceNames.FORMAT_QUOTE);
-			String str = CHARSET;
-			if (preferences.getInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.UPPER)
-				str = CHARSET.toUpperCase();
-			source.append(str);
-			String enc = ((ICSSCharsetRule) node).getEncoding();
-			quote = CSSUtil.detectQuote(enc, quote);
-			str = quote + ((enc != null) ? enc : "") + quote + ";";//$NON-NLS-1$ //$NON-NLS-2$
-			appendSpaceBefore(node, str, source);
-			source.append(str);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, IRegion region, StringBuffer source) {
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if ((i != 0 || needS(outside[0])) && !regions[i].getType().equals(CSSRegionContexts.CSS_DELIMITER))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(decoratedIdentRegion(regions[i], stgy));
-		}
-		if (needS(outside[1]) && !isIncludesPreEnd(node, region))
-			appendSpaceBefore(node, outside[1], source);
-	}
-
-	/**
-	 * 
-	 */
-	public int getAttrInsertPos(ICSSNode node, String attrName) {
-		if (node == null || attrName == null || attrName.length() == 0)
-			return -1;
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		if (!ICSSCharsetRule.ENCODING.equalsIgnoreCase(attrName))
-			return -1;
-
-		ICSSAttr attr = (ICSSAttr) node.getAttributes().getNamedItem(ICSSCharsetRule.ENCODING);
-		if (attr != null && ((IndexedRegion) attr).getEndOffset() > 0)
-			return ((IndexedRegion) attr).getStartOffset();
-		IndexedRegion iNode = (IndexedRegion) node;
-		if (iNode.getEndOffset() <= 0)
-			return -1;
-
-		CompoundRegion regions[] = getRegionsWithoutWhiteSpaces(node.getOwnerDocument().getModel().getStructuredDocument(), new FormatRegion(iNode.getStartOffset(), iNode.getEndOffset() - iNode.getStartOffset()), stgy);
-		for (int i = regions.length - 1; i >= 0; i--) {
-			if (regions[i].getType() != CSSRegionContexts.CSS_COMMENT)
-				return regions[i].getStartOffset();
-		}
-		return iNode.getEndOffset();
-	}
-
-	/**
-	 * 
-	 */
-	public int getChildInsertPos(ICSSNode node) {
-		int n = ((IndexedRegion) node).getEndOffset();
-		if (n > 0) {
-			IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(n - 1);
-			if (flatNode.getRegionAtCharacterOffset(n - 1).getType() == CSSRegionContexts.CSS_DELIMITER)
-				return n - 1;
-			return n;
-		}
-		return -1;
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static CharsetRuleFormatter getInstance() {
-		if (instance == null)
-			instance = new CharsetRuleFormatter();
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CompoundRegion.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CompoundRegion.java
deleted file mode 100644
index 9b3c8ff..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CompoundRegion.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-class CompoundRegion {
-
-	CompoundRegion(IStructuredDocumentRegion documentRegion, ITextRegion textRegion) {
-		super();
-		this.fDocumentRegion = documentRegion;
-		this.fTextRegion = textRegion;
-	}
-
-	IStructuredDocumentRegion getDocumentRegion() {
-		return fDocumentRegion;
-	}
-
-	ITextRegion getTextRegion() {
-		return fTextRegion;
-	}
-
-	String getType() {
-		return fTextRegion.getType();
-	}
-
-	String getText() {
-		return fDocumentRegion.getText(fTextRegion);
-	}
-
-	int getStartOffset() {
-		return fDocumentRegion.getStartOffset(fTextRegion);
-	}
-
-	int getEndOffset() {
-		return fDocumentRegion.getEndOffset(fTextRegion);
-	}
-
-
-	private IStructuredDocumentRegion fDocumentRegion;
-	private ITextRegion fTextRegion;
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CounterFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CounterFormatter.java
deleted file mode 100644
index 331dd1b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CounterFormatter.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICounter;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.css.core.internal.util.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-/**
- * 
- */
-public class CounterFormatter extends DefaultCSSSourceFormatter {
-
-	private static CounterFormatter instance;
-
-	/**
-	 * 
-	 */
-	CounterFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public StringBuffer formatAttrChanged(ICSSNode node, ICSSAttr attr, boolean insert, AttrChangeContext context) {
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		
-		StringBuffer source = new StringBuffer();
-		if (node == null || attr == null)
-			return source;
-
-		if (!ICounter.IDENTIFIER.equalsIgnoreCase(attr.getName()) && !ICounter.LISTSTYLE.equalsIgnoreCase(attr.getName()) && !ICounter.SEPARATOR.equalsIgnoreCase(attr.getName()))
-			return source;
-
-		// get region to replace
-		IndexedRegion iNode = (IndexedRegion) node;
-		context.start = iNode.getStartOffset();
-		context.end = iNode.getEndOffset();
-
-		ICounter counter = (ICounter) node;
-		String quote = preferences.getString(CSSCorePreferenceNames.FORMAT_QUOTE);
-		String sep = counter.getSeparator();
-		String ident = counter.getIdentifier();
-		String style = counter.getListStyle();
-
-		if (ICounter.IDENTIFIER.equalsIgnoreCase(attr.getName())) {
-			if (insert)
-				ident = attr.getValue();
-			else
-				ident = "";//$NON-NLS-1$
-		}
-		else if (ICounter.LISTSTYLE.equalsIgnoreCase(attr.getName())) {
-			if (insert)
-				style = attr.getValue();
-			else
-				style = null;
-		}
-		else if (ICounter.SEPARATOR.equalsIgnoreCase(attr.getName())) {
-			if (insert)
-				sep = attr.getValue();
-			else
-				sep = null;
-		}
-
-		quote = CSSUtil.detectQuote(sep, quote);
-		sep = (sep == null || sep.length() == 0) ? null : (quote + sep + quote);
-
-		String func = (sep == null || sep.length() == 0) ? "counter(" : "counters(";//$NON-NLS-2$//$NON-NLS-1$
-		if (preferences.getInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.UPPER) {
-			ident = ident.toUpperCase();
-			style = style.toUpperCase();
-			func = func.toUpperCase();
-		}
-		else {
-			ident = ident.toLowerCase();
-			style = style.toLowerCase();
-		}
-		if (sep == null || sep.length() == 0) {
-			source.append(func);
-			appendSpaceBefore(node, ident, source);
-			source.append(ident);
-		}
-		else {
-			source.append(func);
-			appendSpaceBefore(node, ident, source);
-			source.append(ident);
-			source.append(",");//$NON-NLS-1$
-			appendSpaceBefore(node, sep, source);
-			source.append(sep);
-		}
-
-		if (style != null && style.length() != 0) {
-			source.append(",");//$NON-NLS-1$
-			appendSpaceBefore(node, style, source);
-		}
-		source.append(")");//$NON-NLS-1$
-
-		/*
-		 * IStructuredDocument structuredDocument =
-		 * node.getOwnerDocument().getModel().getStructuredDocument();
-		 * ITextRegion[] regions =
-		 * getRegionsWithoutWhiteSpaces(structuredDocument, new
-		 * FormatRegion(context.start, context.end - context.start + 1)); int
-		 * commas[2]; int numComma = 0; for(int j = 0; j <regions.length; j++) {
-		 * if (regions[j].getType() == CSSRegionContexts.COMMA) {
-		 * commas[numComma++] = j; if (numComma > 1) break; } }
-		 * 
-		 * if (ICounter.IDENTIFIER.equalsIgnoreCase(attr.getName())) { } else
-		 * if (ICounter.LISTSTYLE.equalsIgnoreCase(attr.getName())) { } else
-		 * if (ICounter.SEPARATOR.equalsIgnoreCase(attr.getName())) { boolean
-		 * skipSpace = false; String func = insert ? "counters(" : "counter(";
-		 * if (mgr.isPropValueUpperCase()) func = func.toUpperCase();
-		 * 
-		 * for(int i=0; i <regions.length; i++) { if (regions[i].getType() ==
-		 * CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION)
-		 * source.append(func); else { if (numComma == 2 && commas[1] < i) {
-		 *  } else if (numComma == 1 && commas[0] < i && insert) {
-		 *  } else if (numComma == 1 && commas[0] < i && ! insert) { } else if
-		 * (numComma == 0 && insert && regions[i].getType ==
-		 * CSSRegionContexts.PARENTHESIS_CLOSE) { source.append(",");
-		 * appendSpaceBefore(node,attr.getValue(),source);
-		 * source.append(attr.getValue()); }
-		 * 
-		 * if (i != 0 && !skipSpace)
-		 * appendSpaceBefore(node,regions[i],source);
-		 * source.append(decoratedPropValueRegion(regions[i])); } skipSpace =
-		 * false;
-		 * 
-		 * if (regions[i].getType() ==
-		 * CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) skipSpace = true; } }
-		 */
-		return source;
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, StringBuffer source) {
-		int start = ((IndexedRegion) node).getStartOffset();
-		int end = ((IndexedRegion) node).getEndOffset();
-
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		if (end > 0) { // format source
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			boolean skipSpace = false;
-			for (int i = 0; i < regions.length; i++) {
-				if (i != 0 && !skipSpace)
-					appendSpaceBefore(node, regions[i], source);
-				skipSpace = false;
-				source.append(decoratedPropValueRegion(regions[i], stgy));
-				if (regions[i].getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION)
-					skipSpace = true;
-			}
-		}
-		else { // generate source
-			ICounter counter = (ICounter) node;
-			String quote = preferences.getString(CSSCorePreferenceNames.FORMAT_QUOTE);
-			String separator = counter.getSeparator();
-			quote = CSSUtil.detectQuote(separator, quote);
-			String sep = (separator == null || separator.length() == 0) ? null : (quote + separator + quote);
-			String ident = counter.getIdentifier();
-			String style = counter.getListStyle();
-			String func = (sep == null || sep.length() == 0) ? "counter(" : "counters(";//$NON-NLS-2$//$NON-NLS-1$
-			// normalize
-			if (ident == null)
-				ident = "";//$NON-NLS-1$
-			if (style == null)
-				style = "";//$NON-NLS-1$
-
-			if (preferences.getInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.UPPER) {
-				ident = ident.toUpperCase();
-				style = style.toUpperCase();
-				func = func.toUpperCase();
-			}
-			else {
-				ident = ident.toLowerCase();
-				style = style.toLowerCase();
-			}
-			if (sep == null || sep.length() == 0) {
-				source.append(func);
-				appendSpaceBefore(node, ident, source);
-				source.append(ident);
-			}
-			else {
-				source.append(func);
-				appendSpaceBefore(node, ident, source);
-				source.append(ident);
-				source.append(",");//$NON-NLS-1$
-				appendSpaceBefore(node, sep, source);
-				source.append(sep);
-			}
-
-			if (style != null && style.length() != 0) {
-				source.append(",");//$NON-NLS-1$
-				appendSpaceBefore(node, style, source);
-			}
-			source.append(")");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, IRegion region, StringBuffer source) {
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(decoratedPropValueRegion(regions[i], stgy));
-		}
-		if (needS(outside[1]) && !isIncludesPreEnd(node, region))
-			appendSpaceBefore(node, outside[1], source);
-	}
-
-	/**
-	 * 
-	 */
-	public int getAttrInsertPos(ICSSNode node, String attrName) {
-		if (node == null || attrName == null || attrName.length() == 0)
-			return -1;
-
-		IndexedRegion iNode = (IndexedRegion) node;
-		if (ICounter.IDENTIFIER.equalsIgnoreCase(attrName)) {
-			ICSSAttr attr = (ICSSAttr) node.getAttributes().getNamedItem(ICounter.IDENTIFIER);
-			if (attr != null && ((IndexedRegion) attr).getEndOffset() > 0)
-				return ((IndexedRegion) attr).getStartOffset();
-			if (iNode.getEndOffset() <= 0)
-				return -1;
-
-			IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(iNode.getEndOffset() - 1);
-			RegionIterator it = new RegionIterator(flatNode, flatNode.getRegionAtCharacterOffset(iNode.getEndOffset() - 1));
-			while (it.hasPrev()) {
-				ITextRegion region = it.prev();
-				if (region.getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION)
-					return it.getStructuredDocumentRegion().getEndOffset(region);
-			}
-			return ((IndexedRegion) node).getEndOffset();
-		}
-		else if (ICounter.LISTSTYLE.equalsIgnoreCase(attrName)) {
-			ICSSAttr attr = (ICSSAttr) node.getAttributes().getNamedItem(ICounter.LISTSTYLE);
-			if (attr != null && ((IndexedRegion) attr).getEndOffset() > 0)
-				return ((IndexedRegion) attr).getStartOffset();
-
-			IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(iNode.getEndOffset() - 1);
-			RegionIterator it = new RegionIterator(flatNode, flatNode.getRegionAtCharacterOffset(iNode.getEndOffset() - 1));
-			while (it.hasPrev()) {
-				ITextRegion region = it.prev();
-				if (region.getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR)
-					return it.getStructuredDocumentRegion().getEndOffset(region);
-				else if (region.getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION)
-					return it.getStructuredDocumentRegion().getEndOffset(region);
-			}
-			return ((IndexedRegion) node).getEndOffset();
-		}
-		else if (ICounter.SEPARATOR.equalsIgnoreCase(attrName)) {
-			ICSSAttr attr = (ICSSAttr) node.getAttributes().getNamedItem(ICounter.SEPARATOR);
-			if (attr != null && ((IndexedRegion) attr).getEndOffset() > 0)
-				return ((IndexedRegion) attr).getStartOffset();
-
-			IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(iNode.getEndOffset() - 1);
-			RegionIterator it = new RegionIterator(flatNode, flatNode.getRegionAtCharacterOffset(iNode.getEndOffset() - 1));
-			boolean hasComma = false;
-			while (it.hasPrev()) {
-				ITextRegion region = it.prev();
-				if (region.getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR) {
-					if (!hasComma)
-						hasComma = true;
-					else
-						return it.getStructuredDocumentRegion().getEndOffset(region);
-				}
-				else if (region.getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION)
-					return it.getStructuredDocumentRegion().getEndOffset(region);
-			}
-			return ((IndexedRegion) node).getEndOffset();
-		}
-		else
-			return -1;
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static CounterFormatter getInstance() {
-		if (instance == null)
-			instance = new CounterFormatter();
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/DeclContainerFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/DeclContainerFormatter.java
deleted file mode 100644
index 7fff44b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/DeclContainerFormatter.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-
-/**
- * 
- */
-public class DeclContainerFormatter extends DefaultCSSSourceFormatter {
-
-	/**
-	 * 
-	 */
-	DeclContainerFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 * @return java.lang.String
-	 */
-	protected String decoratedSelectorRegion(CompoundRegion region, CompoundRegion prevRegion, CSSCleanupStrategy stgy) {
-		String text = region.getText();
-		if (isFormat())
-			return text;
-
-		String type = region.getType();
-		if (type == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_NAME || type == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_VALUE || type == CSSRegionContexts.CSS_SELECTOR_CLASS || type == CSSRegionContexts.CSS_SELECTOR_ELEMENT_NAME || type == CSSRegionContexts.CSS_SELECTOR_ID || type == CSSRegionContexts.CSS_SELECTOR_PSEUDO) {
-			short selCase = stgy.getSelectorTagCase();
-			if (selCase == org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy.UPPER) {
-				return text.toUpperCase();
-			}
-			else if (selCase == org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy.LOWER) {
-				return text.toLowerCase();
-			}
-			return text;
-		}
-
-		return decoratedRegion(region, 0, stgy);
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPost(ICSSNode node, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		int end = ((IndexedRegion) node).getEndOffset();
-		int start = (node.getLastChild() != null && ((IndexedRegion) node.getLastChild()).getEndOffset() > 0) ? ((IndexedRegion) node.getLastChild()).getEndOffset() : getChildInsertPos(node);
-		if (end > 0 && start < end) { // format source
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			for (int i = 0; i < regions.length; i++) {
-				appendDelimBefore(node, regions[i], source);
-				source.append(decoratedRegion(regions[i], 0, stgy));
-			}
-		}
-		else { // generate source
-			String delim = getLineDelimiter(node);
-			source.append(delim);
-			source.append(getIndent(node));
-			source.append("}");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPost(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendDelimBefore(node, regions[i], source);
-			source.append(decoratedRegion(regions[i], 0, stgy));
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public int getChildInsertPos(ICSSNode node) {
-		int n = ((IndexedRegion) node).getEndOffset();
-		if (n > 0) {
-			IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(n - 1);
-			if (flatNode.getRegionAtCharacterOffset(n - 1).getType() == CSSRegionContexts.CSS_RBRACE)
-				return n - 1;
-			else
-				return n;
-		}
-		return -1;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/DefaultCSSSourceFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/DefaultCSSSourceFormatter.java
deleted file mode 100644
index c1aed20..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/DefaultCSSSourceFormatter.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.parser.CSSRegionUtil;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-
-
-/**
- * 
- */
-public class DefaultCSSSourceFormatter extends AbstractCSSSourceFormatter {
-
-	/**
-	 * 
-	 */
-	DefaultCSSSourceFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	protected void appendSpaceBetween(ICSSNode node, CompoundRegion prev, CompoundRegion next, StringBuffer source) {
-		if (isCleanup() && !getCleanupStrategy(node).isFormatSource())
-			return; // for not formatting case on cleanup action
-
-		// in selector
-		String prevType = prev.getType();
-		String nextType = next.getType();
-		if (CSSRegionUtil.isSelectorBegginingType(prevType) && CSSRegionUtil.isSelectorBegginingType(nextType)) {
-			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=73990
-			// Formatting CSS file splits element.class into element . class
-			if ((prevType == CSSRegionContexts.CSS_SELECTOR_ELEMENT_NAME && (nextType == CSSRegionContexts.CSS_SELECTOR_CLASS || nextType == CSSRegionContexts.CSS_SELECTOR_ID)) || ((prevType == CSSRegionContexts.CSS_SELECTOR_ELEMENT_NAME || prevType == CSSRegionContexts.CSS_SELECTOR_CLASS) && nextType == CSSRegionContexts.CSS_SELECTOR_PSEUDO)) {
-				// Individually, SELECTOR_ELEMENT_NAME, SELECTOR_CLASS, and SELECTOR_ID can all be beginning types.
-				// But, we should not insert a space in between when SELECTOR_ELEMENT_NAME is followed by SELECTOR_CLASS, or when
-				// SELECTOR_ELEMENT_NAME is followed by SELECTOR_ID.
-				// For example: H1.pastoral and H1#z98y
-				//
-				// Also, space is now not inserted in between when SELECTOR_ELEMENT_NAME is followed by SELECTOR_PSEUDO, or when
-				// SELECTOR_CLASS is followed by SELECTOR_PSEUDO.
-				// For example: P:first-letter and A.external:visited
-			}
-			else
-				appendSpaceBefore(node, next, source);
-			return;
-		}
-
-		if (prevType == CSSRegionContexts.CSS_PAGE || prevType == CSSRegionContexts.CSS_CHARSET || prevType == CSSRegionContexts.CSS_ATKEYWORD || prevType == CSSRegionContexts.CSS_FONT_FACE || prevType == CSSRegionContexts.CSS_IMPORT || prevType == CSSRegionContexts.CSS_MEDIA) {
-			appendSpaceBefore(node, next, source);
-			return;
-		}
-
-		if (prevType == CSSRegionContexts.CSS_UNKNOWN && nextType != CSSRegionContexts.CSS_COMMENT) {
-			if (prev.getEndOffset() != next.getStartOffset()) { // not
-																// sequential
-				appendSpaceBefore(node, next, source);
-			}
-			return;
-		}
-
-		if (prevType == CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR || prevType == CSSRegionContexts.CSS_COMMENT || nextType == CSSRegionContexts.CSS_COMMENT || nextType == CSSRegionContexts.CSS_LBRACE || nextType == CSSRegionContexts.CSS_UNKNOWN) {
-			appendSpaceBefore(node, next, source);
-			return;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatBefore(ICSSNode node, ICSSNode child, String toAppend, StringBuffer source, IRegion exceptFor) {
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatBefore(ICSSNode node, ICSSNode child, IRegion region, String toAppend, StringBuffer source) {
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPost(ICSSNode node, StringBuffer source) {
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPost(ICSSNode node, IRegion region, StringBuffer source) {
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, StringBuffer source) {
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, IRegion region, StringBuffer source) {
-	}
-
-	/**
-	 * 
-	 */
-	public int getChildInsertPos(ICSSNode node) {
-		int n = ((IndexedRegion) node).getEndOffset();
-		if (n > 0)
-			return n;
-		return -1;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FontFaceRuleFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FontFaceRuleFormatter.java
deleted file mode 100644
index 65a67d3..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FontFaceRuleFormatter.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-
-/**
- * 
- */
-public class FontFaceRuleFormatter extends DeclContainerFormatter {
-
-	public final static java.lang.String FONT_FACE = "@font-face";//$NON-NLS-1$
-	private static FontFaceRuleFormatter instance;
-
-	/**
-	 * 
-	 */
-	FontFaceRuleFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(org.eclipse.wst.css.core.internal.provisional.document.ICSSNode node, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		int start = ((IndexedRegion) node).getStartOffset();
-		int end = (node.getFirstChild() != null && ((IndexedRegion) node.getFirstChild()).getEndOffset() > 0) ? ((IndexedRegion) node.getFirstChild()).getStartOffset() : getChildInsertPos(node);
-		if (end > 0) {
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			for (int i = 0; i < regions.length; i++) {
-				if (i != 0)
-					appendSpaceBefore(node, regions[i], source);
-				source.append(decoratedIdentRegion(regions[i], stgy));
-			}
-		}
-		else {
-			String str = FONT_FACE;
-			if (CSSCorePlugin.getDefault().getPluginPreferences().getInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.UPPER)
-				str = FONT_FACE.toUpperCase();
-			source.append(str);
-			appendSpaceBefore(node, "{", source);//$NON-NLS-1$
-			source.append("{");//$NON-NLS-1$
-		}
-		appendDelimBefore(node, null, source);
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(decoratedIdentRegion(regions[i], stgy));
-		}
-		if (needS(outside[1])) {
-			if (isIncludesPreEnd(node, region))
-				appendDelimBefore(node, null, source);
-			else
-				appendSpaceBefore(node, outside[1], source);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static FontFaceRuleFormatter getInstance() {
-		if (instance == null)
-			instance = new FontFaceRuleFormatter();
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FormatRegion.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FormatRegion.java
deleted file mode 100644
index ff0c9d3..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FormatRegion.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.jface.text.IRegion;
-
-/**
- * 
- */
-class FormatRegion implements IRegion {
-
-	private int fOffset, fLength;
-
-	/**
-	 * 
-	 */
-	FormatRegion(int offset, int length) {
-		super();
-		set(offset, length);
-	}
-
-	/**
-	 * Returns the length of the region.
-	 * 
-	 * @return the length of the region
-	 */
-	public int getLength() {
-		return fLength;
-	}
-
-	/**
-	 * Returns the offset of the region.
-	 * 
-	 * @return the offset of the region
-	 */
-	public int getOffset() {
-		return fOffset;
-	}
-
-	/**
-	 * 
-	 */
-	void set(int offset, int length) {
-		this.fOffset = offset;
-		this.fLength = length;
-	}
-
-	/**
-	 * 
-	 */
-	void setLength(int newLength) {
-		fLength = newLength;
-	}
-
-	/**
-	 * 
-	 */
-	void setOffset(int newOffset) {
-		fOffset = newOffset;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FunctionFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FunctionFormatter.java
deleted file mode 100644
index 29499ba..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FunctionFormatter.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-
-/**
- * 
- */
-abstract public class FunctionFormatter extends AbstractCSSSourceFormatter {
-
-	/**
-	 * 
-	 */
-	FunctionFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatBefore(ICSSNode node, ICSSNode child, String toAppend, StringBuffer source, IRegion exceptFor) {
-		ICSSNode prev = (child != null) ? child.getPreviousSibling() : node.getLastChild();
-		int start = (prev != null) ? ((IndexedRegion) prev).getEndOffset() : 0;
-		int end = (child != null) ? ((IndexedRegion) child).getStartOffset() : 0;
-		if (start > 0 && start < end) { // format source
-			CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			// get meaning regions
-			CompoundRegion[] regions = null;
-			if (exceptFor == null)
-				regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			else {
-				String pickupType = CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR;
-				if (prev == null || child == null)
-					pickupType = null;
-				regions = getRegions(structuredDocument, new FormatRegion(start, end - start), exceptFor, pickupType);
-			}
-			// extract source
-			for (int i = 0; i < regions.length; i++) {
-				appendSpaceBefore(node, regions[i], source);
-				source.append(decoratedRegion(regions[i], 2, stgy));
-			}
-		} else if (prev != null && child != null) { // generate source between
-			// parameters
-			source.append(",");//$NON-NLS-1$
-		}
-		appendSpaceBefore(node, toAppend, source);
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatBefore(ICSSNode node, ICSSNode child, IRegion region, String toAppend, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(decoratedRegion(regions[i], 2, stgy));
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPost(org.eclipse.wst.css.core.internal.provisional.document.ICSSNode node, java.lang.StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		int end = ((IndexedRegion) node).getEndOffset();
-		int start = (node.getLastChild() != null && ((IndexedRegion) node.getLastChild()).getEndOffset() > 0) ? ((IndexedRegion) node.getLastChild()).getEndOffset() : getChildInsertPos(node);
-		if (end > 0 && start < end) { // format source
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			for (int i = 0; i < regions.length; i++) {
-				appendSpaceBefore(node, regions[i], source);
-				source.append(decoratedRegion(regions[i], 2, stgy));
-			}
-		} else { // generate source
-			source.append(")");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPost(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(decoratedRegion(regions[i], 2, stgy));
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, StringBuffer source) {
-		int start = ((IndexedRegion) node).getStartOffset();
-		int end = (node.getFirstChild() != null && ((IndexedRegion) node.getFirstChild()).getEndOffset() > 0) ? ((IndexedRegion) node.getFirstChild()).getStartOffset() : getChildInsertPos(node);
-
-		if (end > 0) { // format source
-			CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			for (int i = 0; i < regions.length; i++) {
-				if (i != 0)
-					appendSpaceBefore(node, regions[i], source);
-				source.append(decoratedPropValueRegion(regions[i], stgy));
-			}
-		} else { // generate source
-			String func = getFunc();
-			if (CSSCorePlugin.getDefault().getPluginPreferences().getInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.UPPER)
-				func = func.toUpperCase();
-			source.append(func);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(decoratedPropValueRegion(regions[i], stgy));
-		}
-		if (needS(outside[1]) && !isIncludesPreEnd(node, region))
-			appendSpaceBefore(node, outside[1], source);
-	}
-
-	/**
-	 * 
-	 */
-	public int getChildInsertPos(ICSSNode node) {
-		int n = ((IndexedRegion) node).getEndOffset();
-		if (n > 0) {
-			IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(n - 1);
-			if (flatNode.getRegionAtCharacterOffset(n - 1).getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-				return n - 1;
-			return n;
-		}
-		return -1;
-	}
-
-	/**
-	 * 
-	 */
-	protected abstract String getFunc();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/ImportRuleFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/ImportRuleFormatter.java
deleted file mode 100644
index d5d3ef7..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/ImportRuleFormatter.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.css.core.internal.util.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-/**
- * 
- */
-public class ImportRuleFormatter extends AbstractCSSSourceFormatter {
-
-	public final static java.lang.String IMPORT = "@import";//$NON-NLS-1$
-	private static ImportRuleFormatter instance;
-
-	/**
-	 * 
-	 */
-	ImportRuleFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public StringBuffer formatAttrChanged(ICSSNode node, ICSSAttr attr, boolean insert, AttrChangeContext context) {
-		StringBuffer buf = new StringBuffer();
-		if (node == null || attr == null)
-			return buf;
-
-		if (!ICSSImportRule.HREF.equalsIgnoreCase(attr.getName()))
-			return buf;
-
-		// get region to replace
-		if (context != null && ((IndexedRegion) node).getEndOffset() > 0) {
-			if (attr != null && ((IndexedRegion) attr).getEndOffset() > 0) {
-				IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(((IndexedRegion) attr).getStartOffset());
-				ITextRegion region = flatNode.getRegionAtCharacterOffset(((IndexedRegion) attr).getStartOffset());
-				RegionIterator it = new RegionIterator(flatNode, region);
-				it.prev();
-				if (it.hasPrev()) {
-					ITextRegion prev = it.prev();
-					if (prev.getType() == CSSRegionContexts.CSS_S)
-						context.start = it.getStructuredDocumentRegion().getStartOffset(prev);
-					else
-						context.start = it.getStructuredDocumentRegion().getStartOffset(region);
-					it.next();
-				} else
-					context.start = it.getStructuredDocumentRegion().getStartOffset(region);
-				it.next();
-				it.next();
-				if (it.hasNext()) {
-					ITextRegion next = it.next();
-					if (next.getType() == CSSRegionContexts.CSS_S)
-						context.end = it.getStructuredDocumentRegion().getEndOffset(next);
-					else
-						context.end = it.getStructuredDocumentRegion().getEndOffset(region);
-				} else
-					context.end = it.getStructuredDocumentRegion().getEndOffset(region);
-			} else {
-				ICSSNode child = node.getFirstChild();
-				IStructuredDocumentRegion flatNode = null;
-				ITextRegion region = null;
-				if (child == null) {
-					flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(((IndexedRegion) node).getEndOffset() - 1);
-					region = flatNode.getRegionAtCharacterOffset(((IndexedRegion) node).getEndOffset() - 1);
-				} else {
-					flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(((IndexedRegion) child).getStartOffset() - 1);
-					region = flatNode.getRegionAtCharacterOffset(((IndexedRegion) child).getStartOffset() - 1);
-				}
-				if (region.getType() == CSSRegionContexts.CSS_S) {
-					context.start = flatNode.getStartOffset(region);
-					context.end = flatNode.getEndOffset(region);
-				} else {
-					context.start = flatNode.getEndOffset();
-					context.end = flatNode.getEndOffset();
-				}
-			}
-		}
-		// generate text
-		if (insert && attr.getValue() != null && attr.getValue().length() > 0) {
-			appendSpaceBefore(node, attr.getValue(), buf);
-			buf.append(attr.getValue());
-			appendSpaceBefore(node, "", buf);//$NON-NLS-1$
-		}
-		return buf;
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatBefore(ICSSNode node, ICSSNode child, String toAppend, StringBuffer source, IRegion exceptFor) {
-		// for media-type
-		ICSSNode prev = (child != null) ? child.getPreviousSibling() : node.getLastChild();
-		int start = (prev != null) ? ((IndexedRegion) prev).getEndOffset() : 0;
-		int end = (child != null) ? ((IndexedRegion) child).getStartOffset() : 0;
-		if (start > 0 && start < end) { // format source
-			CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			// get meaning regions
-			CompoundRegion[] regions = null;
-			if (exceptFor == null)
-				regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			else {
-				String pickupType = CSSRegionContexts.CSS_MEDIA_SEPARATOR;
-				if (prev == null || child == null)
-					pickupType = null;
-				regions = getRegions(structuredDocument, new FormatRegion(start, end - start), exceptFor, pickupType);
-			}
-			// extract source
-			for (int i = 0; i < regions.length; i++) {
-				appendSpaceBefore(node, regions[i], source);
-				source.append(decoratedRegion(regions[i], 0, stgy)); // must
-				// be
-				// comments
-			}
-			appendSpaceBefore(node, toAppend, source);
-		} else if (prev != null && child != null) { // generate source : ????
-			source.append(",");//$NON-NLS-1$
-			appendSpaceBefore(node, toAppend, source);
-		} else if (child != null) { // generate source : between 'url()' and
-			// media types
-			appendSpaceBefore(node, toAppend, source);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatBefore(ICSSNode node, ICSSNode child, IRegion region, String toAppend, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(decoratedRegion(regions[i], 0, stgy)); // must be
-			// comments
-		}
-		if (needS(outside[1])) {
-			if (((IndexedRegion) child).getStartOffset() == region.getOffset() + region.getLength())
-				appendSpaceBefore(node, toAppend, source);
-			else
-				appendSpaceBefore(node, outside[1], source);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPost(ICSSNode node, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		int end = ((IndexedRegion) node).getEndOffset();
-		int start = (node.getLastChild() != null && ((IndexedRegion) node.getLastChild()).getEndOffset() > 0) ? ((IndexedRegion) node.getLastChild()).getEndOffset() : getChildInsertPos(node);
-		if (end > 0 && start < end) {
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			for (int i = 0; i < regions.length; i++) {
-				appendDelimBefore(node, regions[i], source);
-				source.append(decoratedRegion(regions[i], 0, stgy));
-			}
-		} else {
-			source.append(";"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPost(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if ((i != 0 || needS(outside[0])) && !regions[i].getType().equals(CSSRegionContexts.CSS_DELIMITER))
-				appendDelimBefore(node, regions[i], source);
-			source.append(decoratedRegion(regions[i], 0, stgy));
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, StringBuffer source) {
-		int start = ((IndexedRegion) node).getStartOffset();
-		int end = (node.getFirstChild() != null && ((IndexedRegion) node.getFirstChild()).getEndOffset() > 0) ? ((IndexedRegion) node.getFirstChild()).getStartOffset() : getChildInsertPos(node);
-
-		if (end > 0) { // format source
-			CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			for (int i = 0; i < regions.length; i++) {
-				String str = regions[i].getText();
-				if (regions[i].getType() == CSSRegionContexts.CSS_IMPORT)
-					str = decoratedIdentRegion(regions[i], stgy);
-				else
-					str = decoratedPropValueRegion(regions[i], stgy);
-				if (i != 0)
-					appendSpaceBefore(node, regions[i], source);
-				source.append(str);
-			}
-		} else { // generate source
-			Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-
-			String str = IMPORT;
-			if (preferences.getInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.UPPER)
-				str = IMPORT.toUpperCase();
-			String quote = preferences.getString(CSSCorePreferenceNames.FORMAT_QUOTE);
-			source.append(str);
-			str = "url(";//$NON-NLS-1$
-			if (preferences.getInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.UPPER)
-				str = str.toUpperCase();
-			String href = ((ICSSImportRule) node).getHref();
-			quote = CSSUtil.detectQuote(href, quote);
-			str = str + quote + href + quote + ")";//$NON-NLS-1$
-			appendSpaceBefore(node, str, source);
-			source.append(str);
-		}
-		ICSSNode child = node.getFirstChild();
-		if (child != null && (child instanceof org.w3c.dom.stylesheets.MediaList) && ((org.w3c.dom.stylesheets.MediaList) child).getLength() > 0) {
-			appendSpaceBefore(node, "", source);//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			String str = regions[i].getText();
-			if (regions[i].getType() == CSSRegionContexts.CSS_IMPORT)
-				str = decoratedIdentRegion(regions[i], stgy);
-			else
-				str = decoratedPropValueRegion(regions[i], stgy);
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(str);
-		}
-		if (needS(outside[1]) && !isIncludesPreEnd(node, region))
-			appendSpaceBefore(node, outside[1], source);
-	}
-
-	/**
-	 * 
-	 */
-	public int getAttrInsertPos(ICSSNode node, String attrName) {
-		if (node == null || attrName == null || attrName.length() == 0)
-			return -1;
-
-		if (!ICSSImportRule.HREF.equalsIgnoreCase(attrName))
-			return -1;
-
-		ICSSAttr attr = (ICSSAttr) node.getAttributes().getNamedItem(ICSSImportRule.HREF);
-		if (attr != null && ((IndexedRegion) attr).getEndOffset() > 0)
-			return ((IndexedRegion) attr).getStartOffset();
-		IndexedRegion iNode = (IndexedRegion) node;
-		if (iNode.getEndOffset() <= 0)
-			return -1;
-
-		FormatRegion formatRegion = null;
-		ICSSNode child = node.getFirstChild();
-		if (child != null && ((IndexedRegion) child).getEndOffset() > 0)
-			formatRegion = new FormatRegion(iNode.getStartOffset(), ((IndexedRegion) child).getStartOffset() - iNode.getStartOffset());
-		else
-			formatRegion = new FormatRegion(iNode.getStartOffset(), iNode.getEndOffset() - iNode.getStartOffset());
-		CompoundRegion regions[] = getRegionsWithoutWhiteSpaces(node.getOwnerDocument().getModel().getStructuredDocument(), formatRegion, getCleanupStrategy(node));
-
-		boolean atrule = false;
-		for (int i = 0; i < regions.length; i++) {
-			if (regions[i].getType() == CSSRegionContexts.CSS_IMPORT) {
-				atrule = true;
-				continue;
-			} else if (!atrule)
-				continue;
-			if (regions[i].getType() != CSSRegionContexts.CSS_COMMENT)
-				return regions[i].getStartOffset();
-		}
-		return (child != null && ((IndexedRegion) child).getEndOffset() > 0) ? ((IndexedRegion) child).getStartOffset() : iNode.getEndOffset();
-	}
-
-	/**
-	 * 
-	 */
-	public int getChildInsertPos(ICSSNode node) {
-		int n = ((IndexedRegion) node).getEndOffset();
-		if (n > 0) {
-			IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(n - 1);
-			if (flatNode.getRegionAtCharacterOffset(n - 1).getType() == CSSRegionContexts.CSS_DELIMITER)
-				return n - 1;
-			return n;
-		}
-		return -1;
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static ImportRuleFormatter getInstance() {
-		if (instance == null)
-			instance = new ImportRuleFormatter();
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/MediaListFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/MediaListFormatter.java
deleted file mode 100644
index fa526f2..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/MediaListFormatter.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.util.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.w3c.dom.stylesheets.MediaList;
-
-
-/**
- * 
- */
-public class MediaListFormatter extends DefaultCSSSourceFormatter {
-
-	private static MediaListFormatter instance;
-
-	/**
-	 * 
-	 */
-	MediaListFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public StringBuffer formatAttrChanged(ICSSNode node, ICSSAttr attr, boolean insert, AttrChangeContext context) {
-		StringBuffer buf = new StringBuffer();
-		if (node == null || attr == null)
-			return buf;
-
-		boolean first = false, last = false;
-		// get region to replace
-		if (context != null && ((IndexedRegion) node).getEndOffset() > 0) {
-			if (attr != null && ((IndexedRegion) attr).getEndOffset() > 0) {
-				IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(((IndexedRegion) attr).getStartOffset());
-				ITextRegion region = flatNode.getRegionAtCharacterOffset(((IndexedRegion) attr).getStartOffset());
-				RegionIterator it = new RegionIterator(flatNode, region);
-				it.prev();
-				context.start = it.getStructuredDocumentRegion().getStartOffset(region);
-				while (it.hasPrev()) {
-					ITextRegion prev = it.prev();
-					if (prev.getType() == CSSRegionContexts.CSS_S || prev.getType() == CSSRegionContexts.CSS_MEDIA_SEPARATOR || prev.getType() == CSSRegionContexts.CSS_COMMENT)
-						context.start = it.getStructuredDocumentRegion().getStartOffset(prev);
-					else
-						break;
-				}
-				if (context.start < ((IndexedRegion) node).getStartOffset()) {
-					context.start = ((IndexedRegion) node).getStartOffset();
-					first = true;
-
-				}
-				it.reset(flatNode, region);
-				context.end = it.getStructuredDocumentRegion().getEndOffset(region);
-				while (it.hasNext()) {
-					ITextRegion next = it.next();
-					if (next.getType() == CSSRegionContexts.CSS_S || next.getType() == CSSRegionContexts.CSS_MEDIA_SEPARATOR || next.getType() == CSSRegionContexts.CSS_COMMENT)
-						context.end = it.getStructuredDocumentRegion().getEndOffset(next);
-					else
-						break;
-				}
-				if (((IndexedRegion) node).getEndOffset() < context.end) {
-					context.end = ((IndexedRegion) node).getEndOffset();
-					last = true;
-				}
-			} else {
-				last = true;
-				IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(((IndexedRegion) node).getEndOffset() - 1);
-				ITextRegion region = flatNode.getRegionAtCharacterOffset(((IndexedRegion) node).getEndOffset() - 1);
-				RegionIterator it = new RegionIterator(flatNode, region);
-				context.start = it.getStructuredDocumentRegion().getEndOffset(region);
-				context.end = it.getStructuredDocumentRegion().getEndOffset(region);
-				while (it.hasPrev()) {
-					ITextRegion prev = it.prev();
-					if (prev.getType() == CSSRegionContexts.CSS_S || prev.getType() == CSSRegionContexts.CSS_MEDIA_SEPARATOR || prev.getType() == CSSRegionContexts.CSS_COMMENT)
-						context.start = it.getStructuredDocumentRegion().getStartOffset(prev);
-					else
-						break;
-				}
-				if (context.start < ((IndexedRegion) node).getStartOffset()) {
-					context.start = ((IndexedRegion) node).getStartOffset();
-					first = true;
-				}
-			}
-		}
-		// generate text
-		if (insert && attr.getValue() != null && attr.getValue().length() > 0) {
-			if (!first)
-				buf.append(","); //$NON-NLS-1$
-			appendSpaceBefore(node, attr.getValue(), buf);
-			buf.append(attr.getValue());
-			if (!last) {
-				buf.append(","); //$NON-NLS-1$
-				appendSpaceBefore(node, "", buf); //$NON-NLS-1$
-			}
-		} else if (!first && !last) {
-			buf.append(","); //$NON-NLS-1$
-			appendSpaceBefore(node, "", buf); //$NON-NLS-1$
-		}
-		return buf;
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		int start = ((IndexedRegion) node).getStartOffset();
-		int end = ((IndexedRegion) node).getEndOffset();
-
-		if (end > 0) { // format source
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			for (int i = 0; i < regions.length; i++) {
-				if (i != 0)
-					appendSpaceBefore(node, regions[i], source);
-				source.append(decoratedIdentRegion(regions[i], stgy));
-			}
-		} else { // generate source
-			MediaList list = (MediaList) node;
-			int n = list.getLength();
-			for (int i = 0; i < n; i++) {
-				String medium = list.item(i);
-				if (CSSCorePlugin.getDefault().getPluginPreferences().getInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.UPPER)
-					medium = medium.toUpperCase();
-				else
-					medium = medium.toLowerCase();
-
-				if (i != 0) {
-					source.append(","); //$NON-NLS-1$
-					appendSpaceBefore(node, medium, source);
-				}
-				source.append(medium);
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(decoratedIdentRegion(regions[i], stgy));
-		}
-		if (needS(outside[1]) && !isIncludesPreEnd(node, region))
-			appendSpaceBefore(node, outside[1], source);
-	}
-
-	/**
-	 * 
-	 */
-	public int getAttrInsertPos(ICSSNode node, String attrName) {
-		if (node == null || attrName == null || attrName.length() == 0)
-			return -1;
-
-		ICSSAttr attr = (ICSSAttr) node.getAttributes().getNamedItem(attrName);
-
-		if (attr != null && ((IndexedRegion) attr).getEndOffset() > 0)
-			return ((IndexedRegion) attr).getStartOffset();
-		IndexedRegion iNode = (IndexedRegion) node;
-		if (iNode.getEndOffset() <= 0)
-			return -1;
-
-		/*
-		 * ITextRegion regions[] =
-		 * getRegionsWithoutWhiteSpaces(node.getOwnerDocument().getModel().getStructuredDocument(),
-		 * new FormatRegion(iNode.getStartOffset(), iNode.getEndOffset() -
-		 * iNode.getStartOffset() + 1)); for(int i=regions.length - 1; i >= 0;
-		 * i--) { if (regions[i].getType() == CSSRegionContexts.IMPORTANT_SYM)
-		 * return regions[i].getStartOffset(); }
-		 */
-		return iNode.getEndOffset();
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static MediaListFormatter getInstance() {
-		if (instance == null)
-			instance = new MediaListFormatter();
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/MediaRuleFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/MediaRuleFormatter.java
deleted file mode 100644
index b752532..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/MediaRuleFormatter.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.util.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-/**
- * 
- */
-public class MediaRuleFormatter extends AbstractCSSSourceFormatter {
-
-	public final static java.lang.String MEDIA = "@media";//$NON-NLS-1$
-	private static MediaRuleFormatter instance;
-
-	/**
-	 * 
-	 */
-	MediaRuleFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatBefore(ICSSNode node, ICSSNode child, String toAppend, StringBuffer source, IRegion exceptFor) {
-		ICSSNode prev = (child != null) ? child.getPreviousSibling() : node.getLastChild();
-		int start = (prev != null) ? ((IndexedRegion) prev).getEndOffset() : 0;
-		int end = (child != null) ? ((IndexedRegion) child).getStartOffset() : 0;
-		if (start > 0 && start < end) { // source formatting
-			CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			// get meaning regions
-			CompoundRegion[] regions = null;
-			if (exceptFor == null)
-				regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			else {
-				String pickupType = null;
-				if ((prev != null && prev.getNodeType() == ICSSNode.MEDIALIST_NODE) || (prev == null && (child == null || child.getNodeType() != ICSSNode.MEDIALIST_NODE))) {
-					pickupType = CSSRegionContexts.CSS_LBRACE;
-				}
-				regions = getRegions(structuredDocument, new FormatRegion(start, end - start), exceptFor, pickupType);
-			}
-			// extract source
-			if (child != null && child.getNodeType() == ICSSNode.MEDIALIST_NODE) { // between
-				// "@media"
-				// and
-				// mediatype
-				for (int i = 0; i < regions.length; i++) {
-					appendSpaceBefore(node, regions[i], source);
-					source.append(decoratedRegion(regions[i], 0, stgy)); // must
-					// be
-					// comments
-				}
-				appendSpaceBefore(node, toAppend, source);
-			} else if (child != null && (child.getPreviousSibling() == null || child.getPreviousSibling().getNodeType() == ICSSNode.MEDIALIST_NODE)) { // between
-				// mediatype
-				// and
-				// the
-				// first
-				// style
-				// rule
-				for (int i = 0; i < regions.length; i++) {
-					appendSpaceBefore(node, regions[i], source);
-					source.append(decoratedRegion(regions[i], 0, stgy)); // must
-					// be
-					// comments
-				}
-				appendDelimBefore(node, null, source);
-			} else { // between styles
-				for (int i = 0; i < regions.length; i++) {
-					appendDelimBefore(node, regions[i], source);
-					source.append(decoratedRegion(regions[i], 0, stgy)); // must
-					// be
-					// comments
-				}
-				appendDelimBefore(node, null, source);
-			}
-		} else { // source generation
-			if (child == null && prev != null && prev.getNodeType() != ICSSNode.MEDIALIST_NODE) { // after
-				// the
-				// last
-				// style
-				// rule
-				appendDelimBefore(node.getParentNode(), null, source);
-			} else if (child != null && child.getNodeType() == ICSSNode.MEDIALIST_NODE) { // between
-				// "@media"
-				// and
-				// mediatype
-				appendSpaceBefore(node, toAppend, source);
-			} else if (prev != null && prev.getNodeType() == ICSSNode.MEDIALIST_NODE) { // between
-				// mediatype
-				// and
-				// the
-				// first
-				// style
-				// rule
-				appendSpaceBefore(node, "{", source);//$NON-NLS-1$
-				source.append("{");//$NON-NLS-1$
-				if (child != null)
-					appendDelimBefore(node, null, source);
-				else
-					appendDelimBefore(node.getParentNode(), null, source);
-			} else { // normal case
-				appendDelimBefore(node, null, source);
-			}
-		}
-
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatBefore(ICSSNode node, ICSSNode child, IRegion region, String toAppend, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		if (child != null && child.getNodeType() == ICSSNode.MEDIALIST_NODE) { // between
-			// "@media"
-			// and
-			// mediatype
-			for (int i = 0; i < regions.length; i++) {
-				if (i != 0 || needS(outside[0]))
-					appendSpaceBefore(node, regions[i], source);
-				source.append(decoratedRegion(regions[i], 0, stgy)); // must
-				// be
-				// comments
-			}
-			if (needS(outside[1]) && ((IndexedRegion) child).getStartOffset() == region.getOffset() + region.getLength()) {
-				appendSpaceBefore(node, toAppend, source);
-			}
-		} else if (child != null && (child.getPreviousSibling() == null || child.getPreviousSibling().getNodeType() == ICSSNode.MEDIALIST_NODE)) { // between
-			// mediatype
-			// and
-			// the
-			// first
-			// style
-			// rule
-			for (int i = 0; i < regions.length; i++) {
-				if (i != 0 || needS(outside[0]))
-					appendSpaceBefore(node, regions[i], source);
-				source.append(decoratedRegion(regions[i], 0, stgy)); // must
-				// be
-				// comments
-			}
-			if (needS(outside[1]) && ((IndexedRegion) child).getStartOffset() == region.getOffset() + region.getLength()) {
-				appendDelimBefore(node, null, source);
-			}
-		} else { // between styles
-			for (int i = 0; i < regions.length; i++) {
-				if (i != 0 || needS(outside[0]))
-					appendDelimBefore(node, regions[i], source);
-				source.append(decoratedRegion(regions[i], 0, stgy)); // must
-				// be
-				// comments
-			}
-			if (needS(outside[1]) && ((IndexedRegion) child).getStartOffset() == region.getOffset() + region.getLength()) {
-				appendDelimBefore(node, null, source);
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPost(ICSSNode node, StringBuffer source) {
-		int end = ((IndexedRegion) node).getEndOffset();
-		int start = (node.getLastChild() != null && ((IndexedRegion) node.getLastChild()).getEndOffset() > 0) ? ((IndexedRegion) node.getLastChild()).getEndOffset() : getChildInsertPos(node);
-		if (end > 0 && start < end) { // source formatting
-			CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			if (node.getLastChild() == null || node.getLastChild().getNodeType() != ICSSNode.MEDIALIST_NODE) {
-				for (int i = 0; i < regions.length; i++) {
-					appendDelimBefore(node, regions[i], source);
-					source.append(decoratedRegion(regions[i], 0, stgy));
-				}
-			} else {
-				boolean bInCurlyBrace = false;
-				for (int i = 0; i < regions.length; i++) {
-					if (!bInCurlyBrace)
-						appendSpaceBefore(node, regions[i], source);
-					else
-						appendDelimBefore(node, regions[i], source);
-					source.append(decoratedRegion(regions[i], 0, stgy));
-					if (regions[i].getType() == CSSRegionContexts.CSS_LBRACE)
-						bInCurlyBrace = true;
-				}
-			}
-		} else { // source generation
-			String delim = getLineDelimiter(node);
-			if (node.getLastChild() != null && node.getLastChild().getNodeType() == ICSSNode.MEDIALIST_NODE) {
-				appendSpaceBefore(node, "{", source);//$NON-NLS-1$
-				source.append("{");//$NON-NLS-1$
-			}
-
-			source.append(delim);
-			source.append(getIndent(node));
-			source.append("}");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPost(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendDelimBefore(node, regions[i], source);
-			source.append(decoratedRegion(regions[i], 0, stgy));
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, StringBuffer source) {
-		int start = ((IndexedRegion) node).getStartOffset();
-		int end = (node.getFirstChild() != null && ((IndexedRegion) node.getFirstChild()).getEndOffset() > 0) ? ((IndexedRegion) node.getFirstChild()).getStartOffset() : getChildInsertPos(node);
-
-		if (end > 0) { // source formatting
-			CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			for (int i = 0; i < regions.length; i++) {
-				if (i != 0)
-					appendSpaceBefore(node, regions[i], source);
-				source.append(decoratedIdentRegion(regions[i], stgy));
-			}
-		} else { // source generation
-			String str = MEDIA;
-			if (CSSCorePlugin.getDefault().getPluginPreferences().getInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.UPPER)
-				str = MEDIA.toUpperCase();
-			source.append(str);
-		}
-		ICSSNode child = node.getFirstChild();
-		if (child != null && (child instanceof org.w3c.dom.stylesheets.MediaList) && ((org.w3c.dom.stylesheets.MediaList) child).getLength() > 0) {
-			appendSpaceBefore(node, "", source);//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(decoratedIdentRegion(regions[i], stgy));
-		}
-		if (needS(outside[1]) && !isIncludesPreEnd(node, region))
-			appendSpaceBefore(node, outside[1], source);
-	}
-
-	/**
-	 * 
-	 */
-	public int getChildInsertPos(ICSSNode node) {
-		int n = ((IndexedRegion) node).getEndOffset();
-		if (n > 0) {
-			IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(n - 1);
-			if (flatNode.getRegionAtCharacterOffset(n - 1).getType() == CSSRegionContexts.CSS_LBRACE)
-				return n - 1;
-			return n;
-		}
-		return -1;
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static MediaRuleFormatter getInstance() {
-		if (instance == null)
-			instance = new MediaRuleFormatter();
-		return instance;
-	}
-
-	/**
-	 * 
-	 * @return int
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param insertPos
-	 *            int
-	 */
-	public int getLengthToReformatAfter(ICSSNode node, int insertPos) {
-		if (node == null)
-			return 0;
-		IndexedRegion nnode = (IndexedRegion) node;
-		if (insertPos <= 0 || !nnode.contains(insertPos - 1))
-			return 0;
-
-		if (node.getFirstChild().getNextSibling() == node.getLastChild()) { // inserted
-			// first
-			// style
-			// rule
-			IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(insertPos);
-			if (flatNode == null)
-				return 0;
-			ITextRegion region = flatNode.getRegionAtCharacterOffset(insertPos);
-			if (region == null)
-				return 0;
-			RegionIterator it = new RegionIterator(flatNode, region);
-			while (it.hasNext()) {
-				region = it.next();
-				if (region.getType() == CSSRegionContexts.CSS_LBRACE)
-					break;
-				if (nnode.getEndOffset() <= it.getStructuredDocumentRegion().getEndOffset(region))
-					break;
-			}
-			int pos = it.getStructuredDocumentRegion().getStartOffset(region) - insertPos;
-			return (pos >= 0) ? pos : 0;
-
-		}
-		return super.getLengthToReformatAfter(node, insertPos);
-	}
-
-	/**
-	 * 
-	 * @return int
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param insertPos
-	 *            int
-	 */
-	public int getLengthToReformatBefore(ICSSNode node, int insertPos) {
-		if (node == null)
-			return 0;
-		IndexedRegion nnode = (IndexedRegion) node;
-		if (insertPos <= 0 || !nnode.contains(insertPos - 1))
-			return 0;
-
-		if (node.getFirstChild().getNextSibling() == node.getLastChild()) { // inserted
-			// first
-			// style
-			// rule
-			int pos = ((IndexedRegion) node.getFirstChild()).getEndOffset();
-			if (pos <= 0)
-				pos = ((IndexedRegion) node).getStartOffset() + 6 /*
-																	 * length
-																	 * of
-																	 * "@media"
-																	 */;
-			return insertPos - pos;
-		}
-		return super.getLengthToReformatBefore(node, insertPos);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/PageRuleFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/PageRuleFormatter.java
deleted file mode 100644
index 63de94e..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/PageRuleFormatter.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule;
-import org.eclipse.wst.css.core.internal.util.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-/**
- * 
- */
-public class PageRuleFormatter extends DeclContainerFormatter {
-
-	public final static java.lang.String PAGE = "@page";//$NON-NLS-1$
-	private static PageRuleFormatter instance;
-
-	/**
-	 * 
-	 */
-	PageRuleFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public StringBuffer formatAttrChanged(ICSSNode node, ICSSAttr attr, boolean insert, AttrChangeContext context) {
-		StringBuffer buf = new StringBuffer();
-		if (node == null || attr == null)
-			return buf;
-
-		if (!ICSSPageRule.SELECTOR.equalsIgnoreCase(attr.getName()))
-			return buf;
-
-		// get region to replace
-		if (context != null && ((IndexedRegion) node).getEndOffset() > 0) {
-			if (attr != null && ((IndexedRegion) attr).getEndOffset() > 0) {
-				IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(((IndexedRegion) attr).getEndOffset() - 1);
-				ITextRegion region = flatNode.getRegionAtCharacterOffset(((IndexedRegion) attr).getEndOffset() - 1);
-				RegionIterator it = new RegionIterator(flatNode, region);
-				it.next();
-				if (it.hasNext()) {
-					ITextRegion next = it.next();
-					if (next.getType() == CSSRegionContexts.CSS_S)
-						context.end = it.getStructuredDocumentRegion().getEndOffset(next);
-					else
-						context.end = it.getStructuredDocumentRegion().getEndOffset(region);
-				}
-				else
-					context.end = it.getStructuredDocumentRegion().getEndOffset(region);
-				context.start = it.getStructuredDocumentRegion().getStartOffset(region);
-			}
-			else {
-				int pos = getAttrInsertPos(node, attr.getName());
-				context.start = pos;
-				context.end = pos;
-				/*
-				 * IStructuredDocumentRegion flatNode =
-				 * node.getOwnerDocument().getModel().getStructuredDocument().getNodeAtCharacterOffset(((IndexedRegion)node).getStartOffset());
-				 * ITextRegion region =
-				 * flatNode.getRegionAtCharacterOffset(((IndexedRegion)node).getStartOffset());
-				 * if (region.getType() == CSSRegionContexts.S) {
-				 * context.start = region.getStartOffset(); context.end =
-				 * region.getEndOffset(); } else { context.start =
-				 * flatNode.getEndOffset() + 1; context.end =
-				 * flatNode.getEndOffset(); }
-				 */}
-		}
-		// generate text
-		if (insert) {
-			String val = attr.getValue();
-			if (val != null && val.length() > 0) {
-				buf.append(val);
-				appendSpaceBefore(node, "", buf);//$NON-NLS-1$
-			}
-		}
-		return buf;
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		int start = ((IndexedRegion) node).getStartOffset();
-		int end = (node.getFirstChild() != null && ((IndexedRegion) node.getFirstChild()).getEndOffset() > 0) ? ((IndexedRegion) node.getFirstChild()).getStartOffset() : getChildInsertPos(node);
-
-		if (end > 0) { // format source
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			for (int i = 0; i < regions.length; i++) {
-				if (i != 0)
-					appendSpaceBetween(node, regions[i - 1], regions[i], source);
-				source.append(decoratedIdentRegion(regions[i], stgy));
-			}
-		}
-		else { // generate source
-			String str = PAGE;
-			if (CSSCorePlugin.getDefault().getPluginPreferences().getInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.UPPER)
-				str = PAGE.toUpperCase();
-			source.append(str);
-			str = ((ICSSPageRule) node).getSelectorText();
-			if (str != null && str.length() > 0) {
-				appendSpaceBefore(node, str, source);
-				source.append(str);
-			}
-			appendSpaceBefore(node, "{", source);//$NON-NLS-1$
-			source.append("{");//$NON-NLS-1$
-		}
-		appendDelimBefore(node, null, source);
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBetween(node, (i == 0) ? outside[0] : regions[i - 1], regions[i], source);
-			source.append(decoratedIdentRegion(regions[i], stgy));
-		}
-		if (needS(outside[1])) {
-			if (isIncludesPreEnd(node, region))
-				appendDelimBefore(node, null, source);
-			else
-				appendSpaceBetween(node, regions[regions.length - 1], outside[1], source);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public int getAttrInsertPos(ICSSNode node, String attrName) {
-		if (node == null || attrName == null || attrName.length() == 0)
-			return -1;
-
-		if (!ICSSPageRule.SELECTOR.equalsIgnoreCase(attrName))
-			return -1;
-
-		ICSSAttr attr = (ICSSAttr) node.getAttributes().getNamedItem(ICSSPageRule.SELECTOR);
-		if (attr != null && ((IndexedRegion) attr).getEndOffset() > 0)
-			return ((IndexedRegion) attr).getStartOffset();
-		else if (((IndexedRegion) node).getEndOffset() > 0) {
-			IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(((IndexedRegion) node).getStartOffset());
-			ITextRegion region = flatNode.getRegionAtCharacterOffset(((IndexedRegion) node).getStartOffset());
-			RegionIterator it = new RegionIterator(flatNode, region);
-			while (it.hasNext()) {
-				region = it.next();
-				if (region.getType() == CSSRegionContexts.CSS_LBRACE) {
-					return it.getStructuredDocumentRegion().getStartOffset(region);
-				}
-				if (it.getStructuredDocumentRegion().getEndOffset(region) >= ((IndexedRegion) node).getEndOffset())
-					break;
-			}
-		}
-		return ((IndexedRegion) node).getStartOffset();
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static PageRuleFormatter getInstance() {
-		if (instance == null)
-			instance = new PageRuleFormatter();
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/PrimitiveValueFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/PrimitiveValueFormatter.java
deleted file mode 100644
index 1855e9d..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/PrimitiveValueFormatter.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSPrimitiveValue;
-
-
-/**
- * 
- */
-public class PrimitiveValueFormatter extends DefaultCSSSourceFormatter {
-
-	private static PrimitiveValueFormatter instance;
-
-	/**
-	 * 
-	 */
-	PrimitiveValueFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, StringBuffer source) {
-		int start = ((IndexedRegion) node).getStartOffset();
-		int end = ((IndexedRegion) node).getEndOffset();
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		if (end > 0) { // format source
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			boolean appendQuote = regions.length > 1 && node.getParentNode() instanceof ICSSStyleDeclItem && isCleanup() && getCleanupStrategy(node).isQuoteValues() && (((ICSSStyleDeclItem) node.getParentNode()).getPropertyName().equals(PropCMProperty.P_FONT) || ((ICSSStyleDeclItem) node.getParentNode()).getPropertyName().equals(PropCMProperty.P_FONT_FAMILY) || ((ICSSStyleDeclItem) node.getParentNode()).getPropertyName().equals(PropCMProperty.P_VOICE_FAMILY));
-			String quote = preferences.getString(CSSCorePreferenceNames.FORMAT_QUOTE);
-
-			StringBuffer strBuf = new StringBuffer();
-			boolean skipSpace = false;
-			for (int i = 0; i < regions.length; i++) {
-				if (i != 0 && !skipSpace)
-					appendSpaceBefore(node, regions[i], strBuf);
-				skipSpace = false;
-				strBuf.append(decoratedPropValueRegion(regions[i], stgy));
-				if (regions[i].getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION)
-					skipSpace = true;
-			}
-
-			if (appendQuote) {
-				source.append(quote);
-				String str = strBuf.toString();
-				str = str.replace('\'', ' ');
-				str = str.replace('\"', ' ');
-				str = str.trim();
-				source.append(str);
-				source.append(quote);
-			}
-			else {
-				source.append(strBuf);
-			}
-		}
-		else { // generate source
-			ICSSPrimitiveValue value = (ICSSPrimitiveValue) node;
-			short type = value.getPrimitiveType();
-			String quote = preferences.getString(CSSCorePreferenceNames.FORMAT_QUOTE);
-
-			String str = null;
-			switch (type) {
-				case CSSPrimitiveValue.CSS_NUMBER :
-				case CSSPrimitiveValue.CSS_PERCENTAGE :
-				case CSSPrimitiveValue.CSS_EMS :
-				case CSSPrimitiveValue.CSS_EXS :
-				case CSSPrimitiveValue.CSS_PX :
-				case CSSPrimitiveValue.CSS_CM :
-				case CSSPrimitiveValue.CSS_MM :
-				case CSSPrimitiveValue.CSS_IN :
-				case CSSPrimitiveValue.CSS_PT :
-				case CSSPrimitiveValue.CSS_PC :
-				case CSSPrimitiveValue.CSS_DEG :
-				case CSSPrimitiveValue.CSS_RAD :
-				case CSSPrimitiveValue.CSS_GRAD :
-				case CSSPrimitiveValue.CSS_MS :
-				case CSSPrimitiveValue.CSS_S :
-				case CSSPrimitiveValue.CSS_HZ :
-				case CSSPrimitiveValue.CSS_KHZ :
-				case CSSPrimitiveValue.CSS_DIMENSION :
-				case ICSSPrimitiveValue.CSS_INTEGER :
-					if (value.getFloatValue(type) == ((int) value.getFloatValue(type))) {
-						str = Integer.toString((int) value.getFloatValue(type));
-					}
-					else {
-						str = Float.toString(value.getFloatValue(type));
-					}
-					break;
-				case CSSPrimitiveValue.CSS_IDENT :
-				case ICSSPrimitiveValue.CSS_HASH :
-				case ICSSPrimitiveValue.CSS_INHERIT_PRIMITIVE :
-					str = value.getStringValue();
-					if (str != null) {
-						if (preferences.getInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.UPPER)
-							str = str.toUpperCase();
-						else
-							str.toLowerCase();
-					}
-					break;
-				case CSSPrimitiveValue.CSS_STRING :
-				case CSSPrimitiveValue.CSS_URI :
-				case CSSPrimitiveValue.CSS_ATTR :
-				case ICSSPrimitiveValue.CSS_URANGE :
-				case ICSSPrimitiveValue.CSS_FORMAT :
-				case ICSSPrimitiveValue.CSS_LOCAL :
-				case ICSSPrimitiveValue.CSS_COMMA :
-				case ICSSPrimitiveValue.CSS_SLASH :
-					str = value.getStringValue();
-			}
-
-			String preStr = null, postStr = null;
-			switch (type) {
-				case CSSPrimitiveValue.CSS_ATTR :
-					preStr = "attr(";//$NON-NLS-1$
-					postStr = ")";//$NON-NLS-1$
-					break;
-				case CSSPrimitiveValue.CSS_CM :
-					postStr = "cm";//$NON-NLS-1$
-					break;
-				// case ICSSPrimitiveValue.CSS_COUNTER:
-				case CSSPrimitiveValue.CSS_DEG :
-					postStr = "deg";//$NON-NLS-1$
-					break;
-				case CSSPrimitiveValue.CSS_EMS :
-					postStr = "em";//$NON-NLS-1$
-					break;
-				case CSSPrimitiveValue.CSS_EXS :
-					postStr = "ex";//$NON-NLS-1$
-					break;
-				case CSSPrimitiveValue.CSS_GRAD :
-					postStr = "grad";//$NON-NLS-1$
-					break;
-				case CSSPrimitiveValue.CSS_HZ :
-					postStr = "Hz";//$NON-NLS-1$
-					break;
-				case CSSPrimitiveValue.CSS_IN :
-					postStr = "in";//$NON-NLS-1$
-					break;
-				case CSSPrimitiveValue.CSS_KHZ :
-					postStr = "kHz";//$NON-NLS-1$
-					break;
-				case CSSPrimitiveValue.CSS_MM :
-					postStr = "mm";//$NON-NLS-1$
-					break;
-				case CSSPrimitiveValue.CSS_MS :
-					postStr = "ms";//$NON-NLS-1$
-					break;
-				case CSSPrimitiveValue.CSS_PC :
-					postStr = "pc";//$NON-NLS-1$
-					break;
-				case CSSPrimitiveValue.CSS_PERCENTAGE :
-					postStr = "%";//$NON-NLS-1$
-					break;
-				case CSSPrimitiveValue.CSS_PT :
-					postStr = "pt";//$NON-NLS-1$
-					break;
-				case CSSPrimitiveValue.CSS_PX :
-					postStr = "px";//$NON-NLS-1$
-					break;
-				case CSSPrimitiveValue.CSS_RAD :
-					postStr = "rad";//$NON-NLS-1$
-					break;
-				// case ICSSPrimitiveValue.CSS_RECT:
-				// case ICSSPrimitiveValue.CSS_RGBCOLOR:
-				case CSSPrimitiveValue.CSS_S :
-					postStr = "s";//$NON-NLS-1$
-					break;
-				case CSSPrimitiveValue.CSS_STRING :
-					quote = CSSUtil.detectQuote(str, quote);
-					preStr = quote;
-					postStr = quote;
-					break;
-				case CSSPrimitiveValue.CSS_URI :
-					quote = CSSUtil.detectQuote(str, quote);
-					preStr = "url(" + quote;//$NON-NLS-1$
-					postStr = quote + ")";//$NON-NLS-1$
-					break;
-				// the followings are original primitive values
-				case CSSPrimitiveValue.CSS_IDENT :
-				case CSSPrimitiveValue.CSS_UNKNOWN :
-				// use str
-				case ICSSPrimitiveValue.CSS_INTEGER :
-				case ICSSPrimitiveValue.CSS_HASH :
-				case ICSSPrimitiveValue.CSS_SLASH :
-				case ICSSPrimitiveValue.CSS_COMMA :
-				case CSSPrimitiveValue.CSS_DIMENSION :
-				case CSSPrimitiveValue.CSS_NUMBER :
-				case ICSSPrimitiveValue.CSS_INHERIT_PRIMITIVE :
-					break;
-				case ICSSPrimitiveValue.CSS_URANGE :
-					preStr = "U+";//$NON-NLS-1$
-					break;
-				case ICSSPrimitiveValue.CSS_FORMAT :
-					quote = CSSUtil.detectQuote(str, quote);
-					preStr = "format(" + quote;//$NON-NLS-1$
-					postStr = quote + ")";//$NON-NLS-1$
-					break;
-				case ICSSPrimitiveValue.CSS_LOCAL :
-					quote = CSSUtil.detectQuote(str, quote);
-					preStr = "local(" + quote;//$NON-NLS-1$
-					postStr = quote + ")";//$NON-NLS-1$
-					break;
-			}
-			if (preferences.getInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.UPPER) {
-				if (preStr != null)
-					preStr = preStr.toUpperCase();
-				if (postStr != null)
-					postStr = postStr.toUpperCase();
-			}
-			if (preStr != null)
-				source.append(preStr);
-			if (str != null)
-				source.append(str);
-			if (postStr != null)
-				source.append(postStr);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(decoratedPropValueRegion(regions[i], stgy));
-		}
-		if (needS(outside[1]) && !isIncludesPreEnd(node, region))
-			appendSpaceBefore(node, outside[1], source);
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static PrimitiveValueFormatter getInstance() {
-		if (instance == null)
-			instance = new PrimitiveValueFormatter();
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/RGBFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/RGBFormatter.java
deleted file mode 100644
index a6909db..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/RGBFormatter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-/**
- * 
- */
-public class RGBFormatter extends FunctionFormatter {
-
-	private static RGBFormatter instance;
-
-	/**
-	 * 
-	 */
-	RGBFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	protected String getFunc() {
-		return "rgb(";//$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static RGBFormatter getInstance() {
-		if (instance == null)
-			instance = new RGBFormatter();
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/RectFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/RectFormatter.java
deleted file mode 100644
index f3ec832..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/RectFormatter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-/**
- * 
- */
-public class RectFormatter extends FunctionFormatter {
-
-	private static RectFormatter instance;
-
-	/**
-	 * 
-	 */
-	RectFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	protected String getFunc() {
-		return "rect(";//$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static RectFormatter getInstance() {
-		if (instance == null)
-			instance = new RectFormatter();
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleDeclItemFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleDeclItemFormatter.java
deleted file mode 100644
index 64f911e..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleDeclItemFormatter.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.util.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-/**
- * 
- */
-public class StyleDeclItemFormatter extends DefaultCSSSourceFormatter {
-
-	private static StyleDeclItemFormatter instance;
-
-	/**
-	 * 
-	 */
-	StyleDeclItemFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	private void appendAfterColonSpace(ICSSNode node, StringBuffer source) {
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		int n = preferences.getInt(CSSCorePreferenceNames.FORMAT_PROP_POST_DELIM);
-
-		if (preferences.getInt(CSSCorePreferenceNames.LINE_WIDTH) > 0 && (!preferences.getBoolean(CSSCorePreferenceNames.WRAPPING_PROHIBIT_WRAP_ON_ATTR) || node.getOwnerDocument().getNodeType() != ICSSNode.STYLEDECLARATION_NODE)) {
-			int length = getLastLineLength(node, source);
-			int append = getFirstChildRegionLength(node);
-			if (length + n + append > preferences.getInt(CSSCorePreferenceNames.LINE_WIDTH)) {
-				source.append(getLineDelimiter(node));
-				source.append(getIndent(node));
-				source.append(getIndentString());
-				n = 0; // no space is necessary
-			}
-		}
-		// no delimiter case
-		while (n-- > 0)
-			source.append(" ");//$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 */
-	private int getFirstChildRegionLength(ICSSNode node) {
-		ICSSNode firstChild = node.getFirstChild();
-		if (firstChild == null)
-			return 1;
-		int start = ((IndexedRegion) firstChild).getStartOffset();
-		RegionIterator itr = new RegionIterator(node.getOwnerDocument().getModel().getStructuredDocument(), start);
-		while (itr.hasNext()) {
-			ITextRegion reg = itr.next();
-			if (reg != null && reg.getType() != CSSRegionContexts.CSS_S)
-				return reg.getTextLength();
-		}
-		return 1;
-	}
-
-	/**
-	 * 
-	 */
-	public StringBuffer formatAttrChanged(ICSSNode node, ICSSAttr attr, boolean insert, AttrChangeContext context) {
-		StringBuffer buf = new StringBuffer();
-		if (node == null || attr == null)
-			return buf;
-
-		if (!ICSSStyleDeclItem.IMPORTANT.equalsIgnoreCase(attr.getName()))
-			return buf;
-
-		// get region to replace
-		if (context != null && ((IndexedRegion) node).getEndOffset() > 0) {
-			if (attr != null && ((IndexedRegion) attr).getEndOffset() > 0) {
-				IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(((IndexedRegion) attr).getStartOffset());
-				ITextRegion region = flatNode.getRegionAtCharacterOffset(((IndexedRegion) attr).getStartOffset());
-				RegionIterator it = new RegionIterator(flatNode, region);
-				it.prev();
-				if (it.hasPrev()) {
-					ITextRegion prev = it.prev();
-					if (prev.getType() == CSSRegionContexts.CSS_S)
-						context.start = it.getStructuredDocumentRegion().getStartOffset(prev);
-					else
-						context.start = it.getStructuredDocumentRegion().getStartOffset(region);
-				} else
-					context.start = it.getStructuredDocumentRegion().getStartOffset(region);
-				context.end = it.getStructuredDocumentRegion().getEndOffset(region);
-			} else {
-				IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(((IndexedRegion) node).getEndOffset() - 1);
-				ITextRegion region = flatNode.getRegionAtCharacterOffset(((IndexedRegion) node).getEndOffset() - 1);
-				if (region.getType() == CSSRegionContexts.CSS_S) {
-					context.start = flatNode.getStartOffset(region);
-					context.end = flatNode.getEndOffset(region);
-				} else {
-					context.start = flatNode.getEndOffset();
-					context.end = flatNode.getEndOffset();
-				}
-			}
-		}
-		// generate text
-		if (insert && attr.getValue() != null && attr.getValue().length() > 0) {
-			appendSpaceBefore(node, attr.getValue(), buf);
-			buf.append(attr.getValue());
-		}
-		return buf;
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatBefore(ICSSNode node, ICSSNode child, String toAppend, StringBuffer source, IRegion exceptFor) {
-		ICSSNode prev = (child != null) ? child.getPreviousSibling() : node.getLastChild();
-		int start = (prev != null) ? ((IndexedRegion) prev).getEndOffset() : 0;
-		int end = (child != null) ? ((IndexedRegion) child).getStartOffset() : 0;
-		if (start > 0 && start < end) {
-			CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			// get meaning regions
-			CompoundRegion[] regions = null;
-			if (exceptFor == null)
-				regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			else {
-				regions = getRegions(structuredDocument, new FormatRegion(start, end - start), exceptFor, null);
-			}
-			// generate source
-			for (int i = 0; i < regions.length; i++) {
-				appendSpaceBefore(node, regions[i], source);
-				source.append(decoratedRegion(regions[i], 2, stgy)); // must
-				// be
-				// comments
-			}
-		}
-		if (child != null && child instanceof ICSSPrimitiveValue) {
-			if (((ICSSPrimitiveValue) child).getPrimitiveType() == ICSSPrimitiveValue.CSS_COMMA)
-				toAppend = ",";//$NON-NLS-1$
-			else if (((ICSSPrimitiveValue) child).getPrimitiveType() == ICSSPrimitiveValue.CSS_SLASH)
-				toAppend = "/";//$NON-NLS-1$
-		}
-		if (child != null && toAppend != null && !toAppend.equals(",") && !toAppend.equals("/")) //$NON-NLS-1$ //$NON-NLS-2$
-			appendSpaceBefore(node, toAppend, source);
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatBefore(ICSSNode node, ICSSNode child, IRegion region, String toAppend, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(decoratedRegion(regions[i], 2, stgy)); // must be
-			// comments
-		}
-		if (needS(outside[1])) {
-			if (((IndexedRegion) child).getStartOffset() == region.getOffset() + region.getLength()) {
-				if (toAppend != "," && toAppend != "/") //$NON-NLS-1$ //$NON-NLS-2$
-					appendSpaceBefore(node, toAppend, source);
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPost(ICSSNode node, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		int end = ((IndexedRegion) node).getEndOffset();
-		int start = (node.getLastChild() != null && ((IndexedRegion) node.getLastChild()).getEndOffset() > 0) ? ((IndexedRegion) node.getLastChild()).getEndOffset() : getChildInsertPos(node);
-		if (end > 0 && start < end) { // format source
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			for (int i = 0; i < regions.length; i++) {
-				appendSpaceBefore(node, regions[i], source);
-				source.append(decoratedIdentRegion(regions[i], stgy));
-			}
-		} else { // generate source
-			// append "!important"
-			String priority = ((ICSSStyleDeclItem) node).getPriority();
-			if (priority != null && priority.length() > 0) {
-				appendSpaceBefore(node, priority, source);
-				source.append(priority);
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPost(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(decoratedIdentRegion(regions[i], stgy));
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, StringBuffer source) {
-		int start = ((IndexedRegion) node).getStartOffset();
-		int end = (node.getFirstChild() != null && ((IndexedRegion) node.getFirstChild()).getEndOffset() > 0) ? ((IndexedRegion) node.getFirstChild()).getStartOffset() : getChildInsertPos(node);
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		if (end > 0) { // format source
-			CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			for (int i = 0; i < regions.length; i++) {
-				if (i != 0)
-					appendSpaceBefore(node, regions[i], source);
-				source.append(decoratedPropNameRegion(regions[i], stgy));
-			}
-		} else { // generatoe source
-			ICSSStyleDeclItem item = (ICSSStyleDeclItem) node;
-			if (preferences.getInt(CSSCorePreferenceNames.CASE_PROPERTY_NAME) == CSSCorePreferenceNames.UPPER)
-				source.append(item.getPropertyName().toUpperCase());
-			else
-				source.append(item.getPropertyName());
-
-			int k = preferences.getInt(CSSCorePreferenceNames.FORMAT_PROP_PRE_DELIM);
-			if (preferences.getInt(CSSCorePreferenceNames.LINE_WIDTH) > 0 && (!preferences.getBoolean(CSSCorePreferenceNames.WRAPPING_PROHIBIT_WRAP_ON_ATTR) || node.getOwnerDocument().getNodeType() != ICSSNode.STYLEDECLARATION_NODE)) {
-				int length = getLastLineLength(node, source);
-				int append = 1;
-				if (length + k + append > preferences.getInt(CSSCorePreferenceNames.LINE_WIDTH)) {
-					source.append(getLineDelimiter(node));
-					source.append(getIndent(node));
-					source.append(getIndentString());
-					k = 0; // no space is necessary
-				}
-			}
-			// no delimiter case
-			while (k-- > 0)
-				source.append(" ");//$NON-NLS-1$
-			source.append(":");//$NON-NLS-1$
-		}
-		if (!isCleanup() || getCleanupStrategy(node).isFormatSource()) {
-			appendAfterColonSpace(node, source);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(decoratedPropNameRegion(regions[i], stgy));
-		}
-		if (needS(outside[1])) {
-			if (isIncludesPreEnd(node, region) && (!isCleanup() || getCleanupStrategy(node).isFormatSource())) {
-				appendAfterColonSpace(node, source);
-			} else
-				appendSpaceBefore(node, outside[1], source);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public StringBuffer formatValue(ICSSNode node) {
-		StringBuffer source = new StringBuffer();
-		formatChildren(node, source);
-
-		return source;
-	}
-
-	/**
-	 * 
-	 */
-	public int getAttrInsertPos(ICSSNode node, String attrName) {
-		if (node == null || attrName == null || attrName.length() == 0)
-			return -1;
-
-		if (!ICSSStyleDeclItem.IMPORTANT.equalsIgnoreCase(attrName))
-			return -1;
-
-		ICSSAttr attr = (ICSSAttr) node.getAttributes().getNamedItem(ICSSStyleDeclItem.IMPORTANT);
-		if (attr != null && ((IndexedRegion) attr).getEndOffset() > 0)
-			return ((IndexedRegion) attr).getStartOffset();
-		IndexedRegion iNode = (IndexedRegion) node;
-		if (iNode.getEndOffset() <= 0)
-			return -1;
-
-		CompoundRegion regions[] = getRegionsWithoutWhiteSpaces(node.getOwnerDocument().getModel().getStructuredDocument(), new FormatRegion(iNode.getStartOffset(), iNode.getEndOffset() - iNode.getStartOffset()), getCleanupStrategy(node));
-		for (int i = regions.length - 1; i >= 0; i--) {
-			if (regions[i].getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_IMPORTANT)
-				return regions[i].getStartOffset();
-		}
-		return iNode.getEndOffset();
-	}
-
-	/**
-	 * 
-	 */
-	public int getChildInsertPos(ICSSNode node) {
-		int n = ((IndexedRegion) node).getEndOffset();
-		if (n < 0) {
-			return -1;
-		}
-		IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(n - 1);
-		if (flatNode != null && flatNode.getType() == CSSRegionContexts.CSS_DECLARATION_DELIMITER) {
-			n -= flatNode.getLength();
-		}
-		if (n > 0) {
-			String important = ((ICSSStyleDeclItem) node).getPriority();
-			if (important != null && important.length() > 0) {
-				// find before "!important" position
-				flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(n - 1);
-				RegionIterator it = new RegionIterator(flatNode, flatNode.getRegionAtCharacterOffset(n - 1));
-				while (it.hasPrev()) {
-					ITextRegion region = it.prev();
-					if (it.getStructuredDocumentRegion() != flatNode)
-						break;
-					if (region.getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_IMPORTANT)
-						return it.getStructuredDocumentRegion().getStartOffset(region);
-				}
-			}
-			// skip last space
-			flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(n - 1);
-			ITextRegion region = flatNode.getRegionAtCharacterOffset(n - 1);
-			if (region != null) {
-				n -= region.getLength() - region.getTextLength();
-			}
-
-			return n;
-		}
-		return -1;
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static StyleDeclItemFormatter getInstance() {
-		if (instance == null)
-			instance = new StyleDeclItemFormatter();
-		return instance;
-	}
-
-	private String getIndentString() {
-		StringBuffer indent = new StringBuffer();
-
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		if (preferences != null) {
-			char indentChar = ' ';
-			String indentCharPref = preferences.getString(CSSCorePreferenceNames.INDENTATION_CHAR);
-			if (CSSCorePreferenceNames.TAB.equals(indentCharPref)) {
-				indentChar = '\t';
-			}
-			int indentationWidth = preferences.getInt(CSSCorePreferenceNames.INDENTATION_SIZE);
-
-			for (int i = 0; i < indentationWidth; i++) {
-				indent.append(indentChar);
-			}
-		}
-		return indent.toString();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleDeclarationFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleDeclarationFormatter.java
deleted file mode 100644
index ad06635..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleDeclarationFormatter.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-/**
- * 
- */
-public class StyleDeclarationFormatter extends DefaultCSSSourceFormatter {
-
-	private static StyleDeclarationFormatter instance;
-
-	/**
-	 * 
-	 */
-	StyleDeclarationFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatBefore(ICSSNode node, ICSSNode child, String toAppend, StringBuffer source, IRegion exceptFor) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		ICSSNode prev = (child != null) ? child.getPreviousSibling() : node.getLastChild();
-		int start = (prev != null) ? ((IndexedRegion) prev).getEndOffset() : 0;
-		int end = (child != null) ? ((IndexedRegion) child).getStartOffset() : 0;
-
-		// check no child
-		if (child == null && prev == null)
-			return;
-
-		if (start > 0 && start < end) { // format source
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			// get meaning regions
-			CompoundRegion[] regions = null;
-			if (exceptFor == null)
-				regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			else {
-				String pickupType = CSSRegionContexts.CSS_DECLARATION_DELIMITER;
-				if (prev == null || child == null)
-					pickupType = null;
-				regions = getRegions(structuredDocument, new FormatRegion(start, end - start), exceptFor, pickupType);
-			}
-			// extract source
-			for (int i = 0; i < regions.length; i++) {
-				appendSpaceBefore(node, regions[i], source);
-				source.append(decoratedRegion(regions[i], 0, stgy)); // must
-				// be
-				// comments
-			}
-		} else if (prev != null && child != null) { // generate source :
-			// between two
-			// declarations
-			source.append(";");//$NON-NLS-1$
-		} else if (prev == null) { // generate source : before the first
-			// declaration
-			org.eclipse.wst.css.core.internal.util.RegionIterator it = null;
-			if (end > 0) {
-				IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-				it = new org.eclipse.wst.css.core.internal.util.RegionIterator(structuredDocument, end - 1);
-			} else {
-				int pos = getChildInsertPos(node);
-				if (pos >= 0) {
-					IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-					it = new org.eclipse.wst.css.core.internal.util.RegionIterator(structuredDocument, pos - 1);
-				}
-			}
-			if (it != null) {
-				int limit = ((IndexedRegion) ((node.getParentNode() != null) ? node.getParentNode() : node)).getStartOffset();
-				while (it.hasPrev()) {
-					ITextRegion curReg = it.prev();
-					if (curReg.getType() == CSSRegionContexts.CSS_LBRACE || curReg.getType() == CSSRegionContexts.CSS_DECLARATION_DELIMITER)
-						break;
-					if (curReg.getType() != CSSRegionContexts.CSS_S && curReg.getType() != CSSRegionContexts.CSS_COMMENT) {
-						source.append(";");//$NON-NLS-1$
-						break;
-					}
-					if (it.getStructuredDocumentRegion().getStartOffset(curReg) <= limit)
-						break;
-				}
-			}
-		} else if (child == null) { // generate source : after the last
-			// declaration
-			org.eclipse.wst.css.core.internal.util.RegionIterator it = null;
-			if (start > 0) {
-				IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-				it = new org.eclipse.wst.css.core.internal.util.RegionIterator(structuredDocument, start);
-			} else {
-				int pos = getChildInsertPos(node);
-				if (pos >= 0) {
-					IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-					it = new org.eclipse.wst.css.core.internal.util.RegionIterator(structuredDocument, pos);
-				}
-			}
-			if (it != null) {
-				int limit = ((IndexedRegion) ((node.getParentNode() != null) ? node.getParentNode() : node)).getEndOffset();
-				while (it.hasNext()) {
-					ITextRegion curReg = it.next();
-					if (curReg.getType() == CSSRegionContexts.CSS_RBRACE || curReg.getType() == CSSRegionContexts.CSS_DECLARATION_DELIMITER)
-						break;
-					if (curReg.getType() != CSSRegionContexts.CSS_S && curReg.getType() != CSSRegionContexts.CSS_COMMENT) {
-						source.append(";");//$NON-NLS-1$
-						break;
-					}
-					if (limit <= it.getStructuredDocumentRegion().getEndOffset(curReg))
-						break;
-				}
-			}
-		}
-		if (child == null) {
-			if (((IndexedRegion) node).getEndOffset() <= 0) {
-				// get next region
-				int pos = getChildInsertPos(node);
-				CompoundRegion toAppendRegion = null;
-				if (pos >= 0) {
-					IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-					IStructuredDocumentRegion flatNode = structuredDocument.getRegionAtCharacterOffset(pos);
-					toAppendRegion = new CompoundRegion(flatNode, flatNode.getRegionAtCharacterOffset(pos));
-				}
-				appendDelimBefore(node.getParentNode(), toAppendRegion, source);
-			}
-		} else if ((prev != null || ((IndexedRegion) node).getEndOffset() <= 0)) {
-			Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-
-			if (preferences.getBoolean(CSSCorePreferenceNames.WRAPPING_ONE_PER_LINE) && (node.getOwnerDocument() != node || !preferences.getBoolean(CSSCorePreferenceNames.WRAPPING_PROHIBIT_WRAP_ON_ATTR)))
-				appendDelimBefore(node, null, source);
-			else if (prev != null || node.getOwnerDocument() != node)
-				appendSpaceBefore(node, toAppend, source);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatBefore(ICSSNode node, ICSSNode child, IRegion region, String toAppend, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(decoratedRegion(regions[i], 0, stgy)); // must be
-			// comments
-		}
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		if (needS(outside[1])) {
-			if (((IndexedRegion) child).getStartOffset() == region.getOffset() + region.getLength() && preferences.getBoolean(CSSCorePreferenceNames.WRAPPING_ONE_PER_LINE) && (node.getOwnerDocument() != node || !preferences.getBoolean(CSSCorePreferenceNames.WRAPPING_PROHIBIT_WRAP_ON_ATTR))) {
-				appendDelimBefore(node, null, source);
-			} else
-				appendSpaceBefore(node, toAppend, source);
-		}
-	}
-
-	/**
-	 * Insert the method's description here.
-	 */
-	public int getChildInsertPos(ICSSNode node) {
-		if (node == null)
-			return -1;
-		int pos = super.getChildInsertPos(node);
-		if (pos < 0) {
-			CSSSourceGenerator formatter = getParentFormatter(node);
-			return (formatter != null) ? formatter.getChildInsertPos(node.getParentNode()) : -1;
-		}
-		return pos;
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static StyleDeclarationFormatter getInstance() {
-		if (instance == null)
-			instance = new StyleDeclarationFormatter();
-		return instance;
-	}
-
-	/**
-	 * 
-	 * @return int
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param insertPos
-	 *            int
-	 */
-	public int getLengthToReformatAfter(ICSSNode node, int insertPos) {
-		if (node == null)
-			return 0;
-		IndexedRegion nnode = (IndexedRegion) node;
-		if (insertPos < 0 || !nnode.contains(insertPos)) {
-			if (node.getParentNode() != null && nnode.getEndOffset() <= 0) {
-				CSSSourceGenerator pntFormatter = getParentFormatter(node);
-				if (pntFormatter != null)
-					return pntFormatter.getLengthToReformatAfter(node.getParentNode(), insertPos);
-			}
-			return 0;
-		}
-		return super.getLengthToReformatAfter(node, insertPos);
-	}
-
-	/**
-	 * 
-	 * @return int
-	 * @param node
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param insertPos
-	 *            int
-	 */
-	public int getLengthToReformatBefore(ICSSNode node, int insertPos) {
-		if (node == null)
-			return 0;
-		IndexedRegion nnode = (IndexedRegion) node;
-		if (insertPos <= 0 || !nnode.contains(insertPos - 1)) {
-			if (node.getParentNode() != null && nnode.getEndOffset() <= 0) {
-				CSSSourceGenerator pntFormatter = getParentFormatter(node);
-				if (pntFormatter != null)
-					return pntFormatter.getLengthToReformatBefore(node.getParentNode(), insertPos);
-			}
-			return 0;
-		}
-		return super.getLengthToReformatBefore(node, insertPos);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleRuleFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleRuleFormatter.java
deleted file mode 100644
index ce9356d..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleRuleFormatter.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.core.internal.util.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-/**
- * 
- */
-public class StyleRuleFormatter extends DeclContainerFormatter {
-
-	private static StyleRuleFormatter instance;
-
-	/**
-	 * 
-	 */
-	StyleRuleFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public StringBuffer formatAttrChanged(ICSSNode node, ICSSAttr attr, boolean insert, AttrChangeContext context) {
-		StringBuffer buf = new StringBuffer();
-		if (node == null || attr == null)
-			return buf;
-
-		if (!ICSSStyleRule.SELECTOR.equalsIgnoreCase(attr.getName()))
-			return buf;
-
-		// get region to replace
-		if (context != null && ((IndexedRegion) node).getEndOffset() > 0) {
-			if (attr != null && ((IndexedRegion) attr).getEndOffset() > 0) {
-				IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(((IndexedRegion) attr).getEndOffset() - 1);
-				ITextRegion region = flatNode.getRegionAtCharacterOffset(((IndexedRegion) attr).getEndOffset() - 1);
-				RegionIterator it = new RegionIterator(flatNode, region);
-				it.next();
-				if (it.hasNext()) {
-					ITextRegion next = it.next();
-					if (next.getType() == CSSRegionContexts.CSS_S)
-						context.end = it.getStructuredDocumentRegion().getEndOffset(next);
-					else
-						context.end = it.getStructuredDocumentRegion().getEndOffset(region);
-				}
-				else
-					context.end = it.getStructuredDocumentRegion().getEndOffset(region);
-				context.start = it.getStructuredDocumentRegion().getStartOffset(region);
-			}
-			else {
-				IStructuredDocumentRegion flatNode = node.getOwnerDocument().getModel().getStructuredDocument().getRegionAtCharacterOffset(((IndexedRegion) node).getStartOffset());
-				ITextRegion region = flatNode.getRegionAtCharacterOffset(((IndexedRegion) node).getStartOffset());
-				if (region.getType() == CSSRegionContexts.CSS_S) {
-					context.start = flatNode.getStartOffset(region);
-					context.end = flatNode.getEndOffset(region);
-				}
-				else {
-					context.start = flatNode.getEndOffset();
-					context.end = flatNode.getEndOffset();
-				}
-			}
-		}
-		// generate text
-		if (insert) {
-			buf.append(attr.getValue());
-			appendSpaceBefore(node, "", buf);//$NON-NLS-1$
-		}
-		return buf;
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		int start = ((IndexedRegion) node).getStartOffset();
-		int end = (node.getFirstChild() != null && ((IndexedRegion) node.getFirstChild()).getEndOffset() > 0) ? ((IndexedRegion) node.getFirstChild()).getStartOffset() : getChildInsertPos(node);
-		if (end > 0) { // format source
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			for (int i = 0; i < regions.length; i++) {
-				if (i != 0)
-					appendSpaceBetween(node, regions[i - 1], regions[i], source);
-				source.append(decoratedSelectorRegion(regions[i], (i != 0) ? regions[i - 1] : null, stgy));
-			}
-		}
-		else { // generate source
-			String str = ((ICSSStyleRule) node).getSelectorText();
-			// appendSpaceBefore(node,str,source);
-			source.append(str);
-			appendSpaceBefore(node, "{", source);//$NON-NLS-1$
-			source.append("{");//$NON-NLS-1$
-		}
-		appendDelimBefore(node, null, source);
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBetween(node, (i == 0) ? outside[0] : regions[i - 1], regions[i], source);
-			source.append(decoratedSelectorRegion(regions[i], (i != 0) ? regions[i - 1] : null, stgy));
-		}
-		if (needS(outside[1])) {
-			if (isIncludesPreEnd(node, region))
-				appendDelimBefore(node, null, source);
-			else
-				appendSpaceBetween(node, regions[regions.length - 1], outside[1], source);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public int getAttrInsertPos(ICSSNode node, String attrName) {
-		if (node == null || attrName == null || attrName.length() == 0)
-			return -1;
-
-		if (!ICSSStyleRule.SELECTOR.equalsIgnoreCase(attrName))
-			return -1;
-
-		ICSSAttr attr = (ICSSAttr) node.getAttributes().getNamedItem(ICSSStyleRule.SELECTOR);
-		if (attr != null && ((IndexedRegion) attr).getEndOffset() > 0)
-			return ((IndexedRegion) attr).getStartOffset();
-		else
-			return ((IndexedRegion) node).getStartOffset();
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static StyleRuleFormatter getInstance() {
-		if (instance == null)
-			instance = new StyleRuleFormatter();
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleSheetFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleSheetFormatter.java
deleted file mode 100644
index 5bc1984..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleSheetFormatter.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.util.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-/**
- * 
- */
-public class StyleSheetFormatter extends AbstractCSSSourceFormatter {
-
-	private static StyleSheetFormatter instance;
-
-	/**
-	 * 
-	 */
-	StyleSheetFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatBefore(ICSSNode node, ICSSNode child, String toAppend, StringBuffer source, IRegion exceptFor) {
-		String delim = getLineDelimiter(node);
-		ICSSNode prev = (child != null) ? child.getPreviousSibling() : node.getLastChild();
-		if (prev == null && child == null)
-			return;
-		int start = (prev != null) ? ((IndexedRegion) prev).getEndOffset() : 0;
-		int end = (child != null) ? ((IndexedRegion) child).getStartOffset() : 0;
-		if (start > 0 && start < end) {
-			CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			// get meaning regions
-			CompoundRegion[] regions = null;
-			if (exceptFor == null)
-				regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			else {
-				String pickupType = CSSRegionContexts.CSS_DELIMITER;
-				if (prev == null)
-					pickupType = null;
-				regions = getRegions(structuredDocument, new FormatRegion(start, end - start), exceptFor, pickupType);
-			}
-			// generate source
-			if (prev != null) {
-				appendDelimBefore(node, (regions.length > 0) ? regions[0] : null, source);
-			}
-			for (int i = 0; i < regions.length; i++) {
-				appendDelimBefore(node, regions[i], source);
-				source.append(decoratedRegion(regions[i], 0, stgy)); // must
-																		// be
-																		// comments
-																		// or
-																		// semi_colon
-				if (regions[i].getType() == CSSRegionContexts.CSS_DELIMITER) {
-					// append delim after
-					appendDelimBefore(node, null, source);
-				}
-			}
-			if (prev != null)
-				appendDelimBefore(node, null, source);
-		}
-		else if (prev != null && child != null) { // source generation :
-													// between two rules
-			source.append(delim);
-			source.append(delim);
-		}
-		else if (((IndexedRegion) node).getEndOffset() > 0) {
-			if (prev == null) { // source formatting : before the first rule
-				ICSSNode next = child.getNextSibling();
-				int pos = getChildInsertPos(node);
-				if (next != null && ((IndexedRegion) next).getEndOffset() > 0)
-					pos = ((IndexedRegion) next).getStartOffset();
-				if (pos != 0) {
-					IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-					CompoundRegion[] prevRegions = getRegions(structuredDocument, new FormatRegion(0, pos), null, null);
-					if (prevRegions != null && prevRegions.length > 0)
-						appendDelimBefore(node, null, source);
-				}
-			}
-			else if (child == null) { // source formatting : after the last
-										// rule
-				if (start > 0 && start <= ((IndexedRegion) node).getEndOffset()) {
-					appendDelimBefore(node, null, source);
-				}
-				else if (start <= 0) {
-					int pos = getChildInsertPos(node);
-					if (pos < ((IndexedRegion) node).getEndOffset()) {
-						appendDelimBefore(node, null, source);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatBefore(ICSSNode node, ICSSNode child, IRegion region, String toAppend, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendDelimBefore(node, regions[i], source);
-			source.append(decoratedRegion(regions[i], 0, stgy)); // must be
-																	// comments
-		}
-		if (needS(outside[1])) {
-			if (((IndexedRegion) child).getStartOffset() == region.getOffset() + region.getLength())
-				appendDelimBefore(node, null, source);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPost(ICSSNode node, StringBuffer source) {
-		int end = ((IndexedRegion) node).getEndOffset();
-		int start = (node.getLastChild() != null && ((IndexedRegion) node.getLastChild()).getEndOffset() > 0) ? ((IndexedRegion) node.getLastChild()).getEndOffset() : getChildInsertPos(node);
-		if (end > 0 && start < end) {
-			CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			for (int i = 0; i < regions.length; i++) {
-				appendDelimBefore(node, regions[i], source);
-				source.append(decoratedRegion(regions[i], 0, stgy));
-			}
-			if ((regions != null && regions.length > 0 && regions[regions.length - 1].getType() == CSSRegionContexts.CSS_CDC) || node.getOwnerDocument().getModel().getStyleSheetType() == ICSSModel.EMBEDDED)
-				appendDelimBefore(node, null, source);
-		}
-		else { // source generation
-			if (node.getOwnerDocument().getModel() != null && node.getOwnerDocument().getModel().getStyleSheetType() == ICSSModel.EMBEDDED)
-				appendDelimBefore(node, null, source);
-			return; // nothing
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPost(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendDelimBefore(node, regions[i], source);
-			source.append(decoratedRegion(regions[i], 0, stgy));
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(org.eclipse.wst.css.core.internal.provisional.document.ICSSNode node, java.lang.StringBuffer source) {
-		int start = ((IndexedRegion) node).getStartOffset();
-		int end = (node.getFirstChild() != null && ((IndexedRegion) node.getFirstChild()).getEndOffset() > 0) ? ((IndexedRegion) node.getFirstChild()).getStartOffset() : getChildInsertPos(node);
-		if (end > 0) {
-			CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			for (int i = 0; i < regions.length; i++) {
-				if (i != 0 || regions[i].getType() == CSSRegionContexts.CSS_CDO || node.getOwnerDocument().getModel().getStyleSheetType() == ICSSModel.EMBEDDED)
-					appendDelimBefore(node, regions[i], source);
-				source.append(decoratedRegion(regions[i], 0, stgy));
-			}
-			if (node.getLastChild() != null && (source.length() > 0 || node.getOwnerDocument().getModel().getStyleSheetType() == ICSSModel.EMBEDDED)) {
-				appendDelimBefore(node, null, source);
-			}
-		}
-		else if (node.getOwnerDocument().getModel() != null && node.getOwnerDocument().getModel().getStyleSheetType() == ICSSModel.EMBEDDED) {
-			appendDelimBefore(node, null, source);
-			// source.append("<!--");
-			// appendDelimBefore(node,null, source);
-		}
-		else
-			return; // nothing
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, IRegion region, java.lang.StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]) || regions[i].getType() == CSSRegionContexts.CSS_CDO || node.getOwnerDocument().getModel().getStyleSheetType() == ICSSModel.EMBEDDED)
-				appendDelimBefore(node, regions[i], source);
-			source.append(decoratedRegion(regions[i], 0, stgy));
-		}
-		if (needS(outside[1])) {
-			if (isIncludesPreEnd(node, region)) {
-				if (source.length() > 0 || node.getOwnerDocument().getModel().getStyleSheetType() == ICSSModel.EMBEDDED) {
-					String delim = getLineDelimiter(node);
-					source.append(delim);
-				}
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public int getChildInsertPos(ICSSNode node) {
-		int n = ((IndexedRegion) node).getEndOffset();
-		if (n > 0) {
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			IStructuredDocumentRegion flatNode = structuredDocument.getRegionAtCharacterOffset(n - 1);
-			ITextRegion region = flatNode.getRegionAtCharacterOffset(n - 1);
-			RegionIterator it = new RegionIterator(flatNode, region);
-			while (it.hasPrev()) {
-				ITextRegion reg = it.prev();
-				if (reg.getType() == CSSRegionContexts.CSS_CDC)
-					return it.getStructuredDocumentRegion().getStartOffset(reg);
-			}
-			return n;
-		}
-		return -1;
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static StyleSheetFormatter getInstance() {
-		if (instance == null)
-			instance = new StyleSheetFormatter();
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/UnknownRuleFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/UnknownRuleFormatter.java
deleted file mode 100644
index 406a408..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/UnknownRuleFormatter.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.formatter;
-
-
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSUnknownRule;
-
-
-/**
- * 
- */
-public class UnknownRuleFormatter extends DefaultCSSSourceFormatter {
-
-	private static UnknownRuleFormatter instance;
-
-	/**
-	 * 
-	 */
-	UnknownRuleFormatter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		int start = ((IndexedRegion) node).getStartOffset();
-		int end = ((IndexedRegion) node).getEndOffset();
-		if (end > 0) { // format source
-			IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-			CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, new FormatRegion(start, end - start), stgy);
-			for (int i = 0; i < regions.length; i++) {
-				if (i != 0)
-					appendSpaceBefore(node, regions[i], source);
-				source.append(decoratedPropValueRegion(regions[i], stgy));
-			}
-		}
-		else { // generate source
-			CSSUnknownRule rule = (CSSUnknownRule) node;
-			source.append(rule.getCssText());
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void formatPre(ICSSNode node, IRegion region, StringBuffer source) {
-		CSSCleanupStrategy stgy = getCleanupStrategy(node);
-
-		IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument();
-		CompoundRegion[] regions = getRegionsWithoutWhiteSpaces(structuredDocument, region, stgy);
-		CompoundRegion[] outside = getOutsideRegions(structuredDocument, region);
-		for (int i = 0; i < regions.length; i++) {
-			if (i != 0 || needS(outside[0]))
-				appendSpaceBefore(node, regions[i], source);
-			source.append(decoratedPropValueRegion(regions[i], stgy));
-		}
-		if (needS(outside[1]) && !isIncludesPreEnd(node, region))
-			appendSpaceBefore(node, outside[1], source);
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static UnknownRuleFormatter getInstance() {
-		if (instance == null)
-			instance = new UnknownRuleFormatter();
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMCategory.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMCategory.java
deleted file mode 100644
index 6bcd400..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMCategory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-public interface CSSMMCategory extends CSSMMNode {
-
-	String getCaption();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMCharsetRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMCharsetRule.java
deleted file mode 100644
index d97fcdc..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMCharsetRule.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-public interface CSSMMCharsetRule extends CSSMMNode {
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMContainer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMContainer.java
deleted file mode 100644
index 0b83713..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMContainer.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-public interface CSSMMContainer extends CSSMMNode {
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMDescriptor.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMDescriptor.java
deleted file mode 100644
index 14ba720..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMDescriptor.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-import java.util.Iterator;
-
-public interface CSSMMDescriptor extends CSSMMNode {
-
-	Iterator getValues();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMFontFaceRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMFontFaceRule.java
deleted file mode 100644
index fe45dc2..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMFontFaceRule.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-public interface CSSMMFontFaceRule extends CSSMMNode {
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMFunction.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMFunction.java
deleted file mode 100644
index 22df25d..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMFunction.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-public interface CSSMMFunction extends CSSMMNode {
-
-	String getFunctionString();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMImportRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMImportRule.java
deleted file mode 100644
index 77fd164..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMImportRule.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-public interface CSSMMImportRule extends CSSMMNode {
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMKeyword.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMKeyword.java
deleted file mode 100644
index 5b45b32..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMKeyword.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-public interface CSSMMKeyword extends CSSMMNode {
-
-	String getKeywordString();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMMediaRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMMediaRule.java
deleted file mode 100644
index b80aa21..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMMediaRule.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-public interface CSSMMMediaRule extends CSSMMNode {
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMNode.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMNode.java
deleted file mode 100644
index d9ae2ea..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMNode.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-import java.util.Iterator;
-
-public interface CSSMMNode {
-	String getType();
-
-	String getName();
-
-	String getDescription();
-
-	String getAttribute(String name);
-
-	Iterator getChildNodes();
-
-	Iterator getDescendants();
-
-
-	static final String _PREFIX = "CSSMM."; //$NON-NLS-1$
-	static final String TYPE_KEYWORD = _PREFIX + "Keyword"; //$NON-NLS-1$
-	static final String TYPE_UNIT = _PREFIX + "Unit"; //$NON-NLS-1$
-	static final String TYPE_FUNCTION = _PREFIX + "Function"; //$NON-NLS-1$
-	static final String TYPE_STRING = _PREFIX + "String"; //$NON-NLS-1$
-	static final String TYPE_STYLE_SHEET = _PREFIX + "StyleSheet"; //$NON-NLS-1$
-	static final String TYPE_PROPERTY = _PREFIX + "Property"; //$NON-NLS-1$
-	static final String TYPE_DESCRIPTOR = _PREFIX + "Descriptor"; //$NON-NLS-1$
-	static final String TYPE_CONTAINER = _PREFIX + "Container"; //$NON-NLS-1$
-	static final String TYPE_NUMBER = _PREFIX + "Number"; //$NON-NLS-1$
-	static final String TYPE_SEPARATOR = _PREFIX + "Separator"; //$NON-NLS-1$
-	static final String TYPE_CHARSET_RULE = _PREFIX + "CharsetRule"; //$NON-NLS-1$
-	static final String TYPE_IMPORT_RULE = _PREFIX + "ImportRule"; //$NON-NLS-1$
-	static final String TYPE_STYLE_RULE = _PREFIX + "StyleRule"; //$NON-NLS-1$
-	static final String TYPE_MEDIA_RULE = _PREFIX + "MediaRule"; //$NON-NLS-1$
-	static final String TYPE_PAGE_RULE = _PREFIX + "PageRule"; //$NON-NLS-1$
-	static final String TYPE_FONT_FACE_RULE = _PREFIX + "FontFaceRule"; //$NON-NLS-1$
-	static final String TYPE_CATEGORY = _PREFIX + "Category"; //$NON-NLS-1$
-	static final String TYPE_META_MODEL = _PREFIX + "MetaModel"; //$NON-NLS-1$
-	static final String TYPE_SELECTOR = _PREFIX + "Selector"; //$NON-NLS-1$	
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMNumber.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMNumber.java
deleted file mode 100644
index 2ea1b27..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMNumber.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-public interface CSSMMNumber extends CSSMMNode {
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMPageRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMPageRule.java
deleted file mode 100644
index 04f99e9..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMPageRule.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-public interface CSSMMPageRule extends CSSMMNode {
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMProperty.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMProperty.java
deleted file mode 100644
index ec41462..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMProperty.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-import java.util.Iterator;
-
-public interface CSSMMProperty extends CSSMMNode {
-
-	String getCategoryName();
-
-	Iterator getValues();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMSelector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMSelector.java
deleted file mode 100644
index d17ac19..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMSelector.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-public interface CSSMMSelector extends CSSMMNode {
-	String getSelectorType();
-
-	String getSelectorString();
-
-
-	static final String TYPE_EXPRESSION = "Expression"; //$NON-NLS-1$
-	static final String TYPE_PSEUDO_CLASS = "PseudoClass"; //$NON-NLS-1$
-	static final String TYPE_PSEUDO_ELEMENT = "PseudoElement"; //$NON-NLS-1$
-
-	// embedded expression type
-	static final String EXPRESSION_DESCENDANT = "descendant"; //$NON-NLS-1$
-	static final String EXPRESSION_CHILD = "child"; //$NON-NLS-1$
-	static final String EXPRESSION_ADJACENT = "adjacent"; //$NON-NLS-1$
-	static final String EXPRESSION_UNIVERSAL = "universal"; //$NON-NLS-1$
-	static final String EXPRESSION_ATTRIBUTE = "attribute"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMString.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMString.java
deleted file mode 100644
index c9ddf8d..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMString.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-public interface CSSMMString extends CSSMMNode {
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStyleRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStyleRule.java
deleted file mode 100644
index 80414fa..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStyleRule.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-public interface CSSMMStyleRule extends CSSMMNode {
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStyleSheet.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStyleSheet.java
deleted file mode 100644
index 40dc67b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStyleSheet.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-public interface CSSMMStyleSheet extends CSSMMNode {
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMUnit.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMUnit.java
deleted file mode 100644
index 52910c6..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMUnit.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-public interface CSSMMUnit extends CSSMMNode {
-
-	String getUnitString();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMetaModel.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMetaModel.java
deleted file mode 100644
index f80c260..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMetaModel.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-import java.util.Iterator;
-
-public interface CSSMetaModel extends CSSMMNode {
-
-	// public interface CSSMetaModel {
-	CSSMMStyleSheet getStyleSheet();
-
-	/*
-	 * Shortcut to access property node
-	 */
-	// Iterator getProperties();
-	// Iterator getDescriptors();
-	// CSSMMProperty getProperty(String propertyName);
-	/*
-	 * access to category information
-	 */
-	Iterator getCategories();
-
-	/*
-	 * Utilities
-	 */
-	// Iterator collectNodesByType(String type);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSProfile.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSProfile.java
deleted file mode 100644
index 1d5fb89..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSProfile.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-import java.net.URL;
-
-
-public interface CSSProfile {
-
-	String getProfileID();
-
-	String getProfileName();
-
-	URL getProfileURL();
-
-	CSSMetaModel getMetaModel();
-
-	boolean isDefault();
-
-	String getOwnerPluginID();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSProfileRegistry.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSProfileRegistry.java
deleted file mode 100644
index 122b4cb..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSProfileRegistry.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel;
-
-
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.wst.css.core.internal.metamodelimpl.RegistryReader;
-
-
-
-public class CSSProfileRegistry {
-	public synchronized static CSSProfileRegistry getInstance() {
-		if (fInstance == null) {
-			fInstance = new CSSProfileRegistry();
-		}
-		return fInstance;
-	}
-
-	public Iterator getProfiles() {
-		return Collections.unmodifiableCollection(fProfiles.values()).iterator();
-	}
-
-	public CSSProfile getProfile(String profileID) {
-		return (CSSProfile) fProfiles.get(profileID);
-	}
-
-	public CSSProfile getDefaultProfile() {
-		Iterator i = getProfiles();
-		while (i.hasNext()) {
-			CSSProfile profile = (CSSProfile) i.next();
-			if (profile.isDefault()) {
-				return profile;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Constructor for CSSProfileRegistry.
-	 */
-	private CSSProfileRegistry() {
-		super();
-		fProfiles = new HashMap();
-		Iterator i = new RegistryReader().enumProfiles();
-		while (i.hasNext()) {
-			Object profile = i.next();
-			if (profile instanceof CSSProfile) {
-				fProfiles.put(((CSSProfile) profile).getProfileID(), profile);
-			}
-		}
-	}
-
-
-	private static CSSProfileRegistry fInstance = null;
-	private Map fProfiles = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSFunctionID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSFunctionID.java
deleted file mode 100644
index 8fd67b3..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSFunctionID.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel.util;
-
-public interface CSSFunctionID {
-
-	final static String F_ATTR = "attr"; //$NON-NLS-1$
-	final static String F_COUNTER = "counter"; //$NON-NLS-1$
-	final static String F_RGB = "rgb"; //$NON-NLS-1$
-	final static String F_RECT = "rect"; //$NON-NLS-1$
-	final static String F_URI = "uri"; //$NON-NLS-1$
-	final static String F_FORMAT = "format"; //$NON-NLS-1$
-	final static String F_LOCAL = "local"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSKeywordID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSKeywordID.java
deleted file mode 100644
index 856b36d..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSKeywordID.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel.util;
-
-public interface CSSKeywordID {
-
-	final static String K_100 = "100"; //$NON-NLS-1$
-	final static String K_200 = "200"; //$NON-NLS-1$
-	final static String K_300 = "300"; //$NON-NLS-1$
-	final static String K_400 = "400"; //$NON-NLS-1$
-	final static String K_500 = "500"; //$NON-NLS-1$
-	final static String K_600 = "600"; //$NON-NLS-1$
-	final static String K_700 = "700"; //$NON-NLS-1$
-	final static String K_800 = "800"; //$NON-NLS-1$
-	final static String K_900 = "900"; //$NON-NLS-1$
-	final static String K_ABOVE = "above"; //$NON-NLS-1$
-	final static String K_ABSOLUTE = "absolute"; //$NON-NLS-1$
-	final static String K_ACTIVEBORDER = "ActiveBorder"; //$NON-NLS-1$
-	final static String K_ACTIVECAPTION = "ActiveCaption"; //$NON-NLS-1$
-	final static String K_ALL = "all"; //$NON-NLS-1$
-	final static String K_ALWAYS = "always"; //$NON-NLS-1$
-	final static String K_APPWORKSPACE = "AppWorkspace"; //$NON-NLS-1$
-	final static String K_AQUA = "aqua"; //$NON-NLS-1$
-	final static String K_ARMENIAN = "armenian"; //$NON-NLS-1$
-	final static String K_AUTO = "auto"; //$NON-NLS-1$
-	final static String K_AVOID = "avoid"; //$NON-NLS-1$
-	final static String K_BACKGROUND = "Background"; //$NON-NLS-1$
-	final static String K_BASELINE = "baseline"; //$NON-NLS-1$
-	final static String K_BEHIND = "behind"; //$NON-NLS-1$
-	final static String K_BELOW = "below"; //$NON-NLS-1$
-	final static String K_BIDI_OVERRIDE = "bidi-override"; //$NON-NLS-1$
-	final static String K_BLACK = "black"; //$NON-NLS-1$
-	final static String K_BLINK = "blink"; //$NON-NLS-1$
-	final static String K_BLOCK = "block"; //$NON-NLS-1$
-	final static String K_BLUE = "blue"; //$NON-NLS-1$
-	final static String K_BOLD = "bold"; //$NON-NLS-1$
-	final static String K_BOLDER = "bolder"; //$NON-NLS-1$
-	final static String K_BOTH = "both"; //$NON-NLS-1$
-	final static String K_BOTTOM = "bottom"; //$NON-NLS-1$
-	final static String K_BUTTONFACE = "ButtonFace"; //$NON-NLS-1$
-	final static String K_BUTTONHIGHLIGHT = "ButtonHighlight"; //$NON-NLS-1$
-	final static String K_BUTTONSHADOW = "ButtonShadow"; //$NON-NLS-1$
-	final static String K_BUTTONTEXT = "ButtonText"; //$NON-NLS-1$
-	final static String K_CAPITALIZE = "capitalize"; //$NON-NLS-1$
-	final static String K_CAPTION = "caption"; //$NON-NLS-1$
-	final static String K_CAPTIONTEXT = "CaptionText"; //$NON-NLS-1$
-	final static String K_CENTER = "center"; //$NON-NLS-1$
-	final static String K_CENTER_LEFT = "center-left"; //$NON-NLS-1$
-	final static String K_CENTER_RIGHT = "center-right"; //$NON-NLS-1$
-	final static String K_CHILD = "child"; //$NON-NLS-1$
-	final static String K_CIRCLE = "circle"; //$NON-NLS-1$
-	final static String K_CJK_IDEOGRAPHIC = "cjk-ideographic"; //$NON-NLS-1$
-	final static String K_CLOSE_QUOTE = "close-quote"; //$NON-NLS-1$
-	final static String K_CODE = "code"; //$NON-NLS-1$
-	final static String K_CONDENSED = "condensed"; //$NON-NLS-1$
-	final static String K_COLLAPSE = "collapse"; //$NON-NLS-1$
-	final static String K_COMPACT = "compact"; //$NON-NLS-1$
-	final static String K_CONTINUOUS = "continuous"; //$NON-NLS-1$
-	final static String K_CROP = "crop"; //$NON-NLS-1$
-	final static String K_CROSS = "cross"; //$NON-NLS-1$
-	final static String K_CROSSHAIR = "crosshair"; //$NON-NLS-1$
-	final static String K_CURSIVE = "cursive"; //$NON-NLS-1$
-	final static String K_DASHED = "dashed"; //$NON-NLS-1$
-	final static String K_DECIMAL = "decimal"; //$NON-NLS-1$
-	final static String K_DECIMAL_LEADING_ZERO = "decimal-leading-zero"; //$NON-NLS-1$
-	final static String K_DEFAULT = "default"; //$NON-NLS-1$
-	final static String K_DIGITS = "digits"; //$NON-NLS-1$
-	final static String K_DISC = "disc"; //$NON-NLS-1$
-	final static String K_DOTTED = "dotted"; //$NON-NLS-1$
-	final static String K_DOUBLE = "double"; //$NON-NLS-1$
-	final static String K_E_RESIZE = "e-resize"; //$NON-NLS-1$
-	final static String K_EMBED = "embed"; //$NON-NLS-1$
-	final static String K_EXPANDED = "expanded"; //$NON-NLS-1$
-	final static String K_EXTRA_CONDENSED = "extra-condensed"; //$NON-NLS-1$
-	final static String K_EXTRA_EXPANDED = "extra-expanded"; //$NON-NLS-1$
-	final static String K_FANTASY = "fantasy"; //$NON-NLS-1$
-	final static String K_FAR_LEFT = "far-left"; //$NON-NLS-1$
-	final static String K_FAR_RIGHT = "far-right"; //$NON-NLS-1$
-	final static String K_FAST = "fast"; //$NON-NLS-1$
-	final static String K_FASTER = "faster"; //$NON-NLS-1$
-	final static String K_FEMALE = "female"; //$NON-NLS-1$
-	final static String K_FIXED = "fixed"; //$NON-NLS-1$
-	final static String K_FUCHSIA = "fuchsia"; //$NON-NLS-1$
-	final static String K_GEORGIAN = "georgian"; //$NON-NLS-1$
-	final static String K_GRAY = "gray"; //$NON-NLS-1$
-	final static String K_GRAYTEXT = "GrayText"; //$NON-NLS-1$
-	final static String K_GREEN = "green"; //$NON-NLS-1$
-	final static String K_GROOVE = "groove"; //$NON-NLS-1$
-	final static String K_HEBREW = "hebrew"; //$NON-NLS-1$
-	final static String K_HELP = "help"; //$NON-NLS-1$
-	final static String K_HIDDEN = "hidden"; //$NON-NLS-1$
-	final static String K_HIDE = "hide"; //$NON-NLS-1$
-	final static String K_HIGH = "high"; //$NON-NLS-1$
-	final static String K_HIGHLIGHT = "Highlight"; //$NON-NLS-1$
-	final static String K_HIGHLIGHTTEXT = "HighlightText"; //$NON-NLS-1$
-	final static String K_HIGHER = "higher"; //$NON-NLS-1$
-	final static String K_HIRAGANA = "hiragana"; //$NON-NLS-1$
-	final static String K_HIRAGANA_IROHA = "hiragana-iroha"; //$NON-NLS-1$
-	final static String K_ICON = "icon"; //$NON-NLS-1$
-	final static String K_INACTIVEBORDER = "InactiveBorder"; //$NON-NLS-1$
-	final static String K_INACTIVECAPTION = "InactiveCaption"; //$NON-NLS-1$
-	final static String K_INACTIVECAPTIONTEXT = "InactiveCaptionText"; //$NON-NLS-1$
-	final static String K_INFOBACKGROUND = "InfoBackground"; //$NON-NLS-1$
-	final static String K_INFOTEXT = "InfoText"; //$NON-NLS-1$
-	final static String K_INLINE = "inline"; //$NON-NLS-1$
-	final static String K_INLINE_TABLE = "inline-table"; //$NON-NLS-1$
-	final static String K_INSET = "inset"; //$NON-NLS-1$
-	final static String K_INSIDE = "inside"; //$NON-NLS-1$
-	final static String K_INVERT = "invert"; //$NON-NLS-1$
-	final static String K_ITALIC = "italic"; //$NON-NLS-1$
-	final static String K_JUSTIFY = "justify"; //$NON-NLS-1$
-	final static String K_KATAKANA = "katakana"; //$NON-NLS-1$
-	final static String K_KATAKANA_IROHA = "katakana-iroha"; //$NON-NLS-1$
-	final static String K_LANDSCAPE = "landscape"; //$NON-NLS-1$
-	final static String K_LARGE = "large"; //$NON-NLS-1$
-	final static String K_LARGER = "larger"; //$NON-NLS-1$
-	final static String K_LEFT = "left"; //$NON-NLS-1$
-	final static String K_LEFT_SIDE = "left-side"; //$NON-NLS-1$
-	final static String K_LEFTWARDS = "leftwards"; //$NON-NLS-1$
-	final static String K_LEVEL = "level"; //$NON-NLS-1$
-	final static String K_LIGHTER = "lighter"; //$NON-NLS-1$
-	final static String K_LIME = "lime"; //$NON-NLS-1$
-	final static String K_LINE_THROUGH = "line-through"; //$NON-NLS-1$
-	final static String K_LIST_ITEM = "list-item"; //$NON-NLS-1$
-	final static String K_LOUD = "loud"; //$NON-NLS-1$
-	final static String K_LOW = "low"; //$NON-NLS-1$
-	final static String K_LOWER = "lower"; //$NON-NLS-1$
-	final static String K_LOWER_ALPHA = "lower-alpha"; //$NON-NLS-1$
-	final static String K_LOWER_GREEK = "lower-greek"; //$NON-NLS-1$
-	final static String K_LOWER_LATIN = "lower-latin"; //$NON-NLS-1$
-	final static String K_LOWER_ROMAN = "lower-roman"; //$NON-NLS-1$
-	final static String K_LOWERCASE = "lowercase"; //$NON-NLS-1$
-	final static String K_LTR = "ltr"; //$NON-NLS-1$
-	final static String K_MALE = "male"; //$NON-NLS-1$
-	final static String K_MARKER = "marker"; //$NON-NLS-1$
-	final static String K_MAROON = "maroon"; //$NON-NLS-1$
-	final static String K_MEDIUM = "medium"; //$NON-NLS-1$
-	final static String K_MENU = "menu"; //$NON-NLS-1$
-	final static String K_MENUTEXT = "MenuText"; //$NON-NLS-1$
-	final static String K_MESSAGE_BOX = "message-box"; //$NON-NLS-1$
-	final static String K_MIDDLE = "middle"; //$NON-NLS-1$
-	final static String K_MIX = "mix"; //$NON-NLS-1$
-	final static String K_MONOSPACE = "monospace"; //$NON-NLS-1$
-	final static String K_MOVE = "move"; //$NON-NLS-1$
-	final static String K_N_RESIZE = "n-resize"; //$NON-NLS-1$
-	final static String K_NARROWER = "narrower"; //$NON-NLS-1$
-	final static String K_NAVY = "navy"; //$NON-NLS-1$
-	final static String K_NE_RESIZE = "ne-resize"; //$NON-NLS-1$
-	final static String K_NO_CLOSE_QUOTE = "no-close-quote"; //$NON-NLS-1$
-	final static String K_NO_OPEN_QUOTE = "no-open-quote"; //$NON-NLS-1$
-	final static String K_NO_REPEAT = "no-repeat"; //$NON-NLS-1$
-	final static String K_NONE = "none"; //$NON-NLS-1$
-	final static String K_NORMAL = "normal"; //$NON-NLS-1$
-	final static String K_NOWRAP = "nowrap"; //$NON-NLS-1$
-	final static String K_NW_RESIZE = "nw-resize"; //$NON-NLS-1$
-	final static String K_OBLIQUE = "oblique"; //$NON-NLS-1$
-	final static String K_OLIVE = "olive"; //$NON-NLS-1$
-	final static String K_ONCE = "once"; //$NON-NLS-1$
-	final static String K_OPEN_QUOTE = "open-quote"; //$NON-NLS-1$
-	final static String K_OUTSET = "outset"; //$NON-NLS-1$
-	final static String K_OUTSIDE = "outside"; //$NON-NLS-1$
-	final static String K_OVERLINE = "overline"; //$NON-NLS-1$
-	final static String K_POINTER = "pointer"; //$NON-NLS-1$
-	final static String K_PORTRAIT = "portrait"; //$NON-NLS-1$
-	final static String K_PRE = "pre"; //$NON-NLS-1$
-	final static String K_PURPLE = "purple"; //$NON-NLS-1$
-	final static String K_RED = "red"; //$NON-NLS-1$
-	final static String K_RELATIVE = "relative"; //$NON-NLS-1$
-	final static String K_REPEAT = "repeat"; //$NON-NLS-1$
-	final static String K_REPEAT_X = "repeat-x"; //$NON-NLS-1$
-	final static String K_REPEAT_Y = "repeat-y"; //$NON-NLS-1$
-	final static String K_RIDGE = "ridge"; //$NON-NLS-1$
-	final static String K_RIGHT = "right"; //$NON-NLS-1$
-	final static String K_RIGHT_SIDE = "right-side"; //$NON-NLS-1$
-	final static String K_RIGHTWARDS = "rightwards"; //$NON-NLS-1$
-	final static String K_RTL = "rtl"; //$NON-NLS-1$
-	final static String K_RUN_IN = "run-in"; //$NON-NLS-1$
-	final static String K_S_RESIZE = "s-resize"; //$NON-NLS-1$
-	final static String K_SANS_SERIF = "sans-serif"; //$NON-NLS-1$
-	final static String K_SCROLL = "scroll"; //$NON-NLS-1$
-	final static String K_SCROLLBAR = "Scrollbar"; //$NON-NLS-1$
-	final static String K_SE_RESIZE = "se-resize"; //$NON-NLS-1$
-	final static String K_SEMI_CONDENSED = "semi-condensed"; //$NON-NLS-1$
-	final static String K_SEMI_EXPANDED = "semi-expanded"; //$NON-NLS-1$
-	final static String K_SEPARATE = "separate"; //$NON-NLS-1$
-	final static String K_SERIF = "serif"; //$NON-NLS-1$
-	final static String K_SHOW = "show"; //$NON-NLS-1$
-	final static String K_SILENT = "silent"; //$NON-NLS-1$
-	final static String K_SILVER = "silver"; //$NON-NLS-1$
-	final static String K_SLOW = "slow"; //$NON-NLS-1$
-	final static String K_SLOWER = "slower"; //$NON-NLS-1$
-	final static String K_SMALL = "small"; //$NON-NLS-1$
-	final static String K_SMALL_CAPS = "small-caps"; //$NON-NLS-1$
-	final static String K_SMALL_CAPTION = "small-caption"; //$NON-NLS-1$
-	final static String K_SMALLER = "smaller"; //$NON-NLS-1$
-	final static String K_SOFT = "soft"; //$NON-NLS-1$
-	final static String K_SOLID = "solid"; //$NON-NLS-1$
-	final static String K_SPELL_OUT = "spell-out"; //$NON-NLS-1$
-	final static String K_SQUARE = "square"; //$NON-NLS-1$
-	final static String K_STATIC = "static"; //$NON-NLS-1$
-	final static String K_STATUS_BAR = "status-bar"; //$NON-NLS-1$
-	final static String K_SUB = "sub"; //$NON-NLS-1$
-	final static String K_SUPER = "super"; //$NON-NLS-1$
-	final static String K_SW_RESIZE = "sw-resize"; //$NON-NLS-1$
-	final static String K_TABLE = "table"; //$NON-NLS-1$
-	final static String K_TABLE_CAPTION = "table-caption"; //$NON-NLS-1$
-	final static String K_TABLE_CELL = "table-cell"; //$NON-NLS-1$
-	final static String K_TABLE_COLUMN = "table-column"; //$NON-NLS-1$
-	final static String K_TABLE_COLUMN_GROUP = "table-column-group"; //$NON-NLS-1$
-	final static String K_TABLE_FOOTER_GROUP = "table-footer-group"; //$NON-NLS-1$
-	final static String K_TABLE_HEADER_GROUP = "table-header-group"; //$NON-NLS-1$
-	final static String K_TABLE_ROW = "table-row"; //$NON-NLS-1$
-	final static String K_TABLE_ROW_GROUP = "table-row-group"; //$NON-NLS-1$
-	final static String K_TEAL = "teal"; //$NON-NLS-1$
-	final static String K_TEXT = "text"; //$NON-NLS-1$
-	final static String K_TEXT_TOP = "text-top"; //$NON-NLS-1$
-	final static String K_TEXT_BOTTOM = "text-bottom"; //$NON-NLS-1$
-	final static String K_THICK = "thick"; //$NON-NLS-1$
-	final static String K_THIN = "thin"; //$NON-NLS-1$
-	final static String K_THREEDDARKSHADOW = "ThreeDDarkShadow"; //$NON-NLS-1$
-	final static String K_THREEDFACE = "ThreeDFace"; //$NON-NLS-1$
-	final static String K_THREEDHIGHLIGHT = "ThreeDHighlight"; //$NON-NLS-1$
-	final static String K_THREEDLIGHTSHADOW = "ThreeDLightShadow"; //$NON-NLS-1$
-	final static String K_THREEDSHADOW = "ThreeDShadow"; //$NON-NLS-1$
-	final static String K_TOP = "top"; //$NON-NLS-1$
-	final static String K_TRANSPARENT = "transparent"; //$NON-NLS-1$
-	final static String K_ULTRA_CONDENSED = "ultra-condensed"; //$NON-NLS-1$
-	final static String K_ULTRA_EXPANDED = "ultra-expanded"; //$NON-NLS-1$
-	final static String K_UNDERLINE = "underline"; //$NON-NLS-1$
-	final static String K_UPPER_ALPHA = "upper-alpha"; //$NON-NLS-1$
-	final static String K_UPPER_LATIN = "upper-latin"; //$NON-NLS-1$
-	final static String K_UPPER_ROMAN = "upper-roman"; //$NON-NLS-1$
-	final static String K_UPPERCASE = "uppercase"; //$NON-NLS-1$
-	final static String K_VISIBLE = "visible"; //$NON-NLS-1$
-	final static String K_W_RESIZE = "w-resize"; //$NON-NLS-1$
-	final static String K_WAIT = "wait"; //$NON-NLS-1$
-	final static String K_WHITE = "white"; //$NON-NLS-1$
-	final static String K_WIDER = "wider"; //$NON-NLS-1$
-	final static String K_WINDOW = "Window"; //$NON-NLS-1$
-	final static String K_WINDOWFRAME = "WindowFrame"; //$NON-NLS-1$
-	final static String K_WINDOWTEXT = "WindowText"; //$NON-NLS-1$
-	final static String K_X_FAST = "x-fast"; //$NON-NLS-1$
-	final static String K_X_HIGH = "x-high"; //$NON-NLS-1$
-	final static String K_X_LARGE = "x-large"; //$NON-NLS-1$
-	final static String K_X_LOUD = "x-loud"; //$NON-NLS-1$
-	final static String K_X_LOW = "x-low"; //$NON-NLS-1$
-	final static String K_X_SLOW = "x-slow"; //$NON-NLS-1$
-	final static String K_X_SMALL = "x-small"; //$NON-NLS-1$
-	final static String K_X_SOFT = "x-soft"; //$NON-NLS-1$
-	final static String K_XX_SMALL = "xx-small"; //$NON-NLS-1$
-	final static String K_XX_LARGE = "xx-large"; //$NON-NLS-1$
-	final static String K_YELLOW = "yellow"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMMTypeCollector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMMTypeCollector.java
deleted file mode 100644
index c2baf78..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMMTypeCollector.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-
-
-public class CSSMMTypeCollector extends CSSMetaModelTraverser {
-
-	/**
-	 * Constructor for TypeCollector.
-	 */
-	public CSSMMTypeCollector() {
-		super();
-	}
-
-	public void apply(CSSMMNode node, String type) {
-		fType = type;
-		fNodes = new ArrayList();
-		apply(node);
-	}
-
-	public void collectNestedType(boolean nested) {
-		fNested = nested;
-	}
-
-	protected short preNode(CSSMMNode node) {
-		short rc = TRAV_CONT;
-		if (node != null) {
-			if (fType == node.getType()) {
-				if (!fNodes.contains(node)) {
-					fNodes.add(node);
-				}
-				if (!fNested) {
-					rc = TRAV_PRUNE;
-				}
-			}
-		}
-		return rc;
-	}
-
-	public Iterator getNodes() {
-		return fNodes.iterator();
-	}
-
-
-	private boolean fNested = false;
-	private String fType = null;
-	List fNodes = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMediaGroupID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMediaGroupID.java
deleted file mode 100644
index b7bda54..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMediaGroupID.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel.util;
-
-public interface CSSMediaGroupID {
-
-	final static String M_CONTINUOUS = "continuous"; //$NON-NLS-1$
-	final static String M_PAGED = "paged"; //$NON-NLS-1$
-
-	final static String M_VISUAL = "visual"; //$NON-NLS-1$
-	final static String M_AURAL = "aural"; //$NON-NLS-1$
-	final static String M_TACTILE = "tactile"; //$NON-NLS-1$
-
-	final static String M_GRID = "grid"; //$NON-NLS-1$
-	final static String M_BITMAP = "bitmap"; //$NON-NLS-1$
-
-	final static String M_INTERACTIVE = "interactive"; //$NON-NLS-1$
-	final static String M_STATIC = "static"; //$NON-NLS-1$
-
-	final static String M_ALL = "all"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMetaModelFinder.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMetaModelFinder.java
deleted file mode 100644
index f07d84a..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMetaModelFinder.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel.util;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-
-public class CSSMetaModelFinder {
-	/**
-	 * Constructor for CSSMetaModelFinder.
-	 */
-	private CSSMetaModelFinder() {
-		super();
-	}
-
-	static synchronized public CSSMetaModelFinder getInstance() {
-		if (fInstance == null) {
-			fInstance = new CSSMetaModelFinder();
-		}
-		return fInstance;
-	}
-
-	public CSSMetaModel findMetaModelFor(ICSSNode node) {
-		return CSSProfileFinder.getInstance().findProfileFor(node).getMetaModel();
-	}
-
-	public CSSMetaModel findMetaModelFor(IStructuredModel model) {
-		return CSSProfileFinder.getInstance().findProfileFor(model).getMetaModel();
-
-	}
-
-	// findMetaModelFor(Node) is not used.
-	// Even if it is used, it can be replaced with
-	// findMetaModelFor(IStructuredModel) easily
-
-	public CSSMetaModel findMetaModelFor(String baseLocation) {
-		return CSSProfileFinder.getInstance().findProfileFor(baseLocation).getMetaModel();
-	}
-
-	static private CSSMetaModelFinder fInstance = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMetaModelTraverser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMetaModelTraverser.java
deleted file mode 100644
index 05a6f48..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMetaModelTraverser.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel.util;
-
-import java.util.Iterator;
-import java.util.Stack;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-
-
-
-abstract public class CSSMetaModelTraverser {
-
-	/**
-	 * Constructor for Traverser.
-	 */
-	public CSSMetaModelTraverser() {
-		super();
-	}
-
-	public final void apply(CSSMMNode node) {
-		fTravStack = new Stack();
-
-		begin(node);
-		traverse(node);
-		end(node);
-	}
-
-	private final short traverse(CSSMMNode node) {
-		if (node == null) {
-			return TRAV_CONT;
-		}
-
-		fTravStack.push(node);
-
-		short rc;
-		rc = preNode(node);
-
-		if (rc == TRAV_CONT) {
-			Iterator i = node.getChildNodes();
-			while (i.hasNext()) {
-				CSSMMNode child = (CSSMMNode) i.next();
-				short rcChild = traverse(child);
-				if (rcChild == TRAV_STOP) {
-					fTravStack.pop();
-					return TRAV_STOP;
-				}
-			}
-		}
-		else if (rc == TRAV_STOP) {
-			fTravStack.pop();
-			return TRAV_STOP;
-		}
-
-		rc = postNode(node);
-
-		fTravStack.pop();
-		return (rc == TRAV_PRUNE) ? TRAV_CONT : rc;
-	}
-
-	protected void begin(CSSMMNode node) {
-
-	}
-
-	protected void end(CSSMMNode node) {
-
-	}
-
-	protected short preNode(CSSMMNode node) {
-		return TRAV_CONT;
-	}
-
-	protected short postNode(CSSMMNode node) {
-		return TRAV_CONT;
-	}
-
-
-	Stack fTravStack = null;
-
-	protected static final short TRAV_CONT = 0;
-	protected static final short TRAV_STOP = 1;
-	protected static final short TRAV_PRUNE = 2;
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMetaModelUtil.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMetaModelUtil.java
deleted file mode 100644
index aad0b1b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMetaModelUtil.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel.util;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMDescriptor;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMProperty;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.w3c.dom.css.CSSFontFaceRule;
-
-
-public class CSSMetaModelUtil {
-	public CSSMetaModelUtil(CSSMetaModel metamodel) {
-		super();
-		fMetaModel = metamodel;
-	}
-
-	public Iterator getProperties() {
-		return collectNodesByType(CSSMMNode.TYPE_PROPERTY);
-	}
-
-	public Iterator getDescriptors() {
-		return collectNodesByType(CSSMMNode.TYPE_DESCRIPTOR);
-	}
-
-	public Iterator collectNodesByType(String type) {
-		CSSMMTypeCollector collector = new CSSMMTypeCollector();
-		collector.apply(fMetaModel, type);
-		return collector.getNodes();
-	}
-
-	public CSSMMProperty getProperty(String propertyName) {
-		Iterator iProperty = getProperties();
-		while (iProperty.hasNext()) {
-			CSSMMNode node = (CSSMMNode) iProperty.next();
-			if (node.getName().equalsIgnoreCase(propertyName)) {
-				return (CSSMMProperty) node;
-			}
-		}
-		return null;
-	}
-
-	public CSSMMDescriptor getDescriptor(String descriptorName) {
-		Iterator iDescriptor = getDescriptors();
-		while (iDescriptor.hasNext()) {
-			CSSMMNode node = (CSSMMNode) iDescriptor.next();
-			if (node.getName().equalsIgnoreCase(descriptorName)) {
-				return (CSSMMDescriptor) node;
-			}
-		}
-		return null;
-	}
-
-	public CSSMMNode getMetaModelNodeFor(ICSSNode node) {
-		if (node instanceof ICSSStyleDeclaration) {
-			node = node.getParentNode();
-		}
-		if (node instanceof ICSSStyleDeclItem) {
-			ICSSNode parent = node.getParentNode();
-			if (parent != null) {
-				parent = parent.getParentNode();
-			}
-			if (parent instanceof ICSSStyleRule) {
-				return getProperty(((ICSSStyleDeclItem) node).getPropertyName());
-			}
-			else if (parent instanceof CSSFontFaceRule) {
-				return getDescriptor(((ICSSStyleDeclItem) node).getPropertyName());
-			}
-		}
-		if (node == null) {
-			return null;
-		}
-
-		if (fTypeMap == null) {
-			fTypeMap = new HashMap();
-			fTypeMap.put(new Short(ICSSNode.STYLERULE_NODE), CSSMMNode.TYPE_STYLE_RULE);
-			fTypeMap.put(new Short(ICSSNode.FONTFACERULE_NODE), CSSMMNode.TYPE_FONT_FACE_RULE);
-			fTypeMap.put(new Short(ICSSNode.PAGERULE_NODE), CSSMMNode.TYPE_PAGE_RULE);
-		}
-
-		String nodeType = (String) fTypeMap.get(new Short(node.getNodeType()));
-		if (nodeType == null) {
-			return null;
-		}
-
-		Iterator iNodes = collectNodesByType(nodeType);
-		if (iNodes.hasNext()) {
-			CSSMMNode targetNode = (CSSMMNode) iNodes.next();
-			if (!iNodes.hasNext()) { // it's only one
-				return targetNode;
-			}
-		}
-
-		return null;
-	}
-
-	public CSSMetaModel getMetaModel() {
-		return fMetaModel;
-	}
-
-
-	private CSSMetaModel fMetaModel = null;
-	private Map fTypeMap = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSNumberID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSNumberID.java
deleted file mode 100644
index 4b367ab..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSNumberID.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel.util;
-
-public interface CSSNumberID {
-
-	final static java.lang.String N_ANGLE = "angle";//$NON-NLS-1$
-	final static java.lang.String N_FREQUENCY = "frequency";//$NON-NLS-1$
-	final static java.lang.String N_INTEGER = "integer";//$NON-NLS-1$
-	final static java.lang.String N_LENGTH = "length";//$NON-NLS-1$
-	final static java.lang.String N_PERCENTAGE = "percentage";//$NON-NLS-1$
-	final static java.lang.String N_TIME = "time";//$NON-NLS-1$
-	final static java.lang.String N_HASH = "hash"; //$NON-NLS-1$
-	final static java.lang.String N_NUM = "number";//$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSProfileFinder.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSProfileFinder.java
deleted file mode 100644
index 1dd2e3a..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSProfileFinder.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel.util;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.css.core.internal.metamodel.CSSProfile;
-import org.eclipse.wst.css.core.internal.metamodel.CSSProfileRegistry;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.provisional.contentproperties.ContentSettingsCreator;
-import org.eclipse.wst.sse.ui.internal.provisional.contentproperties.IContentSettings;
-
-
-public class CSSProfileFinder {
-
-	final static private String CSS_PROFILE = "css-profile"; //$NON-NLS-1$
-
-	/**
-	 * Constructor for CSSProfileFinder.
-	 */
-	private CSSProfileFinder() {
-		super();
-	}
-
-	static synchronized public CSSProfileFinder getInstance() {
-		if (fInstance == null) {
-			fInstance = new CSSProfileFinder();
-		}
-		return fInstance;
-	}
-
-	public CSSProfile findProfileFor(ICSSNode node) {
-		ICSSModel model = null;
-		if (node != null) {
-			ICSSDocument doc = node.getOwnerDocument();
-			if (doc != null) {
-				model = doc.getModel();
-			}
-		}
-		return findProfileFor(model);
-	}
-
-	public CSSProfile findProfileFor(IStructuredModel model) {
-		String baseLocation = null;
-		if (model instanceof ICSSModel) {
-			Object modelType = ((ICSSModel) model).getStyleSheetType();
-			if (modelType == ICSSModel.EXTERNAL) {
-				baseLocation = model.getBaseLocation();
-			}
-			else if (modelType == ICSSModel.EMBEDDED || modelType == ICSSModel.INLINE) {
-				baseLocation = model.getBaseLocation(); // may be null
-			}
-		}
-		else if (model != null) {
-			baseLocation = model.getBaseLocation();
-		}
-		return findProfileFor(baseLocation);
-	}
-
-	public CSSProfile findProfileFor(String baseLocation) {
-		CSSProfileRegistry reg = CSSProfileRegistry.getInstance();
-		CSSProfile profile = null;
-
-		if (baseLocation != null) {
-			IContentSettings cs = ContentSettingsCreator.create();
-			IPath path = new Path(baseLocation);
-			IResource resource = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path);
-			if (resource == null && path.segmentCount() > 1)
-				resource = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-			if (resource != null) {
-				IProject project = resource.getProject();
-				// at first, initialized with project settings
-				if (project != null) {
-					String profileID = cs.getProperty(project, CSS_PROFILE);
-					if (profileID != null && 0 < profileID.length()) {
-						profile = reg.getProfile(profileID);
-					}
-				}
-				// if resource settings exist, overwrite with project settings
-				String profileID = cs.getProperty(resource, CSS_PROFILE);
-				if (profileID != null && 0 < profileID.length()) {
-					profile = reg.getProfile(profileID);
-				}
-			}
-		}
-
-		return (profile != null) ? profile : reg.getDefaultProfile();
-	}
-
-	static private CSSProfileFinder fInstance = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSPropertyID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSPropertyID.java
deleted file mode 100644
index 5f66cdb..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSPropertyID.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel.util;
-
-public interface CSSPropertyID {
-
-	final static String P_AZIMUTH = "azimuth"; //$NON-NLS-1$
-	final static String P_BG = "background"; //$NON-NLS-1$
-	final static String P_BG_ATTACHMENT = "background-attachment"; //$NON-NLS-1$
-	final static String P_BG_COLOR = "background-color"; //$NON-NLS-1$
-	final static String P_BG_IMAGE = "background-image"; //$NON-NLS-1$
-	final static String P_BG_POSITION = "background-position"; //$NON-NLS-1$
-	final static String P_BG_REPEAT = "background-repeat"; //$NON-NLS-1$
-	final static String P_BORDER = "border"; //$NON-NLS-1$
-	final static String P_BORDER_COLLAPSE = "border-collapse"; //$NON-NLS-1$
-	final static String P_BORDER_COLOR = "border-color"; //$NON-NLS-1$
-	final static String P_BORDER_SPACING = "border-spacing"; //$NON-NLS-1$
-	final static String P_BORDER_STYLE = "border-style"; //$NON-NLS-1$
-	final static String P_BORDER_TOP = "border-top"; //$NON-NLS-1$
-	final static String P_BORDER_RIGHT = "border-right"; //$NON-NLS-1$
-	final static String P_BORDER_BOTTOM = "border-bottom"; //$NON-NLS-1$
-	final static String P_BORDER_LEFT = "border-left"; //$NON-NLS-1$
-	final static String P_BORDER_TOP_COLOR = "border-top-color"; //$NON-NLS-1$
-	final static String P_BORDER_RIGHT_COLOR = "border-right-color"; //$NON-NLS-1$
-	final static String P_BORDER_BOTTOM_COLOR = "border-bottom-color"; //$NON-NLS-1$
-	final static String P_BORDER_LEFT_COLOR = "border-left-color"; //$NON-NLS-1$
-	final static String P_BORDER_TOP_STYLE = "border-top-style"; //$NON-NLS-1$
-	final static String P_BORDER_RIGHT_STYLE = "border-right-style"; //$NON-NLS-1$
-	final static String P_BORDER_BOTTOM_STYLE = "border-bottom-style"; //$NON-NLS-1$
-	final static String P_BORDER_LEFT_STYLE = "border-left-style"; //$NON-NLS-1$
-	final static String P_BORDER_TOP_WIDTH = "border-top-width"; //$NON-NLS-1$
-	final static String P_BORDER_RIGHT_WIDTH = "border-right-width"; //$NON-NLS-1$
-	final static String P_BORDER_BOTTOM_WIDTH = "border-bottom-width"; //$NON-NLS-1$
-	final static String P_BORDER_LEFT_WIDTH = "border-left-width"; //$NON-NLS-1$
-	final static String P_BORDER_WIDTH = "border-width"; //$NON-NLS-1$
-	final static String P_BOTTOM = "bottom"; //$NON-NLS-1$
-	final static String P_CAPTION_SIDE = "caption-side"; //$NON-NLS-1$
-	final static String P_CLEAR = "clear"; //$NON-NLS-1$
-	final static String P_CLIP = "clip"; //$NON-NLS-1$
-	final static String P_COLOR = "color"; //$NON-NLS-1$
-	final static String P_CONTENT = "content"; //$NON-NLS-1$
-	final static String P_COUNTER_INCREMENT = "counter-increment"; //$NON-NLS-1$
-	final static String P_COUNTER_RESET = "counter-reset"; //$NON-NLS-1$
-	final static String P_CUE = "cue"; //$NON-NLS-1$
-	final static String P_CUE_AFTER = "cue-after"; //$NON-NLS-1$
-	final static String P_CUE_BEFORE = "cue-before"; //$NON-NLS-1$
-	final static String P_CURSOR = "cursor"; //$NON-NLS-1$
-	final static String P_DIRECTION = "direction"; //$NON-NLS-1$
-	final static String P_DISPLAY = "display"; //$NON-NLS-1$
-	final static String P_ELEVATION = "elevation"; //$NON-NLS-1$
-	final static String P_EMPTY_CELLS = "empty-cells"; //$NON-NLS-1$
-	final static String P_FLOAT = "float"; //$NON-NLS-1$
-	final static String P_FONT = "font"; //$NON-NLS-1$
-	final static String P_FONT_FAMILY = "font-family"; //$NON-NLS-1$
-	final static String P_FONT_SIZE = "font-size"; //$NON-NLS-1$
-	final static String P_FONT_SIZE_ADJUST = "font-size-adjust"; //$NON-NLS-1$
-	final static String P_FONT_STRETCH = "font-stretch"; //$NON-NLS-1$
-	final static String P_FONT_STYLE = "font-style"; //$NON-NLS-1$
-	final static String P_FONT_VARIANT = "font-variant"; //$NON-NLS-1$
-	final static String P_FONT_WEIGHT = "font-weight"; //$NON-NLS-1$
-	final static String P_HEIGHT = "height"; //$NON-NLS-1$
-	final static String P_LEFT = "left"; //$NON-NLS-1$
-	final static String P_LETTER_SPACING = "letter-spacing"; //$NON-NLS-1$
-	final static String P_LINE_HEIGHT = "line-height"; //$NON-NLS-1$
-	final static String P_LIST_STYLE = "list-style"; //$NON-NLS-1$
-	final static String P_LIST_STYLE_IMAGE = "list-style-image"; //$NON-NLS-1$
-	final static String P_LIST_STYLE_POSITION = "list-style-position"; //$NON-NLS-1$
-	final static String P_LIST_STYLE_TYPE = "list-style-type"; //$NON-NLS-1$
-	final static String P_MARGIN = "margin"; //$NON-NLS-1$
-	final static String P_MARGIN_TOP = "margin-top"; //$NON-NLS-1$
-	final static String P_MARGIN_RIGHT = "margin-right"; //$NON-NLS-1$
-	final static String P_MARGIN_BOTTOM = "margin-bottom"; //$NON-NLS-1$
-	final static String P_MARGIN_LEFT = "margin-left"; //$NON-NLS-1$
-	final static String P_MARKER_OFFSET = "marker-offset"; //$NON-NLS-1$
-	final static String P_MARKS = "marks"; //$NON-NLS-1$
-	final static String P_MAX_HEIGHT = "max-height"; //$NON-NLS-1$
-	final static String P_MAX_WIDTH = "max-width"; //$NON-NLS-1$
-	final static String P_MIN_HEIGHT = "min-height"; //$NON-NLS-1$
-	final static String P_MIN_WIDTH = "min-width"; //$NON-NLS-1$
-	final static String P_ORPHANS = "orphans"; //$NON-NLS-1$
-	final static String P_OUTLINE = "outline"; //$NON-NLS-1$
-	final static String P_OUTLINE_COLOR = "outline-color"; //$NON-NLS-1$
-	final static String P_OUTLINE_STYLE = "outline-style"; //$NON-NLS-1$
-	final static String P_OUTLINE_WIDTH = "outline-width"; //$NON-NLS-1$
-	final static String P_OVERFLOW = "overflow"; //$NON-NLS-1$
-	final static String P_PADDING = "padding"; //$NON-NLS-1$
-	final static String P_PADDING_TOP = "padding-top"; //$NON-NLS-1$
-	final static String P_PADDING_RIGHT = "padding-right"; //$NON-NLS-1$
-	final static String P_PADDING_BOTTOM = "padding-bottom"; //$NON-NLS-1$
-	final static String P_PADDING_LEFT = "padding-left"; //$NON-NLS-1$
-	final static String P_PAGE = "page"; //$NON-NLS-1$
-	final static String P_PAGE_BREAK_AFTER = "page-break-after"; //$NON-NLS-1$
-	final static String P_PAGE_BREAK_BEFORE = "page-break-before"; //$NON-NLS-1$
-	final static String P_PAGE_BREAK_INSIDE = "page-break-inside"; //$NON-NLS-1$
-	final static String P_PAUSE = "pause"; //$NON-NLS-1$
-	final static String P_PAUSE_AFTER = "pause-after"; //$NON-NLS-1$
-	final static String P_PAUSE_BEFORE = "pause-before"; //$NON-NLS-1$
-	final static String P_PITCH = "pitch"; //$NON-NLS-1$
-	final static String P_PITCH_RANGE = "pitch-range"; //$NON-NLS-1$
-	final static String P_PLAY_DURING = "play-during"; //$NON-NLS-1$
-	final static String P_POSITION = "position"; //$NON-NLS-1$
-	final static String P_QUOTES = "quotes"; //$NON-NLS-1$
-	final static String P_RICHNESS = "richness"; //$NON-NLS-1$
-	final static String P_RIGHT = "right"; //$NON-NLS-1$
-	final static String P_SIZE = "size"; //$NON-NLS-1$
-	final static String P_SPEAK = "speak"; //$NON-NLS-1$
-	final static String P_SPEAK_HEADER = "speak-header"; //$NON-NLS-1$
-	final static String P_SPEAK_NUMERAL = "speak-numeral"; //$NON-NLS-1$
-	final static String P_SPEAK_PUNCTUATION = "speak-punctuation"; //$NON-NLS-1$
-	final static String P_SPEECH_RATE = "speech-rate"; //$NON-NLS-1$
-	final static String P_STRESS = "stress"; //$NON-NLS-1$
-	final static String P_TABLE_LAYOUT = "table-layout"; //$NON-NLS-1$
-	final static String P_TEXT_ALIGN = "text-align"; //$NON-NLS-1$
-	final static String P_TEXT_DECORATION = "text-decoration"; //$NON-NLS-1$
-	final static String P_TEXT_INDENT = "text-indent"; //$NON-NLS-1$
-	final static String P_TEXT_SHADOW = "text-shadow"; //$NON-NLS-1$
-	final static String P_TEXT_TRANSFORM = "text-transform"; //$NON-NLS-1$
-	final static String P_TOP = "top"; //$NON-NLS-1$
-	final static String P_UNICODE_BIDI = "unicode-bidi"; //$NON-NLS-1$
-	final static String P_VERTICAL_ALIGN = "vertical-align"; //$NON-NLS-1$
-	final static String P_VISIBILITY = "visibility"; //$NON-NLS-1$
-	final static String P_VOICE_FAMILY = "voice-family"; //$NON-NLS-1$
-	final static String P_VOLUME = "volume"; //$NON-NLS-1$
-	final static String P_WHITE_SPACE = "white-space"; //$NON-NLS-1$
-	final static String P_WIDOWS = "widows"; //$NON-NLS-1$
-	final static String P_WIDTH = "width"; //$NON-NLS-1$
-	final static String P_WORD_SPACING = "word-spacing"; //$NON-NLS-1$
-	final static String P_Z_INDEX = "z-index"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSStringID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSStringID.java
deleted file mode 100644
index c625191..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSStringID.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel.util;
-
-public interface CSSStringID {
-
-	final static String S_ANY = "any"; //$NON-NLS-1$
-	final static String S_COUNTER_IDENTIFIER = "counter-identifier"; //$NON-NLS-1$
-	final static String S_FAMILY_NAME = "family-name"; //$NON-NLS-1$
-	final static String S_FONT_FACE_NAME = "font-face-name"; //$NON-NLS-1$
-	final static String S_PAGE_IDENTIFIER = "page-identifier"; //$NON-NLS-1$
-	final static String S_SPECIFIC_VOICE = "specific-voice"; //$NON-NLS-1$
-	final static String S_URANGE = "urange"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSUnitID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSUnitID.java
deleted file mode 100644
index ce2b5f1..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSUnitID.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodel.util;
-
-public interface CSSUnitID {
-
-	final static String U_CM = "cm";//$NON-NLS-1$
-	final static String U_DEG = "deg";//$NON-NLS-1$
-	final static String U_EMS = "em";//$NON-NLS-1$
-	final static String U_EXS = "ex";//$NON-NLS-1$
-	final static String U_GRAD = "grad";//$NON-NLS-1$
-	final static String U_HASH = "#";//$NON-NLS-1$
-	final static String U_HZ = "Hz";//$NON-NLS-1$
-	final static String U_IN = "in";//$NON-NLS-1$
-	// final static String U_INTEGER = "INTEGER";//$NON-NLS-1$
-	final static String U_KHZ = "kHz";//$NON-NLS-1$
-	final static String U_MM = "mm";//$NON-NLS-1$
-	final static String U_MS = "ms";//$NON-NLS-1$
-	// final static String U_NUMBER = "NUMBER";//$NON-NLS-1$
-	final static String U_PC = "pc";//$NON-NLS-1$
-	final static String U_PERCENTAGE = "%";//$NON-NLS-1$
-	final static String U_PT = "pt";//$NON-NLS-1$
-	final static String U_PX = "px";//$NON-NLS-1$
-	final static String U_RAD = "rad";//$NON-NLS-1$
-	final static String U_S = "s";//$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMCategoryImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMCategoryImpl.java
deleted file mode 100644
index c841a62..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMCategoryImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMCategory;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-
-class CSSMMCategoryImpl extends CSSMMNodeImpl implements CSSMMCategory {
-
-	public CSSMMCategoryImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_CATEGORY;
-	}
-
-	public String getName() {
-		String name = getAttribute(ATTR_NAME);
-		if (name != null) {
-			return name.toLowerCase();
-		}
-		else {
-			return null;
-		}
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		return false;
-	}
-
-	public String getCaption() {
-		return fCaption;
-	}
-
-	void setCaption(String caption) {
-		fCaption = caption;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#getError()
-	 */
-	short getError() {
-		if (getName() == null) {
-			return MetaModelErrors.ERROR_NOT_DEFINED;
-		}
-		else if (getCaption() == null) {
-			return MetaModelErrors.ERROR_NO_CHILD;
-		}
-		else {
-			return MetaModelErrors.NO_ERROR;
-		}
-	}
-
-	/*
-	 * @see Object#toString()
-	 */
-	public String toString() {
-		return getCaption();
-	}
-
-
-	private String fCaption = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMCharsetRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMCharsetRuleImpl.java
deleted file mode 100644
index 007deb6..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMCharsetRuleImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMCharsetRule;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-
-class CSSMMCharsetRuleImpl extends CSSMMNodeImpl implements CSSMMCharsetRule {
-
-
-	public CSSMMCharsetRuleImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_CHARSET_RULE;
-	}
-
-	public String getName() {
-		return NAME_NOT_AVAILABLE;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		return false;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#getError()
-	 */
-	short getError() {
-		return MetaModelErrors.NO_ERROR;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMContainerImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMContainerImpl.java
deleted file mode 100644
index 5e4c581..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMContainerImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMContainer;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-
-class CSSMMContainerImpl extends CSSMMNodeImpl implements CSSMMContainer {
-
-
-	public CSSMMContainerImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_CONTAINER;
-	}
-
-	public String getName() {
-		String name = getAttribute(ATTR_NAME);
-		if (name != null) {
-			return name.toLowerCase();
-		}
-		else {
-			return null;
-		}
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		if (child == null) {
-			return false;
-		}
-		String type = child.getType();
-		return (type == TYPE_NUMBER || type == TYPE_KEYWORD || type == TYPE_FUNCTION || type == TYPE_CONTAINER);
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#getError()
-	 */
-	short getError() {
-		if (getName() == null) {
-			return MetaModelErrors.ERROR_NOT_DEFINED;
-		}
-		else if (getChildCount() == 0) {
-			return MetaModelErrors.ERROR_NO_CHILD;
-		}
-		else {
-			return MetaModelErrors.NO_ERROR;
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMDescriptorImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMDescriptorImpl.java
deleted file mode 100644
index 7026c24..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMDescriptorImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMDescriptor;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-
-
-class CSSMMDescriptorImpl extends CSSMMNodeImpl implements CSSMMDescriptor {
-
-
-	public CSSMMDescriptorImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_DESCRIPTOR;
-	}
-
-	public String getName() {
-		String name = getAttribute(ATTR_NAME);
-		if (name != null) {
-			return name.toLowerCase();
-		}
-		else {
-			return null;
-		}
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		if (child == null) {
-			return false;
-		}
-		String type = child.getType();
-		return (type == TYPE_NUMBER || type == TYPE_KEYWORD || type == TYPE_FUNCTION || type == TYPE_CONTAINER || type == TYPE_STRING || type == TYPE_SEPARATOR);
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#getError()
-	 */
-	short getError() {
-		if (getName() == null) {
-			return MetaModelErrors.ERROR_NOT_DEFINED;
-		}
-		else if (getChildCount() == 0) {
-			return MetaModelErrors.ERROR_NO_CHILD;
-		}
-		else {
-			return MetaModelErrors.NO_ERROR;
-		}
-	}
-
-	/*
-	 * @see CSSMMDescriptor#getValues()
-	 */
-	public Iterator getValues() {
-		ValueCollector collector = new ValueCollector();
-		collector.apply(this);
-		return collector.getNodes();
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMFontFaceRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMFontFaceRuleImpl.java
deleted file mode 100644
index c8d561e..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMFontFaceRuleImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMFontFaceRule;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-
-class CSSMMFontFaceRuleImpl extends CSSMMNodeImpl implements CSSMMFontFaceRule {
-
-
-	public CSSMMFontFaceRuleImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_FONT_FACE_RULE;
-	}
-
-	public String getName() {
-		return NAME_NOT_AVAILABLE;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		return (child != null && child.getType() == TYPE_DESCRIPTOR);
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#getError()
-	 */
-	short getError() {
-		return MetaModelErrors.NO_ERROR;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMFunctionImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMFunctionImpl.java
deleted file mode 100644
index a26b099..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMFunctionImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMFunction;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-
-class CSSMMFunctionImpl extends CSSMMNodeImpl implements CSSMMFunction {
-
-	public CSSMMFunctionImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_FUNCTION;
-	}
-
-	public String getName() {
-		String name = getAttribute(ATTR_NAME);
-		if (name != null) {
-			return name.toLowerCase();
-		}
-		else {
-			return null;
-		}
-	}
-
-	public String getFunctionString() {
-		return fValue;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		return false;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#postSetAttribute()
-	 */
-	// void postSetAttribute() throws BadInitializationException {
-	// super.postSetAttribute();
-	// String name = getName();
-	// if (name == null) { throw new BadInitializationException(); }
-	//
-	// List list = new ArrayList();
-	// list.add(CSSFunctionID.F_ATTR);
-	// list.add(CSSFunctionID.F_COUNTER);
-	// list.add(CSSFunctionID.F_RGB);
-	// list.add(CSSFunctionID.F_RECT);
-	// list.add(CSSFunctionID.F_URI);
-	// list.add(CSSFunctionID.F_FORMAT);
-	// list.add(CSSFunctionID.F_LOCAL);
-	//
-	// if (! list.contains(name.toLowerCase())) {
-	// throw new BadInitializationException();
-	// }
-	// }
-	/*
-	 * @see Object#toString()
-	 */
-	public String toString() {
-		return getFunctionString();
-	}
-
-	void setFunctionString(String value) {
-		fValue = value;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#getError()
-	 */
-	short getError() {
-		if (getName() == null) {
-			return MetaModelErrors.ERROR_NOT_DEFINED;
-		}
-		else if (getFunctionString() == null) {
-			return MetaModelErrors.ERROR_NO_CHILD;
-		}
-		else {
-			return MetaModelErrors.NO_ERROR;
-		}
-	}
-
-
-	private String fValue = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMImportRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMImportRuleImpl.java
deleted file mode 100644
index 582ea8b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMImportRuleImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMImportRule;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-
-class CSSMMImportRuleImpl extends CSSMMNodeImpl implements CSSMMImportRule {
-
-
-	public CSSMMImportRuleImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_IMPORT_RULE;
-	}
-
-	public String getName() {
-		return NAME_NOT_AVAILABLE;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		return false;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#getError()
-	 */
-	short getError() {
-		return MetaModelErrors.NO_ERROR;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMKeywordImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMKeywordImpl.java
deleted file mode 100644
index b46042e..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMKeywordImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMKeyword;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-
-class CSSMMKeywordImpl extends CSSMMNodeImpl implements CSSMMKeyword {
-
-	public CSSMMKeywordImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_KEYWORD;
-	}
-
-	public String getName() {
-		String name = getAttribute(ATTR_NAME);
-		if (name != null) {
-			return name.toLowerCase();
-		}
-		else {
-			return null;
-		}
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		return false;
-	}
-
-	/*
-	 * @see CSSMMKeyword#getKeywordString()
-	 */
-	public String getKeywordString() {
-		return fValue;
-	}
-
-	/*
-	 * @see Object#toString()
-	 */
-	public String toString() {
-		return getKeywordString();
-	}
-
-	void setKeywordString(String value) {
-		fValue = value;
-	}
-
-	short getError() {
-		if (getName() == null) {
-			return MetaModelErrors.ERROR_NOT_DEFINED;
-		}
-		else if (getKeywordString() == null) {
-			return MetaModelErrors.ERROR_NO_CHILD;
-		}
-		else {
-			return MetaModelErrors.NO_ERROR;
-		}
-	}
-
-
-	private String fValue = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMMediaRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMMediaRuleImpl.java
deleted file mode 100644
index 92dec7d..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMMediaRuleImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMMediaRule;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-
-class CSSMMMediaRuleImpl extends CSSMMNodeImpl implements CSSMMMediaRule {
-
-
-	public CSSMMMediaRuleImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_MEDIA_RULE;
-	}
-
-	public String getName() {
-		return NAME_NOT_AVAILABLE;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		return false;
-	}
-
-	short getError() {
-		return MetaModelErrors.NO_ERROR;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMNodeImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMNodeImpl.java
deleted file mode 100644
index fb144d3..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMNodeImpl.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-
-
-abstract class CSSMMNodeImpl implements CSSMMNode {
-
-	public CSSMMNodeImpl() {
-		super();
-	}
-
-	public abstract String getType();
-
-	public String getDescription() {
-		return fDescription;
-	}
-
-	public String getAttribute(String name) {
-		if (fAttributes == null) {
-			return null;
-		}
-		return (String) fAttributes.get(name);
-	}
-
-	public Iterator getChildNodes() {
-		if (fChildNodes == null) {
-			return Collections.EMPTY_LIST.iterator();
-		}
-		else {
-			return Collections.unmodifiableCollection(fChildNodes).iterator();
-		}
-	}
-
-	public Iterator getDescendants() {
-		List descendants = new ArrayList();
-		Iterator iChild = getChildNodes();
-		while (iChild.hasNext()) {
-			CSSMMNode child = (CSSMMNode) iChild.next();
-			Iterator iDescendant = child.getDescendants();
-			if (iDescendant.hasNext()) {
-				while (iDescendant.hasNext()) {
-					CSSMMNode descendant = (CSSMMNode) iDescendant.next();
-					if (!descendants.contains(descendant)) {
-						descendants.add(descendant);
-					}
-				}
-			}
-			else {
-				if (!descendants.contains(child)) {
-					descendants.add(child);
-				}
-			}
-		}
-		return Collections.unmodifiableCollection(descendants).iterator();
-	}
-
-	void appendChild(CSSMMNode child) {
-		if (child == null) {
-			return;
-		}
-		if (fChildNodes == null) {
-			fChildNodes = new ArrayList();
-		}
-		if (!fChildNodes.contains(child)) {
-			fChildNodes.add(child);
-			((CSSMMNodeImpl) child).fRefCount++;
-		}
-	}
-
-	void removeChild(CSSMMNode child) {
-		if (child == null || fChildNodes == null) {
-			return;
-		}
-		Iterator i = fChildNodes.iterator();
-		while (i.hasNext()) {
-			if (i.next() == child) {
-				i.remove();
-				((CSSMMNodeImpl) child).fRefCount--;
-				return;
-			}
-		}
-	}
-
-	void removeAllChildNodes() {
-		if (fChildNodes == null) {
-			return;
-		}
-		Iterator i = fChildNodes.iterator();
-		while (i.hasNext()) {
-			((CSSMMNodeImpl) i.next()).fRefCount--;
-		}
-		fChildNodes.clear();
-	}
-
-	abstract boolean canContain(CSSMMNode child);
-
-	void initializeAttribute(Map attributes) throws IllegalArgumentException {
-		if (fAttributes == null) {
-			fAttributes = new HashMap();
-		}
-		fAttributes.putAll(attributes);
-		postSetAttribute();
-	}
-
-	void setDescription(String description) {
-		fDescription = description;
-	}
-
-	void postSetAttribute() throws IllegalArgumentException {
-		// default : nop
-	}
-
-	abstract short getError();
-
-	int getChildCount() {
-		return (fChildNodes != null) ? fChildNodes.size() : 0;
-	}
-
-	int getReferenceCount() {
-		return fRefCount;
-	}
-
-
-	private List fChildNodes = null;
-	private String fDescription = null;
-	private Map fAttributes = null;
-	private int fRefCount = 0; // for error check
-
-	static final String ATTR_NAME = "name"; //$NON-NLS-1$
-	static final String NAME_NOT_AVAILABLE = ""; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMNumberImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMNumberImpl.java
deleted file mode 100644
index 0f2a9d8..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMNumberImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNumber;
-
-class CSSMMNumberImpl extends CSSMMNodeImpl implements CSSMMNumber {
-
-
-	public CSSMMNumberImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_NUMBER;
-	}
-
-	public String getName() {
-		String name = getAttribute(ATTR_NAME);
-		if (name != null) {
-			return name.toLowerCase();
-		}
-		else {
-			return null;
-		}
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		return (child != null && child.getType() == TYPE_UNIT);
-	}
-
-	short getError() {
-		if (getName() == null) {
-			return MetaModelErrors.ERROR_NOT_DEFINED;
-		}
-		else {
-			return MetaModelErrors.NO_ERROR;
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPageRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPageRuleImpl.java
deleted file mode 100644
index d793562..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPageRuleImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMPageRule;
-
-class CSSMMPageRuleImpl extends CSSMMNodeImpl implements CSSMMPageRule {
-
-
-	public CSSMMPageRuleImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_PAGE_RULE;
-	}
-
-	public String getName() {
-		return NAME_NOT_AVAILABLE;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		if (child == null) {
-			return false;
-		}
-		String type = child.getType();
-		return (type == TYPE_PROPERTY || type == TYPE_SELECTOR);
-	}
-
-	short getError() {
-		if (getChildCount() == 0) {
-			return MetaModelErrors.ERROR_NO_CHILD;
-		}
-		else {
-			return MetaModelErrors.NO_ERROR;
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPropertyImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPropertyImpl.java
deleted file mode 100644
index 739098b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPropertyImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMProperty;
-
-
-class CSSMMPropertyImpl extends CSSMMNodeImpl implements CSSMMProperty {
-	public CSSMMPropertyImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_PROPERTY;
-	}
-
-	public String getName() {
-		String name = getAttribute(ATTR_NAME);
-		if (name != null) {
-			return name.toLowerCase();
-		}
-		else {
-			return null;
-		}
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		if (child == null) {
-			return false;
-		}
-		String type = child.getType();
-		return (type == TYPE_NUMBER || type == TYPE_KEYWORD || type == TYPE_FUNCTION || type == TYPE_CONTAINER || type == TYPE_STRING || type == TYPE_SEPARATOR || type == TYPE_PROPERTY);
-	}
-
-	/*
-	 * @see CSSMMProperty#getCategoryName()
-	 */
-	public String getCategoryName() {
-		return getAttribute(ATTR_CATEGORY);
-	}
-
-	public Iterator getValues() {
-		ValueCollector collector = new ValueCollector();
-		collector.apply(this);
-		return collector.getNodes();
-	}
-
-	short getError() {
-		if (getName() == null) {
-			return MetaModelErrors.ERROR_NOT_DEFINED;
-		}
-		else if (getChildCount() == 0) {
-			return MetaModelErrors.ERROR_NO_CHILD;
-		}
-		else {
-			return MetaModelErrors.NO_ERROR;
-		}
-	}
-
-
-	static final String ATTR_CATEGORY = "category"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPseudoClassImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPseudoClassImpl.java
deleted file mode 100644
index b0cab9a..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPseudoClassImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-class CSSMMPseudoClassImpl extends CSSMMSelectorImpl {
-
-
-	/**
-	 * Constructor for CSSMMPseudoClassImpl.
-	 */
-	public CSSMMPseudoClassImpl() {
-		super();
-	}
-
-	/*
-	 * @see CSSMMSelector#getSelectorType()
-	 */
-	public String getSelectorType() {
-		return TYPE_PSEUDO_CLASS;
-	}
-
-	void setSelectorString(String value) {
-		fValue = ":" + value; //$NON-NLS-1$		
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPseudoElementImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPseudoElementImpl.java
deleted file mode 100644
index 71e9065..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPseudoElementImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-public class CSSMMPseudoElementImpl extends CSSMMSelectorImpl {
-
-
-	/**
-	 * Constructor for CSSMMPseudoElementImpl.
-	 */
-	public CSSMMPseudoElementImpl() {
-		super();
-	}
-
-	/*
-	 * @see CSSMMSelector#getSelectorType()
-	 */
-	public String getSelectorType() {
-		return TYPE_PSEUDO_ELEMENT;
-	}
-
-	void setSelectorString(String value) {
-		fValue = ":" + value; //$NON-NLS-1$
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMSelectorExpressionImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMSelectorExpressionImpl.java
deleted file mode 100644
index e58be60..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMSelectorExpressionImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-class CSSMMSelectorExpressionImpl extends CSSMMSelectorImpl {
-
-	public CSSMMSelectorExpressionImpl() {
-		super();
-	}
-
-	/*
-	 * @see CSSMMSelector#getSelectorType()
-	 */
-	public String getSelectorType() {
-		return TYPE_EXPRESSION;
-	}
-
-	void postSetAttribute() throws IllegalArgumentException {
-		super.postSetAttribute();
-		String name = getName();
-		if (name == null) {
-			throw new IllegalArgumentException();
-		}
-
-		Map map = new HashMap();
-		map.put(EXPRESSION_ADJACENT.toLowerCase(), "+"); //$NON-NLS-1$
-		map.put(EXPRESSION_ATTRIBUTE.toLowerCase(), "[]"); //$NON-NLS-1$
-		map.put(EXPRESSION_CHILD.toLowerCase(), ">"); //$NON-NLS-1$
-		map.put(EXPRESSION_DESCENDANT.toLowerCase(), "' '"); //$NON-NLS-1$
-		map.put(EXPRESSION_UNIVERSAL.toLowerCase(), "*"); //$NON-NLS-1$
-
-		fValue = (String) map.get(name.toLowerCase());
-		if (fValue == null) {
-			throw new IllegalArgumentException();
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMSelectorImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMSelectorImpl.java
deleted file mode 100644
index c7a82cf..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMSelectorImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMSelector;
-
-
-abstract class CSSMMSelectorImpl extends CSSMMNodeImpl implements CSSMMSelector {
-
-	/**
-	 * Constructor for CSSMMSelectorImpl.
-	 */
-	public CSSMMSelectorImpl() {
-		super();
-	}
-
-	/*
-	 * @see CSSMMNode#getName()
-	 */
-	public String getName() {
-		String name = getAttribute(ATTR_NAME);
-		if (name != null) {
-			return name.toLowerCase();
-		}
-		else {
-			return null;
-		}
-	}
-
-	/*
-	 * @see CSSMMNode#getType()
-	 */
-	public String getType() {
-		return TYPE_SELECTOR;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		return false;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#getError()
-	 */
-	short getError() {
-		if (getName() == null) {
-			return MetaModelErrors.ERROR_NOT_DEFINED;
-		}
-		else {
-			return MetaModelErrors.NO_ERROR;
-		}
-	}
-
-	/*
-	 * @see CSSMMSelector#getSelectorString()
-	 */
-	public String getSelectorString() {
-		return fValue;
-	}
-
-	/*
-	 * @see Object#toString()
-	 */
-	public String toString() {
-		return getSelectorString();
-	}
-
-
-	protected String fValue = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMStringImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMStringImpl.java
deleted file mode 100644
index 143759a..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMStringImpl.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMString;
-
-class CSSMMStringImpl extends CSSMMNodeImpl implements CSSMMString {
-
-
-	public CSSMMStringImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_STRING;
-	}
-
-	public String getName() {
-		String name = getAttribute(ATTR_NAME);
-		if (name != null) {
-			return name.toLowerCase();
-		}
-		else {
-			return null;
-		}
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		return false;
-	}
-
-	short getError() {
-		if (getName() == null) {
-			return MetaModelErrors.ERROR_NOT_DEFINED;
-		}
-		else {
-			return MetaModelErrors.NO_ERROR;
-		}
-	}
-	/*
-	 * @see CSSMMNodeImpl#postSetAttribute()
-	 */
-	// void postSetAttribute() throws BadInitializationException {
-	// super.postSetAttribute();
-	// String name = getName();
-	// if (name == null) { throw new BadInitializationException(); }
-	//
-	// Map map = new HashMap();
-	// map.put(CSSStringID.S_ANY.toLowerCase(), "<any>"); //$NON-NLS-1$
-	// map.put(CSSStringID.S_COUNTER_IDENTIFIER.toLowerCase(), "<counter>");
-	// //$NON-NLS-1$
-	// map.put(CSSStringID.S_FAMILY_NAME.toLowerCase(), "<family-name>");
-	// //$NON-NLS-1$
-	// map.put(CSSStringID.S_FONT_FACE_NAME.toLowerCase(),
-	// "<font-face-name>"); //$NON-NLS-1$
-	// map.put(CSSStringID.S_PAGE_IDENTIFIER.toLowerCase(),
-	// "<page-identifier>"); //$NON-NLS-1$
-	// map.put(CSSStringID.S_SPECIFIC_VOICE.toLowerCase(),
-	// "<specific-voice>"); //$NON-NLS-1$
-	// map.put(CSSStringID.S_URANGE.toLowerCase(), "<urange>"); //$NON-NLS-1$
-	//
-	// fValue = (String)map.get(name.toLowerCase());
-	// if (fValue == null) { throw new BadInitializationException(); }
-	// }
-	//
-	// /*
-	// * @see Object#toString()
-	// */
-	// public String toString() {
-	// return fValue;
-	// }
-	//
-	// private String fValue = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMStyleRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMStyleRuleImpl.java
deleted file mode 100644
index 706cff6..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMStyleRuleImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMStyleRule;
-
-class CSSMMStyleRuleImpl extends CSSMMNodeImpl implements CSSMMStyleRule {
-
-
-	public CSSMMStyleRuleImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_STYLE_RULE;
-	}
-
-	public String getName() {
-		return NAME_NOT_AVAILABLE;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		if (child == null) {
-			return false;
-		}
-		String type = child.getType();
-		return (type == TYPE_PROPERTY || type == TYPE_SELECTOR);
-	}
-
-	short getError() {
-		if (getChildCount() == 0) {
-			return MetaModelErrors.ERROR_NO_CHILD;
-		}
-		else {
-			return MetaModelErrors.NO_ERROR;
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMStyleSheetImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMStyleSheetImpl.java
deleted file mode 100644
index a9de98a..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMStyleSheetImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMStyleSheet;
-
-class CSSMMStyleSheetImpl extends CSSMMNodeImpl implements CSSMMStyleSheet {
-
-
-	public CSSMMStyleSheetImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_STYLE_SHEET;
-	}
-
-	public String getName() {
-		return NAME_NOT_AVAILABLE;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		if (child == null) {
-			return false;
-		}
-		String type = child.getType();
-		return (type == TYPE_CHARSET_RULE || type == TYPE_IMPORT_RULE || type == TYPE_PAGE_RULE || type == TYPE_MEDIA_RULE || type == TYPE_FONT_FACE_RULE || type == TYPE_STYLE_RULE);
-	}
-
-	short getError() {
-		if (getChildCount() == 0) {
-			return MetaModelErrors.ERROR_NO_CHILD;
-		}
-		else {
-			return MetaModelErrors.NO_ERROR;
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMUnitImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMUnitImpl.java
deleted file mode 100644
index 74f3f3e..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMUnitImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMUnit;
-
-/**
- * CSSMMUnit : embedded type
- */
-class CSSMMUnitImpl extends CSSMMNodeImpl implements CSSMMUnit {
-
-	public CSSMMUnitImpl() {
-		super();
-	}
-
-	public String getType() {
-		return TYPE_UNIT;
-	}
-
-	public String getName() {
-		String name = getAttribute(ATTR_NAME);
-		if (name != null) {
-			return name.toLowerCase();
-		}
-		else {
-			return null;
-		}
-	}
-
-	/*
-	 * @see CSSMMUnit#getUnitString()
-	 */
-	public String getUnitString() {
-		return fValue;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		return false;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#postSetAttribute()
-	 */
-	// void postSetAttribute() throws BadInitializationException {
-	// super.postSetAttribute();
-	// String name = getName();
-	// if (name == null) { throw new BadInitializationException(); }
-	// Map map = new HashMap();
-	// map.put(CSSUnitID.U_CM.toLowerCase(), "cm");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_DEG.toLowerCase(), "deg");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_EMS.toLowerCase(), "em");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_EXS.toLowerCase(), "ex");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_GRAD.toLowerCase(), "grad");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_HASH.toLowerCase(), "#");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_HZ.toLowerCase(), "Hz");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_IN.toLowerCase(), "in");//$NON-NLS-1$
-	// // map.put(CSSUnitID.U_INTEGER.toLowerCase(),
-	// "(integer)");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_KHZ.toLowerCase(), "kHz");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_MM.toLowerCase(), "mm");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_MS.toLowerCase(), "ms");//$NON-NLS-1$
-	// // map.put(CSSUnitID.U_NUMBER.toLowerCase(), "(number)");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_PC.toLowerCase(), "pc");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_PERCENTAGE.toLowerCase(), "%");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_PT.toLowerCase(), "pt");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_PX.toLowerCase(), "px");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_RAD.toLowerCase(), "rad");//$NON-NLS-1$
-	// map.put(CSSUnitID.U_S.toLowerCase(), "s");//$NON-NLS-1$
-	// fValue = (String)map.get(name.toLowerCase());
-	// if (fValue == null) { throw new BadInitializationException(); }
-	// }
-	/*
-	 * @see Object#toString()
-	 */
-	public String toString() {
-		return getUnitString();
-	}
-
-	void setUnitString(String value) {
-		fValue = value;
-	}
-
-	short getError() {
-		if (getName() == null) {
-			return MetaModelErrors.ERROR_NOT_DEFINED;
-		}
-		else if (getUnitString() == null) {
-			return MetaModelErrors.ERROR_NO_CHILD;
-		}
-		else {
-			return MetaModelErrors.NO_ERROR;
-		}
-	}
-
-	private String fValue = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMetaModelImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMetaModelImpl.java
deleted file mode 100644
index 85725d4..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMetaModelImpl.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMStyleSheet;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel;
-
-
-class CSSMetaModelImpl extends CSSMMNodeImpl implements CSSMetaModel {
-	// class CSSMetaModelImpl implements CSSMetaModel {
-	public CSSMetaModelImpl() {
-		super();
-		fNodePool = new NodePool();
-	}
-
-	public String getType() {
-		return TYPE_META_MODEL;
-	}
-
-	public String getName() {
-		return NAME_NOT_AVAILABLE;
-	}
-
-	/*
-	 * @see CSSMMNodeImpl#canContain(CSSMMNode)
-	 */
-	boolean canContain(CSSMMNode child) {
-		if (child == null) {
-			return false;
-		}
-		String type = child.getType();
-		return (type == TYPE_STYLE_SHEET || type == TYPE_CATEGORY);
-	}
-
-	public CSSMMStyleSheet getStyleSheet() {
-		Iterator i = getChildNodes();
-		while (i.hasNext()) {
-			CSSMMNode node = (CSSMMNode) i.next();
-			if (node.getType() == TYPE_STYLE_SHEET) {
-				return (CSSMMStyleSheet) node;
-			}
-		}
-		return null;
-		// return fStyleSheet;
-	}
-
-	public Iterator getCategories() {
-		List categories = new ArrayList();
-		Iterator i = getChildNodes();
-		while (i.hasNext()) {
-			CSSMMNode node = (CSSMMNode) i.next();
-			if (node.getType() == TYPE_CATEGORY) {
-				categories.add(node);
-			}
-		}
-		return categories.iterator();
-	}
-
-	void loadCompleted() {
-		fNodePool = null;
-	}
-
-	// List fCategories = null;
-	/*
-	 * @see CSSMMNodeImpl#isValid()
-	 */
-	short getError() {
-		if (getStyleSheet() != null) {
-			return MetaModelErrors.ERROR_NO_CHILD;
-		}
-		else {
-			return MetaModelErrors.NO_ERROR;
-		}
-	}
-
-	NodePool getNodePool() {
-		return fNodePool;
-	}
-
-
-	private NodePool fNodePool = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSProfileImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSProfileImpl.java
deleted file mode 100644
index ab81cd7..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSProfileImpl.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.css.core.internal.Logger;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel;
-import org.eclipse.wst.css.core.internal.metamodel.CSSProfile;
-import org.osgi.framework.Bundle;
-
-
-
-class CSSProfileImpl implements CSSProfile {
-
-	/**
-	 * Constructor for CSSMetaModelProfileInfoImpl.
-	 */
-	private CSSProfileImpl() {
-		super();
-	}
-
-	/**
-	 * Constructor for CSSMetaModelProfileInfoImpl.
-	 */
-	public CSSProfileImpl(String id, URL url) {
-		super();
-		fID = id;
-		fURL = url;
-	}
-
-	/*
-	 * @see CSSMetaModelProfileInfo#getProfileID()
-	 */
-	public String getProfileID() {
-		return fID;
-	}
-
-	/*
-	 * @see CSSMetaModelProfileInfo#getProfileName()
-	 */
-	public String getProfileName() {
-		return (fName == null) ? fID : fName;
-	}
-
-	public CSSMetaModel getMetaModel() {
-		if (fMetaModel == null) {
-			try {
-				InputStream input = getProfileURL().openStream();
-				ProfileLoader loader = new ProfileLoader(getResourceBundle(), getLogging());
-				fMetaModel = loader.loadProfile(input);
-			}
-			catch (IOException e) {
-				Logger.logException("Cannot open stream for profile", e); //$NON-NLS-1$
-			}
-		}
-		return fMetaModel;
-	}
-
-	private ResourceBundle getResourceBundle() {
-		ClassLoader targetLoader = null;
-		String pluginID = getOwnerPluginID();
-		if (pluginID != null) {
-			Bundle bundle = Platform.getBundle(pluginID);
-			if (bundle != null) {
-				targetLoader = bundle.getClass().getClassLoader();
-			}
-		}
-		if (targetLoader == null) {
-			targetLoader = this.getClass().getClassLoader();
-		}
-
-		String profileURLString = getProfileURL().toString();
-		int lastSlashPos = profileURLString.lastIndexOf('/');
-		if (1 < lastSlashPos) {
-			String profileURLBase = profileURLString.substring(0, lastSlashPos + 1);
-			try {
-				URL[] urls = new URL[]{new URL(profileURLBase)};
-				targetLoader = URLClassLoader.newInstance(urls, targetLoader);
-			}
-			catch (MalformedURLException e) {
-			}
-		}
-
-		try {
-			return ResourceBundle.getBundle("cssprofile", //$NON-NLS-1$
-						Locale.getDefault(), targetLoader);
-		}
-		catch (MissingResourceException e) {
-			return null;
-		}
-	}
-
-	/*
-	 * @see CSSMetaModelProfileInfo#getProfileURL()
-	 */
-	public URL getProfileURL() {
-		return fURL;
-	}
-
-	void setProfileName(String name) {
-		fName = name;
-	}
-
-	public boolean isDefault() {
-		return fDefault;
-	}
-
-	void setDefault(boolean isDefault) {
-		fDefault = isDefault;
-	}
-
-	public String getOwnerPluginID() {
-		return fOwnerPluginID;
-	}
-
-	void setOwnerPluginID(String pluginID) {
-		fOwnerPluginID = pluginID;
-	}
-
-	/**
-	 * hidden option : logging
-	 */
-	void setLogging(boolean logging) {
-		fLogging = logging;
-	}
-
-	boolean getLogging() {
-		return fLogging;
-	}
-
-
-	String fID = null;
-	String fName = null;
-	URL fURL = null;
-	CSSMetaModel fMetaModel = null;
-	String fOwnerPluginID = null;
-	boolean fDefault = false;
-	boolean fLogging = false;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSProfileTest.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSProfileTest.java
deleted file mode 100644
index 6711596..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSProfileTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.wst.css.core.internal.Logger;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel;
-import org.eclipse.wst.css.core.internal.metamodel.CSSProfile;
-
-
-class CSSProfileTest {
-
-
-	/**
-	 * Test use only
-	 */
-	public static void main(String[] args) {
-		if (args.length == 0)
-			return;
-		CSSMetaModel metamodel = null;
-		try {
-			CSSProfile profile = new CSSProfileImpl("test", new URL(args[0])); //$NON-NLS-1$
-			metamodel = profile.getMetaModel();
-		}
-		catch (MalformedURLException e) {
-			Logger.logException(e);
-		}
-		if (metamodel == null) {
-			return;
-		}
-		/*
-		 * CSSMMTypeCollector collector = new CSSMMTypeCollector();
-		 * collector.apply(metamodel, CSSMMNode.TYPE_PROPERTY); Iterator
-		 * iProperty = collector.getNodes(); while (iProperty.hasNext()) {
-		 * CSSMMNode node = (CSSMMNode)iProperty.next();
-		 * System.out.println("Property " + node.getName() + " can contain:");
-		 * //$NON-NLS-2$ //$NON-NLS-1$ Iterator iValue =
-		 * node.getDescendants(); while (iValue.hasNext()) {
-		 * debugOut((CSSMMNode)iValue.next(), 0, false); } }
-		 */
-		debugOut(metamodel, 0, true);
-	}
-
-	static void debugOut(CSSMMNode node, int depth, boolean recursive) {
-		String type = node.getType();
-		for (int i = 0; i < depth; i++) {
-			System.out.print("\t"); //$NON-NLS-1$
-		}
-		System.out.print("[ " + node.getName() + "(" + type + ") ]"); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
-		if (type == CSSMMNode.TYPE_UNIT || type == CSSMMNode.TYPE_KEYWORD || type == CSSMMNode.TYPE_FUNCTION || type == CSSMMNode.TYPE_SELECTOR) {
-			System.out.print(" -> " + node.toString()); //$NON-NLS-1$
-		}
-		System.out.println();
-
-		if (recursive) {
-			java.util.Iterator iNode = node.getChildNodes();
-			while (iNode.hasNext()) {
-				debugOut((CSSMMNode) iNode.next(), depth + 1, true);
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/MetaModelErrors.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/MetaModelErrors.java
deleted file mode 100644
index 968c58e..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/MetaModelErrors.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-interface MetaModelErrors {
-
-	static final short NO_ERROR = 0;
-
-	// MASK
-	static final short MASK_WARNING = 0x1000;
-	static final short MASK_ERROR = 0x2000;
-
-	// ERROR
-	static final short ERROR_NOT_DEFINED = MASK_ERROR + 0x01;
-	static final short ERROR_INVALID_NAME = MASK_ERROR + 0x04;
-	static final short ERROR_INVAILD_CHILD = MASK_ERROR + 0x02;
-	static final short ERROR_NO_CHILD = MASK_ERROR + 0x08;
-	// static final short ERROR_NO_ESSENTIAL_CHILD = MASK_ERROR + 0x10
-
-	// WARNING
-	static final short WARNING_HAS_NO_CHILD = MASK_WARNING + 0x01;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/NodePool.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/NodePool.java
deleted file mode 100644
index 7d5dd2f..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/NodePool.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.css.core.internal.Logger;
-
-
-
-class NodePool {
-
-	NodePool() {
-		super();
-		initializeClassNameTable();
-	}
-
-	CSSMMNodeImpl getNode(String tagName, String nodeName) {
-		if (nodeName != null) {
-			nodeName = nodeName.toLowerCase();
-		}
-		String className = (String) classNames.get(tagName);
-		if (className == null) {
-			return null;
-		}
-		Map nodes = (Map) nodeRegistry.get(className);
-		if (nodes == null) {
-			nodes = new HashMap();
-			nodeRegistry.put(className, nodes);
-		}
-		CSSMMNodeImpl node = (CSSMMNodeImpl) nodes.get(nodeName);
-		if (node == null) {
-			node = createNewNode(className);
-			nodes.put(nodeName, node);
-		}
-		return node;
-	}
-
-	private CSSMMNodeImpl createNewNode(String className) {
-		CSSMMNodeImpl node = null;
-		if (className != null) {
-			className = getPackageName() + "." + className; //$NON-NLS-1$
-			try {
-				node = (CSSMMNodeImpl) Class.forName(className).newInstance();
-			}
-			catch (IllegalAccessException e) {
-				Logger.logException(e);
-			}
-			catch (InstantiationException e) {
-				Logger.logException(e);
-			}
-			catch (ClassNotFoundException e) {
-				Logger.logException(e);
-			}
-		}
-		// System.out.println(className + " is Created");
-		return node;
-	}
-
-	/**
-	 * Error check function: find nodes that are not referred by any node
-	 */
-	Iterator getStrayNodes() {
-		List strayNodes = new ArrayList();
-		Iterator iMap = nodeRegistry.values().iterator();
-		while (iMap.hasNext()) {
-			Map nodes = (Map) iMap.next();
-			Iterator iNode = nodes.values().iterator();
-			while (iNode.hasNext()) {
-				CSSMMNodeImpl node = (CSSMMNodeImpl) iNode.next();
-				if (node.getReferenceCount() == 0) {
-					strayNodes.add(node);
-				}
-			}
-		}
-		return strayNodes.iterator();
-	}
-
-	// This class must not be inner class :)
-	private String getPackageName() {
-		if (fPackageName == null) {
-			String className = getClass().getName();
-			int pos = className.lastIndexOf('.');
-			if (0 < pos) {
-				fPackageName = className.substring(0, pos);
-			}
-			else {
-				fPackageName = ""; //$NON-NLS-1$
-			}
-		}
-		return fPackageName;
-	}
-
-	void initializeClassNameTable() {
-		classNames.put(ProfileKeywords.STYLESHEET_DEF, CLASS_STYLE_SHEET);
-		classNames.put(ProfileKeywords.CHARSET_RULE_DEF, CLASS_CHARSET_RULE);
-		classNames.put(ProfileKeywords.CHARSET_RULE, CLASS_CHARSET_RULE);
-		classNames.put(ProfileKeywords.FONTFACE_RULE_DEF, CLASS_FONT_FACE_RULE);
-		classNames.put(ProfileKeywords.FONTFACE_RULE, CLASS_FONT_FACE_RULE);
-		classNames.put(ProfileKeywords.IMPORT_RULE_DEF, CLASS_IMPORT_RULE);
-		classNames.put(ProfileKeywords.IMPORT_RULE, CLASS_IMPORT_RULE);
-		classNames.put(ProfileKeywords.MEDIA_RULE_DEF, CLASS_MEDIA_RULE);
-		classNames.put(ProfileKeywords.MEDIA_RULE, CLASS_MEDIA_RULE);
-		classNames.put(ProfileKeywords.PAGE_RULE_DEF, CLASS_PAGE_RULE);
-		classNames.put(ProfileKeywords.PAGE_RULE, CLASS_PAGE_RULE);
-		classNames.put(ProfileKeywords.STYLE_RULE_DEF, CLASS_STYLE_RULE);
-		classNames.put(ProfileKeywords.STYLE_RULE, CLASS_STYLE_RULE);
-		classNames.put(ProfileKeywords.PROPERTY_DEF, CLASS_PROPERTY);
-		classNames.put(ProfileKeywords.PROPERTY, CLASS_PROPERTY);
-		classNames.put(ProfileKeywords.DESCRIPTOR_DEF, CLASS_DESCRIPTOR);
-		classNames.put(ProfileKeywords.DESCRIPTOR, CLASS_DESCRIPTOR);
-		classNames.put(ProfileKeywords.CONTAINER_DEF, CLASS_CONTAINER);
-		classNames.put(ProfileKeywords.CONTAINER, CLASS_CONTAINER);
-		classNames.put(ProfileKeywords.NUMBER_DEF, CLASS_NUMBER);
-		classNames.put(ProfileKeywords.NUMBER, CLASS_NUMBER);
-		classNames.put(ProfileKeywords.KEYWORD_DEF, CLASS_KEYWORD);
-		classNames.put(ProfileKeywords.KEYWORD, CLASS_KEYWORD);
-		classNames.put(ProfileKeywords.UNIT, CLASS_UNIT);
-		classNames.put(ProfileKeywords.UNIT_DEF, CLASS_UNIT);
-		classNames.put(ProfileKeywords.FUNCTION, CLASS_FUNCTION);
-		classNames.put(ProfileKeywords.FUNCTION_DEF, CLASS_FUNCTION);
-		classNames.put(ProfileKeywords.SELECTOR_EXPRESSION, CLASS_SELECTOR_EXPRESSION);
-		classNames.put(ProfileKeywords.PSEUDO_ELEMENT, CLASS_PSEUDO_ELEMENT);
-		classNames.put(ProfileKeywords.PSEUDO_ELEMENT_DEF, CLASS_PSEUDO_ELEMENT);
-		classNames.put(ProfileKeywords.PSEUDO_CLASS, CLASS_PSEUDO_CLASS);
-		classNames.put(ProfileKeywords.PSEUDO_CLASS_DEF, CLASS_PSEUDO_CLASS);
-		classNames.put(ProfileKeywords.STRING, CLASS_STRING);
-		classNames.put(ProfileKeywords.CATEGORY_DEF, CLASS_CATEGORY);
-	}
-
-
-	private String fPackageName;
-	/*
-	 * Conversion Tables nodeRegistry : class name -> hash of node instances
-	 * classNames : Profile Tag name -> java class name
-	 */
-	private Map nodeRegistry = new HashMap();
-	private Map classNames = new HashMap();
-
-	private final static String CLASS_STYLE_SHEET = "CSSMMStyleSheetImpl"; //$NON-NLS-1$
-	private final static String CLASS_CHARSET_RULE = "CSSMMCharsetRuleImpl"; //$NON-NLS-1$
-	private final static String CLASS_FONT_FACE_RULE = "CSSMMFontFaceRuleImpl"; //$NON-NLS-1$
-	private final static String CLASS_IMPORT_RULE = "CSSMMImportRuleImpl"; //$NON-NLS-1$
-	private final static String CLASS_MEDIA_RULE = "CSSMMMediaRuleImpl"; //$NON-NLS-1$
-	private final static String CLASS_PAGE_RULE = "CSSMMPageRuleImpl"; //$NON-NLS-1$
-	private final static String CLASS_STYLE_RULE = "CSSMMStyleRuleImpl"; //$NON-NLS-1$
-	private final static String CLASS_PROPERTY = "CSSMMPropertyImpl"; //$NON-NLS-1$
-	private final static String CLASS_DESCRIPTOR = "CSSMMDescriptorImpl"; //$NON-NLS-1$
-	private final static String CLASS_CONTAINER = "CSSMMContainerImpl"; //$NON-NLS-1$
-	private final static String CLASS_NUMBER = "CSSMMNumberImpl"; //$NON-NLS-1$
-	private final static String CLASS_KEYWORD = "CSSMMKeywordImpl"; //$NON-NLS-1$
-	private final static String CLASS_UNIT = "CSSMMUnitImpl"; //$NON-NLS-1$
-	private final static String CLASS_FUNCTION = "CSSMMFunctionImpl"; //$NON-NLS-1$
-	private final static String CLASS_STRING = "CSSMMStringImpl"; //$NON-NLS-1$
-	private final static String CLASS_CATEGORY = "CSSMMCategoryImpl"; //$NON-NLS-1$
-	private final static String CLASS_SELECTOR_EXPRESSION = "CSSMMSelectorExpressionImpl"; //$NON-NLS-1$
-	private final static String CLASS_PSEUDO_CLASS = "CSSMMPseudoClassImpl"; //$NON-NLS-1$
-	private final static String CLASS_PSEUDO_ELEMENT = "CSSMMPseudoElementImpl"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ProfileHandler.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ProfileHandler.java
deleted file mode 100644
index c2b90bd..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ProfileHandler.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.Stack;
-
-import org.eclipse.wst.css.core.internal.Logger;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMSelector;
-import org.eclipse.wst.css.core.internal.metamodel.CSSProfile;
-import org.eclipse.wst.css.core.internal.metamodel.CSSProfileRegistry;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-
-class ProfileHandler extends DefaultHandler {
-
-	public ProfileHandler(CSSMetaModelImpl metamodel, ResourceBundle resourceBundle, boolean logging) {
-		super();
-		fMetaModel = metamodel;
-		fNodePool = metamodel.getNodePool();
-		fResourceBundle = resourceBundle;
-		fLogging = logging;
-	}
-
-	public ProfileHandler(CSSMetaModelImpl metamodel, ResourceBundle resourceBundle) {
-		super();
-		fMetaModel = metamodel;
-		fNodePool = metamodel.getNodePool();
-		fResourceBundle = resourceBundle;
-		fLogging = false;
-	}
-
-	private String getResourceString(String key) {
-		if (key.equals("%")) { //$NON-NLS-1$
-			return key;
-		}
-		if (!key.startsWith("%")) { //$NON-NLS-1$
-			return key;
-		}
-		if (key.startsWith("%%")) { //$NON-NLS-1$
-			return key.substring(1);
-		}
-
-		if (fResourceBundle != null) {
-			return fResourceBundle.getString(key.substring(1));
-		}
-		else {
-			return key;
-		}
-	}
-
-	public void startDocument() throws SAXException {
-		// System.out.println("startDocument");
-		// fNodeStack.push(metamodel);
-		// fCurrentNode = null;
-	}
-
-	public void endDocument() throws SAXException {
-		new ErrorCorrector().doCorrect(fMetaModel);
-		if (fLogging) {
-			Iterator i = fNodePool.getStrayNodes();
-			while (i.hasNext()) {
-				CSSMMNode node = (CSSMMNode) i.next();
-				String str = "[CSSProfile Warning] " + node.getName(); //$NON-NLS-1$
-				str += "(" + node.getType() + ") is not referred by any node."; //$NON-NLS-1$ //$NON-NLS-2$
-				Logger.log(Logger.WARNING, str);
-				// System.out.println(str);
-			}
-		}
-	}
-
-	public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
-		TagNode tagNode = null;
-		CSSMMNodeImpl parentNode = null;
-		if (0 < fNodeStack.size()) {
-			tagNode = (TagNode) fNodeStack.peek();
-			parentNode = tagNode.node;
-		}
-
-		CSSMMNodeImpl node = null;
-		if (qName.equals(ProfileKeywords.PROFILE_IMPORT)) { // import
-			String profileName = attributes.getValue(ATTR_NAME_REFERENCE);
-			importProfile(profileName);
-		}
-		else if (isDefinition(qName)) { // node creation
-			String nodeName = attributes.getValue(ATTR_NAME_DEFINITION);
-			node = fNodePool.getNode(qName, nodeName);
-			if (node != null) {
-				String overwrite = attributes.getValue(ATTR_OVERWRITE);
-				if (overwrite == null || overwrite.equals(ATTR_VALUE_OVERWRITE_FALSE)) {
-					node.removeAllChildNodes();
-				}
-				Map attrMap = new HashMap();
-				for (int i = 0; i < attributes.getLength(); i++) {
-					attrMap.put(attributes.getQName(i), attributes.getValue(i));
-				}
-				try {
-					node.initializeAttribute(attrMap);
-				}
-				catch (IllegalArgumentException e) {
-					Logger.logException(e);
-				}
-			}
-		}
-		else if (node == null) { // node reference
-			String nodeName = attributes.getValue(ATTR_NAME_REFERENCE);
-			node = fNodePool.getNode(qName, nodeName);
-		}
-
-		if (node != null) {
-			if (parentNode != null && parentNode.canContain(node)) {
-				String enabled = attributes.getValue(ATTR_ENABLED);
-				if (enabled != null && enabled.equals(ATTR_VALUE_ENABLED_FALSE)) {
-					parentNode.removeChild(node);
-				}
-				else {
-					parentNode.appendChild(node);
-				}
-			}
-			else if (node.getType() == CSSMMNode.TYPE_STYLE_SHEET || node.getType() == CSSMMNode.TYPE_CATEGORY) {
-				fMetaModel.appendChild(node);
-			}
-			else {
-				if (fLogging && parentNode != null) {
-					Logger.log(Logger.ERROR, parentNode.getType() + " cannot contain " + //$NON-NLS-1$
-								node.getType() + " (" + qName + ")"); //$NON-NLS-2$//$NON-NLS-1$
-				}
-			}
-		}
-
-		fNodeStack.push(new TagNode(qName, (node != null) ? node : parentNode));
-	}
-
-	public void endElement(String uri, String localName, String qName) throws SAXException {
-		fNodeStack.pop();
-	}
-
-	public void characters(char[] ch, int start, int length) throws SAXException {
-		TagNode tagNode = (TagNode) fNodeStack.peek();
-		String tagName = tagNode.tag;
-		if (tagName.equals(ProfileKeywords.KEYWORD_VALUE) || tagName.equals(ProfileKeywords.UNIT_VALUE) || tagName.equals(ProfileKeywords.FUNCTION_VALUE) || tagName.equals(ProfileKeywords.SELECTOR_VALUE) || tagName.equals(ProfileKeywords.DESCRIPTION) || tagName.equals(ProfileKeywords.CAPTION)) {
-			StringBuffer buf = new StringBuffer(length);
-			for (int i = 0; i < length; i++) {
-				buf.append(ch[start + i]);
-			}
-			String value = getResourceString(buf.toString().trim());
-			CSSMMNodeImpl node = tagNode.node;
-			if (node != null) {
-				if (node.getType() == CSSMMNode.TYPE_KEYWORD && tagName.equals(ProfileKeywords.KEYWORD_VALUE)) {
-					((CSSMMKeywordImpl) node).setKeywordString(value);
-				}
-				else if (node.getType() == CSSMMNode.TYPE_UNIT && tagName.equals(ProfileKeywords.UNIT_VALUE)) {
-					((CSSMMUnitImpl) node).setUnitString(value);
-				}
-				else if (node.getType() == CSSMMNode.TYPE_FUNCTION && tagName.equals(ProfileKeywords.FUNCTION_VALUE)) {
-					((CSSMMFunctionImpl) node).setFunctionString(value);
-				}
-				else if (node.getType() == CSSMMNode.TYPE_SELECTOR && ((CSSMMSelector) node).getSelectorType() == CSSMMSelector.TYPE_PSEUDO_ELEMENT) {
-					((CSSMMPseudoElementImpl) node).setSelectorString(value);
-				}
-				else if (node.getType() == CSSMMNode.TYPE_SELECTOR && ((CSSMMSelector) node).getSelectorType() == CSSMMSelector.TYPE_PSEUDO_CLASS) {
-					((CSSMMPseudoClassImpl) node).setSelectorString(value);
-				}
-				else if (node.getType() == CSSMMNode.TYPE_CATEGORY && tagName.equals(ProfileKeywords.CAPTION)) {
-					((CSSMMCategoryImpl) node).setCaption(value);
-				}
-				else if (tagName.equals(ProfileKeywords.DESCRIPTION)) {
-					node.setDescription(value);
-				}
-			}
-		}
-	}
-
-	private boolean isDefinition(String tagName) {
-		return (tagName.equals(ProfileKeywords.STYLESHEET_DEF) || tagName.equals(ProfileKeywords.CHARSET_RULE_DEF) || tagName.equals(ProfileKeywords.IMPORT_RULE_DEF) || tagName.equals(ProfileKeywords.PAGE_RULE_DEF) || tagName.equals(ProfileKeywords.MEDIA_RULE_DEF) || tagName.equals(ProfileKeywords.FONTFACE_RULE_DEF) || tagName.equals(ProfileKeywords.STYLE_RULE_DEF) || tagName.equals(ProfileKeywords.KEYWORD_DEF) || tagName.equals(ProfileKeywords.NUMBER_DEF) || tagName.equals(ProfileKeywords.PROPERTY_DEF) || tagName.equals(ProfileKeywords.DESCRIPTOR_DEF) || tagName.equals(ProfileKeywords.CONTAINER_DEF) || tagName.equals(ProfileKeywords.UNIT_DEF) || tagName.equals(ProfileKeywords.FUNCTION_DEF) || tagName.equals(ProfileKeywords.STRING) || tagName.equals(ProfileKeywords.CATEGORY_DEF) || tagName.equals(ProfileKeywords.PSEUDO_CLASS_DEF) || tagName.equals(ProfileKeywords.PSEUDO_ELEMENT_DEF) || tagName.equals(ProfileKeywords.SELECTOR_EXPRESSION) || tagName.equals(ProfileKeywords.SEPARATOR));
-	}
-
-	private void importProfile(String profileName) {
-		URL profileURL = null;
-		CSSProfileRegistry reg = CSSProfileRegistry.getInstance();
-		CSSProfile profile = reg.getProfile(profileName);
-		if (profile != null) {
-			// first: find URL by ID
-			profileURL = profile.getProfileURL();
-		}
-		else {
-			// second: find URL by filename of profile URL
-			Iterator i = reg.getProfiles();
-			while (i.hasNext()) {
-				profile = (CSSProfile) i.next();
-				URL url = profile.getProfileURL();
-				if (url.getFile().endsWith(profileName)) {
-					profileURL = url;
-					break;
-				}
-			}
-		}
-		if (profileURL == null) {
-			// final: it may be url itself
-			try {
-				profileURL = new URL(profileName);
-			}
-			catch (MalformedURLException e) {
-				Logger.logException(e);
-			}
-		}
-		if (profileURL != null) {
-			try {
-				ProfileLoader.loadProfile(fMetaModel, profileURL.openStream(), fResourceBundle, fLogging);
-			}
-			catch (IOException e) {
-				Logger.logException("Cannot open stream for profile", //$NON-NLS-1$
-							e);
-			}
-		}
-	}
-
-	class TagNode {
-
-		String tag = null;
-		CSSMMNodeImpl node = null;
-
-		TagNode(String tag, CSSMMNodeImpl node) {
-			this.tag = tag;
-			this.node = node;
-		}
-	}
-
-	class ErrorCorrector {
-
-		void doCorrect(CSSMMNodeImpl node) {
-			Iterator i = node.getChildNodes();
-			ArrayList errorNodes = new ArrayList();
-			while (i.hasNext()) {
-				CSSMMNodeImpl child = (CSSMMNodeImpl) i.next();
-				doCorrect(child);
-				short error = child.getError();
-				if (error != MetaModelErrors.NO_ERROR) {
-					// node.removeChild(child);
-					errorNodes.add(child);
-
-					String str = "[CSSProfile Error] " + node.getName(); //$NON-NLS-1$
-					str += "(" + node.getType() + ") contains error node: "; //$NON-NLS-1$ //$NON-NLS-2$
-					str += child.getName() + "(" + child.getType() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-					str += " - error code = " + error; //$NON-NLS-1$
-					if (fLogging) {
-						Logger.log(Logger.ERROR, str);
-						// System.out.println(str);
-					}
-				}
-			}
-			int errorSize = errorNodes.size();
-			if (errorSize > 0) {
-				for (int j = 0; j < errorSize; j++) {
-					CSSMMNodeImpl errorNode = (CSSMMNodeImpl) errorNodes.get(j);
-					node.removeChild(errorNode);
-				}
-			}
-		}
-	}
-
-
-	private CSSMetaModelImpl fMetaModel = null;
-	private NodePool fNodePool = null;
-	private Stack fNodeStack = new Stack();
-	boolean fLogging = false;
-	private ResourceBundle fResourceBundle = null;
-
-	private final static String ATTR_NAME_DEFINITION = "name"; //$NON-NLS-1$
-	private final static String ATTR_NAME_REFERENCE = "name"; //$NON-NLS-1$
-	private final static String ATTR_OVERWRITE = "overwrite"; //$NON-NLS-1$
-	private final static String ATTR_ENABLED = "enabled"; //$NON-NLS-1$
-	private final static String ATTR_VALUE_OVERWRITE_FALSE = "false"; //$NON-NLS-1$
-	private final static String ATTR_VALUE_ENABLED_FALSE = "false"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ProfileKeywords.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ProfileKeywords.java
deleted file mode 100644
index 468315b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ProfileKeywords.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-interface ProfileKeywords {
-
-	final static String CSS_PROFILE = "css-profile"; //$NON-NLS-1$
-	final static String PROFILE_IMPORT = "profile-import"; //$NON-NLS-1$
-	final static String STYLESHEET_DEF = "stylesheet-def"; //$NON-NLS-1$
-	final static String CHARSET_RULE = "charset-rule"; //$NON-NLS-1$
-	final static String IMPORT_RULE = "import-rule"; //$NON-NLS-1$
-	final static String PAGE_RULE = "page-rule"; //$NON-NLS-1$
-	final static String MEDIA_RULE = "media-rule"; //$NON-NLS-1$
-	final static String FONTFACE_RULE = "fontface-rule"; //$NON-NLS-1$
-	final static String STYLE_RULE = "style-rule"; //$NON-NLS-1$
-	final static String CHARSET_RULE_DEF = "charset-rule-def"; //$NON-NLS-1$
-	final static String IMPORT_RULE_DEF = "import-rule-def"; //$NON-NLS-1$
-	final static String PAGE_RULE_DEF = "page-rule-def"; //$NON-NLS-1$
-	final static String MEDIA_RULE_DEF = "media-rule-def"; //$NON-NLS-1$
-	final static String FONTFACE_RULE_DEF = "fontface-rule-def"; //$NON-NLS-1$
-	final static String STYLE_RULE_DEF = "style-rule-def"; //$NON-NLS-1$
-	final static String FUNCTION_DEF = "function-def"; //$NON-NLS-1$
-	final static String FUNCTION_VALUE = "function-value"; //$NON-NLS-1$
-	final static String KEYWORD_DEF = "keyword-def"; //$NON-NLS-1$
-	final static String KEYWORD_VALUE = "keyword-value"; //$NON-NLS-1$
-	final static String DESCRIPTION = "description"; //$NON-NLS-1$
-	final static String NUMBER_DEF = "number-def"; //$NON-NLS-1$
-	final static String UNIT = "unit"; //$NON-NLS-1$
-	final static String UNIT_DEF = "unit-def"; //$NON-NLS-1$
-	final static String UNIT_VALUE = "unit-value"; //$NON-NLS-1$
-	final static String CONTAINER_DEF = "container-def"; //$NON-NLS-1$
-	final static String CATEGORY_DEF = "category-def"; //$NON-NLS-1$
-	final static String CAPTION = "caption"; //$NON-NLS-1$
-	final static String PROPERTY_DEF = "property-def"; //$NON-NLS-1$
-	final static String DESCRIPTOR_DEF = "descriptor-def"; //$NON-NLS-1$
-	final static String SELECTOR_EXPRESSION = "selector-expression"; //$NON-NLS-1$
-	final static String PSEUDO_CLASS = "pseudo-class"; //$NON-NLS-1$
-	final static String PSEUDO_ELEMENT = "pseudo-element"; //$NON-NLS-1$
-	final static String PSEUDO_CLASS_DEF = "pseudo-class-def"; //$NON-NLS-1$
-	final static String PSEUDO_ELEMENT_DEF = "pseudo-element-def"; //$NON-NLS-1$
-	final static String SELECTOR_VALUE = "selector-value"; //$NON-NLS-1$
-	final static String NUMBER = "number"; //$NON-NLS-1$
-	final static String KEYWORD = "keyword"; //$NON-NLS-1$
-	final static String FUNCTION = "function"; //$NON-NLS-1$
-	final static String CONTAINER = "container"; //$NON-NLS-1$
-	final static String STRING = "string"; //$NON-NLS-1$
-	final static String SEPARATOR = "separator"; //$NON-NLS-1$
-	final static String PROPERTY = "property"; //$NON-NLS-1$
-	final static String DESCRIPTOR = "descriptor"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ProfileLoader.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ProfileLoader.java
deleted file mode 100644
index 18262e1..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ProfileLoader.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.css.core.internal.Logger;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-
-
-
-class ProfileLoader {
-
-
-	/**
-	 * Constructor for ProfileLoader.
-	 */
-	private ProfileLoader() {
-		super();
-	}
-
-	ProfileLoader(ResourceBundle resourceBundle, boolean logging) {
-		super();
-		fResourceBundle = resourceBundle;
-		fLogging = logging;
-	}
-
-	static void loadProfile(CSSMetaModelImpl metamodel, InputStream input, ResourceBundle resourceBundle, boolean logging) {
-		try {
-			XMLReader xmlReader = XMLReaderUtil.createXMLReader(PARSER_NAME);
-			// XMLReaderFactory.createXMLReader(PARSER_NAME);
-			xmlReader.setContentHandler(new ProfileHandler(metamodel, resourceBundle, logging));
-			xmlReader.parse(new InputSource(input));
-		}
-		catch (IOException e) {
-			Logger.logException(e);
-		}
-		catch (SAXException e) {
-			Logger.logException(e);
-		}
-	}
-
-	CSSMetaModel loadProfile(InputStream input) {
-		if (fMetaModel == null) {
-			fMetaModel = new CSSMetaModelImpl();
-		}
-		loadProfile(fMetaModel, input, fResourceBundle, fLogging);
-		fMetaModel.loadCompleted();
-		return fMetaModel;
-	}
-
-
-	CSSMetaModelImpl fMetaModel = null;
-	private final static String PARSER_NAME = "org.apache.xerces.parsers.SAXParser"; //$NON-NLS-1$
-	private ResourceBundle fResourceBundle = null;
-	private boolean fLogging = false;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/RegistryReader.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/RegistryReader.java
deleted file mode 100644
index c328e2c..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/RegistryReader.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-
-
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.css.core.internal.Logger;
-import org.eclipse.wst.css.core.internal.metamodel.CSSProfile;
-import org.osgi.framework.Bundle;
-
-
-
-public class RegistryReader {
-
-	//
-	private String PLUGIN_ID = "org.eclipse.wst.sse.core"; //$NON-NLS-1$
-	private String EXTENSION_POINT_ID = "cssprofile"; //$NON-NLS-1$
-	private String TAG_NAME = "profile"; //$NON-NLS-1$
-	private String ATT_ID = "id"; //$NON-NLS-1$
-	private String ATT_NAME = "name"; //$NON-NLS-1$
-	private String ATT_URI = "uri"; //$NON-NLS-1$
-	private String ATT_DEFAULT = "default"; //$NON-NLS-1$
-	private String ATT_LOGGING = "logging"; // Hidden Option //$NON-NLS-1$
-
-	/**
-	 * Constructor for CSSMetaModelRegistryReader.
-	 */
-	public RegistryReader() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	protected CSSProfile readElement(IConfigurationElement element) {
-		CSSProfileImpl info = null;
-		if (element.getName().equals(TAG_NAME)) {
-			String strID = element.getAttribute(ATT_ID);
-			String strNAME = element.getAttribute(ATT_NAME);
-			String strURI = element.getAttribute(ATT_URI);
-
-			if (strID != null || strURI != null) {
-				Bundle bundle = null;
-				String pluginId = element.getDeclaringExtension().getNamespace();
-				bundle = Platform.getBundle(pluginId);
-				if (bundle != null) {
-					Path path = new Path(strURI);
-					URL url = Platform.find(bundle, path);
-					if (url != null) {
-						try {
-							url = Platform.asLocalURL(url);
-							info = new CSSProfileImpl(strID, url);
-							info.setProfileName(strNAME);
-							info.setDefault((element.getAttribute(ATT_DEFAULT) != null));
-							info.setLogging((element.getAttribute(ATT_LOGGING) != null));
-							info.setOwnerPluginID(pluginId);
-						}
-						catch (java.io.IOException e) {
-							// through
-						}
-					}
-				}
-			}
-
-			if (info == null) {
-				Logger.log(Logger.ERROR, "Error reading CSS Profile: " + strID); //$NON-NLS-1$
-			}
-		}
-		return info;
-	}
-
-	/**
-	 * We simply require an 'add' method, of what ever it is we are to read
-	 * into
-	 */
-	public Iterator enumProfiles() {
-		Set set = new HashSet();
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint point = registry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
-		if (point != null) {
-			IConfigurationElement[] elements = point.getConfigurationElements();
-			for (int i = 0; i < elements.length; i++) {
-				CSSProfile info = readElement(elements[i]);
-				// null can be returned if there's an error reading the
-				// element
-				if (info != null) {
-					set.add(info);
-				}
-			}
-		}
-		return set.iterator();
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ValueCollector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ValueCollector.java
deleted file mode 100644
index b42dead..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ValueCollector.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelTraverser;
-
-
-
-class ValueCollector extends CSSMetaModelTraverser {
-	public void begin(CSSMMNode node) {
-		fNodes = new ArrayList();
-	}
-
-	protected short preNode(CSSMMNode node) {
-		short rc = TRAV_CONT;
-		if (node != null) {
-			String type = node.getType();
-			if (type == CSSMMNode.TYPE_PROPERTY || type == CSSMMNode.TYPE_DESCRIPTOR || type == CSSMMNode.TYPE_CONTAINER) {
-				rc = TRAV_CONT;
-			}
-			else {
-				if (!fNodes.contains(node)) {
-					fNodes.add(node);
-					rc = TRAV_PRUNE;
-				}
-			}
-		}
-		return rc;
-	}
-
-	public Iterator getNodes() {
-		return fNodes.iterator();
-	}
-
-
-	private List fNodes = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/XMLReaderUtil.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/XMLReaderUtil.java
deleted file mode 100644
index 2e894cd..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/XMLReaderUtil.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.metamodelimpl;
-
-
-
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.wst.css.core.internal.Logger;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-
-
-class XMLReaderUtil {
-
-	static public XMLReader createXMLReader(String className) throws SAXException {
-		try {
-			return SAXParserFactory.newInstance().newSAXParser().getXMLReader();
-		}
-		catch (ParserConfigurationException e) {
-			Logger.logException(e);
-		}
-		catch (FactoryConfigurationError e) {
-			Logger.logException(e);
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/modelhandler/CSSModelLoader.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/modelhandler/CSSModelLoader.java
deleted file mode 100644
index 644e7d7..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/modelhandler/CSSModelLoader.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.modelhandler;
-
-
-import org.eclipse.wst.css.core.internal.document.CSSModelImpl;
-import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.model.AbstractModelLoader;
-import org.eclipse.wst.sse.core.internal.provisional.IModelLoader;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-
-/**
- * 
- */
-public class CSSModelLoader extends AbstractModelLoader {
-	/**
-	 * CSSLoader constructor comment.
-	 */
-	public CSSModelLoader() {
-		super();
-	}
-
-	/*
-	 * @see IModelLoader#newModel()
-	 */
-	public IStructuredModel newModel() {
-		IStructuredModel model = new CSSModelImpl();
-		// now done in create
-		// model.setStructuredDocument(createNewStructuredDocument());
-		// model.setFactoryRegistry(defaultFactoryRegistry());
-		return model;
-	}
-
-	public IModelLoader newInstance() {
-		return new CSSModelLoader();
-	}
-
-	public IDocumentLoader getDocumentLoader() {
-		if (documentLoaderInstance == null) {
-			documentLoaderInstance = new CSSDocumentLoader();
-		}
-		return documentLoaderInstance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/modelhandler/ModelHandlerForCSS.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/modelhandler/ModelHandlerForCSS.java
deleted file mode 100644
index 222d816..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/modelhandler/ModelHandlerForCSS.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.modelhandler;
-
-import org.eclipse.wst.css.core.internal.encoding.CSSDocumentCharsetDetector;
-import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader;
-import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.AbstractModelHandler;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.provisional.IModelLoader;
-
-
-public class ModelHandlerForCSS extends AbstractModelHandler implements IModelHandler {
-
-	/**
-	 * Needs to match what's in plugin registry. In fact, can be overwritten
-	 * at run time with what's in registry! (so should never be 'final')
-	 */
-	static String AssociatedContentTypeID = "org.eclipse.wst.css.core.csssource"; //$NON-NLS-1$
-	/**
-	 * Needs to match what's in plugin registry. In fact, can be overwritten
-	 * at run time with what's in registry! (so should never be 'final')
-	 */
-	private static String ModelHandlerID = "org.eclipse.wst.css.core.modelhandler"; //$NON-NLS-1$
-
-	public ModelHandlerForCSS() {
-		super();
-		setId(ModelHandlerID);
-		setAssociatedContentTypeId(AssociatedContentTypeID);
-	}
-
-	public IDocumentCharsetDetector getEncodingDetector() {
-		return new CSSDocumentCharsetDetector();
-	}
-
-	public IDocumentLoader getDocumentLoader() {
-		return new CSSDocumentLoader();
-	}
-
-	/*
-	 * @see ContentTypeDescription#getModelLoader()
-	 */
-	public IModelLoader getModelLoader() {
-		return new CSSModelLoader();
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSRegionUtil.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSRegionUtil.java
deleted file mode 100644
index f9ca54f..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSRegionUtil.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.parser;
-
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-
-
-public class CSSRegionUtil {
-
-	/**
-	 */
-	public static boolean isDeclarationValueType(String type) {
-		return (type == CSSRegionContexts.CSS_DECLARATION_VALUE_DIMENSION || type == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION || type == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH || type == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT || type == CSSRegionContexts.CSS_DECLARATION_VALUE_IMPORTANT || type == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || type == CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR || type == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE || type == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE || type == CSSRegionContexts.CSS_DECLARATION_VALUE_S || type == CSSRegionContexts.CSS_DECLARATION_VALUE_STRING || type == CSSRegionContexts.CSS_DECLARATION_VALUE_UNICODE_RANGE || type == CSSRegionContexts.CSS_DECLARATION_VALUE_URI);
-	}
-
-	/**
-	 * these type can be beggining of selector
-	 */
-	public static boolean isSelectorBegginingType(String type) {
-		return (type == CSSRegionContexts.CSS_SELECTOR_ELEMENT_NAME || type == CSSRegionContexts.CSS_SELECTOR_UNIVERSAL || type == CSSRegionContexts.CSS_SELECTOR_PSEUDO || type == CSSRegionContexts.CSS_SELECTOR_CLASS || type == CSSRegionContexts.CSS_SELECTOR_ID || type == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_START);
-	}
-
-
-	/**
-	 * 
-	 * @param type
-	 * @return
-	 */
-	public static boolean isDeclarationType(String type) {
-		return (type == CSSRegionContexts.CSS_DECLARATION_PROPERTY || type == CSSRegionContexts.CSS_DECLARATION_SEPARATOR || isDeclarationValueType(type) || type == CSSRegionContexts.CSS_DECLARATION_DELIMITER);
-	}
-
-	/**
-	 * These types consist selector region
-	 * 
-	 * @param type
-	 * @return
-	 */
-	public static boolean isSelectorType(String type) {
-		return (type == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_END || type == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_NAME || type == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_OPERATOR || type == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_START || type == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_VALUE || type == CSSRegionContexts.CSS_SELECTOR_CLASS || type == CSSRegionContexts.CSS_SELECTOR_COMBINATOR || type == CSSRegionContexts.CSS_SELECTOR_ELEMENT_NAME || type == CSSRegionContexts.CSS_SELECTOR_ID || type == CSSRegionContexts.CSS_SELECTOR_PSEUDO || type == CSSRegionContexts.CSS_SELECTOR_SEPARATOR || type == CSSRegionContexts.CSS_SELECTOR_UNIVERSAL);
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSSourceParser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSSourceParser.java
deleted file mode 100644
index c4dfa05..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSSourceParser.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.parser;
-
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.Logger;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-
-
-public class CSSSourceParser implements RegionParser {
-	public static final int MODE_STYLESHEET = 0;
-	public static final int MODE_DECLARATION = 1;
-	public static final int MODE_DECLARATION_VALUE = 2;
-
-	private long fStartTime;
-	private long fStopTime;
-	private CSSTokenizer fTokenizer;
-
-	public void setParserMode(int mode) {
-		int initialState;
-		int bufsize;
-		switch (mode) {
-			case MODE_STYLESHEET :
-				initialState = CSSTokenizer.YYINITIAL;
-				bufsize = CSSTokenizer.BUFFER_SIZE_NORMAL;
-				break;
-			case MODE_DECLARATION :
-				initialState = CSSTokenizer.ST_DECLARATION;
-				bufsize = CSSTokenizer.BUFFER_SIZE_NORMAL;
-				break;
-			case MODE_DECLARATION_VALUE :
-				initialState = CSSTokenizer.ST_DECLARATION_PRE_VALUE;
-				bufsize = CSSTokenizer.BUFFER_SIZE_SMALL;
-				break;
-			default :
-				return;
-		}
-		if (0 < initialState) {
-			CSSTokenizer tokenizer = getTokenizer();
-			tokenizer.setInitialState(initialState);
-			tokenizer.setInitialBufferSize(bufsize);
-		}
-	}
-
-	public IStructuredDocumentRegion getDocumentRegions() {
-		IStructuredDocumentRegion headnode = null;
-		if (headnode == null) {
-			if (Debug.perfTest) {
-				fStartTime = System.currentTimeMillis();
-			}
-			headnode = parseNodes();
-			if (Debug.perfTest) {
-				fStopTime = System.currentTimeMillis();
-				System.out.println(" -- creating nodes of IStructuredDocument -- "); //$NON-NLS-1$
-				System.out.println(" Time parse and init all regions: " + (fStopTime - fStartTime) + " (msecs)"); //$NON-NLS-2$//$NON-NLS-1$
-				// System.out.println(" for " + fRegions.size() + "
-				// Regions");//$NON-NLS-2$//$NON-NLS-1$
-				System.out.println("      and " + _countNodes(headnode) + " Nodes"); //$NON-NLS-2$//$NON-NLS-1$
-			}
-		}
-		return headnode;
-	}
-
-	public List getRegions() {
-		IStructuredDocumentRegion headNode = null;
-		if (!getTokenizer().isEOF()) {
-			headNode = getDocumentRegions();
-			// throw new IllegalStateException("parsing has not finished");
-		}
-		// for memory recovery, we assume if someone
-		// requests all regions, we can reset our big
-		// memory consuming objects
-		// but the new "getRegions" method is then more expensive.
-		// I don't think its used much, though.
-		List localRegionsList = getRegions(headNode);
-		primReset();
-		return localRegionsList;
-	}
-
-	/**
-	 * Method getRegions.
-	 * 
-	 * @param headNode
-	 * @return List
-	 */
-	protected List getRegions(IStructuredDocumentRegion headNode) {
-		List allRegions = new ArrayList();
-		IStructuredDocumentRegion currentNode = headNode;
-		while (currentNode != null) {
-			ITextRegionList nodeRegions = currentNode.getRegions();
-			for (int i = 0; i < nodeRegions.size(); i++) {
-				allRegions.add(nodeRegions.get(i));
-			}
-			currentNode = currentNode.getNext();
-		}
-		return allRegions;
-	}
-
-	public void reset(Reader reader) {
-		primReset();
-		getTokenizer().reset(reader, 0);
-	}
-
-	public void reset(Reader reader, int offset) {
-		reset(reader);
-	}
-
-	public void reset(String input) {
-		reset(new StringReader(input));
-	}
-
-	public void reset(String input, int offset) {
-		reset(input);
-	}
-
-	public RegionParser newInstance() {
-		return new CSSSourceParser();
-	}
-
-	private IStructuredDocumentRegion parseNodes() {
-		// regions are initially reported as complete offsets within the
-		// scanned input
-		// they are adjusted here to be indexes from the currentNode's start
-		// offset
-		IStructuredDocumentRegion headNode = null;
-		IStructuredDocumentRegion lastNode = null;
-		ITextRegion region = null;
-		IStructuredDocumentRegion currentNode = null;
-		String type = null;
-		String currentRegionType = null;
-
-		while ((region = getNextRegion()) != null) {
-			type = region.getType();
-			if (mustBeStart(type, currentRegionType) && currentNode != null) {
-				currentNode.setEnded(true);
-			}
-
-			if ((currentNode != null && currentNode.isEnded()) || currentNode == null) {
-				if (currentNode != null && !currentNode.isEnded()) {
-					currentNode.setEnded(true);
-				}
-				lastNode = currentNode;
-				currentNode = createStructuredDocumentRegion(type);
-				currentRegionType = type;
-				if (lastNode != null) {
-					lastNode.setNext(currentNode);
-				}
-				currentNode.setPrevious(lastNode);
-				currentNode.setStart(region.getStart());
-			}
-
-			currentNode.addRegion(region);
-			currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart());
-			region.adjustStart(-currentNode.getStart());
-
-			if (mustBeEnd(type)) {
-				currentNode.setEnded(true);
-			}
-
-			if (headNode == null && currentNode != null) {
-				headNode = currentNode;
-			}
-		}
-
-		if (currentNode != null && !currentNode.isEnded()) {
-			currentNode.setEnded(true);
-		}
-
-		primReset();
-		return headNode;
-	}
-
-	private IStructuredDocumentRegion createStructuredDocumentRegion(String type) {
-		return CSSStructuredDocumentRegionFactory.createRegion(type);
-	}
-
-	private boolean mustBeStart(String type, String docRegionType) {
-		return ((type == CSSRegionContexts.CSS_DELIMITER || type == CSSRegionContexts.CSS_LBRACE || type == CSSRegionContexts.CSS_RBRACE || type == CSSRegionContexts.CSS_IMPORT || type == CSSRegionContexts.CSS_PAGE || type == CSSRegionContexts.CSS_MEDIA || type == CSSRegionContexts.CSS_FONT_FACE || type == CSSRegionContexts.CSS_CHARSET || type == CSSRegionContexts.CSS_ATKEYWORD || type == CSSRegionContexts.CSS_DECLARATION_PROPERTY || type == CSSRegionContexts.CSS_DECLARATION_DELIMITER) || (docRegionType == CSSRegionContexts.CSS_DECLARATION_PROPERTY && type == CSSRegionContexts.CSS_S) || (!CSSRegionUtil.isSelectorBegginingType(docRegionType) && (type == CSSRegionContexts.CSS_SELECTOR_ELEMENT_NAME || type == CSSRegionContexts.CSS_SELECTOR_UNIVERSAL || type == CSSRegionContexts.CSS_SELECTOR_PSEUDO || type == CSSRegionContexts.CSS_SELECTOR_CLASS || type == CSSRegionContexts.CSS_SELECTOR_ID || type == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_START)));
-	}
-
-	private boolean mustBeEnd(String type) {
-		return (type == CSSRegionContexts.CSS_DELIMITER || type == CSSRegionContexts.CSS_LBRACE || type == CSSRegionContexts.CSS_RBRACE || type == CSSRegionContexts.CSS_DECLARATION_DELIMITER);
-	}
-
-	private ITextRegion getNextRegion() {
-		ITextRegion region = null;
-		try {
-			region = getTokenizer().getNextToken();
-			// DMW: 2/12/03 Removed state
-			// if (region != null) {
-			// fRegions.add(region);
-			// }
-			return region;
-		}
-		catch (StackOverflowError e) {
-			Logger.logException(getClass().getName() + ": input could not be parsed correctly at position " + getTokenizer().getOffset(), e); //$NON-NLS-1$
-			throw e;
-		}
-		catch (Exception e) {
-			Logger.logException(getClass().getName() + ": input could not be parsed correctly at position " + getTokenizer().getOffset() + " (" + e.getLocalizedMessage() + ")", e); //$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-		}
-		return null;
-	}
-
-	private void primReset() {
-
-		getTokenizer().reset(new char[0]);
-	}
-
-	private CSSTokenizer getTokenizer() {
-		if (fTokenizer == null) {
-			fTokenizer = new CSSTokenizer();
-		}
-		return fTokenizer;
-	}
-
-
-	/**
-	 * This is a simple utility to count nodes. Used only for debug
-	 * statements.
-	 */
-	private int _countNodes(IStructuredDocumentRegion nodes) {
-		int result = 0;
-		IStructuredDocumentRegion countNode = nodes;
-		while (countNode != null) {
-			result++;
-			countNode = countNode.getNext();
-		}
-		return result;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSStructuredDocumentRegionFactory.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSStructuredDocumentRegionFactory.java
deleted file mode 100644
index 7e7a240..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSStructuredDocumentRegionFactory.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocumentRegion;
-
-public class CSSStructuredDocumentRegionFactory {
-	public static IStructuredDocumentRegion createRegion(String type) {
-		IStructuredDocumentRegion instance = null;
-		if (type != null) {
-			instance = new BasicStructuredDocumentRegion();
-		}
-		else {
-
-		}
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSTokenizer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSTokenizer.java
deleted file mode 100644
index 8929283..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSTokenizer.java
+++ /dev/null
@@ -1,1221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/* The following code was generated by JFlex 1.2.2 on 04/10/01 22:53 */
-
-/*nlsXXX*/
-package org.eclipse.wst.css.core.internal.parser;
-
-import java.io.CharArrayReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.parser.regions.CSSTextRegionFactory;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-
-/**
- * This class is a scanner generated by <a
- * href="http://www.informatik.tu-muenchen.de/~kleing/jflex/">JFlex </a> 1.2.2
- */
-public class CSSTokenizer implements CSSRegionContexts {
-
-	/** this character denotes the end of file */
-	final public static int YYEOF = -1;
-
-	/** lexical states */
-	final public static int ST_SELECTOR_ATTRIBUTE_NAME = 11;
-	final public static int ST_IMPORT_DELIMITER = 5;
-	final public static int ST_DECLARATION_PRE_VALUE = 17;
-	final public static int ST_SELECTOR = 0;
-	final public static int ST_CHARSET_DELIMITER = 2;
-	final public static int ST_DECLARATION_VALUE = 18;
-	final public static int ST_PAGE_PSEUDO_PAGE = 8;
-	final public static int ST_IMPORT_URI = 3;
-	final public static int ST_SELECTOR_ATTRIBUTE_END = 14;
-	final public static int ST_SELECTOR_ATTRIBUTE_OPERATOR = 12;
-	final public static int ST_DECLARATION = 15;
-	final public static int ST_PAGE_DELIMITER = 9;
-	final public static int ST_SELECTOR_ATTRIBUTE_VALUE = 13;
-	final public static int ST_MEDIA_MEDIUM = 6;
-	final public static int ST_CHARSET_NAME = 1;
-	final public static int ST_IMPORT_MEDIUM = 4;
-	final public static int ST_DECLARATION_SEPARATOR = 16;
-	final public static int ST_FONT_FACE_DELIMITER = 9;
-	final public static int ST_MEDIA_DELIMITER = 7;
-	final public static int ST_SELECTOR_MODIFIER = 10;
-	final public static int YYINITIAL = 0;
-
-	/**
-	 * Translates characters to character classes
-	 */
-	final private static String yycmap_packed = "\11\0\1\11\1\17\1\0\1\4\1\20\22\0\1\6\1\31\1\10" + "\1\22\1\16\1\72\1\16\1\5\1\26\1\12\1\35\1\14\1\55" + "\1\13\1\15\1\34\12\1\1\62\1\50\1\30\1\67\1\32\1\21" + "\1\36\1\43\1\27\1\40\1\57\1\46\1\64\1\61\1\41\1\51" + "\2\2\1\25\1\52\1\65\1\54\1\53\1\2\1\24\1\44\1\47" + "\1\23\5\2\1\66\1\3\1\71\1\16\1\2\1\16\1\42\1\7" + "\1\37\1\56\1\45\1\63\1\61\1\41\1\51\2\2\1\25\1\52" + "\1\65\1\54\1\53\1\2\1\24\1\44\1\47\1\23\5\2\1\60" + "\1\70\1\33\1\70\1\0\uff80\2";
-
-	/**
-	 * Translates characters to character classes
-	 */
-	final private static char[] yycmap = yy_unpack_cmap(yycmap_packed);
-
-	/**
-	 * Translates a state to a row index in the transition table
-	 */
-	final private static int yy_rowMap[] = {0, 59, 118, 177, 236, 295, 354, 413, 472, 531, 590, 649, 708, 767, 826, 885, 944, 1003, 1062, 1121, 1180, 1239, 1298, 1357, 1416, 1475, 1534, 1121, 1593, 1121, 1652, 1711, 1121, 1770, 1829, 1888, 1121, 1947, 2006, 2065, 2124, 2183, 2242, 1121, 2301, 2360, 2419, 1121, 1121, 2478, 2537, 2596, 1121, 2655, 2714, 1121, 1121, 2773, 2832, 2891, 1121, 2950, 1121, 3009, 3068, 3127, 3186, 3245, 3304, 3363, 3422, 1121, 1121, 3481, 3540, 3599, 3658, 3717, 1121, 3776, 3835, 3894, 3953, 4012, 4071, 1593, 1121, 4130, 1239, 4189, 4248, 1416, 4307, 1475, 4366, 4425, 4484, 4543, 4602, 4661, 4720, 4779, 4838, 4897, 1770, 4956, 1121, 1829, 5015, 5074, 1947, 5133, 1121, 2006, 5192, 5251, 2183, 5310, 5369, 2360, 5428, 5487, 2537, 5546, 5605, 1121, 2714, 2832, 5664, 5723, 3068, 5782, 3127, 5841, 1121, 3186, 5900, 5959, 3363, 6018, 6077, 6136, 6195, 3894, 1121, 3599, 1121, 6254, 3658, 6313, 1121, 3717, 6372, 6431, 6490, 6549, 3953, 6608, 6667, 6726, 4071, 6785,
-				1121, 4130, 6844, 1121, 6903, 6962, 7021, 7080, 7139, 7198, 7257, 7316, 7375, 7434, 7493, 7552, 1770, 7611, 7670, 1829, 7729, 7788, 1947, 7847, 7906, 2006, 7965, 8024, 8083, 8142, 8201, 8260, 8319, 8378, 3127, 8437, 8496, 3186, 8555, 8614, 8673, 8732, 8791, 3658, 8850, 8909, 3717, 8968, 9027, 9086, 9145, 9204, 9263, 9322, 9381, 1121, 1121, 9440, 9499, 9558, 9617, 9676, 9735, 9794, 9853, 9912, 9971, 10030, 10089, 10148, 10207, 10266, 10325, 10384, 10443, 10502, 10561, 10620, 10679, 10738, 10797, 10856, 10915, 10974, 11033, 11092, 11151, 11210, 11269, 11328, 11387, 11446, 11505, 1121, 11564, 11623, 1121, 11682, 11741, 11800, 11859, 11918, 11977, 12036, 12095, 12154, 12213, 1121, 12272, 12331, 12390, 12449, 12508, 12567, 12626, 12685, 12744, 12803, 12862, 12921, 12980, 13039, 13098, 13157, 13216, 11092, 13275, 13334, 1121, 13393, 13452, 13511, 13570, 13629, 13688, 1121, 13747, 13806, 13865, 13924, 13983, 14042, 14101, 14160, 14219, 12036, 14278, 14337, 14396, 14455,
-				14514, 14573, 14632, 14691, 14750, 14809, 14868, 14927, 14986, 15045, 15104, 15163, 15222, 15281, 15340, 13157, 15399, 15458, 15517, 15576, 15635, 15694, 15753, 1121, 15812, 15871, 15930, 15989, 16048, 16107, 16166, 16225, 16284, 16343, 16402, 16461, 16520, 16579, 16638, 16697, 16756, 16815, 16874, 16933, 16992, 17051, 17110, 17169, 17228, 17287, 17346, 17405, 17464, 17523, 17582, 17641, 17700, 17759, 17818, 17877, 17936, 17995, 18054, 1121, 18113, 18172, 18231, 18290, 18349, 18408, 18467, 18526, 18585, 12154, 18644, 12213, 18703, 18762, 18821, 18880, 18939, 18998, 19057, 19116, 19175, 19234, 13275, 19293, 13334, 19352, 19411, 19470, 19529, 19588, 19647, 19706, 19765, 19824, 19883, 19942, 1121, 20001, 20060, 20119, 20178, 1121, 20237, 20296, 20355, 1121, 20414, 20473, 20532, 20591, 20650, 20709, 20768, 20827, 20886, 20945};
-
-	/**
-	 * The packed transition table of the DFA
-	 */
-	final private static String yy_packed = "\2\24\1\25\1\26\1\27\1\24\1\27\1\25\1\24" + "\1\27\1\24\1\30\1\24\1\31\1\24\2\27\1\24" + "\1\32\3\25\1\24\1\25\1\33\2\24\1\34\1\35" + "\1\36\1\37\11\25\1\24\4\25\1\24\2\25\1\24" + "\1\25\1\40\3\25\1\41\10\24\1\27\1\42\1\27" + "\1\24\1\43\1\27\1\24\1\44\3\24\2\27\7\24" + "\1\33\2\24\1\34\1\35\1\24\1\37\40\24\1\27" + "\1\24\1\27\2\24\1\27\1\24\1\44\3\24\2\27" + "\7\24\1\33\2\24\1\34\1\35\1\24\1\37\11\24" + "\1\45\26\24\1\27\1\46\1\27\1\24\1\47\1\27" + "\1\24\1\44\3\24\2\27\2\24\1\50\4\24\1\33" + "\2\24\1\34\1\35\1\24\1\37\11\24\1\45\24\24" + "\1\51\1\52\1\27\1\24\1\27\1\51\1\24\1\27" + "\1\24\1\53\3\24\2\27\2\24\3\51\1\24\1\51" + "\1\33\2\24\1\34\1\35\1\24\1\37\11\51\1\45" + "\4\51\1\24\2\51\1\24\1\51\1\24\3\51\11\24" + "\1\27\1\24\1\27\2\24\1\27\1\24\1\44\3\24" + "\2\27\7\24\1\33\2\24\1\34\1\35\1\24\1\37" + "\11\24\1\45\4\24\1\54\17\24\1\55\1\56\1\27" + "\1\24\1\27\1\55\1\24\1\27\1\24\1\57\3\24" + "\2\27\2\24\3\55\1\24\1\55\1\33\2\24\1\34"
-				+ "\1\35\1\24\1\37\11\55\1\24\4\55\1\24\2\55" + "\1\24\1\55\1\24\3\55\11\24\1\27\1\24\1\27" + "\2\24\1\27\1\24\1\44\3\24\2\27\7\24\1\33" + "\2\24\1\34\1\35\1\24\1\37\16\24\1\60\2\24" + "\1\61\14\24\1\62\1\63\1\27\1\24\1\27\1\62" + "\1\24\1\27\1\24\1\64\3\24\2\27\2\24\3\62" + "\1\24\1\62\1\33\2\24\1\34\1\35\1\24\1\37" + "\11\62\1\24\4\62\1\24\2\62\1\65\1\62\1\66" + "\3\62\11\24\1\27\1\24\1\27\2\24\1\27\1\24" + "\1\44\3\24\2\27\7\24\1\33\2\24\1\34\1\35" + "\1\24\1\37\21\24\1\65\16\24\1\67\1\24\1\67" + "\2\24\1\67\1\24\1\44\1\70\1\31\1\24\2\67" + "\1\24\1\32\5\24\1\33\1\24\1\70\1\34\1\35" + "\1\36\1\37\16\24\1\71\2\24\1\65\1\24\1\40" + "\3\24\1\41\6\24\1\72\1\73\1\27\1\24\1\27" + "\1\72\1\24\1\27\1\24\1\74\3\24\2\27\2\24" + "\3\72\1\24\1\72\1\33\2\24\1\34\1\35\1\24" + "\1\37\11\72\1\24\4\72\1\24\2\72\1\24\1\72" + "\1\24\3\72\11\24\1\27\1\24\1\27\2\24\1\27" + "\1\24\1\44\3\24\2\27\7\24\1\33\2\24\1\34" + "\1\35\1\24\1\37\30\24\1\75\1\76\1\77\3\24"
-				+ "\1\100\1\101\1\27\1\102\1\27\1\100\1\103\1\27" + "\1\24\1\104\3\24\2\27\2\24\3\100\1\24\1\100" + "\1\33\2\24\1\34\1\35\1\24\1\37\11\100\1\24" + "\4\100\1\24\2\100\1\24\1\100\1\24\3\100\11\24" + "\1\27\1\24\1\27\2\24\1\27\1\24\1\44\3\24" + "\2\27\7\24\1\33\2\24\1\34\1\35\1\24\1\37" + "\32\24\1\77\3\24\1\105\1\106\1\27\1\24\1\27" + "\1\105\1\24\1\27\1\24\1\107\3\24\2\27\2\24" + "\3\105\1\24\1\105\1\33\2\24\1\34\1\35\1\24" + "\1\37\11\105\1\110\4\105\1\24\2\105\1\24\1\105" + "\1\24\3\105\11\24\1\27\1\24\1\27\2\24\1\27" + "\1\24\1\44\3\24\2\27\7\24\1\33\2\24\1\34" + "\1\35\1\24\1\37\11\24\1\110\11\24\1\111\11\24" + "\1\112\1\113\1\114\1\27\1\115\1\27\1\113\1\116" + "\1\27\1\117\1\120\1\121\1\122\1\24\2\27\1\24" + "\1\123\1\124\2\113\1\24\1\113\1\33\1\125\1\24" + "\1\34\1\126\1\24\1\37\11\113\1\110\4\113\1\127" + "\2\113\1\24\1\113\1\24\3\113\6\24\1\112\1\113" + "\1\114\1\130\1\115\1\130\1\113\1\116\1\130\1\117" + "\1\120\1\121\1\122\1\24\2\130\1\24\1\123\1\124"
-				+ "\2\113\1\24\1\113\1\33\1\125\1\24\1\34\1\126" + "\1\24\1\37\11\113\1\110\4\113\1\127\2\113\1\24" + "\1\113\1\24\3\113\5\24\74\0\2\25\1\131\3\0" + "\1\25\3\0\1\25\7\0\3\25\1\0\1\25\7\0" + "\11\25\1\0\4\25\1\0\2\25\1\0\1\25\1\0" + "\3\25\6\0\1\132\2\25\1\0\2\25\1\132\1\25" + "\1\0\5\25\2\0\16\25\1\132\2\25\1\132\2\25" + "\1\132\10\25\1\132\4\25\1\132\7\25\4\0\1\27" + "\1\0\1\27\2\0\1\27\5\0\2\27\53\0\2\25" + "\1\131\3\0\1\25\3\0\1\133\7\0\3\25\1\0" + "\1\25\7\0\11\25\1\0\4\25\1\0\2\25\1\0" + "\1\25\1\0\3\25\6\0\2\134\1\135\3\0\1\134" + "\3\0\1\134\7\0\3\134\1\0\1\134\7\0\11\134" + "\1\0\4\134\1\0\2\134\1\0\1\134\1\0\3\134" + "\6\0\2\136\1\137\3\0\1\136\3\0\1\136\7\0" + "\3\136\1\0\1\136\7\0\11\136\1\0\4\136\1\0" + "\2\136\1\0\1\136\1\0\3\136\36\0\1\140\76\0" + "\1\141\74\0\2\142\10\0\1\143\1\144\1\145\7\0" + "\2\146\10\0\1\147\1\150\3\0\1\147\3\0\1\147" + "\7\0\3\147\1\0\1\147\7\0\11\147\1\0\4\147" + "\1\0\2\147\1\0\1\147\1\0\3\147\6\0\2\151"
-				+ "\1\152\1\0\1\153\11\151\2\0\52\151\1\0\2\154" + "\1\155\1\0\3\154\1\153\6\154\2\0\52\154\13\0" + "\1\156\60\0\2\157\1\160\1\0\1\161\11\157\2\0" + "\52\157\1\0\2\162\1\163\1\0\3\162\1\161\6\162" + "\2\0\52\162\24\0\1\164\47\0\2\51\1\165\3\0" + "\1\51\3\0\1\51\7\0\3\51\1\0\1\51\7\0" + "\11\51\1\0\4\51\1\0\2\51\1\0\1\51\1\0" + "\3\51\6\0\1\166\2\51\1\0\2\51\1\166\1\51" + "\1\0\5\51\2\0\16\51\1\166\2\51\1\166\2\51" + "\1\166\10\51\1\166\4\51\1\166\7\51\1\0\2\51" + "\1\165\3\0\1\51\3\0\1\167\7\0\3\51\1\0" + "\1\51\7\0\11\51\1\0\4\51\1\0\2\51\1\0" + "\1\51\1\0\3\51\6\0\2\55\1\170\3\0\1\55" + "\3\0\1\55\7\0\3\55\1\0\1\55\7\0\11\55" + "\1\0\4\55\1\0\2\55\1\0\1\55\1\0\3\55" + "\6\0\1\171\2\55\1\0\2\55\1\171\1\55\1\0" + "\5\55\2\0\16\55\1\171\2\55\1\171\2\55\1\171" + "\10\55\1\171\4\55\1\171\7\55\1\0\2\55\1\170" + "\3\0\1\55\3\0\1\172\7\0\3\55\1\0\1\55" + "\7\0\11\55\1\0\4\55\1\0\2\55\1\0\1\55" + "\1\0\3\55\6\0\2\62\1\173\3\0\1\62\3\0"
-				+ "\1\62\7\0\3\62\1\0\1\62\7\0\11\62\1\0" + "\4\62\1\0\2\62\1\0\1\62\1\0\3\62\6\0" + "\1\174\2\62\1\0\2\62\1\174\1\62\1\0\5\62" + "\2\0\16\62\1\174\2\62\1\174\2\62\1\174\10\62" + "\1\174\4\62\1\174\7\62\1\0\2\62\1\173\3\0" + "\1\62\3\0\1\175\7\0\3\62\1\0\1\62\7\0" + "\11\62\1\0\4\62\1\0\2\62\1\0\1\62\1\0" + "\3\62\7\0\1\62\1\173\3\0\1\62\3\0\1\62" + "\7\0\3\62\1\0\1\62\7\0\11\62\1\0\4\62" + "\1\0\2\62\1\0\1\62\1\0\3\62\5\0\4\176" + "\1\177\1\176\1\177\2\176\1\177\2\176\1\0\2\176" + "\2\177\11\176\1\0\25\176\1\0\12\176\1\0\2\72" + "\1\200\3\0\1\72\3\0\1\72\7\0\3\72\1\0" + "\1\72\7\0\11\72\1\0\4\72\1\0\2\72\1\0" + "\1\72\1\0\3\72\6\0\1\201\2\72\1\0\2\72" + "\1\201\1\72\1\0\5\72\2\0\16\72\1\201\2\72" + "\1\201\2\72\1\201\10\72\1\201\4\72\1\201\7\72" + "\1\0\2\72\1\200\3\0\1\72\3\0\1\202\7\0" + "\3\72\1\0\1\72\7\0\11\72\1\0\4\72\1\0" + "\2\72\1\0\1\72\1\0\3\72\74\0\1\75\4\0" + "\2\100\1\203\3\0\1\100\3\0\1\100\7\0\3\100" + "\1\0\1\100\7\0\11\100\1\0\4\100\1\0\2\100"
-				+ "\1\0\1\100\1\0\3\100\6\0\1\204\2\100\1\0" + "\2\100\1\204\1\100\1\0\5\100\2\0\16\100\1\204" + "\2\100\1\204\2\100\1\204\10\100\1\204\4\100\1\204" + "\7\100\1\0\2\205\1\206\1\0\1\207\11\205\2\0" + "\52\205\1\0\2\210\1\211\1\0\3\210\1\207\6\210" + "\2\0\52\210\1\0\2\100\1\203\3\0\1\100\3\0" + "\1\212\7\0\3\100\1\0\1\100\7\0\11\100\1\0" + "\4\100\1\0\2\100\1\0\1\100\1\0\3\100\6\0" + "\2\105\1\213\3\0\1\105\3\0\1\105\7\0\3\105" + "\1\0\1\105\7\0\11\105\1\0\4\105\1\0\2\105" + "\1\0\1\105\1\0\3\105\6\0\1\214\2\105\1\0" + "\2\105\1\214\1\105\1\0\5\105\2\0\16\105\1\214" + "\2\105\1\214\2\105\1\214\10\105\1\214\4\105\1\214" + "\7\105\1\0\2\105\1\213\3\0\1\105\3\0\1\215" + "\7\0\3\105\1\0\1\105\7\0\11\105\1\0\4\105" + "\1\0\2\105\1\0\1\105\1\0\3\105\6\0\1\112" + "\1\216\1\217\3\0\1\216\3\0\1\216\1\0\1\220" + "\5\0\3\216\1\0\1\216\7\0\11\216\1\0\4\216" + "\1\0\2\216\1\0\1\216\1\0\3\216\4\0\1\221" + "\1\0\2\113\1\222\3\0\1\113\3\0\1\113\7\0"
-				+ "\3\113\1\223\1\113\7\0\11\113\1\0\4\113\1\0" + "\2\113\1\0\1\113\1\0\3\113\6\0\1\224\2\113" + "\1\0\2\113\1\224\1\113\1\0\5\113\2\0\16\113" + "\1\224\2\113\1\224\2\113\1\224\10\113\1\224\4\113" + "\1\224\7\113\1\0\2\225\1\226\1\0\1\227\11\225" + "\2\0\52\225\1\0\2\230\1\231\1\0\3\230\1\227" + "\6\230\2\0\52\230\1\0\1\232\1\113\1\222\3\0" + "\1\113\3\0\1\233\1\0\1\220\5\0\3\113\1\223" + "\1\113\7\0\11\113\1\0\4\113\1\0\2\113\1\0" + "\1\113\1\0\3\113\6\0\1\112\13\0\1\220\56\0" + "\1\234\72\0\2\235\1\236\3\0\1\235\3\0\1\235" + "\7\0\3\235\1\0\1\235\7\0\11\235\1\0\4\235" + "\1\0\2\235\1\0\1\235\1\0\3\235\6\0\2\113" + "\1\222\3\0\1\113\3\0\1\113\1\237\6\0\1\113" + "\1\240\1\113\1\223\1\113\7\0\11\113\1\0\4\113" + "\1\0\2\113\1\0\1\113\1\0\3\113\11\0\1\241" + "\1\0\1\241\2\0\1\241\5\0\2\241\30\0\1\242" + "\21\0\4\243\1\244\1\243\1\244\2\243\1\244\5\243" + "\2\244\12\243\1\0\14\243\1\0\22\243\1\0\1\245" + "\1\25\1\131\1\25\1\0\1\25\1\245\1\0\1\25"
-				+ "\1\0\1\25\3\0\2\25\2\0\3\25\1\0\1\25" + "\7\0\1\245\2\25\1\245\2\25\1\245\2\25\1\0" + "\4\25\1\0\1\245\1\25\1\0\1\25\1\0\1\245" + "\2\25\6\0\2\25\1\131\3\0\1\25\3\0\1\25" + "\7\0\3\25\1\0\1\25\2\0\1\246\4\0\11\25" + "\1\0\4\25\1\0\2\25\1\0\1\25\1\0\3\25" + "\6\0\1\247\2\134\1\0\2\134\1\247\1\134\1\0" + "\5\134\2\0\16\134\1\247\2\134\1\247\2\134\1\247" + "\10\134\1\247\4\134\1\247\7\134\1\0\1\250\2\136" + "\1\0\2\136\1\250\1\136\1\0\5\136\2\0\16\136" + "\1\250\2\136\1\250\2\136\1\250\10\136\1\250\4\136" + "\1\250\7\136\13\0\1\251\57\0\35\141\1\252\35\141" + "\41\0\1\253\103\0\1\254\65\0\2\255\66\0\2\256" + "\103\0\1\257\17\0\2\147\1\150\3\0\1\147\3\0" + "\1\147\7\0\3\147\1\260\1\147\7\0\11\147\1\0" + "\4\147\1\0\2\147\1\0\1\147\1\0\3\147\6\0" + "\1\261\2\147\1\0\2\147\1\261\1\147\1\0\5\147" + "\2\0\16\147\1\261\2\147\1\261\2\147\1\261\10\147" + "\1\261\4\147\1\261\7\147\1\0\1\262\1\151\1\152" + "\1\151\1\263\1\151\1\262\10\151\1\264\16\151\1\262"
-				+ "\2\151\1\262\2\151\1\262\10\151\1\262\4\151\1\262" + "\7\151\1\0\1\265\1\154\1\155\3\154\1\265\1\266" + "\7\154\1\267\16\154\1\265\2\154\1\265\2\154\1\265" + "\10\154\1\265\4\154\1\265\7\154\32\0\1\246\41\0" + "\1\270\1\157\1\160\1\157\1\271\1\157\1\270\10\157" + "\1\272\16\157\1\270\2\157\1\270\2\157\1\270\10\157" + "\1\270\4\157\1\270\7\157\1\0\1\273\1\162\1\163" + "\3\162\1\273\1\274\7\162\1\275\16\162\1\273\2\162" + "\1\273\2\162\1\273\10\162\1\273\4\162\1\273\7\162" + "\25\0\1\276\46\0\1\277\1\51\1\165\1\51\1\0" + "\1\51\1\277\1\0\1\51\1\0\1\51\3\0\2\51" + "\2\0\3\51\1\0\1\51\7\0\1\277\2\51\1\277" + "\2\51\1\277\2\51\1\0\4\51\1\0\1\277\1\51" + "\1\0\1\51\1\0\1\277\2\51\6\0\2\51\1\165" + "\3\0\1\51\3\0\1\51\7\0\3\51\1\0\1\51" + "\2\0\1\246\4\0\11\51\1\0\4\51\1\0\2\51" + "\1\0\1\51\1\0\3\51\6\0\1\300\1\55\1\170" + "\1\55\1\0\1\55\1\300\1\0\1\55\1\0\1\55" + "\3\0\2\55\2\0\3\55\1\0\1\55\7\0\1\300" + "\2\55\1\300\2\55\1\300\2\55\1\0\4\55\1\0"
-				+ "\1\300\1\55\1\0\1\55\1\0\1\300\2\55\6\0" + "\2\55\1\170\3\0\1\55\3\0\1\55\7\0\3\55" + "\1\0\1\55\2\0\1\246\4\0\11\55\1\0\4\55" + "\1\0\2\55\1\0\1\55\1\0\3\55\6\0\1\301" + "\1\62\1\173\1\62\1\0\1\62\1\301\1\0\1\62" + "\1\0\1\62\3\0\2\62\2\0\3\62\1\0\1\62" + "\7\0\1\301\2\62\1\301\2\62\1\301\2\62\1\0" + "\4\62\1\0\1\301\1\62\1\0\1\62\1\0\1\301" + "\2\62\6\0\2\62\1\173\3\0\1\62\3\0\1\62" + "\7\0\3\62\1\0\1\62\2\0\1\246\4\0\11\62" + "\1\0\4\62\1\0\2\62\1\0\1\62\1\0\3\62" + "\6\0\1\302\1\72\1\200\1\72\1\0\1\72\1\302" + "\1\0\1\72\1\0\1\72\3\0\2\72\2\0\3\72" + "\1\0\1\72\7\0\1\302\2\72\1\302\2\72\1\302" + "\2\72\1\0\4\72\1\0\1\302\1\72\1\0\1\72" + "\1\0\1\302\2\72\6\0\2\72\1\200\3\0\1\72" + "\3\0\1\72\7\0\3\72\1\0\1\72\2\0\1\246" + "\4\0\11\72\1\0\4\72\1\0\2\72\1\0\1\72" + "\1\0\3\72\6\0\1\303\1\100\1\203\1\100\1\0" + "\1\100\1\303\1\0\1\100\1\0\1\100\3\0\2\100" + "\2\0\3\100\1\0\1\100\7\0\1\303\2\100\1\303" + "\2\100\1\303\2\100\1\0\4\100\1\0\1\303\1\100"
-				+ "\1\0\1\100\1\0\1\303\2\100\6\0\1\304\1\205" + "\1\206\1\205\1\305\1\205\1\304\10\205\1\306\16\205" + "\1\304\2\205\1\304\2\205\1\304\10\205\1\304\4\205" + "\1\304\7\205\1\0\1\307\1\210\1\211\3\210\1\307" + "\1\310\7\210\1\311\16\210\1\307\2\210\1\307\2\210" + "\1\307\10\210\1\307\4\210\1\307\7\210\1\0\2\100" + "\1\203\3\0\1\100\3\0\1\100\7\0\3\100\1\0" + "\1\100\2\0\1\246\4\0\11\100\1\0\4\100\1\0" + "\2\100\1\0\1\100\1\0\3\100\6\0\1\312\1\105" + "\1\213\1\105\1\0\1\105\1\312\1\0\1\105\1\0" + "\1\105\3\0\2\105\2\0\3\105\1\0\1\105\7\0" + "\1\312\2\105\1\312\2\105\1\312\2\105\1\0\4\105" + "\1\0\1\312\1\105\1\0\1\105\1\0\1\312\2\105" + "\6\0\2\105\1\213\3\0\1\105\3\0\1\105\7\0" + "\3\105\1\0\1\105\2\0\1\246\4\0\11\105\1\0" + "\4\105\1\0\2\105\1\0\1\105\1\0\3\105\6\0" + "\2\216\1\217\3\0\1\216\3\0\1\216\7\0\3\216" + "\1\0\1\216\7\0\11\216\1\0\4\216\1\0\2\216" + "\1\0\1\216\1\0\3\216\6\0\1\313\2\216\1\0" + "\2\216\1\313\1\216\1\0\5\216\2\0\16\216\1\313"
-				+ "\2\216\1\313\2\216\1\313\10\216\1\313\4\216\1\313" + "\7\216\1\0\1\314\1\113\1\222\1\113\1\0\1\113" + "\1\314\1\0\1\113\1\0\1\113\3\0\2\113\2\0" + "\3\113\1\223\1\113\7\0\1\314\2\113\1\314\2\113" + "\1\314\2\113\1\0\4\113\1\0\1\314\1\113\1\0" + "\1\113\1\0\1\314\2\113\6\0\1\315\1\225\1\226" + "\1\225\1\316\1\225\1\315\10\225\1\317\16\225\1\315" + "\2\225\1\315\2\225\1\315\10\225\1\315\4\225\1\315" + "\7\225\1\0\1\320\1\230\1\231\3\230\1\320\1\321" + "\7\230\1\322\16\230\1\320\2\230\1\320\2\230\1\320" + "\10\230\1\320\4\230\1\320\7\230\1\0\1\232\1\113" + "\1\222\3\0\1\113\3\0\1\113\1\0\1\220\5\0" + "\3\113\1\223\1\113\7\0\11\113\1\0\4\113\1\0" + "\2\113\1\0\1\113\1\0\3\113\4\0\1\221\1\0" + "\2\113\1\222\3\0\1\113\3\0\1\113\7\0\3\113" + "\1\223\1\113\2\0\1\246\4\0\11\113\1\0\4\113" + "\1\0\2\113\1\0\1\113\1\0\3\113\6\0\1\234" + "\1\216\1\217\3\0\1\216\3\0\1\216\7\0\3\216" + "\1\0\1\216\7\0\11\216\1\0\4\216\1\0\2\216" + "\1\0\1\216\1\0\3\216\4\0\1\221\1\0\1\323"
-				+ "\2\235\1\0\2\235\1\323\1\235\1\0\5\235\2\0" + "\16\235\1\323\2\235\1\323\2\235\1\323\10\235\1\323" + "\4\235\1\323\7\235\1\0\1\324\5\0\1\324\11\0" + "\1\324\5\0\1\324\7\0\2\324\1\0\2\324\1\0" + "\2\324\7\0\2\324\3\0\2\324\7\0\2\113\1\222" + "\3\0\1\113\3\0\1\113\7\0\2\113\1\325\1\223" + "\1\113\7\0\11\113\1\0\4\113\1\0\2\113\1\0" + "\1\113\1\0\3\113\57\0\1\326\21\0\1\327\1\25" + "\1\131\1\25\1\0\1\25\1\327\1\0\1\25\1\0" + "\1\25\3\0\2\25\2\0\3\25\1\0\1\25\7\0" + "\1\327\2\25\1\327\2\25\1\327\2\25\1\0\4\25" + "\1\0\1\327\1\25\1\0\1\25\1\0\1\327\2\25" + "\6\0\1\330\1\134\1\135\1\134\1\0\1\134\1\330" + "\1\0\1\134\1\0\1\134\3\0\2\134\2\0\3\134" + "\1\0\1\134\7\0\1\330\2\134\1\330\2\134\1\330" + "\2\134\1\0\4\134\1\0\1\330\1\134\1\0\1\134" + "\1\0\1\330\2\134\6\0\1\331\1\136\1\137\1\136" + "\1\0\1\136\1\331\1\0\1\136\1\0\1\136\3\0" + "\2\136\2\0\3\136\1\0\1\136\7\0\1\331\2\136" + "\1\331\2\136\1\331\2\136\1\0\4\136\1\0\1\331"
-				+ "\1\136\1\0\1\136\1\0\1\331\2\136\20\0\1\332" + "\57\0\34\141\1\333\1\252\35\141\42\0\2\334\102\0" + "\1\335\75\0\2\336\74\0\1\337\76\0\1\340\7\0" + "\1\341\1\342\1\260\1\0\1\260\1\341\1\0\1\260" + "\1\0\1\341\3\0\2\260\2\0\3\341\1\0\1\341" + "\7\0\11\341\1\0\4\341\1\0\2\341\1\0\1\341" + "\1\0\3\341\6\0\1\343\1\147\1\150\1\147\1\0" + "\1\147\1\343\1\0\1\147\1\0\1\147\3\0\2\147" + "\2\0\3\147\1\260\1\147\7\0\1\343\2\147\1\343" + "\2\147\1\343\2\147\1\0\4\147\1\0\1\343\1\147" + "\1\0\1\147\1\0\1\343\2\147\6\0\1\344\1\151" + "\1\152\1\151\1\153\1\151\1\344\27\151\1\344\2\151" + "\1\344\2\151\1\344\10\151\1\344\4\151\1\344\7\151" + "\1\0\2\151\1\152\1\0\1\153\12\151\1\0\52\151" + "\1\0\1\345\1\154\1\155\3\154\1\345\1\153\26\154" + "\1\345\2\154\1\345\2\154\1\345\10\154\1\345\4\154" + "\1\345\7\154\1\0\2\154\1\155\1\0\3\154\1\153" + "\7\154\1\0\52\154\1\0\1\346\1\157\1\160\1\157" + "\1\161\1\157\1\346\27\157\1\346\2\157\1\346\2\157"
-				+ "\1\346\10\157\1\346\4\157\1\346\7\157\1\0\2\157" + "\1\160\1\0\1\161\12\157\1\0\52\157\1\0\1\347" + "\1\162\1\163\3\162\1\347\1\161\26\162\1\347\2\162" + "\1\347\2\162\1\347\10\162\1\347\4\162\1\347\7\162" + "\1\0\2\162\1\163\1\0\3\162\1\161\7\162\1\0" + "\52\162\26\0\1\350\45\0\1\351\1\51\1\165\1\51" + "\1\0\1\51\1\351\1\0\1\51\1\0\1\51\3\0" + "\2\51\2\0\3\51\1\0\1\51\7\0\1\351\2\51" + "\1\351\2\51\1\351\2\51\1\0\4\51\1\0\1\351" + "\1\51\1\0\1\51\1\0\1\351\2\51\6\0\1\352" + "\1\55\1\170\1\55\1\0\1\55\1\352\1\0\1\55" + "\1\0\1\55\3\0\2\55\2\0\3\55\1\0\1\55" + "\7\0\1\352\2\55\1\352\2\55\1\352\2\55\1\0" + "\4\55\1\0\1\352\1\55\1\0\1\55\1\0\1\352" + "\2\55\6\0\1\353\1\62\1\173\1\62\1\0\1\62" + "\1\353\1\0\1\62\1\0\1\62\3\0\2\62\2\0" + "\3\62\1\0\1\62\7\0\1\353\2\62\1\353\2\62" + "\1\353\2\62\1\0\4\62\1\0\1\353\1\62\1\0" + "\1\62\1\0\1\353\2\62\6\0\1\354\1\72\1\200" + "\1\72\1\0\1\72\1\354\1\0\1\72\1\0\1\72" + "\3\0\2\72\2\0\3\72\1\0\1\72\7\0\1\354"
-				+ "\2\72\1\354\2\72\1\354\2\72\1\0\4\72\1\0" + "\1\354\1\72\1\0\1\72\1\0\1\354\2\72\6\0" + "\1\355\1\100\1\203\1\100\1\0\1\100\1\355\1\0" + "\1\100\1\0\1\100\3\0\2\100\2\0\3\100\1\0" + "\1\100\7\0\1\355\2\100\1\355\2\100\1\355\2\100" + "\1\0\4\100\1\0\1\355\1\100\1\0\1\100\1\0" + "\1\355\2\100\6\0\1\356\1\205\1\206\1\205\1\207" + "\1\205\1\356\27\205\1\356\2\205\1\356\2\205\1\356" + "\10\205\1\356\4\205\1\356\7\205\1\0\2\205\1\206" + "\1\0\1\207\12\205\1\0\52\205\1\0\1\357\1\210" + "\1\211\3\210\1\357\1\207\26\210\1\357\2\210\1\357" + "\2\210\1\357\10\210\1\357\4\210\1\357\7\210\1\0" + "\2\210\1\211\1\0\3\210\1\207\7\210\1\0\52\210" + "\1\0\1\360\1\105\1\213\1\105\1\0\1\105\1\360" + "\1\0\1\105\1\0\1\105\3\0\2\105\2\0\3\105" + "\1\0\1\105\7\0\1\360\2\105\1\360\2\105\1\360" + "\2\105\1\0\4\105\1\0\1\360\1\105\1\0\1\105" + "\1\0\1\360\2\105\6\0\1\361\1\216\1\217\1\216" + "\1\0\1\216\1\361\1\0\1\216\1\0\1\216\3\0" + "\2\216\2\0\3\216\1\0\1\216\7\0\1\361\2\216"
-				+ "\1\361\2\216\1\361\2\216\1\0\4\216\1\0\1\361" + "\1\216\1\0\1\216\1\0\1\361\2\216\6\0\1\362" + "\1\113\1\222\1\113\1\0\1\113\1\362\1\0\1\113" + "\1\0\1\113\3\0\2\113\2\0\3\113\1\223\1\113" + "\7\0\1\362\2\113\1\362\2\113\1\362\2\113\1\0" + "\4\113\1\0\1\362\1\113\1\0\1\113\1\0\1\362" + "\2\113\6\0\1\363\1\225\1\226\1\225\1\227\1\225" + "\1\363\27\225\1\363\2\225\1\363\2\225\1\363\10\225" + "\1\363\4\225\1\363\7\225\1\0\2\225\1\226\1\0" + "\1\227\12\225\1\0\52\225\1\0\1\364\1\230\1\231" + "\3\230\1\364\1\227\26\230\1\364\2\230\1\364\2\230" + "\1\364\10\230\1\364\4\230\1\364\7\230\1\0\2\230" + "\1\231\1\0\3\230\1\227\7\230\1\0\52\230\1\0" + "\1\365\1\235\1\236\1\235\1\0\1\235\1\365\1\0" + "\1\235\1\0\1\235\3\0\2\235\2\0\3\235\1\0" + "\1\235\7\0\1\365\2\235\1\365\2\235\1\365\2\235" + "\1\0\4\235\1\0\1\365\1\235\1\0\1\235\1\0" + "\1\365\2\235\6\0\1\366\5\0\1\366\3\0\1\367" + "\5\0\1\366\5\0\1\366\7\0\2\366\1\0\2\366" + "\1\0\2\366\7\0\2\366\3\0\2\366\7\0\2\113"
-				+ "\1\222\3\0\1\113\3\0\1\113\7\0\3\113\1\370" + "\1\113\7\0\11\113\1\0\4\113\1\0\2\113\1\0" + "\1\113\1\0\3\113\60\0\1\371\20\0\1\372\1\25" + "\1\131\1\25\1\0\1\25\1\372\1\0\1\25\1\0" + "\1\25\3\0\2\25\2\0\3\25\1\0\1\25\7\0" + "\1\372\2\25\1\372\2\25\1\372\2\25\1\0\4\25" + "\1\0\1\372\1\25\1\0\1\25\1\0\1\372\2\25" + "\6\0\1\373\1\134\1\135\1\134\1\0\1\134\1\373" + "\1\0\1\134\1\0\1\134\3\0\2\134\2\0\3\134" + "\1\0\1\134\7\0\1\373\2\134\1\373\2\134\1\373" + "\2\134\1\0\4\134\1\0\1\373\1\134\1\0\1\134" + "\1\0\1\373\2\134\6\0\1\374\1\136\1\137\1\136" + "\1\0\1\136\1\374\1\0\1\136\1\0\1\136\3\0" + "\2\136\2\0\3\136\1\0\1\136\7\0\1\374\2\136" + "\1\374\2\136\1\374\2\136\1\0\4\136\1\0\1\374" + "\1\136\1\0\1\136\1\0\1\374\2\136\31\0\1\375" + "\122\0\1\376\67\0\1\377\66\0\2\u0100\73\0\1\u0101" + "\24\0\2\341\1\342\1\u0102\1\0\1\u0102\1\341\1\0" + "\1\u0102\1\u0103\1\341\3\0\2\u0102\2\0\3\341\1\0" + "\1\341\7\0\11\341\1\0\4\341\1\0\2\341\1\0"
-				+ "\1\341\1\0\3\341\6\0\1\u0104\2\341\1\0\2\341" + "\1\u0104\1\341\1\0\5\341\2\0\16\341\1\u0104\2\341" + "\1\u0104\2\341\1\u0104\10\341\1\u0104\4\341\1\u0104\7\341" + "\1\0\1\u0105\1\147\1\150\1\147\1\0\1\147\1\u0105" + "\1\0\1\147\1\0\1\147\3\0\2\147\2\0\3\147" + "\1\260\1\147\7\0\1\u0105\2\147\1\u0105\2\147\1\u0105" + "\2\147\1\0\4\147\1\0\1\u0105\1\147\1\0\1\147" + "\1\0\1\u0105\2\147\6\0\1\u0106\1\151\1\152\1\151" + "\1\153\1\151\1\u0106\27\151\1\u0106\2\151\1\u0106\2\151" + "\1\u0106\10\151\1\u0106\4\151\1\u0106\7\151\1\0\1\u0107" + "\1\154\1\155\3\154\1\u0107\1\153\26\154\1\u0107\2\154" + "\1\u0107\2\154\1\u0107\10\154\1\u0107\4\154\1\u0107\7\154" + "\1\0\1\u0108\1\157\1\160\1\157\1\161\1\157\1\u0108" + "\27\157\1\u0108\2\157\1\u0108\2\157\1\u0108\10\157\1\u0108" + "\4\157\1\u0108\7\157\1\0\1\u0109\1\162\1\163\3\162" + "\1\u0109\1\161\26\162\1\u0109\2\162\1\u0109\2\162\1\u0109" + "\10\162\1\u0109\4\162\1\u0109\7\162\1\0\2\u010a\1\u010b"
-				+ "\1\350\1\u010c\1\350\1\u010a\1\u010d\1\350\1\u010e\4\u010a" + "\2\350\5\u010a\1\0\44\u010a\1\0\1\u010f\1\51\1\165" + "\1\51\1\0\1\51\1\u010f\1\0\1\51\1\0\1\51" + "\3\0\2\51\2\0\3\51\1\0\1\51\7\0\1\u010f" + "\2\51\1\u010f\2\51\1\u010f\2\51\1\0\4\51\1\0" + "\1\u010f\1\51\1\0\1\51\1\0\1\u010f\2\51\6\0" + "\1\u0110\1\55\1\170\1\55\1\0\1\55\1\u0110\1\0" + "\1\55\1\0\1\55\3\0\2\55\2\0\3\55\1\0" + "\1\55\7\0\1\u0110\2\55\1\u0110\2\55\1\u0110\2\55" + "\1\0\4\55\1\0\1\u0110\1\55\1\0\1\55\1\0" + "\1\u0110\2\55\6\0\1\u0111\1\62\1\173\1\62\1\0" + "\1\62\1\u0111\1\0\1\62\1\0\1\62\3\0\2\62" + "\2\0\3\62\1\0\1\62\7\0\1\u0111\2\62\1\u0111" + "\2\62\1\u0111\2\62\1\0\4\62\1\0\1\u0111\1\62" + "\1\0\1\62\1\0\1\u0111\2\62\6\0\1\u0112\1\72" + "\1\200\1\72\1\0\1\72\1\u0112\1\0\1\72\1\0" + "\1\72\3\0\2\72\2\0\3\72\1\0\1\72\7\0" + "\1\u0112\2\72\1\u0112\2\72\1\u0112\2\72\1\0\4\72" + "\1\0\1\u0112\1\72\1\0\1\72\1\0\1\u0112\2\72" + "\6\0\1\u0113\1\100\1\203\1\100\1\0\1\100\1\u0113"
-				+ "\1\0\1\100\1\0\1\100\3\0\2\100\2\0\3\100" + "\1\0\1\100\7\0\1\u0113\2\100\1\u0113\2\100\1\u0113" + "\2\100\1\0\4\100\1\0\1\u0113\1\100\1\0\1\100" + "\1\0\1\u0113\2\100\6\0\1\u0114\1\205\1\206\1\205" + "\1\207\1\205\1\u0114\27\205\1\u0114\2\205\1\u0114\2\205" + "\1\u0114\10\205\1\u0114\4\205\1\u0114\7\205\1\0\1\u0115" + "\1\210\1\211\3\210\1\u0115\1\207\26\210\1\u0115\2\210" + "\1\u0115\2\210\1\u0115\10\210\1\u0115\4\210\1\u0115\7\210" + "\1\0\1\u0116\1\105\1\213\1\105\1\0\1\105\1\u0116" + "\1\0\1\105\1\0\1\105\3\0\2\105\2\0\3\105" + "\1\0\1\105\7\0\1\u0116\2\105\1\u0116\2\105\1\u0116" + "\2\105\1\0\4\105\1\0\1\u0116\1\105\1\0\1\105" + "\1\0\1\u0116\2\105\6\0\1\u0117\1\216\1\217\1\216" + "\1\0\1\216\1\u0117\1\0\1\216\1\0\1\216\3\0" + "\2\216\2\0\3\216\1\0\1\216\7\0\1\u0117\2\216" + "\1\u0117\2\216\1\u0117\2\216\1\0\4\216\1\0\1\u0117" + "\1\216\1\0\1\216\1\0\1\u0117\2\216\6\0\1\u0118" + "\1\113\1\222\1\113\1\0\1\113\1\u0118\1\0\1\113"
-				+ "\1\0\1\113\3\0\2\113\2\0\3\113\1\223\1\113" + "\7\0\1\u0118\2\113\1\u0118\2\113\1\u0118\2\113\1\0" + "\4\113\1\0\1\u0118\1\113\1\0\1\113\1\0\1\u0118" + "\2\113\6\0\1\u0119\1\225\1\226\1\225\1\227\1\225" + "\1\u0119\27\225\1\u0119\2\225\1\u0119\2\225\1\u0119\10\225" + "\1\u0119\4\225\1\u0119\7\225\1\0\1\u011a\1\230\1\231" + "\3\230\1\u011a\1\227\26\230\1\u011a\2\230\1\u011a\2\230" + "\1\u011a\10\230\1\u011a\4\230\1\u011a\7\230\1\0\1\u011b" + "\1\235\1\236\1\235\1\0\1\235\1\u011b\1\0\1\235" + "\1\0\1\235\3\0\2\235\2\0\3\235\1\0\1\235" + "\7\0\1\u011b\2\235\1\u011b\2\235\1\u011b\2\235\1\0" + "\4\235\1\0\1\u011b\1\235\1\0\1\235\1\0\1\u011b" + "\2\235\6\0\1\u011c\5\0\1\u011c\3\0\1\367\5\0" + "\1\u011c\5\0\1\u011c\7\0\2\u011c\1\0\2\u011c\1\0" + "\2\u011c\7\0\2\u011c\3\0\2\u011c\7\0\1\u011d\5\0" + "\1\u011d\11\0\1\u011d\5\0\1\u011d\7\0\2\u011d\1\0" + "\2\u011d\1\0\2\u011d\7\0\2\u011d\3\0\2\u011d\7\0" + "\2\u011e\1\u011f\1\u0120\1\u0121\1\u0120\1\u011e\1\u0122\1\u0120"
-				+ "\1\u0123\4\u011e\2\u0120\5\u011e\1\0\44\u011e\54\0\1\u0124" + "\17\0\1\u0125\1\25\1\131\1\25\1\0\1\25\1\u0125" + "\1\0\1\25\1\0\1\25\3\0\2\25\2\0\3\25" + "\1\0\1\25\7\0\1\u0125\2\25\1\u0125\2\25\1\u0125" + "\2\25\1\0\4\25\1\0\1\u0125\1\25\1\0\1\25" + "\1\0\1\u0125\2\25\6\0\1\u0126\1\134\1\135\1\134" + "\1\0\1\134\1\u0126\1\0\1\134\1\0\1\134\3\0" + "\2\134\2\0\3\134\1\0\1\134\7\0\1\u0126\2\134" + "\1\u0126\2\134\1\u0126\2\134\1\0\4\134\1\0\1\u0126" + "\1\134\1\0\1\134\1\0\1\u0126\2\134\6\0\1\u0127" + "\1\136\1\137\1\136\1\0\1\136\1\u0127\1\0\1\136" + "\1\0\1\136\3\0\2\136\2\0\3\136\1\0\1\136" + "\7\0\1\u0127\2\136\1\u0127\2\136\1\u0127\2\136\1\0" + "\4\136\1\0\1\u0127\1\136\1\0\1\136\1\0\1\u0127" + "\2\136\51\0\1\u0128\52\0\1\u0129\110\0\2\u012a\42\0" + "\1\u012b\63\0\1\u0102\1\0\1\u0102\2\0\1\u0102\1\u0103" + "\4\0\2\u0102\53\0\1\u012c\1\341\1\342\1\341\1\0" + "\1\341\1\u012c\1\0\1\341\1\u0103\1\341\3\0\2\341" + "\2\0\3\341\1\0\1\341\7\0\1\u012c\2\341\1\u012c"
-				+ "\2\341\1\u012c\2\341\1\0\4\341\1\0\1\u012c\1\341" + "\1\0\1\341\1\0\1\u012c\2\341\6\0\1\u012d\1\147" + "\1\150\1\147\1\0\1\147\1\u012d\1\0\1\147\1\0" + "\1\147\3\0\2\147\2\0\3\147\1\260\1\147\7\0" + "\1\u012d\2\147\1\u012d\2\147\1\u012d\2\147\1\0\4\147" + "\1\0\1\u012d\1\147\1\0\1\147\1\0\1\u012d\2\147" + "\6\0\1\u012e\1\151\1\152\1\151\1\153\1\151\1\u012e" + "\27\151\1\u012e\2\151\1\u012e\2\151\1\u012e\10\151\1\u012e" + "\4\151\1\u012e\7\151\1\0\1\u012f\1\154\1\155\3\154" + "\1\u012f\1\153\26\154\1\u012f\2\154\1\u012f\2\154\1\u012f" + "\10\154\1\u012f\4\154\1\u012f\7\154\1\0\1\u0130\1\157" + "\1\160\1\157\1\161\1\157\1\u0130\27\157\1\u0130\2\157" + "\1\u0130\2\157\1\u0130\10\157\1\u0130\4\157\1\u0130\7\157" + "\1\0\1\u0131\1\162\1\163\3\162\1\u0131\1\161\26\162" + "\1\u0131\2\162\1\u0131\2\162\1\u0131\10\162\1\u0131\4\162" + "\1\u0131\7\162\1\0\2\u010a\1\u010b\1\u0132\1\0\2\u010a" + "\1\0\1\u0132\1\u010e\4\u010a\2\u0132\5\u010a\1\0\44\u010a"
-				+ "\1\0\1\u0133\1\u010a\1\u010b\1\u0132\2\u010a\1\u0133\1\u010a" + "\1\u0132\1\u0134\4\u010a\2\u0132\16\u010a\1\u0133\2\u010a\1\u0133" + "\2\u010a\1\u0133\10\u010a\1\u0133\4\u010a\1\u0133\7\u010a\1\0" + "\2\u010c\1\u0135\1\0\1\u0132\11\u010c\2\0\52\u010c\1\0" + "\2\u010d\1\u0136\1\0\3\u010d\1\u0132\6\u010d\2\0\52\u010d" + "\1\0\1\u0137\1\51\1\165\1\51\1\0\1\51\1\u0137" + "\1\0\1\51\1\0\1\51\3\0\2\51\2\0\3\51" + "\1\0\1\51\7\0\1\u0137\2\51\1\u0137\2\51\1\u0137" + "\2\51\1\0\4\51\1\0\1\u0137\1\51\1\0\1\51" + "\1\0\1\u0137\2\51\6\0\1\u0138\1\55\1\170\1\55" + "\1\0\1\55\1\u0138\1\0\1\55\1\0\1\55\3\0" + "\2\55\2\0\3\55\1\0\1\55\7\0\1\u0138\2\55" + "\1\u0138\2\55\1\u0138\2\55\1\0\4\55\1\0\1\u0138" + "\1\55\1\0\1\55\1\0\1\u0138\2\55\6\0\1\u0139" + "\1\62\1\173\1\62\1\0\1\62\1\u0139\1\0\1\62" + "\1\0\1\62\3\0\2\62\2\0\3\62\1\0\1\62" + "\7\0\1\u0139\2\62\1\u0139\2\62\1\u0139\2\62\1\0" + "\4\62\1\0\1\u0139\1\62\1\0\1\62\1\0\1\u0139"
-				+ "\2\62\6\0\1\u013a\1\72\1\200\1\72\1\0\1\72" + "\1\u013a\1\0\1\72\1\0\1\72\3\0\2\72\2\0" + "\3\72\1\0\1\72\7\0\1\u013a\2\72\1\u013a\2\72" + "\1\u013a\2\72\1\0\4\72\1\0\1\u013a\1\72\1\0" + "\1\72\1\0\1\u013a\2\72\6\0\1\u013b\1\100\1\203" + "\1\100\1\0\1\100\1\u013b\1\0\1\100\1\0\1\100" + "\3\0\2\100\2\0\3\100\1\0\1\100\7\0\1\u013b" + "\2\100\1\u013b\2\100\1\u013b\2\100\1\0\4\100\1\0" + "\1\u013b\1\100\1\0\1\100\1\0\1\u013b\2\100\6\0" + "\1\u013c\1\205\1\206\1\205\1\207\1\205\1\u013c\27\205" + "\1\u013c\2\205\1\u013c\2\205\1\u013c\10\205\1\u013c\4\205" + "\1\u013c\7\205\1\0\1\u013d\1\210\1\211\3\210\1\u013d" + "\1\207\26\210\1\u013d\2\210\1\u013d\2\210\1\u013d\10\210" + "\1\u013d\4\210\1\u013d\7\210\1\0\1\u013e\1\105\1\213" + "\1\105\1\0\1\105\1\u013e\1\0\1\105\1\0\1\105" + "\3\0\2\105\2\0\3\105\1\0\1\105\7\0\1\u013e" + "\2\105\1\u013e\2\105\1\u013e\2\105\1\0\4\105\1\0" + "\1\u013e\1\105\1\0\1\105\1\0\1\u013e\2\105\6\0"
-				+ "\1\u013f\1\216\1\217\1\216\1\0\1\216\1\u013f\1\0" + "\1\216\1\0\1\216\3\0\2\216\2\0\3\216\1\0" + "\1\216\7\0\1\u013f\2\216\1\u013f\2\216\1\u013f\2\216" + "\1\0\4\216\1\0\1\u013f\1\216\1\0\1\216\1\0" + "\1\u013f\2\216\6\0\1\u0140\1\113\1\222\1\113\1\0" + "\1\113\1\u0140\1\0\1\113\1\0\1\113\3\0\2\113" + "\2\0\3\113\1\223\1\113\7\0\1\u0140\2\113\1\u0140" + "\2\113\1\u0140\2\113\1\0\4\113\1\0\1\u0140\1\113" + "\1\0\1\113\1\0\1\u0140\2\113\6\0\1\u0141\1\225" + "\1\226\1\225\1\227\1\225\1\u0141\27\225\1\u0141\2\225" + "\1\u0141\2\225\1\u0141\10\225\1\u0141\4\225\1\u0141\7\225" + "\1\0\1\u0142\1\230\1\231\3\230\1\u0142\1\227\26\230" + "\1\u0142\2\230\1\u0142\2\230\1\u0142\10\230\1\u0142\4\230" + "\1\u0142\7\230\1\0\1\u0143\1\235\1\236\1\235\1\0" + "\1\235\1\u0143\1\0\1\235\1\0\1\235\3\0\2\235" + "\2\0\3\235\1\0\1\235\7\0\1\u0143\2\235\1\u0143" + "\2\235\1\u0143\2\235\1\0\4\235\1\0\1\u0143\1\235" + "\1\0\1\235\1\0\1\u0143\2\235\6\0\1\u0144\5\0"
-				+ "\1\u0144\3\0\1\367\5\0\1\u0144\5\0\1\u0144\7\0" + "\2\u0144\1\0\2\u0144\1\0\2\u0144\7\0\2\u0144\3\0" + "\2\u0144\7\0\1\u0145\5\0\1\u0145\11\0\1\u0145\5\0" + "\1\u0145\7\0\2\u0145\1\0\2\u0145\1\0\2\u0145\7\0" + "\2\u0145\3\0\2\u0145\7\0\2\u011e\1\u011f\1\u0146\1\0" + "\2\u011e\1\0\1\u0146\1\u0123\4\u011e\2\u0146\5\u011e\1\0" + "\44\u011e\1\0\1\u0147\1\u011e\1\u011f\1\u0146\2\u011e\1\u0147" + "\1\u011e\1\u0146\1\u0148\4\u011e\2\u0146\16\u011e\1\u0147\2\u011e" + "\1\u0147\2\u011e\1\u0147\10\u011e\1\u0147\4\u011e\1\u0147\7\u011e" + "\1\0\2\u0121\1\u0149\1\0\1\u0146\11\u0121\2\0\52\u0121" + "\1\0\2\u0122\1\u014a\1\0\3\u0122\1\u0146\6\u0122\2\0" + "\52\u0122\24\0\1\u014b\47\0\1\u014c\1\25\1\131\1\25" + "\1\0\1\25\1\u014c\1\0\1\25\1\0\1\25\3\0" + "\2\25\2\0\3\25\1\0\1\25\7\0\1\u014c\2\25" + "\1\u014c\2\25\1\u014c\2\25\1\0\4\25\1\0\1\u014c" + "\1\25\1\0\1\25\1\0\1\u014c\2\25\6\0\1\u014d" + "\1\134\1\135\1\134\1\0\1\134\1\u014d\1\0\1\134"
-				+ "\1\0\1\134\3\0\2\134\2\0\3\134\1\0\1\134" + "\7\0\1\u014d\2\134\1\u014d\2\134\1\u014d\2\134\1\0" + "\4\134\1\0\1\u014d\1\134\1\0\1\134\1\0\1\u014d" + "\2\134\6\0\1\u014e\1\136\1\137\1\136\1\0\1\136" + "\1\u014e\1\0\1\136\1\0\1\136\3\0\2\136\2\0" + "\3\136\1\0\1\136\7\0\1\u014e\2\136\1\u014e\2\136" + "\1\u014e\2\136\1\0\4\136\1\0\1\u014e\1\136\1\0" + "\1\136\1\0\1\u014e\2\136\52\0\2\u014f\73\0\1\u0150" + "\106\0\2\u0151\7\0\1\u0152\1\341\1\342\1\341\1\0" + "\1\341\1\u0152\1\0\1\341\1\u0103\1\341\3\0\2\341" + "\2\0\3\341\1\0\1\341\7\0\1\u0152\2\341\1\u0152" + "\2\341\1\u0152\2\341\1\0\4\341\1\0\1\u0152\1\341" + "\1\0\1\341\1\0\1\u0152\2\341\6\0\1\u0153\1\147" + "\1\150\1\147\1\0\1\147\1\u0153\1\0\1\147\1\0" + "\1\147\3\0\2\147\2\0\3\147\1\260\1\147\7\0" + "\1\u0153\2\147\1\u0153\2\147\1\u0153\2\147\1\0\4\147" + "\1\0\1\u0153\1\147\1\0\1\147\1\0\1\u0153\2\147" + "\6\0\1\u0154\1\151\1\152\1\151\1\153\1\151\1\u0154"
-				+ "\27\151\1\u0154\2\151\1\u0154\2\151\1\u0154\10\151\1\u0154" + "\4\151\1\u0154\7\151\1\0\1\u0155\1\154\1\155\3\154" + "\1\u0155\1\153\26\154\1\u0155\2\154\1\u0155\2\154\1\u0155" + "\10\154\1\u0155\4\154\1\u0155\7\154\1\0\1\u0156\1\157" + "\1\160\1\157\1\161\1\157\1\u0156\27\157\1\u0156\2\157" + "\1\u0156\2\157\1\u0156\10\157\1\u0156\4\157\1\u0156\7\157" + "\1\0\1\u0157\1\162\1\163\3\162\1\u0157\1\161\26\162" + "\1\u0157\2\162\1\u0157\2\162\1\u0157\10\162\1\u0157\4\162" + "\1\u0157\7\162\4\0\1\u0132\1\0\1\u0132\2\0\1\u0132" + "\1\u010e\4\0\2\u0132\53\0\1\u0158\1\u010a\1\u010b\1\u010a" + "\1\0\1\u010a\1\u0158\1\0\1\u010a\1\u010e\13\u010a\1\0" + "\10\u010a\1\u0158\2\u010a\1\u0158\2\u010a\1\u0158\10\u010a\1\u0158" + "\4\u010a\1\u0158\7\u010a\1\0\1\u0159\1\u010c\1\u0135\1\u010c" + "\1\u015a\1\u010c\1\u0159\10\u010c\1\u015b\16\u010c\1\u0159\2\u010c" + "\1\u0159\2\u010c\1\u0159\10\u010c\1\u0159\4\u010c\1\u0159\7\u010c"
-				+ "\1\0\1\u015c\1\u010d\1\u0136\3\u010d\1\u015c\1\u015d\7\u010d" + "\1\u015e\16\u010d\1\u015c\2\u010d\1\u015c\2\u010d\1\u015c\10\u010d" + "\1\u015c\4\u010d\1\u015c\7\u010d\1\0\1\u015f\1\51\1\165" + "\1\51\1\0\1\51\1\u015f\1\0\1\51\1\0\1\51" + "\3\0\2\51\2\0\3\51\1\0\1\51\7\0\1\u015f" + "\2\51\1\u015f\2\51\1\u015f\2\51\1\0\4\51\1\0" + "\1\u015f\1\51\1\0\1\51\1\0\1\u015f\2\51\6\0" + "\1\u0160\1\55\1\170\1\55\1\0\1\55\1\u0160\1\0" + "\1\55\1\0\1\55\3\0\2\55\2\0\3\55\1\0" + "\1\55\7\0\1\u0160\2\55\1\u0160\2\55\1\u0160\2\55" + "\1\0\4\55\1\0\1\u0160\1\55\1\0\1\55\1\0" + "\1\u0160\2\55\6\0\1\u0161\1\62\1\173\1\62\1\0" + "\1\62\1\u0161\1\0\1\62\1\0\1\62\3\0\2\62" + "\2\0\3\62\1\0\1\62\7\0\1\u0161\2\62\1\u0161" + "\2\62\1\u0161\2\62\1\0\4\62\1\0\1\u0161\1\62" + "\1\0\1\62\1\0\1\u0161\2\62\6\0\1\u0162\1\72" + "\1\200\1\72\1\0\1\72\1\u0162\1\0\1\72\1\0" + "\1\72\3\0\2\72\2\0\3\72\1\0\1\72\7\0" + "\1\u0162\2\72\1\u0162\2\72\1\u0162\2\72\1\0\4\72"
-				+ "\1\0\1\u0162\1\72\1\0\1\72\1\0\1\u0162\2\72" + "\6\0\1\u0163\1\100\1\203\1\100\1\0\1\100\1\u0163" + "\1\0\1\100\1\0\1\100\3\0\2\100\2\0\3\100" + "\1\0\1\100\7\0\1\u0163\2\100\1\u0163\2\100\1\u0163" + "\2\100\1\0\4\100\1\0\1\u0163\1\100\1\0\1\100" + "\1\0\1\u0163\2\100\6\0\1\u0164\1\205\1\206\1\205" + "\1\207\1\205\1\u0164\27\205\1\u0164\2\205\1\u0164\2\205" + "\1\u0164\10\205\1\u0164\4\205\1\u0164\7\205\1\0\1\u0165" + "\1\210\1\211\3\210\1\u0165\1\207\26\210\1\u0165\2\210" + "\1\u0165\2\210\1\u0165\10\210\1\u0165\4\210\1\u0165\7\210" + "\1\0\1\u0166\1\105\1\213\1\105\1\0\1\105\1\u0166" + "\1\0\1\105\1\0\1\105\3\0\2\105\2\0\3\105" + "\1\0\1\105\7\0\1\u0166\2\105\1\u0166\2\105\1\u0166" + "\2\105\1\0\4\105\1\0\1\u0166\1\105\1\0\1\105" + "\1\0\1\u0166\2\105\6\0\1\u0167\1\216\1\217\1\216" + "\1\0\1\216\1\u0167\1\0\1\216\1\0\1\216\3\0" + "\2\216\2\0\3\216\1\0\1\216\7\0\1\u0167\2\216" + "\1\u0167\2\216\1\u0167\2\216\1\0\4\216\1\0\1\u0167"
-				+ "\1\216\1\0\1\216\1\0\1\u0167\2\216\6\0\1\u0168" + "\1\113\1\222\1\113\1\0\1\113\1\u0168\1\0\1\113" + "\1\0\1\113\3\0\2\113\2\0\3\113\1\223\1\113" + "\7\0\1\u0168\2\113\1\u0168\2\113\1\u0168\2\113\1\0" + "\4\113\1\0\1\u0168\1\113\1\0\1\113\1\0\1\u0168" + "\2\113\6\0\1\u0169\1\225\1\226\1\225\1\227\1\225" + "\1\u0169\27\225\1\u0169\2\225\1\u0169\2\225\1\u0169\10\225" + "\1\u0169\4\225\1\u0169\7\225\1\0\1\u016a\1\230\1\231" + "\3\230\1\u016a\1\227\26\230\1\u016a\2\230\1\u016a\2\230" + "\1\u016a\10\230\1\u016a\4\230\1\u016a\7\230\1\0\1\u016b" + "\1\235\1\236\1\235\1\0\1\235\1\u016b\1\0\1\235" + "\1\0\1\235\3\0\2\235\2\0\3\235\1\0\1\235" + "\7\0\1\u016b\2\235\1\u016b\2\235\1\u016b\2\235\1\0" + "\4\235\1\0\1\u016b\1\235\1\0\1\235\1\0\1\u016b" + "\2\235\6\0\1\u016c\5\0\1\u016c\3\0\1\367\5\0" + "\1\u016c\5\0\1\u016c\7\0\2\u016c\1\0\2\u016c\1\0" + "\2\u016c\7\0\2\u016c\3\0\2\u016c\7\0\1\u016d\5\0" + "\1\u016d\11\0\1\u016d\5\0\1\u016d\7\0\2\u016d\1\0"
-				+ "\2\u016d\1\0\2\u016d\7\0\2\u016d\3\0\2\u016d\12\0" + "\1\u0146\1\0\1\u0146\2\0\1\u0146\1\u0123\4\0\2\u0146" + "\53\0\1\u016e\1\u011e\1\u011f\1\u011e\1\0\1\u011e\1\u016e" + "\1\0\1\u011e\1\u0123\13\u011e\1\0\10\u011e\1\u016e\2\u011e" + "\1\u016e\2\u011e\1\u016e\10\u011e\1\u016e\4\u011e\1\u016e\7\u011e" + "\1\0\1\u016f\1\u0121\1\u0149\1\u0121\1\u0170\1\u0121\1\u016f" + "\10\u0121\1\u0171\16\u0121\1\u016f\2\u0121\1\u016f\2\u0121\1\u016f" + "\10\u0121\1\u016f\4\u0121\1\u016f\7\u0121\1\0\1\u0172\1\u0122" + "\1\u014a\3\u0122\1\u0172\1\u0173\7\u0122\1\u0174\16\u0122\1\u0172" + "\2\u0122\1\u0172\2\u0122\1\u0172\10\u0122\1\u0172\4\u0122\1\u0172" + "\7\u0122\47\0\1\u0175\24\0\2\25\1\131\1\25\1\0" + "\2\25\1\0\1\25\1\0\1\25\3\0\2\25\2\0" + "\3\25\1\0\1\25\7\0\11\25\1\0\4\25\1\0" + "\2\25\1\0\1\25\1\0\3\25\6\0\1\u0176\1\134" + "\1\135\1\134\1\0\1\134\1\u0176\1\0\1\134\1\0" + "\1\134\3\0\2\134\2\0\3\134\1\0\1\134\7\0" + "\1\u0176\2\134\1\u0176\2\134\1\u0176\2\134\1\0\4\134"
-				+ "\1\0\1\u0176\1\134\1\0\1\134\1\0\1\u0176\2\134" + "\6\0\1\u0177\1\136\1\137\1\136\1\0\1\136\1\u0177" + "\1\0\1\136\1\0\1\136\3\0\2\136\2\0\3\136" + "\1\0\1\136\7\0\1\u0177\2\136\1\u0177\2\136\1\u0177" + "\2\136\1\0\4\136\1\0\1\u0177\1\136\1\0\1\136" + "\1\0\1\u0177\2\136\54\0\1\u0178\65\0\2\u0179\30\0" + "\1\u017a\1\341\1\342\1\341\1\0\1\341\1\u017a\1\0" + "\1\341\1\u0103\1\341\3\0\2\341\2\0\3\341\1\0" + "\1\341\7\0\1\u017a\2\341\1\u017a\2\341\1\u017a\2\341" + "\1\0\4\341\1\0\1\u017a\1\341\1\0\1\341\1\0" + "\1\u017a\2\341\6\0\1\u017b\1\147\1\150\1\147\1\0" + "\1\147\1\u017b\1\0\1\147\1\0\1\147\3\0\2\147" + "\2\0\3\147\1\260\1\147\7\0\1\u017b\2\147\1\u017b" + "\2\147\1\u017b\2\147\1\0\4\147\1\0\1\u017b\1\147" + "\1\0\1\147\1\0\1\u017b\2\147\6\0\1\u017c\1\151" + "\1\152\1\151\1\153\1\151\1\u017c\27\151\1\u017c\2\151" + "\1\u017c\2\151\1\u017c\10\151\1\u017c\4\151\1\u017c\7\151" + "\1\0\1\u017d\1\154\1\155\3\154\1\u017d\1\153\26\154"
-				+ "\1\u017d\2\154\1\u017d\2\154\1\u017d\10\154\1\u017d\4\154" + "\1\u017d\7\154\1\0\1\u017e\1\157\1\160\1\157\1\161" + "\1\157\1\u017e\27\157\1\u017e\2\157\1\u017e\2\157\1\u017e" + "\10\157\1\u017e\4\157\1\u017e\7\157\1\0\1\u017f\1\162" + "\1\163\3\162\1\u017f\1\161\26\162\1\u017f\2\162\1\u017f" + "\2\162\1\u017f\10\162\1\u017f\4\162\1\u017f\7\162\1\0" + "\1\u0180\1\u010a\1\u010b\1\u010a\1\0\1\u010a\1\u0180\1\0" + "\1\u010a\1\u010e\13\u010a\1\0\10\u010a\1\u0180\2\u010a\1\u0180" + "\2\u010a\1\u0180\10\u010a\1\u0180\4\u010a\1\u0180\7\u010a\1\0" + "\1\u0181\1\u010c\1\u0135\1\u010c\1\u0132\1\u010c\1\u0181\27\u010c" + "\1\u0181\2\u010c\1\u0181\2\u010c\1\u0181\10\u010c\1\u0181\4\u010c" + "\1\u0181\7\u010c\1\0\2\u010c\1\u0135\2\u0132\1\u015a\2\u010c" + "\1\u015a\1\u0182\4\u010c\2\u0132\52\u010c\1\0\2\u010c\1\u0135" + "\1\0\1\u0132\12\u010c\1\0\52\u010c\1\0\1\u0183\1\u010d" + "\1\u0136\3\u010d\1\u0183\1\u0132\26\u010d\1\u0183\2\u010d\1\u0183"
-				+ "\2\u010d\1\u0183\10\u010d\1\u0183\4\u010d\1\u0183\7\u010d\1\0" + "\2\u010d\1\u0136\1\u0132\1\u010d\1\u015d\1\u010d\1\u0132\1\u015d" + "\1\u0184\4\u010d\2\u0132\52\u010d\1\0\2\u010d\1\u0136\1\0" + "\3\u010d\1\u0132\7\u010d\1\0\52\u010d\1\0\2\51\1\165" + "\1\51\1\0\2\51\1\0\1\51\1\0\1\51\3\0" + "\2\51\2\0\3\51\1\0\1\51\7\0\11\51\1\0" + "\4\51\1\0\2\51\1\0\1\51\1\0\3\51\6\0" + "\2\55\1\170\1\55\1\0\2\55\1\0\1\55\1\0" + "\1\55\3\0\2\55\2\0\3\55\1\0\1\55\7\0" + "\11\55\1\0\4\55\1\0\2\55\1\0\1\55\1\0" + "\3\55\6\0\2\62\1\173\1\62\1\0\2\62\1\0" + "\1\62\1\0\1\62\3\0\2\62\2\0\3\62\1\0" + "\1\62\7\0\11\62\1\0\4\62\1\0\2\62\1\0" + "\1\62\1\0\3\62\6\0\2\72\1\200\1\72\1\0" + "\2\72\1\0\1\72\1\0\1\72\3\0\2\72\2\0" + "\3\72\1\0\1\72\7\0\11\72\1\0\4\72\1\0" + "\2\72\1\0\1\72\1\0\3\72\6\0\2\100\1\203" + "\1\100\1\0\2\100\1\0\1\100\1\0\1\100\3\0" + "\2\100\2\0\3\100\1\0\1\100\7\0\11\100\1\0" + "\4\100\1\0\2\100\1\0\1\100\1\0\3\100\6\0"
-				+ "\1\u0185\1\205\1\206\1\205\1\207\1\205\1\u0185\27\205" + "\1\u0185\2\205\1\u0185\2\205\1\u0185\10\205\1\u0185\4\205" + "\1\u0185\7\205\1\0\1\u0186\1\210\1\211\3\210\1\u0186" + "\1\207\26\210\1\u0186\2\210\1\u0186\2\210\1\u0186\10\210" + "\1\u0186\4\210\1\u0186\7\210\1\0\2\105\1\213\1\105" + "\1\0\2\105\1\0\1\105\1\0\1\105\3\0\2\105" + "\2\0\3\105\1\0\1\105\7\0\11\105\1\0\4\105" + "\1\0\2\105\1\0\1\105\1\0\3\105\6\0\1\u0187" + "\1\216\1\217\1\216\1\0\1\216\1\u0187\1\0\1\216" + "\1\0\1\216\3\0\2\216\2\0\3\216\1\0\1\216" + "\7\0\1\u0187\2\216\1\u0187\2\216\1\u0187\2\216\1\0" + "\4\216\1\0\1\u0187\1\216\1\0\1\216\1\0\1\u0187" + "\2\216\6\0\2\113\1\222\1\113\1\0\2\113\1\0" + "\1\113\1\0\1\113\3\0\2\113\2\0\3\113\1\223" + "\1\113\7\0\11\113\1\0\4\113\1\0\2\113\1\0" + "\1\113\1\0\3\113\6\0\1\u0188\1\225\1\226\1\225" + "\1\227\1\225\1\u0188\27\225\1\u0188\2\225\1\u0188\2\225" + "\1\u0188\10\225\1\u0188\4\225\1\u0188\7\225\1\0\1\u0189"
-				+ "\1\230\1\231\3\230\1\u0189\1\227\26\230\1\u0189\2\230" + "\1\u0189\2\230\1\u0189\10\230\1\u0189\4\230\1\u0189\7\230" + "\1\0\1\u018a\1\235\1\236\1\235\1\0\1\235\1\u018a" + "\1\0\1\235\1\0\1\235\3\0\2\235\2\0\3\235" + "\1\0\1\235\7\0\1\u018a\2\235\1\u018a\2\235\1\u018a" + "\2\235\1\0\4\235\1\0\1\u018a\1\235\1\0\1\235" + "\1\0\1\u018a\2\235\6\0\1\u018b\5\0\1\u018b\3\0" + "\1\367\5\0\1\u018b\5\0\1\u018b\7\0\2\u018b\1\0" + "\2\u018b\1\0\2\u018b\7\0\2\u018b\3\0\2\u018b\7\0" + "\1\u018c\5\0\1\u018c\11\0\1\u018c\5\0\1\u018c\7\0" + "\2\u018c\1\0\2\u018c\1\0\2\u018c\7\0\2\u018c\3\0" + "\2\u018c\7\0\1\u018d\1\u011e\1\u011f\1\u011e\1\0\1\u011e" + "\1\u018d\1\0\1\u011e\1\u0123\13\u011e\1\0\10\u011e\1\u018d" + "\2\u011e\1\u018d\2\u011e\1\u018d\10\u011e\1\u018d\4\u011e\1\u018d" + "\7\u011e\1\0\1\u018e\1\u0121\1\u0149\1\u0121\1\u0146\1\u0121" + "\1\u018e\27\u0121\1\u018e\2\u0121\1\u018e\2\u0121\1\u018e\10\u0121" + "\1\u018e\4\u0121\1\u018e\7\u0121\1\0\2\u0121\1\u0149\2\u0146"
-				+ "\1\u0170\2\u0121\1\u0170\1\u018f\4\u0121\2\u0146\52\u0121\1\0" + "\2\u0121\1\u0149\1\0\1\u0146\12\u0121\1\0\52\u0121\1\0" + "\1\u0190\1\u0122\1\u014a\3\u0122\1\u0190\1\u0146\26\u0122\1\u0190" + "\2\u0122\1\u0190\2\u0122\1\u0190\10\u0122\1\u0190\4\u0122\1\u0190" + "\7\u0122\1\0\2\u0122\1\u014a\1\u0146\1\u0122\1\u0173\1\u0122" + "\1\u0146\1\u0173\1\u0191\4\u0122\2\u0146\52\u0122\1\0\2\u0122" + "\1\u014a\1\0\3\u0122\1\u0146\7\u0122\1\0\52\u0122\42\0" + "\2\u0192\30\0\2\134\1\135\1\134\1\0\2\134\1\0" + "\1\134\1\0\1\134\3\0\2\134\2\0\3\134\1\0" + "\1\134\7\0\11\134\1\0\4\134\1\0\2\134\1\0" + "\1\134\1\0\3\134\6\0\2\136\1\137\1\136\1\0" + "\2\136\1\0\1\136\1\0\1\136\3\0\2\136\2\0" + "\3\136\1\0\1\136\7\0\11\136\1\0\4\136\1\0" + "\2\136\1\0\1\136\1\0\3\136\44\0\2\u0193\33\0" + "\1\u0194\1\341\1\342\1\341\1\0\1\341\1\u0194\1\0" + "\1\341\1\u0103\1\341\3\0\2\341\2\0\3\341\1\0" + "\1\341\7\0\1\u0194\2\341\1\u0194\2\341\1\u0194\2\341"
-				+ "\1\0\4\341\1\0\1\u0194\1\341\1\0\1\341\1\0" + "\1\u0194\2\341\6\0\2\147\1\150\1\147\1\0\2\147" + "\1\0\1\147\1\0\1\147\3\0\2\147\2\0\3\147" + "\1\260\1\147\7\0\11\147\1\0\4\147\1\0\2\147" + "\1\0\1\147\1\0\3\147\6\0\2\151\1\152\1\151" + "\1\153\65\151\1\0\2\154\1\155\4\154\1\153\62\154" + "\1\0\2\157\1\160\1\157\1\161\65\157\1\0\2\162" + "\1\163\4\162\1\161\62\162\1\0\1\u0195\1\u010a\1\u010b" + "\1\u010a\1\0\1\u010a\1\u0195\1\0\1\u010a\1\u010e\13\u010a" + "\1\0\10\u010a\1\u0195\2\u010a\1\u0195\2\u010a\1\u0195\10\u010a" + "\1\u0195\4\u010a\1\u0195\7\u010a\1\0\1\u0196\1\u010c\1\u0135" + "\1\u010c\1\u0132\1\u010c\1\u0196\27\u010c\1\u0196\2\u010c\1\u0196" + "\2\u010c\1\u0196\10\u010c\1\u0196\4\u010c\1\u0196\7\u010c\1\0" + "\1\u0197\1\u010d\1\u0136\3\u010d\1\u0197\1\u0132\26\u010d\1\u0197" + "\2\u010d\1\u0197\2\u010d\1\u0197\10\u010d\1\u0197\4\u010d\1\u0197" + "\7\u010d\1\0\2\205\1\206\1\205\1\207\65\205\1\0" + "\2\210\1\211\4\210\1\207\62\210\1\0\2\216\1\217"
-				+ "\1\216\1\0\2\216\1\0\1\216\1\0\1\216\3\0" + "\2\216\2\0\3\216\1\0\1\216\7\0\11\216\1\0" + "\4\216\1\0\2\216\1\0\1\216\1\0\3\216\6\0" + "\2\225\1\226\1\225\1\227\65\225\1\0\2\230\1\231" + "\4\230\1\227\62\230\1\0\2\235\1\236\1\235\1\0" + "\2\235\1\0\1\235\1\0\1\235\3\0\2\235\2\0" + "\3\235\1\0\1\235\7\0\11\235\1\0\4\235\1\0" + "\2\235\1\0\1\235\1\0\3\235\20\0\1\367\60\0" + "\1\u0198\5\0\1\u0198\11\0\1\u0198\5\0\1\u0198\7\0" + "\2\u0198\1\0\2\u0198\1\0\2\u0198\7\0\2\u0198\3\0" + "\2\u0198\7\0\1\u0199\1\u011e\1\u011f\1\u011e\1\0\1\u011e" + "\1\u0199\1\0\1\u011e\1\u0123\13\u011e\1\0\10\u011e\1\u0199" + "\2\u011e\1\u0199\2\u011e\1\u0199\10\u011e\1\u0199\4\u011e\1\u0199" + "\7\u011e\1\0\1\u019a\1\u0121\1\u0149\1\u0121\1\u0146\1\u0121" + "\1\u019a\27\u0121\1\u019a\2\u0121\1\u019a\2\u0121\1\u019a\10\u0121" + "\1\u019a\4\u0121\1\u019a\7\u0121\1\0\1\u019b\1\u0122\1\u014a" + "\3\u0122\1\u019b\1\u0146\26\u0122\1\u019b\2\u0122\1\u019b\2\u0122"
-				+ "\1\u019b\10\u0122\1\u019b\4\u0122\1\u019b\7\u0122\65\0\1\u019c" + "\52\0\2\u019d\25\0\1\u019e\1\341\1\342\1\341\1\0" + "\1\341\1\u019e\1\0\1\341\1\u0103\1\341\3\0\2\341" + "\2\0\3\341\1\0\1\341\7\0\1\u019e\2\341\1\u019e" + "\2\341\1\u019e\2\341\1\0\4\341\1\0\1\u019e\1\341" + "\1\0\1\341\1\0\1\u019e\2\341\6\0\1\u019f\1\u010a" + "\1\u010b\1\u010a\1\0\1\u010a\1\u019f\1\0\1\u010a\1\u010e" + "\13\u010a\1\0\10\u010a\1\u019f\2\u010a\1\u019f\2\u010a\1\u019f" + "\10\u010a\1\u019f\4\u010a\1\u019f\7\u010a\1\0\1\u01a0\1\u010c" + "\1\u0135\1\u010c\1\u0132\1\u010c\1\u01a0\27\u010c\1\u01a0\2\u010c" + "\1\u01a0\2\u010c\1\u01a0\10\u010c\1\u01a0\4\u010c\1\u01a0\7\u010c" + "\1\0\1\u01a1\1\u010d\1\u0136\3\u010d\1\u01a1\1\u0132\26\u010d" + "\1\u01a1\2\u010d\1\u01a1\2\u010d\1\u01a1\10\u010d\1\u01a1\4\u010d" + "\1\u01a1\7\u010d\1\0\1\u01a2\5\0\1\u01a2\11\0\1\u01a2" + "\5\0\1\u01a2\7\0\2\u01a2\1\0\2\u01a2\1\0\2\u01a2" + "\7\0\2\u01a2\3\0\2\u01a2\7\0\1\u01a3\1\u011e\1\u011f"
-				+ "\1\u011e\1\0\1\u011e\1\u01a3\1\0\1\u011e\1\u0123\13\u011e" + "\1\0\10\u011e\1\u01a3\2\u011e\1\u01a3\2\u011e\1\u01a3\10\u011e" + "\1\u01a3\4\u011e\1\u01a3\7\u011e\1\0\1\u01a4\1\u0121\1\u0149" + "\1\u0121\1\u0146\1\u0121\1\u01a4\27\u0121\1\u01a4\2\u0121\1\u01a4" + "\2\u0121\1\u01a4\10\u0121\1\u01a4\4\u0121\1\u01a4\7\u0121\1\0" + "\1\u01a5\1\u0122\1\u014a\3\u0122\1\u01a5\1\u0146\26\u0122\1\u01a5" + "\2\u0122\1\u01a5\2\u0122\1\u01a5\10\u0122\1\u01a5\4\u0122\1\u01a5" + "\7\u0122\47\0\1\u01a6\24\0\2\341\1\342\1\341\1\0" + "\2\341\1\0\1\341\1\u0103\1\341\3\0\2\341\2\0" + "\3\341\1\0\1\341\7\0\11\341\1\0\4\341\1\0" + "\2\341\1\0\1\341\1\0\3\341\6\0\1\u01a7\1\u010a" + "\1\u010b\1\u010a\1\0\1\u010a\1\u01a7\1\0\1\u010a\1\u010e" + "\13\u010a\1\0\10\u010a\1\u01a7\2\u010a\1\u01a7\2\u010a\1\u01a7" + "\10\u010a\1\u01a7\4\u010a\1\u01a7\7\u010a\1\0\1\u01a8\1\u010c" + "\1\u0135\1\u010c\1\u0132\1\u010c\1\u01a8\27\u010c\1\u01a8\2\u010c"
-				+ "\1\u01a8\2\u010c\1\u01a8\10\u010c\1\u01a8\4\u010c\1\u01a8\7\u010c" + "\1\0\1\u01a9\1\u010d\1\u0136\3\u010d\1\u01a9\1\u0132\26\u010d" + "\1\u01a9\2\u010d\1\u01a9\2\u010d\1\u01a9\10\u010d\1\u01a9\4\u010d" + "\1\u01a9\7\u010d\1\0\1\u01aa\1\u011e\1\u011f\1\u011e\1\0" + "\1\u011e\1\u01aa\1\0\1\u011e\1\u0123\13\u011e\1\0\10\u011e" + "\1\u01aa\2\u011e\1\u01aa\2\u011e\1\u01aa\10\u011e\1\u01aa\4\u011e" + "\1\u01aa\7\u011e\1\0\1\u01ab\1\u0121\1\u0149\1\u0121\1\u0146" + "\1\u0121\1\u01ab\27\u0121\1\u01ab\2\u0121\1\u01ab\2\u0121\1\u01ab" + "\10\u0121\1\u01ab\4\u0121\1\u01ab\7\u0121\1\0\1\u01ac\1\u0122" + "\1\u014a\3\u0122\1\u01ac\1\u0146\26\u0122\1\u01ac\2\u0122\1\u01ac" + "\2\u0122\1\u01ac\10\u0122\1\u01ac\4\u0122\1\u01ac\7\u0122\1\0" + "\2\u010a\1\u010b\1\u010a\1\0\2\u010a\1\0\1\u010a\1\u010e" + "\13\u010a\1\0\44\u010a\1\0\1\u01ad\1\u010c\1\u0135\1\u010c" + "\1\u0132\1\u010c\1\u01ad\27\u010c\1\u01ad\2\u010c\1\u01ad\2\u010c"
-				+ "\1\u01ad\10\u010c\1\u01ad\4\u010c\1\u01ad\7\u010c\1\0\1\u01ae" + "\1\u010d\1\u0136\3\u010d\1\u01ae\1\u0132\26\u010d\1\u01ae\2\u010d" + "\1\u01ae\2\u010d\1\u01ae\10\u010d\1\u01ae\4\u010d\1\u01ae\7\u010d" + "\1\0\2\u011e\1\u011f\1\u011e\1\0\2\u011e\1\0\1\u011e" + "\1\u0123\13\u011e\1\0\44\u011e\1\0\1\u01af\1\u0121\1\u0149" + "\1\u0121\1\u0146\1\u0121\1\u01af\27\u0121\1\u01af\2\u0121\1\u01af" + "\2\u0121\1\u01af\10\u0121\1\u01af\4\u0121\1\u01af\7\u0121\1\0" + "\1\u01b0\1\u0122\1\u014a\3\u0122\1\u01b0\1\u0146\26\u0122\1\u01b0" + "\2\u0122\1\u01b0\2\u0122\1\u01b0\10\u0122\1\u01b0\4\u0122\1\u01b0" + "\7\u0122\1\0\2\u010c\1\u0135\1\u010c\1\u0132\65\u010c\1\0" + "\2\u010d\1\u0136\4\u010d\1\u0132\62\u010d\1\0\2\u0121\1\u0149" + "\1\u0121\1\u0146\65\u0121\1\0\2\u0122\1\u014a\4\u0122\1\u0146" + "\62\u0122";
-
-	/**
-	 * The transition table of the DFA
-	 */
-	final private static int yytrans[] = yy_unpack(yy_packed);
-
-
-	/* error codes */
-	final private static int YY_UNKNOWN_ERROR = 0;
-//trivial hand edit to remove "not used" warning	final private static int YY_ILLEGAL_STATE = 1;
-	final private static int YY_NO_MATCH = 2;
-//	trivial hand edit to remove "not used" warning	final private static int YY_PUSHBACK_2BIG = 3;
-
-	/* error messages for the codes above */
-	final private static String YY_ERROR_MSG[] = {"Unkown internal scanner error", "Internal error: unknown state", "Error: could not match input", "Error: pushback value was too large"};
-
-	/**
-	 * YY_ATTRIBUTE[aState] contains the attributes of state
-	 * <code>aState</code>
-	 */
-	private final static byte YY_ATTRIBUTE[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 1, 1, 1, 1, 1, 1, 1, 9, 1, 9, 1, 1, 9, 1, 1, 1, 9, 1, 1, 1, 1, 1, 1, 9, 1, 1, 1, 9, 9, 1, 1, 1, 9, 1, 3, 9, 9, 1, 1, 1, 9, 1, 9, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 1, 1, 1, 1, 1, 9, 1, 1, 1, 1, 1, 1, 1, 9, 3, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 9, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 13, 7, 0, 1, 1, 0, 1, 0, 0, 9, 0, 0, 1, 0, 1, 1, 1, 0, 0, 9, 0, 9, 1, 0, 0, 9, 0, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 13, 7, 1, 9, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 9, 9, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 9, 0, 0, 9, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 9, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 9, 0, 1, 1, 1, 0, 0, 9, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0,
-				0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 9, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 9, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 9, 0, 0, 0, 0, 9, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-
-	/** the input device */
-	private java.io.Reader yy_reader;
-
-	/** the current state of the DFA */
-	private int yy_state;
-
-	/** the current lexical state */
-	private int yy_lexical_state = YYINITIAL;
-
-	/**
-	 * this buffer contains the current text to be matched and is the source
-	 * of the yytext() string
-	 */
-	private char yy_buffer[] = new char[16384];
-
-	/** the textposition at the last accepting state */
-	private int yy_markedPos;
-
-	/** the textposition at the last state to be included in yytext */
-	private int yy_pushbackPos;
-
-	/** the current text position in the buffer */
-	private int yy_currentPos;
-
-	/** startRead marks the beginning of the yytext() string in the buffer */
-	private int yy_startRead;
-
-	/**
-	 * endRead marks the last character in the buffer, that has been read from
-	 * input
-	 */
-	private int yy_endRead;
-
-	/** number of newlines encountered up to the start of the matched text */
-	private int yyline;
-
-	/** the number of characters up to the start of the matched text */
-	private int yychar;
-
-	/**
-	 * the number of characters from the last newline up to the start of the
-	 * matched text
-	 */
-//	trivial hand edit to remove "not used" warning	private int yycolumn;
-
-	/**
-	 * yy_atBOL == true <=>the scanner is currently at the beginning of a
-	 * line
-	 */
-//	trivial hand edit to remove "not used" warning	private boolean yy_atBOL;
-
-	/** yy_atEOF == true <=>the scanner has returned a value for EOF */
-	private boolean yy_atEOF;
-
-	/* user code: */
-	private final static String UNDEFINED = "undefined";
-	private String fBufferedContext = null;
-	private int fBufferedStart;
-	// private int fBufferedTextLength;
-	private int fBufferedLength;
-	// private StringBuffer fBufferedText = null;
-	private CSSTextRegionFactory fRegionFactory = CSSTextRegionFactory.getInstance();
-	private int fInitialState = YYINITIAL;
-	public final static int BUFFER_SIZE_NORMAL = 16384;
-	public final static int BUFFER_SIZE_SMALL = 256;
-	private int fInitialBufferSize = BUFFER_SIZE_NORMAL;
-
-	public void setInitialState(int state) {
-		fInitialState = state;
-	}
-
-	public void setInitialBufferSize(int size) {
-		fInitialBufferSize = size;
-	}
-
-	/* user method */
-	public final ITextRegion getNextToken() throws IOException {
-		String context;
-		String nextTokenType;
-		boolean spaceFollows;
-		// StringBuffer text;
-		int start;
-		int textLength;
-		int length;
-		if (fBufferedContext != null) {
-			context = fBufferedContext;
-			// text = fBufferedText;
-			start = fBufferedStart;
-			textLength = length = fBufferedLength;
-
-			fBufferedContext = null;
-		}
-		else {
-			context = primGetNextToken();
-			// text = new StringBuffer(yytext());
-			start = yychar;
-			textLength = length = yylength();
-		}
-
-		if (context != null) {
-			if (context == UNDEFINED) {
-				// undef -> concatenate undef's
-				nextTokenType = primGetNextToken();
-				while (nextTokenType == UNDEFINED) {
-					// text.append(yytext());
-					textLength += yylength();
-					length = textLength;
-					nextTokenType = primGetNextToken();
-				}
-				fBufferedContext = nextTokenType;
-				// fBufferedText = new StringBuffer(yytext());
-				fBufferedStart = yychar;
-				fBufferedLength = yylength();
-			}
-			else {
-				nextTokenType = null;
-				spaceFollows = false;
-				if (CSSRegionUtil.isDeclarationValueType(context)) { // declaration
-																		// value
-																		// can
-																		// contain
-																		// VALUE_S
-					nextTokenType = primGetNextToken();
-					spaceFollows = (nextTokenType == CSS_DECLARATION_VALUE_S);
-				}
-				else if (canContainSpace(context)) {
-					nextTokenType = primGetNextToken();
-					spaceFollows = (nextTokenType == CSS_S);
-				}
-				if (nextTokenType != null) { // nextToken is retrieved
-					if (spaceFollows) {
-						// next is space -> append
-						// text.append(yytext());
-						length += yylength();
-					}
-					else {
-						// next is NOT space -> push this for next time,
-						// return itself
-						fBufferedContext = nextTokenType;
-						// fBufferedText = new StringBuffer(yytext());
-						fBufferedStart = yychar;
-						fBufferedLength = yylength();
-					}
-				}
-			}
-		}
-
-		if (context != null) {
-			if (context == UNDEFINED) {
-				context = CSS_UNKNOWN;
-			}
-			return fRegionFactory.createRegion(context, start, textLength, length);
-		}
-		else {
-			return null;
-		}
-	}
-
-	/* user method */
-	/* for standalone use */
-	public final List parseText() throws IOException {
-		List tokens = new ArrayList();
-
-		CSSTextToken token;
-		for (String kind = primGetNextToken(); kind != null; kind = primGetNextToken()) {
-			token = new CSSTextToken();
-			token.kind = kind;
-			token.start = yychar;
-			token.length = yylength();
-			token.image = yytext();
-			tokens.add(token);
-		}
-
-		return tokens;
-	}
-
-	/* user method */
-	private boolean canContainSpace(String type) {
-		if (type == CSS_DELIMITER || type == CSS_RBRACE || type == CSS_DECLARATION_DELIMITER) {
-			return false;
-		}
-		else {
-			return true;
-		}
-	}
-
-	/* user method */
-	public final int getOffset() {
-		return yychar;
-	}
-
-	/* user method */
-	public final boolean isEOF() {
-		return yy_atEOF;
-	}
-
-	/* user method */
-	public void reset(char[] charArray) {
-		reset(new CharArrayReader(charArray), 0);
-	}
-
-	/* user method */
-	public final void reset(java.io.Reader in, int newOffset) {
-		/** the input device */
-		yy_reader = in;
-
-		/** the current state of the DFA */
-		yy_state = 0;
-
-		/** the current lexical state */
-		yy_lexical_state = fInitialState; // YYINITIAL;
-
-		/**
-		 * this buffer contains the current text to be matched and is the
-		 * source of the yytext() string
-		 */
-		if (yy_buffer.length != fInitialBufferSize) {
-			yy_buffer = new char[fInitialBufferSize];
-		}
-		java.util.Arrays.fill(yy_buffer, (char) 0);
-
-		/** the textposition at the last accepting state */
-		yy_markedPos = 0;
-
-		/** the textposition at the last state to be included in yytext */
-		yy_pushbackPos = 0;
-
-		/** the current text position in the buffer */
-		yy_currentPos = 0;
-
-		/** startRead marks the beginning of the yytext() string in the buffer */
-		yy_startRead = 0;
-
-		/**
-		 * endRead marks the last character in the buffer, that has been read
-		 * from input
-		 */
-		yy_endRead = 0;
-
-		/** number of newlines encountered up to the start of the matched text */
-		yyline = 0;
-
-		/** the number of characters up to the start of the matched text */
-		yychar = 0;
-
-		/**
-		 * the number of characters from the last newline up to the start of
-		 * the matched text
-		 */
-//		trivial hand edit to remove "not used" warning		yycolumn = 0;
-
-		/**
-		 * yy_atBOL == true <=>the scanner is currently at the beginning of a
-		 * line
-		 */
-//		trivial hand edit to remove "not used" warning		yy_atBOL = false;
-
-		/** yy_atEOF == true <=>the scanner has returned a value for EOF */
-		yy_atEOF = false;
-
-		/* user variables */
-		// fUndefined.delete(0, fUndefined.length());
-	}
-
-	/* user method */
-	public CSSTokenizer() {
-		super();
-	}
-
-
-
-	/**
-	 * Creates a new scanner There is also a java.io.InputStream version of
-	 * this constructor.
-	 * 
-	 * @param in
-	 *            the java.io.Reader to read input from.
-	 */
-	public CSSTokenizer(java.io.Reader in) {
-		this.yy_reader = in;
-	}
-
-	/**
-	 * Creates a new scanner. There is also java.io.Reader version of this
-	 * constructor.
-	 * 
-	 * @param in
-	 *            the java.io.Inputstream to read input from.
-	 */
-	public CSSTokenizer(java.io.InputStream in) {
-		this(new java.io.InputStreamReader(in));
-	}
-
-	/**
-	 * Unpacks the compressed DFA transition table.
-	 * 
-	 * @param packed
-	 *            the packed transition table
-	 * @return the unpacked transition table
-	 */
-	private static int[] yy_unpack(String packed) {
-		int[] trans = new int[21004];
-		int i = 0; /* index in packed string */
-		int j = 0; /* index in unpacked array */
-		while (i < 13906) {
-			int count = packed.charAt(i++);
-			int value = packed.charAt(i++);
-			value--;
-			do
-				trans[j++] = value;
-			while (--count > 0);
-		}
-		return trans;
-	}
-
-	/**
-	 * Unpacks the compressed character translation table.
-	 * 
-	 * @param packed
-	 *            the packed character translation table
-	 * @return the unpacked character translation table
-	 */
-	private static char[] yy_unpack_cmap(String packed) {
-		char[] map = new char[0x10000];
-		int i = 0; /* index in packed string */
-		int j = 0; /* index in unpacked array */
-		while (i < 170) {
-			int count = packed.charAt(i++);
-			char value = packed.charAt(i++);
-			do
-				map[j++] = value;
-			while (--count > 0);
-		}
-		return map;
-	}
-
-
-	/**
-	 * Gets the next input character.
-	 * 
-	 * @return the next character of the input stream, EOF if the end of the
-	 *         stream is reached.
-	 * @exception IOException
-	 *                if any I/O-Error occurs
-	 */
-	private int yy_advance() throws java.io.IOException {
-
-		/* standard case */
-		if (yy_currentPos < yy_endRead)
-			return yy_buffer[yy_currentPos++];
-
-		/* if the eof is reached, we don't need to work hard */
-		if (yy_atEOF)
-			return YYEOF;
-
-		/* otherwise: need to refill the buffer */
-
-		/* first: make room (if you can) */
-		if (yy_startRead > 0) {
-			System.arraycopy(yy_buffer, yy_startRead, yy_buffer, 0, yy_endRead - yy_startRead);
-
-			/* translate stored positions */
-			yy_endRead -= yy_startRead;
-			yy_currentPos -= yy_startRead;
-			yy_markedPos -= yy_startRead;
-			yy_pushbackPos -= yy_startRead;
-			yy_startRead = 0;
-		}
-
-		/* is the buffer big enough? */
-		if (yy_currentPos >= yy_buffer.length) {
-			/* if not: blow it up */
-			char newBuffer[] = new char[yy_currentPos * 2];
-			System.arraycopy(yy_buffer, 0, newBuffer, 0, yy_buffer.length);
-			yy_buffer = newBuffer;
-		}
-
-		/* finally: fill the buffer with new input */
-		int numRead = yy_reader.read(yy_buffer, yy_endRead, yy_buffer.length - yy_endRead);
-
-		if (numRead == -1)
-			return YYEOF;
-
-		yy_endRead += numRead;
-
-		return yy_buffer[yy_currentPos++];
-	}
-
-
-	/**
-	 * Closes the input stream.
-	 */
-	final public void yyclose() throws java.io.IOException {
-		yy_atEOF = true; /* indicate end of file */
-		yy_endRead = yy_startRead; /* invalidate buffer */
-		yy_reader.close();
-	}
-
-
-	/**
-	 * Returns the current lexical state.
-	 */
-	final public int yystate() {
-		return yy_lexical_state;
-	}
-
-	/**
-	 * Enters a new lexical state
-	 * 
-	 * @param newState
-	 *            the new lexical state
-	 */
-	final public void yybegin(int newState) {
-		yy_lexical_state = newState;
-	}
-
-
-	/**
-	 * Returns the text matched by the current regular expression.
-	 */
-	final public String yytext() {
-		return new String(yy_buffer, yy_startRead, yy_markedPos - yy_startRead);
-	}
-
-	/**
-	 * Returns the length of the matched text region.
-	 */
-	final public int yylength() {
-		return yy_markedPos - yy_startRead;
-	}
-
-
-	/**
-	 * Reports an error that occured while scanning.
-	 * 
-	 * @param errorCode
-	 *            the code of the errormessage to display
-	 */
-	private void yy_ScanError(int errorCode) {
-		try {
-			System.out.println(YY_ERROR_MSG[errorCode]);
-		}
-		catch (ArrayIndexOutOfBoundsException e) {
-			System.out.println(YY_ERROR_MSG[YY_UNKNOWN_ERROR]);
-			e.printStackTrace();
-
-		}
-
-		// System.exit(1);
-	}
-
-
-	/**
-	 * Pushes the specified amount of characters back into the input stream.
-	 * 
-	 * They will be read again by then next call of the scanning method
-	 * 
-	 * @param number
-	 *            the number of characters to be read again. This number must
-	 *            not be greater than yylength()!
-	 */
-//	trivial hand edit to remove "not used" warning
-//	private void yypushback(int number) {
-//		if (number > yylength())
-//			yy_ScanError(YY_PUSHBACK_2BIG);
-//
-//		yy_markedPos -= number;
-//	}
-
-
-	/**
-	 * Resumes scanning until the next regular expression is matched, the end
-	 * of input is encountered or an I/O-Error occurs.
-	 * 
-	 * @return the next token
-	 * @exception IOException
-	 *                if any I/O-Error occurs
-	 */
-	public String primGetNextToken() throws java.io.IOException {
-		int yy_input;
-		int yy_action;
-
-		yy_pushbackPos = -1;
-		boolean yy_was_pushback;
-
-		while (true) {
-
-			yychar += yylength();
-
-			boolean yy_counted = false;
-			for (yy_currentPos = yy_startRead; yy_currentPos < yy_markedPos; yy_currentPos++) {
-				switch (yy_buffer[yy_currentPos]) {
-					case '\r' :
-						yyline++;
-						yy_counted = true;
-						break;
-					case '\n' :
-						if (yy_counted)
-							yy_counted = false;
-						else {
-							yyline++;
-						}
-						break;
-					default :
-						yy_counted = false;
-				}
-			}
-
-			if (yy_counted) {
-				if (yy_advance() == '\n')
-					yyline--;
-				if (!yy_atEOF)
-					yy_currentPos--;
-			}
-
-			yy_action = -1;
-
-			yy_currentPos = yy_startRead = yy_markedPos;
-
-			yy_state = yy_lexical_state;
-
-			yy_was_pushback = false;
-
-			yy_forAction : {
-				while (true) {
-
-					yy_input = yy_advance();
-
-					if (yy_input == YYEOF)
-						break yy_forAction;
-
-					int yy_next = yytrans[yy_rowMap[yy_state] + yycmap[yy_input]];
-					if (yy_next == -1)
-						break yy_forAction;
-					yy_state = yy_next;
-
-					int yy_attributes = YY_ATTRIBUTE[yy_state];
-					if ((yy_attributes & 2) > 0)
-						yy_pushbackPos = yy_currentPos;
-
-					if ((yy_attributes & 1) > 0) {
-						yy_was_pushback = (yy_attributes & 4) > 0;
-						yy_action = yy_state;
-						yy_markedPos = yy_currentPos;
-						if ((yy_attributes & 8) > 0)
-							break yy_forAction;
-					}
-
-				}
-			}
-
-			if (yy_was_pushback)
-				yy_markedPos = yy_pushbackPos;
-
-			switch (yy_action) {
-
-				case 421 : {
-					yybegin(ST_DECLARATION_VALUE);
-					return CSS_DECLARATION_VALUE_IMPORTANT;
-				}
-				case 433 :
-					break;
-				case 412 : {
-					yybegin(ST_FONT_FACE_DELIMITER);
-					return CSS_FONT_FACE;
-				}
-				case 434 :
-					break;
-				case 375 : {
-					yybegin(ST_CHARSET_NAME);
-					return CSS_CHARSET;
-				}
-				case 435 :
-					break;
-				case 335 : {
-					yybegin(ST_IMPORT_URI);
-					return CSS_IMPORT;
-				}
-				case 436 :
-					break;
-				case 297 : {
-					yybegin(ST_MEDIA_MEDIUM);
-					return CSS_MEDIA;
-				}
-				case 437 :
-					break;
-				case 290 :
-				case 327 :
-				case 398 :
-				case 400 : {
-					yybegin(ST_DECLARATION_VALUE);
-					return CSS_DECLARATION_VALUE_URI;
-				}
-				case 438 :
-					break;
-				case 269 :
-				case 307 :
-				case 385 :
-				case 387 : {
-					yybegin(ST_IMPORT_MEDIUM);
-					return CSS_URI;
-				}
-				case 439 :
-					break;
-				case 255 : {
-					yybegin(ST_PAGE_PSEUDO_PAGE);
-					return CSS_PAGE;
-				}
-				case 440 :
-					break;
-				case 218 : {
-					return CSS_COMMENT;
-				}
-				case 441 :
-					break;
-				case 217 : {
-					return CSS_CDO;
-				}
-				case 442 :
-					break;
-				case 211 :
-				case 245 :
-				case 283 :
-				case 284 :
-				case 323 :
-				case 324 :
-				case 363 :
-				case 364 :
-				case 394 :
-				case 395 :
-				case 407 :
-				case 417 : {
-					yybegin(ST_DECLARATION_VALUE);
-					return CSS_DECLARATION_VALUE_UNICODE_RANGE;
-				}
-				case 443 :
-					break;
-				case 165 : {
-					return CSS_CDC;
-				}
-				case 444 :
-					break;
-				case 162 : {
-					return CSS_DECLARATION_VALUE_S;
-				}
-				case 445 :
-					break;
-				case 156 :
-				case 210 :
-				case 244 :
-				case 282 :
-				case 322 :
-				case 362 :
-				case 393 : {
-					yybegin(ST_DECLARATION_VALUE);
-					return CSS_DECLARATION_VALUE_HASH;
-				}
-				case 446 :
-					break;
-				case 150 :
-				case 205 :
-				case 208 : {
-					yybegin(ST_DECLARATION_VALUE);
-					return CSS_DECLARATION_VALUE_STRING;
-				}
-				case 447 :
-					break;
-				case 57 :
-				case 59 :
-				case 128 :
-				case 129 :
-				case 193 :
-				case 235 :
-				case 273 :
-				case 313 :
-				case 353 : {
-					yybegin(ST_SELECTOR_ATTRIBUTE_OPERATOR);
-					return CSS_SELECTOR_ATTRIBUTE_NAME;
-				}
-				case 448 :
-					break;
-				case 56 : {
-					yybegin(ST_SELECTOR);
-					return CSS_SELECTOR_SEPARATOR;
-				}
-				case 449 :
-					break;
-				case 55 :
-				case 125 : {
-					yybegin(ST_SELECTOR);
-					return CSS_SELECTOR_COMBINATOR;
-				}
-				case 450 :
-					break;
-				case 52 : {
-					yybegin(ST_DECLARATION);
-					return CSS_LBRACE;
-				}
-				case 451 :
-					break;
-				case 49 :
-				case 51 :
-				case 123 :
-				case 124 :
-				case 192 :
-				case 234 :
-				case 272 :
-				case 312 :
-				case 352 : {
-					yybegin(ST_PAGE_DELIMITER);
-					return CSS_PAGE_SELECTOR;
-				}
-				case 452 :
-					break;
-				case 48 : {
-					yybegin(YYINITIAL);
-					return CSS_LBRACE;
-				}
-				case 453 :
-					break;
-				case 47 : {
-					yybegin(ST_MEDIA_MEDIUM);
-					return CSS_MEDIA_SEPARATOR;
-				}
-				case 454 :
-					break;
-				case 44 :
-				case 46 :
-				case 120 :
-				case 121 :
-				case 191 :
-				case 233 :
-				case 271 :
-				case 311 :
-				case 351 : {
-					yybegin(ST_MEDIA_DELIMITER);
-					return CSS_MEDIUM;
-				}
-				case 455 :
-					break;
-				case 43 : {
-					yybegin(ST_IMPORT_MEDIUM);
-					return CSS_MEDIA_SEPARATOR;
-				}
-				case 456 :
-					break;
-				case 20 :
-				case 23 :
-				case 89 :
-				case 90 :
-				case 164 :
-				case 214 :
-				case 249 :
-				case 292 :
-				case 331 : {
-					yybegin(ST_SELECTOR_MODIFIER);
-					return CSS_SELECTOR_ELEMENT_NAME;
-				}
-				case 457 :
-					break;
-				case 22 :
-				case 54 :
-				case 87 :
-				case 126 :
-				case 163 : {
-					return CSS_S;
-				}
-				case 458 :
-					break;
-				case 27 : {
-					yybegin(YYINITIAL);
-					return CSS_RBRACE;
-				}
-				case 459 :
-					break;
-				case 29 : {
-					yybegin(ST_SELECTOR_MODIFIER);
-					return CSS_SELECTOR_UNIVERSAL;
-				}
-				case 460 :
-					break;
-				case 32 : {
-					yybegin(ST_SELECTOR_ATTRIBUTE_NAME);
-					return CSS_SELECTOR_ATTRIBUTE_START;
-				}
-				case 461 :
-					break;
-				case 36 : {
-					yybegin(YYINITIAL);
-					return CSS_DELIMITER;
-				}
-				case 462 :
-					break;
-				case 40 :
-				case 42 :
-				case 117 :
-				case 118 :
-				case 190 :
-				case 232 :
-				case 270 :
-				case 310 :
-				case 350 : {
-					yybegin(ST_IMPORT_DELIMITER);
-					return CSS_MEDIUM;
-				}
-				case 463 :
-					break;
-				case 60 : {
-					yybegin(ST_SELECTOR_ATTRIBUTE_VALUE);
-					return CSS_SELECTOR_ATTRIBUTE_OPERATOR;
-				}
-				case 464 :
-					break;
-				case 62 : {
-					yybegin(ST_SELECTOR_MODIFIER);
-					return CSS_SELECTOR_ATTRIBUTE_END;
-				}
-				case 465 :
-					break;
-				case 63 :
-				case 67 :
-				case 131 :
-				case 134 :
-				case 137 :
-				case 194 :
-				case 196 :
-				case 199 :
-				case 236 :
-				case 274 :
-				case 314 :
-				case 354 : {
-					yybegin(ST_SELECTOR_ATTRIBUTE_END);
-					return CSS_SELECTOR_ATTRIBUTE_VALUE;
-				}
-				case 466 :
-					break;
-				case 68 :
-				case 70 :
-				case 139 :
-				case 140 :
-				case 201 :
-				case 239 :
-				case 277 :
-				case 317 :
-				case 357 : {
-					yybegin(ST_DECLARATION_SEPARATOR);
-					return CSS_DECLARATION_PROPERTY;
-				}
-				case 467 :
-					break;
-				case 71 : {
-					yybegin(ST_DECLARATION);
-					return CSS_DECLARATION_DELIMITER;
-				}
-				case 468 :
-					break;
-				case 72 : {
-					yybegin(ST_DECLARATION_PRE_VALUE);
-					return CSS_DECLARATION_SEPARATOR;
-				}
-				case 469 :
-					break;
-				case 73 :
-				case 155 : {
-					yybegin(ST_DECLARATION_VALUE);
-					return CSS_DECLARATION_VALUE_NUMBER;
-				}
-				case 470 :
-					break;
-				case 74 :
-				case 79 :
-				case 83 :
-				case 147 :
-				case 153 :
-				case 154 :
-				case 159 :
-				case 203 :
-				case 212 :
-				case 241 :
-				case 279 :
-				case 319 :
-				case 359 : {
-					yybegin(ST_DECLARATION_VALUE);
-					return CSS_DECLARATION_VALUE_IDENT;
-				}
-				case 471 :
-					break;
-				case 78 : {
-					yybegin(ST_DECLARATION_VALUE);
-					return CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE;
-				}
-				case 472 :
-					break;
-				case 85 :
-				case 86 : {
-					yybegin(ST_DECLARATION_VALUE);
-					return CSS_DECLARATION_VALUE_OPERATOR;
-				}
-				case 473 :
-					break;
-				case 91 :
-				case 166 :
-				case 215 :
-				case 250 :
-				case 293 :
-				case 332 :
-				case 373 : {
-					yybegin(ST_SELECTOR_MODIFIER);
-					return CSS_SELECTOR_CLASS;
-				}
-				case 474 :
-					break;
-				case 93 :
-				case 167 :
-				case 216 :
-				case 251 :
-				case 294 :
-				case 333 :
-				case 374 : {
-					yybegin(ST_SELECTOR_MODIFIER);
-					return CSS_SELECTOR_ID;
-				}
-				case 475 :
-					break;
-				case 102 :
-				case 176 :
-				case 226 :
-				case 258 :
-				case 260 :
-				case 300 :
-				case 338 :
-				case 378 : {
-					yybegin(ST_SELECTOR_MODIFIER);
-					return CSS_SELECTOR_PSEUDO;
-				}
-				case 476 :
-					break;
-				case 106 :
-				case 178 :
-				case 181 : {
-					yybegin(ST_CHARSET_DELIMITER);
-					return CSS_STRING;
-				}
-				case 477 :
-					break;
-				case 112 :
-				case 184 :
-				case 187 : {
-					yybegin(ST_IMPORT_MEDIUM);
-					return CSS_STRING;
-				}
-				case 478 :
-					break;
-				case 141 :
-				case 202 :
-				case 240 :
-				case 278 :
-				case 318 :
-				case 358 :
-				case 390 : {
-					yybegin(ST_DECLARATION_VALUE);
-					return CSS_DECLARATION_VALUE_DIMENSION;
-				}
-				case 479 :
-					break;
-				case 144 : {
-					yybegin(ST_DECLARATION_VALUE);
-					return CSS_DECLARATION_VALUE_PERCENTAGE;
-				}
-				case 480 :
-					break;
-				case 146 :
-				case 247 : {
-					yybegin(ST_DECLARATION_VALUE);
-					return CSS_DECLARATION_VALUE_FUNCTION;
-				}
-				case 481 :
-					break;
-				case 19 :
-				case 21 :
-				case 24 :
-				case 25 :
-				case 26 :
-				case 28 :
-				case 30 :
-				case 31 :
-				case 33 :
-				case 34 :
-				case 35 :
-				case 37 :
-				case 38 :
-				case 39 :
-				case 41 :
-				case 45 :
-				case 50 :
-				case 53 :
-				case 58 :
-				case 61 :
-				case 64 :
-				case 65 :
-				case 66 :
-				case 69 :
-				case 75 :
-				case 76 :
-				case 77 :
-				case 80 :
-				case 81 :
-				case 82 :
-				case 84 : {
-					return UNDEFINED;
-				}
-				case 482 :
-					break;
-				default :
-					if (yy_input == YYEOF && yy_startRead == yy_currentPos) {
-						yy_atEOF = true;
-						return null;
-					}
-					else {
-						yy_ScanError(YY_NO_MATCH);
-					}
-			}
-		}
-	}
-
-	/**
-	 * Runs the scanner on input files.
-	 * 
-	 * This main method is the debugging routine for the scanner. It prints
-	 * each returned token to System.out until the end of file is reached, or
-	 * an error occured.
-	 * 
-	 * @param argv
-	 *            the command line, contains the filenames to run the scanner
-	 *            on.
-	 */
-	public static void main(String argv[]) {
-		for (int i = 0; i < argv.length; i++) {
-			CSSTokenizer scanner = null;
-			try {
-				scanner = new CSSTokenizer(new java.io.FileReader(argv[i]));
-			}
-			catch (java.io.FileNotFoundException e) {
-				System.out.println("File not found : \"" + argv[i] + "\"");
-				System.exit(1);
-			}
-			catch (ArrayIndexOutOfBoundsException e) {
-				System.out.println("Usage : java CSSTokenizer <inputfile>");
-				System.exit(1);
-			}
-
-			try {
-				do {
-					System.out.println(scanner.primGetNextToken());
-				}
-				while (!scanner.yy_atEOF);
-
-			}
-			catch (java.io.IOException e) {
-				System.out.println("An I/O error occured while scanning :");
-				System.out.println(e);
-				System.exit(1);
-			}
-			catch (Exception e) {
-				e.printStackTrace();
-				System.exit(1);
-			}
-		}
-	}
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/regions/CSSTextRegionFactory.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/regions/CSSTextRegionFactory.java
deleted file mode 100644
index e6dcdde..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/regions/CSSTextRegionFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.parser.regions;
-
-import org.eclipse.wst.sse.core.internal.parser.ContextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-public class CSSTextRegionFactory {
-	public synchronized static CSSTextRegionFactory getInstance() {
-		if (fInstance == null) {
-			fInstance = new CSSTextRegionFactory();
-		}
-		return fInstance;
-	}
-
-	public ITextRegion createRegion(String context, int start, int textLength, int length) {
-		ITextRegion region = null;
-		region = new ContextRegion(context, start, textLength, length);
-		return region;
-	}
-
-	private CSSTextRegionFactory() {
-		super();
-	}
-
-	private static CSSTextRegionFactory fInstance = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parserz/CSSRegionContexts.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parserz/CSSRegionContexts.java
deleted file mode 100644
index cd3bd13..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parserz/CSSRegionContexts.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.parserz;
-
-/**
- */
-public interface CSSRegionContexts {
-	public static final String CSS_COMMENT = "COMMENT"; //$NON-NLS-1$
-	public static final String CSS_CDO = "CDO"; //$NON-NLS-1$
-	public static final String CSS_CDC = "CDC"; //$NON-NLS-1$
-	public static final String CSS_S = "S"; //$NON-NLS-1$
-
-	public static final String CSS_DELIMITER = "DELIMITER"; //$NON-NLS-1$
-	public static final String CSS_LBRACE = "LBRACE"; //$NON-NLS-1$
-	public static final String CSS_RBRACE = "RBRACE"; //$NON-NLS-1$
-
-	public static final String CSS_IMPORT = "IMPORT"; //$NON-NLS-1$
-	public static final String CSS_PAGE = "PAGE"; //$NON-NLS-1$
-	public static final String CSS_MEDIA = "MEDIA"; //$NON-NLS-1$
-	public static final String CSS_FONT_FACE = "FONT_FACE"; //$NON-NLS-1$
-	public static final String CSS_CHARSET = "CHARSET"; //$NON-NLS-1$
-	public static final String CSS_ATKEYWORD = "ATKEYWORD"; //$NON-NLS-1$
-
-	public static final String CSS_STRING = "STRING"; //$NON-NLS-1$
-	public static final String CSS_URI = "URI"; //$NON-NLS-1$
-	public static final String CSS_MEDIUM = "MEDIUM"; //$NON-NLS-1$
-	public static final String CSS_MEDIA_SEPARATOR = "MEDIA_SEPARATOR"; //$NON-NLS-1$
-
-	public static final String CSS_CHARSET_NAME = "CHARSET_NAME"; //$NON-NLS-1$
-
-	public static final String CSS_PAGE_SELECTOR = "CSS_PAGE_SELECTOR"; //$NON-NLS-1$
-
-	public static final String CSS_SELECTOR_ELEMENT_NAME = "SELECTOR_ELEMENT_NAME"; //$NON-NLS-1$
-	public static final String CSS_SELECTOR_UNIVERSAL = "SELECTOR_UNIVERSAL"; //$NON-NLS-1$
-	public static final String CSS_SELECTOR_PSEUDO = "SELECTOR_PSEUDO"; //$NON-NLS-1$
-	public static final String CSS_SELECTOR_CLASS = "SELECTOR_CLASS"; //$NON-NLS-1$
-	public static final String CSS_SELECTOR_ID = "SELECTOR_ID"; //$NON-NLS-1$
-	public static final String CSS_SELECTOR_COMBINATOR = "SELECTOR_COMBINATOR"; //$NON-NLS-1$
-	public static final String CSS_SELECTOR_SEPARATOR = "SELECTOR_SEPARATOR"; //$NON-NLS-1$
-
-	public static final String CSS_SELECTOR_ATTRIBUTE_START = "SELECTOR_ATTRIBUTE_START"; //$NON-NLS-1$
-	public static final String CSS_SELECTOR_ATTRIBUTE_END = "SELECTOR_ATTRIBUTE_END"; //$NON-NLS-1$
-	public static final String CSS_SELECTOR_ATTRIBUTE_NAME = "SELECTOR_ATTRIBUTE_NAME"; //$NON-NLS-1$
-	public static final String CSS_SELECTOR_ATTRIBUTE_VALUE = "SELECTOR_ATTRIBUTE_VALUE"; //$NON-NLS-1$
-	public static final String CSS_SELECTOR_ATTRIBUTE_OPERATOR = "SELECTOR_ATTRIBUTE_OPERATOR"; //$NON-NLS-1$
-
-	public static final String CSS_DECLARATION_PROPERTY = "DECLARATION_PROPERTY"; //$NON-NLS-1$
-	public static final String CSS_DECLARATION_SEPARATOR = "DECLARATION_SEPARATOR"; //$NON-NLS-1$
-	public static final String CSS_DECLARATION_DELIMITER = "DECLARATION_DELIMITER"; //$NON-NLS-1$
-	public static final String CSS_DECLARATION_VALUE_IDENT = "DECLARATION_VALUE_IDENT"; //$NON-NLS-1$
-	public static final String CSS_DECLARATION_VALUE_DIMENSION = "DECLARATION_VALUE_DIMENSION"; //$NON-NLS-1$
-	public static final String CSS_DECLARATION_VALUE_PERCENTAGE = "DECLARATION_VALUE_PERCENTAGE"; //$NON-NLS-1$
-	public static final String CSS_DECLARATION_VALUE_NUMBER = "DECLARATION_VALUE_NUMBER"; //$NON-NLS-1$
-	public static final String CSS_DECLARATION_VALUE_FUNCTION = "DECLARATION_VALUE_FUNCTION"; //$NON-NLS-1$
-	public static final String CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE = "DECLARATION_VALUE_PARENTHESIS_CLOSE"; //$NON-NLS-1$
-	public static final String CSS_DECLARATION_VALUE_STRING = "DECLARATION_VALUE_STRING"; //$NON-NLS-1$
-	public static final String CSS_DECLARATION_VALUE_URI = "DECLARATION_VALUE_URI"; //$NON-NLS-1$
-	public static final String CSS_DECLARATION_VALUE_HASH = "DECLARATION_VALUE_HASH"; //$NON-NLS-1$
-	public static final String CSS_DECLARATION_VALUE_UNICODE_RANGE = "DECLARATION_VALUE_UNICODE_RANGE"; //$NON-NLS-1$
-	public static final String CSS_DECLARATION_VALUE_IMPORTANT = "CSS_DECLARATION_VALUE_IMPORTANT"; //$NON-NLS-1$
-	public static final String CSS_DECLARATION_VALUE_OPERATOR = "DECLARATION_VALUE_OPERATOR"; //$NON-NLS-1$
-	public static final String CSS_DECLARATION_VALUE_S = "DECLARATION_VALUE_S"; //$NON-NLS-1$
-
-	public static final String CSS_UNKNOWN = "UNKNOWN"; //$NON-NLS-1$
-
-	// For null object : CSSTokenizer never set this value
-	public static final String CSS_UNDEFINED = "UNDEFINED"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parserz/CSSTextParser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parserz/CSSTextParser.java
deleted file mode 100644
index 922c3f1..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parserz/CSSTextParser.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.parserz;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.parser.CSSTokenizer;
-
-
-
-public class CSSTextParser {
-	public static final int MODE_STYLESHEET = 0;
-	public static final int MODE_DECLARATION = 1;
-	public static final int MODE_DECLARATION_VALUE = 2;
-
-	public CSSTextParser(int parserMode) {
-		initializeParserMode(parserMode);
-	}
-
-	public CSSTextParser(int parserMode, Reader reader) {
-		initializeParserMode(parserMode);
-		reset(reader);
-	}
-
-	public CSSTextParser(int parserMode, String input) {
-		initializeParserMode(parserMode);
-		reset(input);
-	}
-
-	public void reset(Reader reader) {
-		getTokenizer().reset(reader, 0);
-	}
-
-	public void reset(String input) {
-		getTokenizer().reset(new StringReader(input), 0);
-	}
-
-	public CSSTextToken[] getTokens() {
-		List tokenList = getTokenList();
-		CSSTextToken[] tokens = new CSSTextToken[tokenList.size()];
-		return (CSSTextToken[]) tokenList.toArray(tokens);
-	}
-
-	public List getTokenList() {
-		List tokens;
-		try {
-			tokens = getTokenizer().parseText();
-		}
-		catch (IOException e) {
-			tokens = Collections.EMPTY_LIST;
-		}
-		return tokens;
-	}
-
-	private void initializeParserMode(int parserMode) {
-		int initialState;
-		int bufsize;
-		switch (parserMode) {
-			case MODE_STYLESHEET :
-				initialState = CSSTokenizer.YYINITIAL;
-				bufsize = CSSTokenizer.BUFFER_SIZE_NORMAL;
-				break;
-			case MODE_DECLARATION :
-				initialState = CSSTokenizer.ST_DECLARATION;
-				bufsize = CSSTokenizer.BUFFER_SIZE_NORMAL;
-				break;
-			case MODE_DECLARATION_VALUE :
-				initialState = CSSTokenizer.ST_DECLARATION_PRE_VALUE;
-				bufsize = CSSTokenizer.BUFFER_SIZE_SMALL;
-				break;
-			default :
-				return;
-		}
-		if (0 < initialState) {
-			CSSTokenizer tokenizer = getTokenizer();
-			tokenizer.setInitialState(initialState);
-			tokenizer.setInitialBufferSize(bufsize);
-		}
-	}
-
-	private CSSTokenizer getTokenizer() {
-		if (fTokenizer == null) {
-			fTokenizer = new CSSTokenizer();
-		}
-		return fTokenizer;
-	}
-
-	private CSSTokenizer fTokenizer = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parserz/CSSTextToken.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parserz/CSSTextToken.java
deleted file mode 100644
index adcf01f..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parserz/CSSTextToken.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.parserz;
-
-
-public class CSSTextToken {
-	public String kind;
-	public String image;
-	public int start;
-	public int length;
-
-	public String toString() {
-		return (image != null) ? image : ""; //$NON-NLS-1$
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/preferences/CSSCorePreferenceInitializer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/preferences/CSSCorePreferenceInitializer.java
deleted file mode 100644
index fc3997d..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/preferences/CSSCorePreferenceInitializer.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.sse.core.internal.encoding.CommonCharsetNames;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-
-/**
- * Sets default values for CSS Core preferences
- */
-public class CSSCorePreferenceInitializer extends AbstractPreferenceInitializer {
-
-	public void initializeDefaultPreferences() {
-		IEclipsePreferences node = new DefaultScope().getNode(CSSCorePlugin.getDefault().getBundle().getSymbolicName());
-
-		// formatting preferences
-		node.putInt(CSSCorePreferenceNames.LINE_WIDTH, 72);
-		node.putBoolean(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, false);
-		node.put(CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.TAB);
-		node.putInt(CSSCorePreferenceNames.INDENTATION_SIZE, 1);
-
-		// cleanup preferences
-		node.putBoolean(CSSCorePreferenceNames.QUOTE_ATTR_VALUES, true);
-		node.putBoolean(CSSCorePreferenceNames.FORMAT_SOURCE, true);
-
-		// code generation preferences
-		node.put(CommonEncodingPreferenceNames.INPUT_CODESET, ""); //$NON-NLS-1$
-		String defaultEnc = "UTF-8";//$NON-NLS-1$
-		String systemEnc = System.getProperty("file.encoding"); //$NON-NLS-1$
-		if (systemEnc != null) {
-			defaultEnc = CommonCharsetNames.getPreferredDefaultIanaName(systemEnc, "UTF-8");//$NON-NLS-1$
-		}
-		node.put(CommonEncodingPreferenceNames.OUTPUT_CODESET, defaultEnc);
-		node.put(CommonEncodingPreferenceNames.END_OF_LINE_CODE, ""); //$NON-NLS-1$
-		
-		// additional css core preferences
-		node.putInt(CSSCorePreferenceNames.FORMAT_PROP_PRE_DELIM, 0);
-		node.putInt(CSSCorePreferenceNames.FORMAT_PROP_POST_DELIM, 1);
-		node.put(CSSCorePreferenceNames.FORMAT_QUOTE, "\"");//$NON-NLS-1$
-		node.put(CSSCorePreferenceNames.FORMAT_BETWEEN_VALUE, " ");//$NON-NLS-1$
-		node.putBoolean(CSSCorePreferenceNames.FORMAT_QUOTE_IN_URI, true);
-		node.putBoolean(CSSCorePreferenceNames.WRAPPING_ONE_PER_LINE, true);
-		node.putBoolean(CSSCorePreferenceNames.WRAPPING_PROHIBIT_WRAP_ON_ATTR, true);
-		node.putBoolean(CSSCorePreferenceNames.WRAPPING_NEWLINE_ON_OPEN_BRACE, false);
-		node.putInt(CSSCorePreferenceNames.CASE_IDENTIFIER, CSSCorePreferenceNames.UPPER);
-		node.putInt(CSSCorePreferenceNames.CASE_PROPERTY_NAME, CSSCorePreferenceNames.LOWER);
-		node.putInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE, CSSCorePreferenceNames.LOWER);
-
-		// CSS cleanup preferences
-		node.putInt(CSSCorePreferenceNames.CLEANUP_CASE_IDENTIFIER, CSSCorePreferenceNames.ASIS);
-		node.putInt(CSSCorePreferenceNames.CLEANUP_CASE_PROPERTY_NAME, CSSCorePreferenceNames.ASIS);
-		node.putInt(CSSCorePreferenceNames.CLEANUP_CASE_PROPERTY_VALUE, CSSCorePreferenceNames.ASIS);
-		node.putInt(CSSCorePreferenceNames.CLEANUP_CASE_SELECTOR, CSSCorePreferenceNames.ASIS);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/preferences/CSSCorePreferenceNames.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/preferences/CSSCorePreferenceNames.java
deleted file mode 100644
index 130389a..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/preferences/CSSCorePreferenceNames.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.preferences;
-
-/**
- * CSS core preference keys.
- * 
- * @plannedfor 1.0
- */
-public class CSSCorePreferenceNames {
-	private CSSCorePreferenceNames() {
-		// empty private constructor so users cannot instantiate class
-	}
-
-	public static final String CASE_IDENTIFIER = "identifierCase"; //$NON-NLS-1$
-	public static final String CASE_PROPERTY_NAME = "propNameCase"; //$NON-NLS-1$
-	public static final String CASE_PROPERTY_VALUE = "propValueCase"; //$NON-NLS-1$
-	public static final String FORMAT_BETWEEN_VALUE = "betweenValue"; //$NON-NLS-1$
-	public static final String FORMAT_PROP_POST_DELIM = "postDelim"; //$NON-NLS-1$
-	public static final String FORMAT_PROP_PRE_DELIM = "preDelim"; //$NON-NLS-1$
-	public static final String FORMAT_QUOTE = "quote"; //$NON-NLS-1$
-	public static final String FORMAT_QUOTE_IN_URI = "quoteInURI"; //$NON-NLS-1$
-	public static final String WRAPPING_NEWLINE_ON_OPEN_BRACE = "newLineOnOpenBrace"; //$NON-NLS-1$
-	public static final String WRAPPING_ONE_PER_LINE = "onePropertyPerLine"; //$NON-NLS-1$
-	public static final String WRAPPING_PROHIBIT_WRAP_ON_ATTR = "prohibitWrapOnAttr"; //$NON-NLS-1$
-
-	// CSS cleanup preference names
-	public static final String CLEANUP_CASE_IDENTIFIER = "cleanupIdentifierCase"; //$NON-NLS-1$
-	public static final String CLEANUP_CASE_PROPERTY_NAME = "cleanupPropNameCase"; //$NON-NLS-1$
-	public static final String CLEANUP_CASE_PROPERTY_VALUE = "cleanupPropValueCase"; //$NON-NLS-1$
-	public static final String CLEANUP_CASE_SELECTOR = "cleanupSelectorCase"; //$NON-NLS-1$
-
-	/**
-	 * The maximum width of a line before a line split is needed.
-	 * <p>
-	 * Value is of type <code>Integer</code>.
-	 * </p>
-	 */
-	public static final String LINE_WIDTH = "lineWidth";//$NON-NLS-1$
-
-	/**
-	 * Indicates if all blanks lines should be cleared during formatting.
-	 * Blank lines will be kept when false.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String CLEAR_ALL_BLANK_LINES = "clearAllBlankLines";//$NON-NLS-1$
-
-	/**
-	 * The number of #INDENTATION_CHAR for 1 indentation.
-	 * <p>
-	 * Value is of type <code>Integer</code>.
-	 * </p>
-	 */
-	public static final String INDENTATION_SIZE = "indentationSize";//$NON-NLS-1$
-
-	/**
-	 * The character used for indentation.
-	 * <p>
-	 * Value is of type <code>String</code>.<br />
-	 * Possible values: {TAB, SPACE}
-	 * </p>
-	 */
-	public static final String INDENTATION_CHAR = "indentationChar";//$NON-NLS-1$
-
-	/**
-	 * Possible value for the preference #INDENTATION_CHAR. Indicates to use
-	 * tab character when formatting.
-	 * 
-	 * @see #SPACE
-	 * @see #INDENTATION_CHAR
-	 */
-	public static final String TAB = "tab"; //$NON-NLS-1$
-
-	/**
-	 * Possible value for the preference #INDENTATION_CHAR. Indicates to use
-	 * space character when formatting.
-	 * 
-	 * @see #TAB
-	 * @see #INDENTATION_CHAR
-	 */
-	public static final String SPACE = "space"; //$NON-NLS-1$
-
-	/**
-	 * Indicates whether or not to quote all attribute values during cleanup.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String QUOTE_ATTR_VALUES = "quoteAttrValues";//$NON-NLS-1$
-
-	/**
-	 * Indicates whether or not cleanup processor should format source.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String FORMAT_SOURCE = "formatSource";//$NON-NLS-1$
-
-	/**
-	 * Possible value for the case preferences Indicates to leave case as is.
-	 * 
-	 * @see #LOWER
-	 * @see #UPPER
-	 */
-	public static final int ASIS = 0;
-
-	/**
-	 * Possible value for the case preferences Indicates to make name
-	 * lowercase.
-	 * 
-	 * @see #ASIS
-	 * @see #UPPER
-	 */
-	public static final int LOWER = 1;
-
-	/**
-	 * Possible value for the case preferences Indicates to make name
-	 * uppercase.
-	 * 
-	 * @see #LOWER
-	 * @see #ASIS
-	 */
-	public static final int UPPER = 2;
-}
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/ICSSModelAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/ICSSModelAdapter.java
deleted file mode 100644
index b28ae0d..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/ICSSModelAdapter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.adapters;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-
-
-/**
- */
-public interface ICSSModelAdapter extends INodeAdapter {
-
-	ICSSModel getModel();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IModelProvideAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IModelProvideAdapter.java
deleted file mode 100644
index d22ac37..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IModelProvideAdapter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.adapters;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-/**
- * 
- */
-public interface IModelProvideAdapter extends INodeAdapter {
-
-	/**
-	 * 
-	 */
-	void modelProvided(IStructuredModel newModel);
-
-	/**
-	 */
-	void modelReleased(IStructuredModel newModel);
-
-	/**
-	 */
-	void modelRemoved(IStructuredModel newModel);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleDeclarationAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleDeclarationAdapter.java
deleted file mode 100644
index 897f1b7..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleDeclarationAdapter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.adapters;
-
-
-
-import org.w3c.dom.css.CSSStyleDeclaration;
-
-
-/**
- */
-public interface IStyleDeclarationAdapter extends ICSSModelAdapter {
-
-	/**
-	 */
-	public CSSStyleDeclaration getStyle();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleSelectorAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleSelectorAdapter.java
deleted file mode 100644
index e678359..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleSelectorAdapter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.adapters;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * 
- */
-public interface IStyleSelectorAdapter extends INodeAdapter {
-
-	/**
-	 * @return boolean
-	 * @param element
-	 *            org.w3c.dom.Element
-	 * @param pseudoName
-	 *            java.lang.String
-	 */
-	boolean match(ICSSSimpleSelector selector, Element element, String pseudoName);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleSheetAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleSheetAdapter.java
deleted file mode 100644
index a4e8251..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleSheetAdapter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.adapters;
-
-
-
-import org.w3c.dom.Element;
-import org.w3c.dom.stylesheets.StyleSheet;
-
-/**
- */
-public interface IStyleSheetAdapter extends ICSSModelAdapter {
-
-	/**
-	 * Returns HTML/XML element that is the owner of this adapter
-	 */
-	Element getElement();
-
-	/**
-	 * Returns CSS document that is related to this element
-	 */
-	public StyleSheet getSheet();
-
-	/**
-	 * This is called at the time of releasing HTML/XML model
-	 */
-	public void released();
-
-	/**
-	 * This is called at the time of removing this Element from the document
-	 */
-	public void removed();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleSheetListAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleSheetListAdapter.java
deleted file mode 100644
index 8027744..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleSheetListAdapter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.adapters;
-
-
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.w3c.dom.Element;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.stylesheets.StyleSheetList;
-
-/**
- */
-public interface IStyleSheetListAdapter extends INodeAdapter {
-
-	/**
-	 */
-	Enumeration getClasses();
-
-	/**
-	 */
-	public CSSStyleDeclaration getOverrideStyle(Element element, String pseudoName);
-
-	/**
-	 */
-	public StyleSheetList getStyleSheets();
-
-	/**
-	 */
-	public void releaseStyleSheets();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/contenttype/ContentTypeIdForCSS.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/contenttype/ContentTypeIdForCSS.java
deleted file mode 100644
index 79622cf..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/contenttype/ContentTypeIdForCSS.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.wst.css.core.internal.provisional.contenttype;
-
-
-/**
- * This class, with its one field, is a convience to provide compile-time
- * safety when refering to a contentType ID. The value of the contenttype id
- * field must match what is specified in plugin.xml file.
- */
-
-public class ContentTypeIdForCSS {
-	/**
-	 * The value of the contenttype id field must match what is specified in
-	 * plugin.xml file. Note: this value is intentially set with default
-	 * protected method so it will not be inlined.
-	 */
-	public final static String ContentTypeID_CSS = getConstantString();
-
-	/**
-	 * Don't allow instantiation.
-	 */
-	private ContentTypeIdForCSS() {
-		super();
-	}
-	
-	static String getConstantString() {
-		return "org.eclipse.wst.css.core.csssource"; //$NON-NLS-1$
-	}
-	
-
-}
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSAccess.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSAccess.java
deleted file mode 100644
index 6d84c33..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSAccess.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import java.util.Vector;
-
-/**
- * 
- */
-public interface ICSSAccess {
-
-	/**
-	 * @return java.util.Vector
-	 */
-	Vector getClassNames();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSAttr.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSAttr.java
deleted file mode 100644
index 611e4c1..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSAttr.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-/**
- * 
- */
-public interface ICSSAttr extends ICSSNode {
-
-	/**
-	 * @return java.lang.String
-	 */
-	String getName();
-
-	/**
-	 * @return org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 */
-	ICSSNode getOwnerCSSNode();
-
-	/**
-	 * @return java.lang.String
-	 */
-	String getValue();
-
-	/**
-	 * @param newValue
-	 *            java.lang.String
-	 */
-	void setValue(String newValue);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSCharsetRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSCharsetRule.java
deleted file mode 100644
index 8687ebf..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSCharsetRule.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.css.CSSCharsetRule;
-
-/**
- * 
- */
-public interface ICSSCharsetRule extends ICSSNode, CSSCharsetRule {
-
-	java.lang.String ENCODING = "encoding"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSDocument.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSDocument.java
deleted file mode 100644
index 74562b2..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSDocument.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.css.CSSFontFaceRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSUnknownRule;
-import org.w3c.dom.stylesheets.MediaList;
-
-/**
- * 
- */
-public interface ICSSDocument extends ICSSNode {
-
-	/**
-	 * @return org.w3c.dom.css.CSSCharsetRule
-	 */
-	ICSSCharsetRule createCSSCharsetRule();
-
-	/**
-	 * @return org.w3c.dom.css.CSSFontFaceRule
-	 */
-	CSSFontFaceRule createCSSFontFaceRule();
-
-	/**
-	 * @return org.w3c.dom.css.CSSImportRule
-	 */
-	ICSSImportRule createCSSImportRule();
-
-	/**
-	 * @return org.w3c.dom.css.ICSSMediaRule
-	 */
-	ICSSMediaRule createCSSMediaRule();
-
-	/**
-	 * @return org.w3c.dom.css.CSSPageRule
-	 */
-	ICSSPageRule createCSSPageRule();
-
-	/**
-	 * @return org.w3c.dom.css.CSSPrimitiveValue
-	 */
-	ICSSPrimitiveValue createCSSPrimitiveValue(short primitiveType);
-
-	/**
-	 * @return org.w3c.dom.css.CSSRule
-	 * @param rule
-	 *            java.lang.String
-	 */
-	CSSRule createCSSRule(String rule);
-
-	/**
-	 * @return org.w3c.dom.css.CSSStyleDeclaration
-	 */
-	ICSSStyleDeclaration createCSSStyleDeclaration();
-
-	/**
-	 * @param propertyName
-	 *            java.lang.String
-	 */
-	ICSSStyleDeclItem createCSSStyleDeclItem(String propertyName);
-
-	/**
-	 * @return org.w3c.dom.css.CSSStyleRule
-	 */
-	ICSSStyleRule createCSSStyleRule();
-
-	/**
-	 * @return org.w3c.dom.css.CSSUnknownRule
-	 */
-	CSSUnknownRule createCSSUnknownRule();
-
-	/**
-	 * @return org.w3c.dom.stylesheets.MediaList
-	 */
-	MediaList createMediaList();
-
-	ICSSModel getModel();
-
-	/**
-	 * @return boolean
-	 */
-	boolean isDocument();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSImportRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSImportRule.java
deleted file mode 100644
index a514aa6..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSImportRule.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.css.CSSImportRule;
-
-/**
- * 
- */
-public interface ICSSImportRule extends ICSSNode, CSSImportRule {
-
-	java.lang.String HREF = "href"; //$NON-NLS-1$
-
-	/**
-	 * 
-	 */
-	void refreshStyleSheet();
-
-	/**
-	 * @param href
-	 *            java.lang.String
-	 */
-	void setHref(String href);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSMediaRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSMediaRule.java
deleted file mode 100644
index aef95a1..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSMediaRule.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.css.CSSMediaRule;
-
-/**
- * 
- */
-public interface ICSSMediaRule extends ICSSNode, ICSSRuleContainer, CSSMediaRule {
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSModel.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSModel.java
deleted file mode 100644
index dd57cfb..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSModel.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.eclipse.wst.css.core.internal.event.ICSSStyleNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.w3c.dom.Node;
-
-
-/**
- * 
- */
-public interface ICSSModel extends ICSSStyleNotifier, IStructuredModel {
-
-	public static final String EXTERNAL = "externalCSS"; //$NON-NLS-1$
-	public static final String EMBEDDED = "embeddedCSS"; //$NON-NLS-1$
-	public static final String INLINE = "inlineCSS"; //$NON-NLS-1$
-
-	ICSSDocument getDocument();
-
-	/**
-	 * @return org.w3c.dom.Node
-	 */
-	Node getOwnerDOMNode();
-
-	/**
-	 * 
-	 * @return java.lang.Object
-	 */
-	Object getStyleSheetType();
-
-	/**
-	 * cleanup -> rebuild CSS Nodes This is pre-beta fix for 178176.
-	 */
-	void refreshNodes();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSNamedNodeMap.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSNamedNodeMap.java
deleted file mode 100644
index 86c136a..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSNamedNodeMap.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-/**
- * 
- */
-public interface ICSSNamedNodeMap extends ICSSNodeList {
-
-	/**
-	 * @return org.eclipse.wst.css.core.model.interfaces.ICSSNode
-	 * @param name
-	 *            java.lang.String
-	 */
-	ICSSNode getNamedItem(String name);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSNode.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSNode.java
deleted file mode 100644
index d2691bd..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSNode.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-/**
- * 
- */
-public interface ICSSNode {
-
-	short ATTR_NODE = -1;
-	short UNKNOWNRULE_NODE = 0;
-	short STYLERULE_NODE = 1;
-	short CHARSETRULE_NODE = 2;
-	short IMPORTRULE_NODE = 3;
-	short MEDIARULE_NODE = 4;
-	short FONTFACERULE_NODE = 5;
-	short PAGERULE_NODE = 6;
-	short STYLESHEET_NODE = 7;
-	short STYLEDECLARATION_NODE = 8;
-	short STYLEDECLITEM_NODE = 9;
-	short VALUELIST_NODE = 10;
-	short PRIMITIVEVALUE_NODE = 11;
-	short MEDIALIST_NODE = 12;
-	short DOCUMENTCSSSTYLE_NODE = 13;
-	short LINKSTYLE_NODE = 14;
-	short ELEMENTCSSINLINESTYLE_NODE = 15;
-
-	ICSSNode cloneNode(boolean deep);
-
-	/**
-	 * @return org.eclipse.wst.css.core.model.interfaces.ICSSNamedNodeMap
-	 */
-	ICSSNamedNodeMap getAttributes();
-
-	ICSSNodeList getChildNodes();
-
-	ICSSNode getFirstChild();
-
-	ICSSNode getLastChild();
-
-	ICSSNode getNextSibling();
-
-	/**
-	 * @return short
-	 */
-	short getNodeType();
-
-	ICSSDocument getOwnerDocument();
-
-	ICSSNode getParentNode();
-
-	ICSSNode getPreviousSibling();
-
-	/**
-	 * @return boolean
-	 */
-	boolean hasChildNodes();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSNodeList.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSNodeList.java
deleted file mode 100644
index 8c4323d..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSNodeList.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-/**
- * 
- */
-public interface ICSSNodeList {
-
-	/**
-	 * @return int
-	 */
-	int getLength();
-
-	ICSSNode item(int index);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSPageRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSPageRule.java
deleted file mode 100644
index cd26879..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSPageRule.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.css.CSSPageRule;
-
-public interface ICSSPageRule extends ICSSNode, CSSPageRule {
-
-	java.lang.String SELECTOR = "selector"; //$NON-NLS-1$
-
-	ICSSSelectorList getSelectors();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSPrimitiveValue.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSPrimitiveValue.java
deleted file mode 100644
index f6a0eba..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSPrimitiveValue.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.css.CSSPrimitiveValue;
-
-/**
- * 
- */
-public interface ICSSPrimitiveValue extends ICSSNode, ICSSValue, CSSPrimitiveValue {
-
-	short CSS_INTEGER = 26;
-	short CSS_HASH = 27;
-	short CSS_URANGE = 28;
-	short CSS_FORMAT = 29;
-	short CSS_LOCAL = 30;
-	short CSS_SLASH = 31;
-	short CSS_COMMA = 32;
-	short CSS_INHERIT_PRIMITIVE = 33;
-
-	/**
-	 * @param floatValue
-	 *            float
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	void setValue(float floatValue) throws org.w3c.dom.DOMException;
-
-	/**
-	 * @param stringValue
-	 *            java.lang.String
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	void setValue(String stringValue) throws org.w3c.dom.DOMException;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSRuleContainer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSRuleContainer.java
deleted file mode 100644
index ddbe1db..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSRuleContainer.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.css.CSSRule;
-
-/**
- * 
- */
-public interface ICSSRuleContainer {
-
-	/**
-	 * @return org.w3c.dom.css.CSSRule
-	 * @param rule
-	 *            org.w3c.dom.css.CSSRule
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	CSSRule appendRule(CSSRule rule) throws org.w3c.dom.DOMException;
-
-	/**
-	 * @return org.w3c.dom.css.CSSRule
-	 * @param newRule
-	 *            org.w3c.dom.css.CSSRule
-	 * @param refRule
-	 *            org.w3c.dom.css.CSSRule
-	 */
-	CSSRule insertRuleBefore(CSSRule newRule, CSSRule refRule) throws DOMException;
-
-	/**
-	 * @return org.w3c.dom.css.CSSRule
-	 * @param rule
-	 *            org.w3c.dom.css.CSSRule
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	CSSRule removeRule(CSSRule rule) throws org.w3c.dom.DOMException;
-
-	/**
-	 * @return org.w3c.dom.css.CSSRule
-	 * @param newChild
-	 *            org.w3c.dom.css.CSSRule
-	 * @param oldChild
-	 *            org.w3c.dom.css.CSSRule
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	CSSRule replaceRule(CSSRule newRule, CSSRule oldRule) throws org.w3c.dom.DOMException;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelector.java
deleted file mode 100644
index 84e7bea..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelector.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import java.util.Iterator;
-
-import org.w3c.dom.Element;
-
-/**
- * 
- */
-public interface ICSSSelector {
-
-	ICSSSelectorItem getItem(int index);
-
-	/**
-	 * @return java.util.Iterator
-	 */
-	Iterator getIterator();
-
-	/**
-	 * @return int
-	 */
-	int getLength();
-
-	/**
-	 * @return int
-	 */
-	int getSpecificity();
-
-	/**
-	 * @return java.lang.String
-	 */
-	String getString();
-
-	/**
-	 * @return boolean
-	 * @param element
-	 *            org.w3c.dom.Element
-	 */
-	boolean match(Element element, String pseudoName);
-
-	/**
-	 * 
-	 */
-	Iterator getErrors();
-
-	/**
-	 * 
-	 */
-	int getErrorCount();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelectorCombinator.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelectorCombinator.java
deleted file mode 100644
index f0e25a5..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelectorCombinator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-/**
- * 
- */
-public interface ICSSSelectorCombinator extends ICSSSelectorItem {
-
-	public static final char DESCENDANT = ' ';
-	public static final char CHILD = '>';
-	public static final char ADJACENT = '+';
-	public static final char UNKNOWN = '?'; // error case
-
-	/**
-	 * @return int
-	 */
-	char getCombinatorType();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelectorItem.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelectorItem.java
deleted file mode 100644
index 2e3585b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelectorItem.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-/**
- * 
- */
-public interface ICSSSelectorItem {
-
-	public static final int SIMPLE = 1;
-	public static final int COMBINATOR = 2;
-
-	/**
-	 * @return int
-	 */
-	int getItemType();
-
-	/**
-	 * @return java.lang.String
-	 */
-	String getString();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelectorList.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelectorList.java
deleted file mode 100644
index 1514ce8..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelectorList.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import java.util.Iterator;
-
-import org.w3c.dom.Element;
-
-/**
- * 
- */
-public interface ICSSSelectorList {
-
-	/**
-	 * @return java.util.Iterator
-	 */
-	Iterator getIterator();
-
-	/**
-	 * @return int
-	 */
-	int getLength();
-
-	/**
-	 * @return java.util.Vector
-	 * @param index
-	 *            int
-	 */
-	ICSSSelector getSelector(int index);
-
-	/**
-	 * @return java.lang.String
-	 */
-	String getString();
-
-	/**
-	 * 
-	 */
-	int getErrorCount();
-
-	/**
-	 * 
-	 */
-	Iterator getErrors();
-
-	/**
-	 * @return boolean
-	 * @param element
-	 *            org.w3c.dom.Element
-	 */
-	boolean match(Element element, String pseudoName);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSimpleSelector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSimpleSelector.java
deleted file mode 100644
index 74e779d..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSimpleSelector.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-/**
- * 
- */
-public interface ICSSSimpleSelector extends ICSSSelectorItem {
-
-	/**
-	 * @return java.lang.String
-	 * @param index
-	 *            int
-	 */
-	String getAttribute(int index);
-
-	/**
-	 * @return java.lang.String
-	 * @param index
-	 *            int
-	 */
-	String getClass(int index);
-
-	/**
-	 * @return java.lang.String
-	 * @param index
-	 *            int
-	 */
-	String getID(int index);
-
-	/**
-	 * @return java.lang.String
-	 */
-	String getName();
-
-	/**
-	 * @return boolean
-	 */
-	int getNumOfAttributes();
-
-	/**
-	 * @return boolean
-	 */
-	int getNumOfClasses();
-
-	/**
-	 * @return boolean
-	 */
-	int getNumOfIDs();
-
-	/**
-	 * @return boolean
-	 */
-	int getNumOfPseudoNames();
-
-	/**
-	 * @return java.lang.String
-	 * @param index
-	 *            int
-	 */
-	String getPseudoName(int index);
-
-	/**
-	 * @return boolean
-	 */
-	boolean isUniversal();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleDeclItem.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleDeclItem.java
deleted file mode 100644
index 5b170c4..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleDeclItem.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.css.CSSValue;
-
-/**
- * 
- */
-public interface ICSSStyleDeclItem extends ICSSNode, ICSSValueList {
-
-	java.lang.String IMPORTANT = "important"; //$NON-NLS-1$
-
-	/**
-	 * @return org.w3c.dom.css.CSSPrimitiveValue
-	 * @param value
-	 *            org.w3c.dom.css.CSSPrimitiveValue
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	ICSSPrimitiveValue appendValue(ICSSPrimitiveValue value) throws org.w3c.dom.DOMException;
-
-	/**
-	 * @return org.w3c.dom.css.CSSValue
-	 */
-	CSSValue getCSSValue();
-
-	/**
-	 * @return java.lang.String
-	 */
-	String getPriority();
-
-	/**
-	 * @return java.lang.String
-	 */
-	String getPropertyName();
-
-	/**
-	 * @return org.w3c.dom.css.CSSPrimitiveValue
-	 * @param value
-	 *            org.w3c.dom.css.CSSPrimitiveValue
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	ICSSPrimitiveValue removeValue(ICSSPrimitiveValue value) throws org.w3c.dom.DOMException;
-
-	/**
-	 * @return org.w3c.dom.css.CSSPrimitiveValue
-	 * @param newValue
-	 *            org.w3c.dom.css.CSSPrimitiveValue
-	 * @param oldValue
-	 *            org.w3c.dom.css.CSSPrimitiveValue
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	ICSSPrimitiveValue replaceValue(ICSSPrimitiveValue newValue, ICSSPrimitiveValue oldValue) throws org.w3c.dom.DOMException;
-
-	/**
-	 * @param priority
-	 *            java.lang.String
-	 */
-	void setPriority(String priority);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleDeclaration.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleDeclaration.java
deleted file mode 100644
index f0987f3..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleDeclaration.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.css.CSSStyleDeclaration;
-
-public interface ICSSStyleDeclaration extends ICSSDocument, CSSStyleDeclaration {
-
-	ICSSStyleDeclItem getDeclItemNode(String propertyName);
-
-	ICSSStyleDeclItem removeDeclItemNode(ICSSStyleDeclItem oldDecl) throws org.w3c.dom.DOMException;
-
-	ICSSStyleDeclItem setDeclItemNode(ICSSStyleDeclItem newDecl) throws org.w3c.dom.DOMException;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleRule.java
deleted file mode 100644
index 8d44167..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleRule.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.css.CSSStyleRule;
-
-public interface ICSSStyleRule extends ICSSNode, CSSStyleRule {
-
-	java.lang.String SELECTOR = "selector"; //$NON-NLS-1$
-
-	ICSSSelectorList getSelectors();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleSheet.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleSheet.java
deleted file mode 100644
index 3686d8b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleSheet.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.stylesheets.StyleSheetList;
-
-/**
- * 
- */
-public interface ICSSStyleSheet extends ICSSDocument, ICSSRuleContainer, CSSStyleSheet {
-
-	/**
-	 * @return org.w3c.dom.NodeList
-	 */
-	NodeList getOwnerNodes();
-
-	/**
-	 * @return org.w3c.dom.NodeList
-	 * @param doc
-	 *            org.w3c.dom.Document
-	 */
-	NodeList getOwnerNodes(Document doc);
-
-	/**
-	 * @return org.w3c.dom.css.CSSRuleList
-	 */
-	CSSRuleList getOwnerRules();
-
-	/**
-	 * @return org.w3c.dom.stylesheets.StyleSheetList
-	 */
-	StyleSheetList getParentStyleSheets();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSValue.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSValue.java
deleted file mode 100644
index f73231d..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSValue.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.css.CSSValue;
-
-/**
- * 
- */
-public interface ICSSValue extends CSSValue {
-
-	/**
-	 * @return java.lang.String
-	 */
-	String getCSSValueText();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSValueList.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSValueList.java
deleted file mode 100644
index 546e452..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSValueList.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.css.CSSValueList;
-
-/**
- * 
- */
-public interface ICSSValueList extends ICSSValue, CSSValueList {
-
-	/**
-	 * @return org.w3c.dom.css.CSSPrimitiveValue
-	 * @param value
-	 *            org.w3c.dom.css.CSSPrimitiveValue
-	 */
-	ICSSPrimitiveValue appendValue(ICSSPrimitiveValue value);
-
-	/**
-	 * @return org.w3c.dom.css.CSSPrimitiveValue
-	 * @param value
-	 *            org.w3c.dom.css.CSSPrimitiveValue
-	 */
-	ICSSPrimitiveValue removeValue(ICSSPrimitiveValue value);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICounter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICounter.java
deleted file mode 100644
index 4eea179..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICounter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.css.Counter;
-
-/**
- * 
- */
-public interface ICounter extends ICSSNode, Counter {
-
-	java.lang.String IDENTIFIER = "identifier"; //$NON-NLS-1$
-	java.lang.String LISTSTYLE = "liststyle"; //$NON-NLS-1$
-	java.lang.String SEPARATOR = "separator"; //$NON-NLS-1$
-
-	/**
-	 * @param identifier
-	 *            java.lang.String
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	void setIdentifier(String identifier) throws org.w3c.dom.DOMException;
-
-	/**
-	 * @param listStyle
-	 *            java.lang.String
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	void setListStyle(String listStyle) throws org.w3c.dom.DOMException;
-
-	/**
-	 * @param Separator
-	 *            java.lang.String
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	void setSeparator(String separator) throws org.w3c.dom.DOMException;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/IDOMImplementationCSS.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/IDOMImplementationCSS.java
deleted file mode 100644
index 828891f..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/IDOMImplementationCSS.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.css.DOMImplementationCSS;
-
-/**
- * 
- */
-public interface IDOMImplementationCSS extends DOMImplementationCSS {
-
-	ICSSStyleDeclaration createCSSStyleDeclaration() throws org.w3c.dom.DOMException;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/IDocumentStyle.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/IDocumentStyle.java
deleted file mode 100644
index 03dbeda..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/IDocumentStyle.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.stylesheets.DocumentStyle;
-import org.w3c.dom.stylesheets.StyleSheet;
-
-/**
- * 
- */
-public interface IDocumentStyle extends DocumentStyle {
-
-	/**
-	 * @return org.w3c.dom.stylesheets.StyleSheet
-	 * @param newSheet
-	 *            org.w3c.dom.stylesheets.StyleSheet
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	StyleSheet appendSheet(StyleSheet newSheet) throws org.w3c.dom.DOMException;
-
-	/**
-	 * @return org.w3c.dom.stylesheets.StyleSheet
-	 * @param newSheet
-	 *            org.w3c.dom.stylesheets.StyleSheet
-	 * @param refSheet
-	 *            org.w3c.dom.stylesheets.StyleSheet
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	StyleSheet insertSheetBefore(StyleSheet newSheet, StyleSheet refSheet) throws org.w3c.dom.DOMException;
-
-	/**
-	 * @return org.w3c.dom.stylesheets.StyleSheet
-	 * @param oldSheet
-	 *            org.w3c.dom.stylesheets.StyleSheet
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	StyleSheet removeSheet(StyleSheet oldSheet) throws org.w3c.dom.DOMException;
-
-	/**
-	 * @return org.w3c.dom.stylesheets.StyleSheet
-	 * @param newSheet
-	 *            org.w3c.dom.stylesheets.StyleSheet
-	 * @param oldSheet
-	 *            org.w3c.dom.stylesheets.StyleSheet
-	 * @exception org.w3c.dom.DOMException
-	 *                The exception description.
-	 */
-	StyleSheet replaceSheet(StyleSheet newSheet, StyleSheet oldSheet) throws org.w3c.dom.DOMException;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/preferences/CSSPreferenceHelper.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/preferences/CSSPreferenceHelper.java
deleted file mode 100644
index cd9006c..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/preferences/CSSPreferenceHelper.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.provisional.preferences;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-
-/**
- * @deprecated just access preferences directly
- */
-public class CSSPreferenceHelper {
-
-	/**
-	 * 
-	 */
-	public synchronized static CSSPreferenceHelper getInstance() {
-		if (fInstance == null) {
-			fInstance = new CSSPreferenceHelper();
-		}
-		return fInstance;
-	}
-
-	/**
-	 * 
-	 */
-	public String getBetweenValueString() {
-		return getPreferences().getString(CSSCorePreferenceNames.FORMAT_BETWEEN_VALUE);
-	}
-
-	/**
-	 * 
-	 */
-	public String getIndentString() {
-		StringBuffer indent = new StringBuffer();
-		
-		Preferences preferences = getPreferences();
-		if (preferences != null) {
-			char indentChar = ' ';
-			String indentCharPref = preferences.getString(CSSCorePreferenceNames.INDENTATION_CHAR);
-			if (CSSCorePreferenceNames.TAB.equals(indentCharPref)) {
-				indentChar = '\t';
-			}
-			int indentationWidth = preferences.getInt(CSSCorePreferenceNames.INDENTATION_SIZE);
-	
-			for (int i = 0; i < indentationWidth; i++) {
-				indent.append(indentChar);
-			}
-		}
-		return indent.toString();
-	}
-
-	/**
-	 * 
-	 */
-	public int getMaxLineWidth() {
-		Preferences prefs = getPreferences();
-		return prefs.getInt(CSSCorePreferenceNames.LINE_WIDTH);
-	}
-
-	/**
-	 * 
-	 */
-	public String getQuoteString(ICSSModel model) {
-		// nakamori_TODO css pref transition
-		return getPreferences().getString(CSSCorePreferenceNames.FORMAT_QUOTE);
-	}
-
-	/**
-	 * 
-	 */
-	public int getSpacesPostDelimiter() {
-		return getPreferences().getInt(CSSCorePreferenceNames.FORMAT_PROP_POST_DELIM);
-	}
-
-	/**
-	 * 
-	 */
-	public int getSpacesPreDelimiter() {
-		return getPreferences().getInt(CSSCorePreferenceNames.FORMAT_PROP_PRE_DELIM);
-	}
-
-	/**
-	 * 
-	 */
-	public boolean isIdentUpperCase() {
-		if (getPreferences().getInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.UPPER)
-			return true;
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	public boolean isNewLineOnOpenBrace() {
-		return getPreferences().getBoolean(CSSCorePreferenceNames.WRAPPING_NEWLINE_ON_OPEN_BRACE);
-	}
-
-	/**
-	 * 
-	 */
-	public boolean isOnePropertyPerLine() {
-		return getPreferences().getBoolean(CSSCorePreferenceNames.WRAPPING_ONE_PER_LINE);
-	}
-
-	/**
-	 * 
-	 */
-	public boolean isProhibitWrapOnAttr() {
-		return getPreferences().getBoolean(CSSCorePreferenceNames.WRAPPING_PROHIBIT_WRAP_ON_ATTR);
-	}
-
-	/**
-	 * 
-	 */
-	public boolean isPropNameUpperCase() {
-		if (getPreferences().getInt(CSSCorePreferenceNames.CASE_PROPERTY_NAME) == CSSCorePreferenceNames.UPPER)
-			return true;
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	public boolean isPropValueUpperCase() {
-		if (getPreferences().getInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.UPPER)
-			return true;
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	public boolean isQuoteInURI() {
-		return getPreferences().getBoolean(CSSCorePreferenceNames.FORMAT_QUOTE_IN_URI);
-	}
-
-	/**
-	 * 
-	 */
-	protected void setBetweenValueString(String newBetweenValueString) {
-		getPreferences().setValue(CSSCorePreferenceNames.FORMAT_BETWEEN_VALUE, newBetweenValueString);
-	}
-
-	/**
-	 * 
-	 */
-	protected void setIdentUpperCase(boolean newIdentUpperCase) {
-		int theCase = CSSCorePreferenceNames.LOWER;
-		if (newIdentUpperCase)
-			theCase = CSSCorePreferenceNames.UPPER;
-		getPreferences().setValue(CSSCorePreferenceNames.CASE_IDENTIFIER, theCase);
-	}
-
-	/**
-	 * 
-	 */
-	protected void setOnePropertyPerLine(boolean newOnePropertyPerLine) {
-		getPreferences().setValue(CSSCorePreferenceNames.WRAPPING_ONE_PER_LINE, newOnePropertyPerLine);
-	}
-
-	/**
-	 * 
-	 */
-	protected void setProhibitWrapOnAttr(boolean newProhibitWrapOnAttr) {
-		getPreferences().setValue(CSSCorePreferenceNames.WRAPPING_PROHIBIT_WRAP_ON_ATTR, newProhibitWrapOnAttr);
-	}
-
-	/**
-	 * 
-	 */
-	protected void setPropNameUpperCase(boolean newPropNameUpperCase) {
-		int theCase = CSSCorePreferenceNames.LOWER;
-		if (newPropNameUpperCase)
-			theCase = CSSCorePreferenceNames.UPPER;
-		getPreferences().setValue(CSSCorePreferenceNames.CASE_PROPERTY_NAME, theCase);
-	}
-
-	/**
-	 * 
-	 */
-	protected void setPropValueUpperCase(boolean newPropValueUpperCase) {
-		int theCase = CSSCorePreferenceNames.LOWER;
-		if (newPropValueUpperCase)
-			theCase = CSSCorePreferenceNames.UPPER;
-		getPreferences().setValue(CSSCorePreferenceNames.CASE_PROPERTY_VALUE, theCase);
-	}
-
-	/**
-	 * 
-	 */
-	public void setQuoteString(String quote) {
-		getPreferences().setValue(CSSCorePreferenceNames.FORMAT_QUOTE, quote);
-	}
-
-	/**
-	 * 
-	 */
-	public void setSpacesPostDelimiter(int num) {
-		getPreferences().setValue(CSSCorePreferenceNames.FORMAT_PROP_POST_DELIM, num);
-	}
-
-	/**
-	 * 
-	 */
-	public void setSpacesPreDelimiter(int num) {
-		getPreferences().setValue(CSSCorePreferenceNames.FORMAT_PROP_PRE_DELIM, num);
-	}
-
-	private Preferences getPreferences() {
-		CSSCorePlugin cssModelPlugin = CSSCorePlugin.getDefault();
-		return cssModelPlugin.getPluginPreferences();
-	}
-
-	private CSSPreferenceHelper() {
-		super();
-	}
-
-	private static CSSPreferenceHelper fInstance = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/text/ICSSPartitionTypes.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/text/ICSSPartitionTypes.java
deleted file mode 100644
index 3b8a4fa..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/text/ICSSPartitionTypes.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.eclipse.wst.css.core.internal.provisional.text;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitionTypes;
-
-/**
- * This interface is not intended to be implemented. It defines the
- * partitioning for CSS and all its partitions. Clients should reference the
- * partition type Strings defined here directly.
- * 
- * @plannedfor 1.0
- */
-public interface ICSSPartitionTypes extends IStructuredPartitionTypes {
-
-	String STYLE = "org.eclipse.wst.css.STYLE"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/tasks/CSSFileTaskScanner.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/tasks/CSSFileTaskScanner.java
deleted file mode 100644
index c515ff0..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/tasks/CSSFileTaskScanner.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.tasks;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.tasks.StructuredFileTaskScanner;
-
-public class CSSFileTaskScanner extends StructuredFileTaskScanner {
-	public CSSFileTaskScanner() {
-		super();
-	}
-
-	protected String getCommentedText(IDocument document, int begin, int length) throws BadLocationException {
-		String text = super.getCommentedText(document, begin, length);
-		if (text != null && text.endsWith("*/")) { //$NON-NLS-1$
-			text = text.substring(0, text.length() - 2);
-		}
-		return text;
-	}
-
-	protected boolean isCommentRegion(IStructuredDocumentRegion region, ITextRegion textRegion) {
-		return textRegion.getType().equals(CSSRegionContexts.CSS_COMMENT);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/CSSStructuredDocumentReParser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/CSSStructuredDocumentReParser.java
deleted file mode 100644
index 1558f82..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/CSSStructuredDocumentReParser.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.text;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.css.core.internal.Logger;
-import org.eclipse.wst.css.core.internal.parser.CSSRegionUtil;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.css.core.internal.util.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredTextReParser;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.text.StructuredDocumentReParser;
-
-
-/**
- * This class provides a centralized place to put "reparsing" logic. This is
- * the logic that reparses the text incrementally, as a user types in new
- * characters, or DOM nodes are inserted or deleted. Note: it is not a thread
- * safe class.
- */
-public class CSSStructuredDocumentReParser extends StructuredDocumentReParser {
-
-	class ReparseRange {
-		ReparseRange() {
-			reset();
-		}
-
-		ReparseRange(int start, int end) {
-			fRangeStart = start;
-			fRangeEnd = end;
-		}
-
-		void setStart(int start) {
-			fRangeStart = start;
-		}
-
-		void setEnd(int end) {
-			fRangeEnd = end;
-		}
-
-		int getStart() {
-			return fRangeStart;
-		}
-
-		int getEnd() {
-			return fRangeEnd;
-		}
-
-		boolean isValid() {
-			return (0 < fRangeEnd - fRangeStart) ? true : false;
-		}
-
-		void reset() {
-			fRangeStart = Integer.MAX_VALUE;
-			fRangeEnd = 0;
-		}
-
-		void expand(ReparseRange range) {
-			if (range == null || !range.isValid()) {
-				return;
-			}
-			int start = range.getStart();
-			if (start < fRangeStart) {
-				fRangeStart = start;
-			}
-			int end = range.getEnd();
-			if (fRangeEnd < end) {
-				fRangeEnd = end;
-			}
-		}
-
-		private int fRangeStart;
-		private int fRangeEnd;
-	}
-
-	/**
-	 * 
-	 */
-	public CSSStructuredDocumentReParser() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	// public StructuredDocumentEvent
-	// checkForCrossStructuredDocumentRegionBoundryCases2() {
-	// StructuredDocumentEvent result = specialPositionUpdate(fStart, fStart +
-	// fLengthToReplace - 1);
-	// if (result == null) {
-	// result = checkInsideBrace();
-	// }
-	// return result;
-	// }
-	protected StructuredDocumentEvent checkForCrossStructuredDocumentRegionSyntax() {
-		int checkStart = fStart;
-		int checkEnd = fStart + fLengthToReplace - 1;
-		IStructuredDocumentRegion endRegion = fStructuredDocument.getRegionAtCharacterOffset(checkEnd);
-		if (endRegion != null) {
-			checkEnd = endRegion.getEndOffset();
-		}
-
-		ReparseRange range = new ReparseRange(checkStart, checkEnd);
-
-		range.expand(getUpdateRangeForDelimiter(range.getStart(), range.getEnd()));
-		range.expand(getUpdateRangeForUnknownRegion(range.getStart(), range.getEnd()));
-
-		range.expand(getUpdateRangeForQuotes(range.getStart(), range.getEnd()));
-		range.expand(getUpdateRangeForComments(range.getStart(), range.getEnd()));
-		range.expand(getUpdateRangeForBraces(range.getStart(), range.getEnd()));
-
-		StructuredDocumentEvent result;
-
-		result = checkInsideBrace(range.getStart(), range.getEnd());
-
-		if (result == null) {
-			result = reparse(range.getStart(), range.getEnd());
-		}
-
-		return result;
-	}
-
-	private ReparseRange getUpdateRangeForUnknownRegion(int start, int end) {
-		int newStart = start;
-		RegionIterator iterator = new RegionIterator(fStructuredDocument, start - 1);
-		if (iterator.hasPrev()) {
-			iterator.prev(); // skip myself
-		}
-		while (iterator.hasPrev()) {
-			ITextRegion region = iterator.prev();
-			if (region != null && region.getType() == CSSRegionContexts.CSS_UNKNOWN) {
-				newStart = iterator.getStructuredDocumentRegion().getStartOffset(region);
-			}
-			else {
-				break;
-			}
-		}
-
-		if (start != newStart) {
-			return new ReparseRange(newStart, end);
-		}
-
-		return null;
-	}
-
-	private ReparseRange getUpdateRangeForDelimiter(int start, int end) {
-		if (dirtyStart != null && dirtyStart.getStart() < start) {
-			start = dirtyStart.getStart();
-		}
-		IStructuredDocumentRegion docRegion = fStructuredDocument.getRegionAtCharacterOffset(start);
-		if (docRegion == null) {
-			return null;
-		}
-		if (docRegion.getType() == CSSRegionContexts.CSS_DELIMITER) {
-			IStructuredDocumentRegion prevRegion = docRegion.getPrevious();
-			if (prevRegion != null) {
-				return new ReparseRange(prevRegion.getStart(), end);
-			}
-		}
-
-		return null;
-	}
-
-	private ReparseRange getUpdateRangeForQuotes(int start, int end) {
-		ReparseRange range = new ReparseRange();
-
-		range.expand(getUpdateRangeForPair(start, end, "\"", "\"")); //$NON-NLS-2$//$NON-NLS-1$
-		range.expand(getUpdateRangeForPair(start, end, "\'", "\'")); //$NON-NLS-2$//$NON-NLS-1$
-
-		return (range.isValid()) ? range : null;
-	}
-
-	private ReparseRange getUpdateRangeForComments(int start, int end) {
-		ReparseRange range = new ReparseRange();
-
-		range.expand(getUpdateRangeForPair(start, end, "/*", "*/")); //$NON-NLS-2$//$NON-NLS-1$
-		range.expand(getUpdateRangeForPair(start, end, "<%", "%>")); //$NON-NLS-2$//$NON-NLS-1$
-
-		return (range.isValid()) ? range : null;
-	}
-
-	private ReparseRange getUpdateRangeForBraces(int start, int end) {
-		ReparseRange range = new ReparseRange();
-
-		range.expand(getUpdateRangeForPair(start, end, "[", "]")); //$NON-NLS-2$//$NON-NLS-1$
-		range.expand(getUpdateRangeForPair(start, end, "(", ")")); //$NON-NLS-2$//$NON-NLS-1$
-		range.expand(getUpdateRangeForPair(start, end, "{", "}")); //$NON-NLS-2$//$NON-NLS-1$
-
-		return (range.isValid()) ? range : null;
-	}
-
-	private StructuredDocumentEvent checkInsideBrace(int start, int end) {
-		StructuredDocumentEvent result = null;
-		IStructuredDocumentRegion region = fStructuredDocument.getRegionAtCharacterOffset(start);
-		if (region == null) {
-			return null;
-		}
-		boolean bDeclaration = false;
-		String type = region.getType();
-		if (CSSRegionUtil.isDeclarationType(type) || type == CSSRegionContexts.CSS_LBRACE || type == CSSRegionContexts.CSS_RBRACE) {
-			bDeclaration = true;
-		}
-		if (!bDeclaration) {
-			IStructuredDocumentRegion prevRegion = CSSUtil.findPreviousSignificantNode(region);
-			if (prevRegion != null) {
-				type = prevRegion.getType();
-				if (CSSRegionUtil.isDeclarationType(type) || type == CSSRegionContexts.CSS_LBRACE) {
-					bDeclaration = true;
-				}
-			}
-		}
-		if (!bDeclaration) {
-			IStructuredDocumentRegion nextRegion = CSSUtil.findNextSignificantNode(region);
-			if (nextRegion != null) {
-				type = nextRegion.getType();
-				if (CSSRegionUtil.isDeclarationType(type) || type == CSSRegionContexts.CSS_RBRACE) {
-					bDeclaration = true;
-				}
-			}
-		}
-
-		if (bDeclaration) {
-			IStructuredDocumentRegion startRegion = findRuleStart(region);
-			if (startRegion != null) {
-				IStructuredDocumentRegion endRegion = fStructuredDocument.getRegionAtCharacterOffset(end);
-				if (endRegion != null) {
-					result = reparse(startRegion, endRegion);
-				}
-			}
-		}
-		return result;
-	}
-
-	private IStructuredDocumentRegion findRuleStart(IStructuredDocumentRegion startRegion) {
-		IStructuredDocumentRegion region = startRegion;
-		// find '{'
-		while (region != null && region.getType() != CSSRegionContexts.CSS_LBRACE) {
-			region = region.getPrevious();
-		}
-		// if (region == startRegion) {
-		// return null;
-		// }
-		// else
-		if (region != null) { // '{' is found
-			region = region.getPrevious();
-			if (isLeadingDeclarationType(region.getType())) {
-				return region;
-			}
-		}
-		return null;
-	}
-
-	private boolean isLeadingDeclarationType(String type) {
-		return (type == CSSRegionContexts.CSS_PAGE || type == CSSRegionContexts.CSS_FONT_FACE || CSSRegionUtil.isSelectorType(type));
-	}
-
-	// public StructuredDocumentEvent
-	// checkForCrossStructuredDocumentRegionBoundryCases() {
-	// return specialPositionUpdate(fStart, fStart + fLengthToReplace - 1);
-	// }
-	/**
-	 * 
-	 */
-	private ReparseRange getUpdateRangeForPair(int start, int end, String opener, String closer) {
-		StringBuffer deletionBuf = new StringBuffer();
-		StringBuffer insertionBuf = new StringBuffer();
-		int quoteLen = Math.max(opener.length(), closer.length());
-		if (1 < quoteLen) {
-			/**
-			 * ex) opener = "ABC", closer = "XYZ" model: ABCDEF.......UVWXYZ
-			 * deletion: CDEF.......UVWX pre/post: AB / YZ
-			 */
-			int addStart = start - (quoteLen - 1);
-			if (0 <= addStart) {
-				String addStr = fStructuredDocument.get(addStart, quoteLen - 1);
-				deletionBuf.append(addStr);
-				insertionBuf.append(addStr);
-			}
-			deletionBuf.append(fDeletedText);
-			insertionBuf.append(fChanges);
-			if (end + (quoteLen - 1) < fStructuredDocument.getLength()) {
-				String addStr = fStructuredDocument.get(end + 1, quoteLen - 1);
-				deletionBuf.append(addStr);
-				insertionBuf.append(addStr);
-			}
-		}
-		else {
-			deletionBuf.append(fDeletedText);
-			insertionBuf.append(fChanges);
-		}
-		String deletion = deletionBuf.toString();
-		String insertion = insertionBuf.toString();
-
-		int rangeStart = start;
-		int rangeEnd = end;
-
-		if (0 <= deletion.indexOf(opener) || 0 <= deletion.indexOf(closer) || 0 <= insertion.indexOf(opener) || 0 <= insertion.indexOf(closer)) {
-			int s, e;
-			try {
-				if (start <= fStructuredDocument.getLength()) {
-					IRegion startRegion = getFindReplaceDocumentAdapter().find(start - 1, opener, false, false, false, false);
-					if (startRegion != null) {
-						s = startRegion.getOffset();
-					}
-					else {
-						s = -1;
-					}
-				}
-				else {
-					s = -1;
-				}
-				if (end < fStructuredDocument.getLength() - 1) {
-					IRegion endRegion = getFindReplaceDocumentAdapter().find(end + 1, closer, true, false, false, false);
-					if (endRegion != null) {
-						e = endRegion.getOffset();
-					}
-					else {
-						e = -1;
-					}
-				}
-				else {
-					e = -1;
-				}
-			}
-			catch (BadLocationException ex) {
-				Logger.logException(ex);
-				return null;
-			}
-			if (0 <= s) {
-				rangeStart = Math.min(rangeStart, s);
-			}
-			if (0 <= e) {
-				rangeEnd = Math.max(rangeEnd, e);
-			}
-		}
-
-		if (rangeStart < start || end < rangeEnd) {
-			return new ReparseRange(rangeStart, rangeEnd);
-		}
-		else {
-			return null;
-		}
-	}
-
-	public IStructuredTextReParser newInstance() {
-		return new CSSStructuredDocumentReParser();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/CSSStructuredDocumentRegionFactory.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/CSSStructuredDocumentRegionFactory.java
deleted file mode 100644
index d574ba4..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/CSSStructuredDocumentRegionFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.text;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocumentRegion;
-
-/**
- * 
- */
-public class CSSStructuredDocumentRegionFactory {
-
-	public static final int CSS_GENERIC = 101109;
-
-	/**
-	 * 
-	 */
-	public static IStructuredDocumentRegion createStructuredDocumentRegion(int type) {
-		IStructuredDocumentRegion instance = null;
-		switch (type) {
-			case CSS_GENERIC :
-				instance = new BasicStructuredDocumentRegion();
-				break;
-			default :
-				break;
-		}
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/StructuredDocumentWalker.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/StructuredDocumentWalker.java
deleted file mode 100644
index 476f73d..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/StructuredDocumentWalker.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.text;
-
-
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.util.Utilities;
-
-public class StructuredDocumentWalker {
-
-	IStructuredDocumentRegionList fOldStructuredDocumentRegionList = null;
-	IStructuredDocument fStructuredDocument = null;
-	String fOriginalChanges = null;
-	int fOriginalOffset = 0;
-	int fOriginalLengthToReplace = 0;
-	int fLengthDifference = 0;
-
-	/**
-	 * 
-	 */
-	public StructuredDocumentWalker() {
-	}
-
-	/**
-	 * 
-	 */
-	public StructuredDocumentWalker(StructuredDocumentEvent event) {
-		initialize(event);
-	}
-
-	/**
-	 * 
-	 */
-	public IStructuredDocument getStructuredDocument() {
-		return fStructuredDocument;
-	}
-
-	/**
-	 * Old Nodes: --[O1]--[O2]--[O3]--- : / \ Current Nodes:
-	 * ---[C1]-----[C2]-----[C3]-----[C4]---
-	 * 
-	 * Input: O1 -> Output: O2 Input: O2 -> Output: O3 Input: O3 -> Output: C4
-	 * Input: Cn -> Output: Cn+1
-	 */
-	public IStructuredDocumentRegion getNextNode(IStructuredDocumentRegion node) {
-		IStructuredDocumentRegion nextNode = null;
-		if (node != null) {
-			nextNode = node.getNext();
-			if (nextNode == null) {
-				if (isOldNode(node)) {
-					// this may be the end of old flatnodes
-					int newStart = node.getEnd() - fLengthDifference;
-					nextNode = fStructuredDocument.getRegionAtCharacterOffset(newStart);
-				}
-			}
-		}
-		return nextNode;
-	}
-
-	/**
-	 * Old Nodes: --[O1]--[O2]--[O3]--- : / \ Current Nodes:
-	 * ---[C1]-----[C2]-----[C3]-----[C4]---
-	 * 
-	 * Input: O* -> Output: C4 Input: Cn -> Output: Cn+1
-	 */
-	public IStructuredDocumentRegion getNextNodeInCurrent(IStructuredDocumentRegion node) {
-		IStructuredDocumentRegion nextNode = null;
-		if (isOldNode(node)) {
-			IStructuredDocumentRegion oldEndNode = fOldStructuredDocumentRegionList.item(fOldStructuredDocumentRegionList.getLength() - 1);
-			int newStart = oldEndNode.getEnd() - fLengthDifference;
-			nextNode = fStructuredDocument.getRegionAtCharacterOffset(newStart);
-		}
-		else if (node != null) {
-			nextNode = node.getNext();
-		}
-		return nextNode;
-	}
-
-	/**
-	 * Old Nodes: --[O1]--[O2]--[O3]--- : / \ Current Nodes:
-	 * ---[C1]-----[C2]-----[C3]-----[C4]---
-	 * 
-	 * Input: O1 -> Output: C1 Input: O2 -> Output: O1 Input: O3 -> Output: O2
-	 * Input: Cn -> Output: Cn-1
-	 */
-	public IStructuredDocumentRegion getPrevNode(IStructuredDocumentRegion node) {
-		IStructuredDocumentRegion prevNode = null;
-		if (node != null) {
-			prevNode = node.getPrevious();
-			if (prevNode == null) {
-				if (isOldNode(node)) {
-					// this may be the start of old flatnodes
-					int newEnd = node.getStart() - 1;
-					prevNode = fStructuredDocument.getRegionAtCharacterOffset(newEnd);
-				}
-			}
-		}
-		return prevNode;
-	}
-
-	/**
-	 * Old Nodes: --[O1]--[O2]--[O3]--- : / \ Current Nodes:
-	 * ---[C1]-----[C2]-----[C3]-----[C4]---
-	 * 
-	 * Input: O* -> Output: C1 Input: Cn -> Output: Cn-1
-	 */
-	public IStructuredDocumentRegion getPrevNodeInCurrent(IStructuredDocumentRegion node) {
-		IStructuredDocumentRegion prevNode = null;
-		if (isOldNode(node)) {
-			IStructuredDocumentRegion oldStartNode = fOldStructuredDocumentRegionList.item(0);
-			int newEnd = oldStartNode.getStart() - 1;
-			prevNode = fStructuredDocument.getRegionAtCharacterOffset(newEnd);
-		}
-		else if (node != null) {
-			prevNode = node.getPrevious();
-		}
-		return prevNode;
-	}
-
-	/**
-	 * 
-	 */
-	public void initialize(StructuredDocumentEvent event) {
-		fStructuredDocument = event.getStructuredDocument();
-		fOriginalChanges = event.getText();
-		fOriginalOffset = event.getOffset();
-		fOriginalLengthToReplace = event.getLength();
-		fLengthDifference = Utilities.calculateLengthDifference(fOriginalChanges, fOriginalLengthToReplace);
-
-		if (event instanceof StructuredDocumentRegionsReplacedEvent) {
-			fOldStructuredDocumentRegionList = ((StructuredDocumentRegionsReplacedEvent) event).getOldStructuredDocumentRegions();
-		}
-		else {
-			fOldStructuredDocumentRegionList = null;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public boolean isOldNode(IStructuredDocumentRegion node) {
-		boolean bOld = false;
-		if (fOldStructuredDocumentRegionList != null) {
-			Enumeration e = fOldStructuredDocumentRegionList.elements();
-			while (e.hasMoreElements()) {
-				if (e.nextElement() == node) {
-					bOld = true;
-					break;
-				}
-			}
-		}
-		return bOld;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/StructuredTextPartitionerForCSS.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/StructuredTextPartitionerForCSS.java
deleted file mode 100644
index 47361db..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/StructuredTextPartitionerForCSS.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.text;
-
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.wst.css.core.internal.provisional.text.ICSSPartitionTypes;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitionTypes;
-import org.eclipse.wst.sse.core.internal.text.rules.StructuredTextPartitioner;
-
-public class StructuredTextPartitionerForCSS extends StructuredTextPartitioner {
-	
-	public final static String[] legalTypes = new String[]{ICSSPartitionTypes.STYLE, IStructuredPartitionTypes.DEFAULT_PARTITION};
-
-	public StructuredTextPartitionerForCSS() {
-		super();
-	}
-
-	public String getDefaultPartitionType() {
-		return ICSSPartitionTypes.STYLE;
-	}
-
-	public String[] getLegalContentTypes() {
-		return legalTypes;
-	}
-
-	public IDocumentPartitioner newInstance() {
-		return new StructuredTextPartitionerForCSS();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/AbstractCssTraverser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/AbstractCssTraverser.java
deleted file mode 100644
index 1e9f9c6..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/AbstractCssTraverser.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util;
-
-import java.util.ArrayList;
-import java.util.Stack;
-import java.util.Vector;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-
-
-
-/**
- * 
- */
-public abstract class AbstractCssTraverser {
-
-	public static short TRAV_CONT = 0;
-	public static short TRAV_PRUNE = 1;
-	public static short TRAV_STOP = 2;
-	protected java.util.Stack travStack;
-	private boolean fTraverseImported = false;
-	private boolean fTraverseImportFirst = false;
-	private java.util.Vector traversedSheets;
-
-	/**
-	 * CssPropCMNode constructor comment.
-	 */
-	public AbstractCssTraverser() {
-		super();
-	}
-
-	/**
-	 * @param model
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSModel
-	 */
-	public final void apply(ICSSModel model) {
-		apply(model.getDocument());
-	}
-
-	public final void apply(ICSSNode root) {
-		travStack = new Stack();
-		if (fTraverseImported) {
-			traversedSheets = new Vector();
-			if (root != null && root.getOwnerDocument() != null && root.getOwnerDocument().getNodeType() == ICSSNode.STYLESHEET_NODE) {
-				traversedSheets.add(root.getOwnerDocument());
-			}
-		}
-
-		// first call begin()
-		begin(root);
-
-		// traverse
-		traverse(root);
-
-		// last call end()
-		end(root);
-	}
-
-
-	protected void begin(ICSSNode node) {
-	}
-
-
-	protected void end(ICSSNode node) {
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public final boolean isTraverseImported() {
-		return fTraverseImported;
-	}
-
-
-	protected short postNode(ICSSNode node) {
-		return (short) 0;
-	}
-
-
-	protected short preNode(ICSSNode node) {
-		return (short) 0;
-	}
-
-	/**
-	 * @param newTraverseImported
-	 *            boolean
-	 */
-	public final void setTraverseImported(boolean newTraverseImported) {
-		fTraverseImported = newTraverseImported;
-	}
-
-	/**
-	 * @param newTraverseImportFirst
-	 *            boolean
-	 */
-	public final void setTraverseImportFirst(boolean newTraverseImportFirst) {
-		fTraverseImportFirst = newTraverseImportFirst;
-	}
-
-
-	private final short traverse(ICSSNode node) {
-		if (node == null)
-			return TRAV_CONT;
-
-		travStack.push(node);
-
-		// pre-action
-		short ret = preNode(node);
-
-		if (ret == TRAV_CONT) {
-			if (fTraverseImported && (node.getNodeType() == ICSSNode.IMPORTRULE_NODE)) {
-				ICSSImportRule rule = (ICSSImportRule) node;
-				// traverse external style-sheet
-				ICSSStyleSheet sheet = (ICSSStyleSheet) rule.getStyleSheet();
-				if (sheet != null && !traversedSheets.contains(sheet)) { // prevent
-																			// loop
-					traversedSheets.add(sheet);
-					short retExt = traverse(sheet);
-					if (retExt == TRAV_STOP) {
-						travStack.pop();
-						return retExt;
-					}
-				}
-			}
-
-			// collect children
-			ArrayList children = new ArrayList();
-			ICSSNode child = node.getFirstChild();
-			if (fTraverseImportFirst) {
-				ArrayList others = new ArrayList();
-
-				while (child != null) {
-					if (child.getNodeType() == ICSSNode.IMPORTRULE_NODE)
-						children.add(child);
-					else
-						others.add(child);
-					child = child.getNextSibling();
-				}
-				children.addAll(others);
-			}
-			else {
-				while (child != null) {
-					children.add(child);
-					child = child.getNextSibling();
-				}
-			}
-
-			// traverse children
-			for (int i = 0; i < children.size(); i++) {
-				child = (ICSSNode) children.get(i);
-				short retChild = traverse(child);
-				if (retChild == TRAV_STOP) {
-					travStack.pop();
-					return retChild;
-				}
-			}
-		}
-		else if (ret == TRAV_STOP) {
-			travStack.pop();
-			return ret;
-		}
-
-		// post-action
-		ret = postNode(node);
-
-		travStack.pop();
-		return (ret == TRAV_PRUNE) ? TRAV_CONT : ret;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSClassTraverser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSClassTraverser.java
deleted file mode 100644
index e7574d6..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSClassTraverser.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-
-
-/**
- * 
- */
-public class CSSClassTraverser extends AbstractCssTraverser {
-
-	ArrayList fClassNames;
-
-	/**
-	 * 
-	 */
-	public CSSClassTraverser() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	private void addClassNames(ICSSStyleRule rule) {
-		ICSSSelectorList selectorList = rule.getSelectors();
-		Iterator iSelector = selectorList.getIterator();
-		while (iSelector.hasNext()) {
-			ICSSSelector selector = (ICSSSelector) iSelector.next();
-			Iterator iItem = selector.getIterator();
-			while (iItem.hasNext()) {
-				ICSSSelectorItem item = (ICSSSelectorItem) iItem.next();
-				if (item.getItemType() == ICSSSelectorItem.SIMPLE) {
-					ICSSSimpleSelector sel = (ICSSSimpleSelector) item;
-					int nClasses = sel.getNumOfClasses();
-					for (int iClass = 0; iClass < nClasses; iClass++) {
-						String className = sel.getClass(iClass);
-						if (!fClassNames.contains(className))
-							fClassNames.add(className);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void begin(ICSSNode node) {
-		if (fClassNames == null)
-			fClassNames = new ArrayList();
-	}
-
-	/**
-	 * 
-	 */
-	protected void end(ICSSNode node) {
-	}
-
-	/**
-	 * 
-	 */
-	public Collection getClassNames() {
-		return (fClassNames != null) ? fClassNames : Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * 
-	 */
-	protected short postNode(ICSSNode node) {
-		return TRAV_CONT;
-	}
-
-	/**
-	 * 
-	 */
-	protected short preNode(ICSSNode node) {
-		short ret;
-		if (node instanceof ICSSStyleRule) {
-			addClassNames((ICSSStyleRule) node);
-			ret = TRAV_PRUNE;
-		}
-		else if (node instanceof ICSSStyleSheet || node instanceof ICSSMediaRule || node instanceof ICSSImportRule) {
-			ret = TRAV_CONT;
-		}
-		else {
-			ret = TRAV_PRUNE;
-		}
-		return ret;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSLinkConverter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSLinkConverter.java
deleted file mode 100644
index e5d3690..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSLinkConverter.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util;
-
-
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSValue;
-
-
-/**
- * 
- */
-public class CSSLinkConverter extends org.eclipse.wst.css.core.internal.util.AbstractCssTraverser {
-	private static final String URL_BEGIN = "url("; //$NON-NLS-1$
-	private static final String URL_END = ")"; //$NON-NLS-1$
-	private static final String EMPTY = ""; //$NON-NLS-1$
-	private static final String D_QUOTE = "\""; //$NON-NLS-1$
-	private static final String S_QUOTE = "\'"; //$NON-NLS-1$
-
-	IStructuredModel baseModel;
-
-	/**
-	 * 
-	 */
-	public CSSLinkConverter(IStructuredModel model) {
-		super();
-		baseModel = model;
-		if (model instanceof ICSSModel && ((ICSSModel) model).getStyleSheetType() != ICSSModel.EXTERNAL) {
-			IDOMNode node = (IDOMNode) ((ICSSModel) model).getOwnerDOMNode();
-			baseModel = node.getModel();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public static String addFunc(String value) {
-		if (!value.trim().toLowerCase().startsWith(URL_BEGIN)) {
-			// pa_TODO css pref
-			Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-
-			String quote = preferences.getString(CSSCorePreferenceNames.FORMAT_QUOTE);
-			value = CSSUtil.stripQuotes(value);
-			quote = CSSUtil.detectQuote(value, quote);
-			String str = URL_BEGIN;
-			if (preferences.getInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.UPPER)
-				str = str.toUpperCase();
-			StringBuffer buf = new StringBuffer(str);
-			buf.append(quote);
-			buf.append(value);
-			buf.append(quote);
-			buf.append(URL_END);
-			return buf.toString();
-		}
-		return value;
-	}
-
-
-
-	/**
-	 * 
-	 */
-	protected void begin(ICSSNode node) {
-		if (baseModel == null) {
-			baseModel = node.getOwnerDocument().getModel();
-			if (baseModel instanceof ICSSModel && ((ICSSModel) baseModel).getStyleSheetType() != ICSSModel.EXTERNAL) {
-				IDOMNode xmlNode = (IDOMNode) ((ICSSModel) baseModel).getOwnerDOMNode();
-				baseModel = xmlNode.getModel();
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private static boolean isUrl(String source) {
-		if (source == null)
-			return false;
-		source = source.trim().toLowerCase();
-		return source.startsWith(URL_BEGIN);
-	}
-
-	/**
-	 * 
-	 */
-	protected short preNode(ICSSNode node) {
-		if (node.getNodeType() == ICSSNode.PRIMITIVEVALUE_NODE) {
-			toAbsolute((CSSValue) node);
-		} else if (node.getNodeType() == ICSSNode.IMPORTRULE_NODE) {
-			ICSSImportRule iRule = (ICSSImportRule) node;
-			iRule.setHref(toAbsolute(addFunc(iRule.getHref())));
-		}
-		return TRAV_CONT;
-	}
-
-	/**
-	 * 
-	 * @return java.lang.String
-	 * @param value
-	 *            java.lang.String
-	 */
-	public static String removeFunc(String value) {
-		if (value == null)
-			return EMPTY;
-		String field = value.trim();
-		// first : tear "url(....)"
-		if (field.toLowerCase().startsWith(URL_BEGIN)) {
-			int url = field.toLowerCase().indexOf(URL_BEGIN);
-			int endParenthesis = field.lastIndexOf(URL_END);
-			if (endParenthesis > url) {
-				field = field.substring(url + 4, endParenthesis);
-			} else
-				field = field.substring(url + 4);
-		}
-		return field.trim();
-	}
-
-	/**
-	 * 
-	 */
-	public static String stripFunc(String value) {
-		if (value == null)
-			return EMPTY;
-		// first : tear "url(....)"
-		String field = removeFunc(value);
-		// second : tear quotations
-		if (field.toLowerCase().startsWith(D_QUOTE)) {
-			int quote = field.indexOf(D_QUOTE);
-			int end = field.lastIndexOf(D_QUOTE);
-			if (end > quote) {
-				field = field.substring(quote + 1, end);
-			} else
-				field = field.substring(quote + 1);
-		} else if (field.toLowerCase().startsWith(S_QUOTE)) {
-			int quote = field.indexOf(S_QUOTE);
-			int end = field.lastIndexOf(S_QUOTE);
-			if (end > quote) {
-				field = field.substring(quote + 1, end);
-			} else
-				field = field.substring(quote + 1);
-		}
-
-		return field.trim();
-	}
-
-	/**
-	 * 
-	 */
-	public String toAbsolute(String source) {
-		if (isUrl(source)) {
-			String url = CSSPathService.getAbsoluteURL(baseModel, stripFunc(source));
-			return (url != null) ? addFunc(url) : (URL_BEGIN + URL_END);
-		}
-		return source;
-	}
-
-	/**
-	 * 
-	 */
-	public boolean toAbsolute(CSSValue node) {
-		if (node instanceof ICSSPrimitiveValue) {
-			ICSSPrimitiveValue value = (ICSSPrimitiveValue) node;
-			if (value.getPrimitiveType() == CSSPrimitiveValue.CSS_URI) {
-				value.setValue(stripFunc(toAbsolute(URL_BEGIN + value.getStringValue() + URL_END)));
-				return true;
-			}
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSPathService.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSPathService.java
deleted file mode 100644
index 9fa8433..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSPathService.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util;
-
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-/**
- * 
- */
-public class CSSPathService {
-
-	// Constants
-	private static final String FILEURLSCHEME = "file";//$NON-NLS-1$
-	private static final String URLCOLON = ":"; //$NON-NLS-1$
-	private static final String FILEURLPREFIX = FILEURLSCHEME + URLCOLON + "//";//$NON-NLS-1$
-	private static final String URLSEPARATOR = "/"; //$NON-NLS-1$
-
-	/**
-	 * @return java.lang.String
-	 */
-	public static String getAbsoluteURL(IStructuredModel baseModel, String ref) {
-		String absLink = URLModelProviderCSS.resolveURI(baseModel, ref, true);
-		String url = absLink;
-		if (absLink != null) { // if it has not scheme, we must add "file"
-								// scheme
-			try {
-				new java.net.URL(absLink);
-			}
-			catch (java.net.MalformedURLException e) {
-				IPath path = new Path(absLink);
-				if (path != null)
-					url = toURL(path);
-			}
-		}
-		return url;
-	}
-
-	/**
-	 * 
-	 * @return org.eclipse.core.resources.IFile
-	 * @param location
-	 *            java.lang.String
-	 */
-	public static IFile location2File(String location) {
-		Path path = new Path(location);
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path);
-		if (file == null && path.segmentCount() > 1)
-			file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-		return file;
-	}
-
-	/**
-	 * Gets a file URL for the path.
-	 */
-	private static String toURL(IPath path) {
-		path = new Path(path.toFile().getAbsolutePath());
-		if (path.isUNC() == true) {
-			// it's UNC. return file://host/foo/bar/baz.html
-			return FILEURLSCHEME + URLCOLON + path.toString();
-		}
-		return FILEURLPREFIX + URLSEPARATOR + path.toString();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSSelectorListFactory.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSSelectorListFactory.java
deleted file mode 100644
index 04b97e8..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSSelectorListFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util;
-
-import org.eclipse.wst.css.core.internal.document.CSSSelectorListImpl;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList;
-
-
-public class CSSSelectorListFactory {
-	static synchronized public CSSSelectorListFactory getInstance() {
-		if (fInstance == null) {
-			fInstance = new CSSSelectorListFactory();
-		}
-		return fInstance;
-	}
-
-	public ICSSSelectorList createSelectorList(String selectorString) {
-		return new CSSSelectorListImpl(selectorString);
-	}
-
-
-	private CSSSelectorListFactory() {
-		super();
-	}
-
-	private static CSSSelectorListFactory fInstance;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSStyleDeclarationFactory.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSStyleDeclarationFactory.java
deleted file mode 100644
index e3e48e6..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSStyleDeclarationFactory.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util;
-
-
-
-import org.eclipse.wst.css.core.internal.document.CSSStyleDeclarationFactoryContext;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-
-
-/**
- * 
- */
-public class CSSStyleDeclarationFactory extends CSSStyleDeclarationFactoryContext {
-
-	private static CSSStyleDeclarationFactory fInstance = null;
-
-	/**
-	 * CSSStyleDeclarationFactory constructor comment.
-	 */
-	private CSSStyleDeclarationFactory() {
-		super();
-	}
-
-	/**
-	 * @return org.eclipse.wst.css.core.model.interfaces.ICSSStyleDeclaration
-	 * @param decl
-	 *            org.eclipse.wst.css.core.model.interfaces.ICSSStyleDeclaration
-	 */
-	public ICSSStyleDeclaration createStyleDeclaration(ICSSStyleDeclaration decl) {
-		if (decl == null) {
-			return null;
-		}
-		// 11/22/2004, nsd, nothing's done with this variable
-//		ICSSStyleDeclaration newNode = createStyleDeclaration();
-
-		// 05/11/2004, dmw, unnecessary cast, looks like it was always
-		// returning null!
-		// so something is probably amiss
-		// if (!(newNode instanceof ICSSDocument)) {
-		return null;
-		// }
-		// fOwnerDocument = newNode;
-		// cloneChildNodes(decl, newNode);
-		// return newNode;
-	}
-
-	/**
-	 * 
-	 */
-	public synchronized static CSSStyleDeclarationFactory getInstance() {
-		if (fInstance == null) {
-			fInstance = new CSSStyleDeclarationFactory();
-		}
-		return fInstance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSUtil.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSUtil.java
deleted file mode 100644
index 3583859..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSUtil.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util;
-
-
-
-import java.util.Enumeration;
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.Logger;
-import org.eclipse.wst.css.core.internal.parser.CSSRegionUtil;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-
-public class CSSUtil {
-
-	/**
-	 * 
-	 */
-	public static void debugOut(String str) {
-		Logger.log(Logger.WARNING, "css warning: " + str); //$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 */
-	// public static Vector extractMediaContents(Vector regions) {
-	// Vector media = new Vector();
-	// if (regions == null) { return media; }
-	//
-	// boolean bReady = true;
-	// for (Iterator i = regions.iterator(); i.hasNext(); ) {
-	// ITextRegion region = (ITextRegion)i.next();
-	// if (region == null) { continue; }
-	// String type = region.getType();
-	// if (bReady) {
-	// if (type == IDENT) {
-	// media.addElement(region.getText());
-	// bReady = false;
-	// }
-	// } else {
-	// if (type == COMMA) {
-	// bReady = true;
-	// }
-	// }
-	// }
-	//
-	// return media;
-	// }
-	/**
-	 * 
-	 */
-	public static String extractStringContents(String text) {
-		return stripQuotes(text);
-	}
-
-	/**
-	 * 
-	 */
-	public static String extractUriContents(String text) {
-		String contents = text.trim();
-		if (contents.toLowerCase().startsWith("url(") && //$NON-NLS-1$
-					contents.toLowerCase().endsWith(")")) {//$NON-NLS-1$
-			// strip "url(", ")"
-			contents = contents.substring(4, contents.length() - 1);
-		}
-		contents = stripQuotes(contents);
-
-		return contents;
-	}
-
-	/**
-	 * 
-	 */
-	public static IStructuredDocumentRegion findNextSignificantNode(IStructuredDocumentRegion startNode) {
-		if (startNode == null) {
-			return null;
-		}
-		IStructuredDocumentRegion node = startNode.getNext();
-		while (node != null) {
-			String type = getStructuredDocumentRegionType(node);
-			if (type != CSSRegionContexts.CSS_S && type != CSSRegionContexts.CSS_COMMENT && type != CSSRegionContexts.CSS_CDO && type != CSSRegionContexts.CSS_CDC) {
-				return node;
-			}
-			node = node.getNext();
-		}
-		return null;
-	}
-
-	/**
-	 * 
-	 */
-	public static IStructuredDocumentRegion findNodeBackward(IStructuredDocumentRegion startNode, IStructuredDocumentRegion endNode, String type) {
-		IStructuredDocumentRegion node;
-		for (node = startNode; node != null; node = node.getPrevious()) {
-			if (node.getStartOffset() < endNode.getStartOffset()) {
-				node = null;
-				break;
-			}
-			else if (getStructuredDocumentRegionType(node) == type) {
-				break;
-			}
-		}
-		return node;
-	}
-
-	/**
-	 * 
-	 */
-	public static IStructuredDocumentRegion findNodeForward(IStructuredDocumentRegion startNode, IStructuredDocumentRegion endNode, String type) {
-		IStructuredDocumentRegion node;
-		for (node = startNode; node != null; node = node.getNext()) {
-			if (endNode.getStartOffset() < node.getStartOffset()) {
-				node = null;
-				break;
-			}
-			else if (getStructuredDocumentRegionType(node) == type) {
-				break;
-			}
-		}
-		return node;
-	}
-
-	/**
-	 * 
-	 */
-	public static IStructuredDocumentRegion findPreviousSignificantNode(IStructuredDocumentRegion startNode) {
-		if (startNode == null) {
-			return null;
-		}
-		IStructuredDocumentRegion node = startNode.getPrevious();
-		while (node != null) {
-			String type = getStructuredDocumentRegionType(node);
-			if (type != CSSRegionContexts.CSS_S && type != CSSRegionContexts.CSS_COMMENT && type != CSSRegionContexts.CSS_CDO && type != CSSRegionContexts.CSS_CDC) {
-				return node;
-			}
-			node = node.getPrevious();
-		}
-		return null;
-	}
-
-	/**
-	 * 
-	 */
-	public static String getClassString(Object object) {
-		if (object == null) {
-			return "null"; //$NON-NLS-1$
-		}
-		else {
-			String name = object.getClass().toString();
-			int lastPeriod = name.lastIndexOf('.');
-			return name.substring(lastPeriod + 1);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public static String getStructuredDocumentRegionType(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null) {
-			return CSSRegionContexts.CSS_UNDEFINED;
-		}
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null || regions.size() == 0) {
-			return CSSRegionContexts.CSS_UNDEFINED;
-		}
-		ITextRegion region = regions.get(0);
-		return region.getType();
-	}
-
-	/**
-	 * 
-	 */
-	public static int getLengthDifference(IStructuredDocumentRegionList newNodes, IStructuredDocumentRegionList oldNodes) {
-		int newLen = getTextLength(newNodes);
-		int oldLen = getTextLength(oldNodes);
-		return newLen - oldLen;
-	}
-
-	/**
-	 * 
-	 */
-	public static String getRegionText(IStructuredDocumentRegion flatNode, ITextRegionList regions) {
-		StringBuffer buf = new StringBuffer();
-		if (regions != null) {
-			for (Iterator i = regions.iterator(); i.hasNext();) {
-				ITextRegion region = (ITextRegion) i.next();
-				if (region == null) {
-					continue;
-				}
-				buf.append(flatNode.getText(region));
-			}
-		}
-
-		return buf.toString();
-	}
-
-	/**
-	 * 
-	 */
-	public static int getTextLength(IStructuredDocumentRegionList nodes) {
-		int length = 0;
-
-		if (nodes != null) {
-			for (Enumeration e = nodes.elements(); e.hasMoreElements();) {
-				IStructuredDocumentRegion flatNode = (IStructuredDocumentRegion) e.nextElement();
-				if (flatNode != null) {
-					length += flatNode.getText().length();
-				}
-			}
-		}
-
-		return length;
-	}
-
-	/**
-	 * 
-	 * @param token
-	 * @return
-	 */
-	public static boolean isLength(CSSTextToken token) {
-		if (token == null)
-			return false;
-		if (token.kind == CSSRegionContexts.CSS_DECLARATION_VALUE_DIMENSION)
-			return true;
-		if (token.kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) {
-			double number = Double.parseDouble(token.image);
-			if (number == 0.0)
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	public static boolean isSelectorText(IStructuredDocumentRegion region) {
-		String type = getStructuredDocumentRegionType(region);
-		if (CSSRegionUtil.isSelectorBegginingType(type)) {
-			return true;
-		}
-		else if (type == CSSRegionContexts.CSS_UNKNOWN) {
-			// String text = flatNode.getText();
-			// if (text != null && text.indexOf('.') == 0) {
-			return true;
-			// }
-		}
-
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	public static String stripQuotes(String text) {
-		if (text == null)
-			return null;
-		String contents = text.trim();
-		if (2 <= contents.length()) {
-			char first = contents.charAt(0);
-			char last = contents.charAt(contents.length() - 1);
-			if ((first == '\"' && last == '\"') || (first == '\'' && last == '\'')) {
-				contents = contents.substring(1, contents.length() - 1);
-			}
-		}
-		return contents;
-	}
-
-	public static String detectQuote(String source, String defaultQuote) {
-		if (source == null)
-			return defaultQuote;
-		final String D_QUOTE = "\""; //$NON-NLS-1$
-		final String S_QUOTE = "\'"; //$NON-NLS-1$
-
-		int dIndex = source.indexOf(D_QUOTE);
-		int sIndex = source.indexOf(S_QUOTE);
-		if (dIndex < 0 && sIndex < 0) {
-			return defaultQuote;
-		}
-		else if (dIndex < 0) {
-			return D_QUOTE;
-		}
-		else if (sIndex < 0) {
-			return S_QUOTE;
-		}
-		else if (dIndex < sIndex) {
-			return S_QUOTE;
-		}
-		else {
-			return D_QUOTE;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public static void stripSurroundingSpace(ITextRegionList regions) {
-		if (regions == null) {
-			return;
-		}
-		while (!regions.isEmpty()) {
-			ITextRegion region = regions.get(0);
-			String type = region.getType();
-			if (type == CSSRegionContexts.CSS_S || type == CSSRegionContexts.CSS_COMMENT) {
-				regions.remove(0);
-			}
-			else {
-				break;
-			}
-		}
-		while (!regions.isEmpty()) {
-			ITextRegion region = regions.get(regions.size() - 1);
-			String type = region.getType();
-			if (type == CSSRegionContexts.CSS_S || type == CSSRegionContexts.CSS_COMMENT) {
-				regions.remove(region);
-			}
-			else {
-				break;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/ImportRuleCollector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/ImportRuleCollector.java
deleted file mode 100644
index 6ec4ec0..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/ImportRuleCollector.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util;
-
-
-
-import java.util.Vector;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-
-
-/**
- * 
- */
-public class ImportRuleCollector extends org.eclipse.wst.css.core.internal.util.AbstractCssTraverser {
-
-	protected java.util.Vector rules = new Vector();
-	protected ICSSStyleSheet target = null;
-
-	/**
-	 * 
-	 */
-	public ImportRuleCollector() {
-		super();
-		setTraverseImported(false);
-	}
-
-	/**
-	 * 
-	 */
-	public ImportRuleCollector(ICSSStyleSheet sheet) {
-		super();
-		target = sheet;
-	}
-
-	/**
-	 * 
-	 */
-	public java.util.Vector getRules() {
-		return rules;
-	}
-
-	/**
-	 * 
-	 */
-	protected short preNode(ICSSNode node) {
-		if (node.getNodeType() == ICSSNode.MEDIARULE_NODE || node.getNodeType() == ICSSNode.STYLESHEET_NODE) {
-			return TRAV_CONT;
-		}
-		if (node.getNodeType() == ICSSNode.IMPORTRULE_NODE) {
-			if (target != null) {
-				ICSSImportRule imp = (ICSSImportRule) node;
-				if (imp.getStyleSheet() != target)
-					return TRAV_PRUNE;
-			}
-			if (!rules.contains(node))
-				rules.add(node);
-		}
-		return TRAV_PRUNE;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/ImportedCollector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/ImportedCollector.java
deleted file mode 100644
index 2c4751e..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/ImportedCollector.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util;
-
-
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-
-
-/**
- * 
- */
-public class ImportedCollector extends org.eclipse.wst.css.core.internal.util.AbstractCssTraverser {
-
-	protected java.util.Vector externals = new Vector();
-
-	/**
-	 * 
-	 */
-	public ImportedCollector() {
-		super();
-		setTraverseImported(true);
-	}
-
-	/**
-	 * 
-	 */
-	public List getExternals() {
-		return externals;
-	}
-
-	/**
-	 * 
-	 */
-	protected short preNode(ICSSNode node) {
-		if (node.getNodeType() == ICSSNode.MEDIARULE_NODE) {
-			return TRAV_CONT;
-		}
-		if (node.getNodeType() == ICSSNode.STYLESHEET_NODE) {
-			if (!externals.contains(node)) {
-				externals.add(node);
-			}
-			return TRAV_CONT;
-		}
-		if (node.getNodeType() == ICSSNode.IMPORTRULE_NODE) {
-			return TRAV_CONT;
-		}
-		return TRAV_PRUNE;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/RegionIterator.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/RegionIterator.java
deleted file mode 100644
index 5f2626d..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/RegionIterator.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-/**
- * 
- */
-public class RegionIterator {
-
-	private IStructuredDocumentRegion documentRegion = null;
-	private IStructuredDocumentRegion curDocumentRegion = null;
-	private int current = -1;
-
-	/**
-	 * 
-	 */
-	public RegionIterator(IStructuredDocument structuredDocument, int index) {
-		super();
-
-		reset(structuredDocument, index);
-	}
-
-	/**
-	 * 
-	 */
-	public RegionIterator(IStructuredDocumentRegion flatNode, ITextRegion region) {
-		super();
-		reset(flatNode, region);
-	}
-
-	/**
-	 * 
-	 */
-	public IStructuredDocumentRegion getStructuredDocumentRegion() {
-		return curDocumentRegion;
-	}
-
-	/**
-	 * 
-	 */
-	public boolean hasNext() {
-		if (documentRegion == null)
-			return false;
-		if (current < 0)
-			return false;
-		if (current < documentRegion.getRegions().size())
-			return true;
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	public boolean hasPrev() {
-		// the same as hasNext()
-		return hasNext();
-	}
-
-	/**
-	 * 
-	 */
-	public ITextRegion next() {
-		if (documentRegion == null)
-			return null;
-		if (current < 0 || documentRegion.getRegions() == null || documentRegion.getRegions().size() <= current)
-			return null;
-
-		ITextRegion region = documentRegion.getRegions().get(current);
-		curDocumentRegion = documentRegion;
-
-		if (current >= documentRegion.getRegions().size() - 1) {
-			documentRegion = documentRegion.getNext();
-			current = -1;
-		}
-		current++;
-
-		return region;
-	}
-
-	/**
-	 * 
-	 */
-	public ITextRegion prev() {
-		if (documentRegion == null)
-			return null;
-		if (current < 0 || documentRegion.getRegions() == null || documentRegion.getRegions().size() <= current)
-			return null;
-
-		ITextRegion region = documentRegion.getRegions().get(current);
-		curDocumentRegion = documentRegion;
-
-		if (current == 0) {
-			documentRegion = documentRegion.getPrevious();
-			if (documentRegion != null)
-				current = documentRegion.getRegions().size();
-			else
-				current = 0;
-		}
-		current--;
-
-		return region;
-	}
-
-	/**
-	 * 
-	 */
-	public void reset(IStructuredDocument structuredDocument, int index) {
-		documentRegion = structuredDocument.getRegionAtCharacterOffset(index);
-		curDocumentRegion = documentRegion;
-		if (documentRegion != null) {
-			ITextRegion region = documentRegion.getRegionAtCharacterOffset(index);
-			current = documentRegion.getRegions().indexOf(region);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void reset(IStructuredDocumentRegion flatNode, ITextRegion region) {
-		if (region != null && flatNode != null) {
-			this.documentRegion = flatNode;
-			curDocumentRegion = flatNode;
-			current = flatNode.getRegions().indexOf(region);
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/SelectionCollector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/SelectionCollector.java
deleted file mode 100644
index b523932..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/SelectionCollector.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util;
-
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-
-
-/**
- */
-public class SelectionCollector extends org.eclipse.wst.css.core.internal.util.AbstractCssTraverser {
-
-	int start, end;
-	List selectedNodes;
-
-	/**
-	 * SelectionCollector constructor comment.
-	 */
-	public SelectionCollector() {
-		super();
-	}
-
-	/**
-	 */
-	protected void begin(ICSSNode node) {
-		selectedNodes = new ArrayList();
-	}
-
-	/**
-	 */
-	public List getSelectedNodes() {
-		if (selectedNodes == null)
-			return new ArrayList();
-		else
-			return new ArrayList(selectedNodes);
-	}
-
-	/**
-	 */
-	protected short preNode(ICSSNode node) {
-		IndexedRegion iNode = (IndexedRegion) node;
-		if (iNode.getStartOffset() <= end && start < iNode.getEndOffset()) {
-			if (node.getNodeType() != ICSSNode.STYLESHEET_NODE) {
-				IndexedRegion iFirstChild = (IndexedRegion) node.getFirstChild();
-				IndexedRegion iLastChild = (IndexedRegion) node.getLastChild();
-				if (iFirstChild == null || start < iFirstChild.getStartOffset() || iLastChild.getEndOffset() <= end)
-					selectedNodes.add(node);
-			}
-			return TRAV_CONT;
-		}
-		if (iNode.getStartOffset() > end)
-			return TRAV_STOP;
-		else
-			return TRAV_PRUNE;
-	}
-
-	/**
-	 */
-	public void setRegion(int newStart, int newEnd) {
-		start = newStart;
-		end = newEnd;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/SelectorValidator.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/SelectorValidator.java
deleted file mode 100644
index 0a92aaf..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/SelectorValidator.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util;
-
-
-
-import org.eclipse.wst.css.core.internal.document.CSSSelectorListImpl;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector;
-
-
-public class SelectorValidator {
-
-	/**
-	 * Constructor for SelectorValidator.
-	 */
-	public SelectorValidator(String text) {
-		super();
-		fText = text;
-	}
-
-	/**
-	 * Returns true if the text consists of one CLASS selector. syntax check
-	 * is a little loose (.123 is passed)
-	 * 
-	 * ".class" -> true ".123" -> true ".class , .class2" -> false
-	 * ".class.class2" -> false ".123{}" -> false
-	 */
-	public boolean isClass() {
-		ICSSSimpleSelector selector = getOnlyOneSimpleSelector();
-		if (selector != null) {
-			return (selector.getName().length() == 0 && selector.getNumOfAttributes() == 0 && selector.getNumOfClasses() == 1 && selector.getNumOfIDs() == 0 && selector.getNumOfPseudoNames() == 0);
-		}
-		return false;
-	}
-
-	/**
-	 * Returns true if the text consists of one ID selector.
-	 * 
-	 * "#ID" -> true "H1#myID" -> false "#abc{}" -> false
-	 */
-	public boolean isID() {
-		ICSSSimpleSelector selector = getOnlyOneSimpleSelector();
-		if (selector != null) {
-			return (selector.getName().length() == 0 && selector.getNumOfAttributes() == 0 && selector.getNumOfClasses() == 0 && selector.getNumOfIDs() == 1 && selector.getNumOfPseudoNames() == 0);
-		}
-		return false;
-	}
-
-	/**
-	 * overall check
-	 * 
-	 * "P#hoge98 + *:hover > A:link, A.external:visited" -> true "H1 H2 {}" ->
-	 * false
-	 */
-	public boolean isValid() {
-		parse();
-		return (fSelectorList != null && fSelectorList.getErrorCount() == 0);
-	}
-
-	private ICSSSimpleSelector getOnlyOneSimpleSelector() {
-		parse();
-		if (fSelectorList != null && fSelectorList.getLength() == 1) {
-			ICSSSelector selector = fSelectorList.getSelector(0);
-			int nItem = selector.getLength();
-			if (nItem == 1) {
-				ICSSSelectorItem item = selector.getItem(0);
-				if (item instanceof ICSSSimpleSelector) {
-					return (ICSSSimpleSelector) item;
-				}
-			}
-		}
-		return null;
-	}
-
-	private void parse() {
-		if (fSelectorList == null) {
-			if (fText != null) {
-				fSelectorList = new CSSSelectorListImpl(fText);
-			}
-		}
-	}
-
-
-	private String fText = null;
-	private ICSSSelectorList fSelectorList = null;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/SelectorsCollector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/SelectorsCollector.java
deleted file mode 100644
index fcaa32e..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/SelectorsCollector.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util;
-
-
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-
-
-/**
- * 
- */
-public class SelectorsCollector extends AbstractCssTraverser {
-
-	protected Vector selectors = new Vector();
-	protected Vector selectorsToAvoid = null;
-
-	/**
-	 * 
-	 */
-	public SelectorsCollector() {
-		super();
-		setTraverseImported(false);
-	}
-
-	/**
-	 * 
-	 */
-	public void addSelectorToAvoid(ICSSSelector selToAvoid) {
-		if (selToAvoid == null)
-			return;
-		if (selectorsToAvoid == null)
-			selectorsToAvoid = new Vector();
-
-		if (!selectorsToAvoid.contains(selToAvoid))
-			selectorsToAvoid.add(selToAvoid);
-	}
-
-	/**
-	 * 
-	 */
-	public void addSelectorToAvoid(ICSSStyleRule rule) {
-		ICSSSelectorList list = rule.getSelectors();
-		Iterator it = list.getIterator();
-		while (it.hasNext()) {
-			ICSSSelector sel = (ICSSSelector) it.next();
-			addSelectorToAvoid(sel);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public java.util.List getSelectors() {
-		return selectors;
-	}
-
-	/**
-	 * 
-	 */
-	protected short preNode(ICSSNode node) {
-		if (node.getNodeType() == ICSSNode.STYLERULE_NODE) {
-			ICSSStyleRule rule = (ICSSStyleRule) node;
-			ICSSSelectorList list = rule.getSelectors();
-			Iterator it = list.getIterator();
-			while (it.hasNext()) {
-				Object obj = it.next();
-				if (selectorsToAvoid != null && selectorsToAvoid.contains(obj))
-					continue;
-				if (!selectors.contains(obj))
-					selectors.add(obj);
-			}
-			return TRAV_PRUNE;
-		}
-		else if (node.getNodeType() == ICSSNode.STYLESHEET_NODE) {
-			return TRAV_CONT;
-		}
-		return TRAV_PRUNE;
-	}
-
-	/**
-	 * 
-	 */
-	public void setSelectorsToAvoid(java.util.Vector newSelectorsToAvoid) {
-		selectorsToAvoid = newSelectorsToAvoid;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/URLHelper.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/URLHelper.java
deleted file mode 100644
index f51460e..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/URLHelper.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util;
-
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.wst.sse.core.internal.util.PathHelper;
-
-/**
- * Hyperlink manager. Proved useful services like link conversion An utility
- * class to help other parsre modules to convert links
- */
-public class URLHelper {
-
-	private static final String FILE_PROTOCOL_SEARCH_SIG = "file:/";//$NON-NLS-1$
-	private static final String FILE_PROTOCOL_SIG = "file:///";//$NON-NLS-1$
-	private static String RELATIVE_PATH_SIG = "..";//$NON-NLS-1$	
-	private static final String FORWARD_SLASH = "/";//$NON-NLS-1$	
-	private URL fBaseUrl = null; // base url. assumed to a absulute url
-	private String fBaseUrlString = null;
-	private URL fDocRoot = null;
-	private String fDocRootString = null;
-
-	public URLHelper(String baseUrl) {
-		initialize(baseUrl, null);
-	}
-
-	public URLHelper(String baseUrl, String docRoot) {
-		initialize(baseUrl, docRoot);
-	}
-
-	/**
-	 * Special adujust for file url
-	 */
-	public String adjustFileProtocolUrl(String url) {
-		if (url.startsWith(FILE_PROTOCOL_SEARCH_SIG)) {
-			url = FILE_PROTOCOL_SIG + url.substring(FILE_PROTOCOL_SEARCH_SIG.length());
-		}
-		return url;
-	}
-
-	private String convert(String url, URL baseUrl, String urlString) {
-		String absUrl = url;
-		if (baseUrl != null) {
-			try {
-				// do special thing file protocol
-				if (baseUrl.getProtocol().equalsIgnoreCase("file")) {//$NON-NLS-1$
-					// remove the fist
-					if (url.startsWith("/"))//$NON-NLS-1$
-						url = url.substring(1);
-					// empty string causes malformed exception
-					String tempUrl = url;
-					if ("".equals(url))//$NON-NLS-1$
-						tempUrl = " ";//$NON-NLS-1$
-					URL newUrl = new URL(baseUrl, tempUrl);
-					// do extra math for file protocol to support ie based
-					absUrl = adjustFileProtocolUrl(newUrl.toString());
-				}
-				else {
-					URL newUrl = new URL(fBaseUrl, url);
-					absUrl = newUrl.toString();
-				}
-			}
-			catch (MalformedURLException me) {
-			}
-			// convert everything to forward slash
-			absUrl = PathHelper.switchToForwardSlashes(absUrl);
-		}
-		else {
-			// the given may be based on file
-			if (urlString != null) {
-				// swich the url to proper direction
-				url = PathHelper.removeLeadingSeparator(url);
-				File fle = new File(urlString, url);
-				absUrl = fle.getPath();
-
-			}
-			// convert everything to forward slash
-			absUrl = PathHelper.switchToForwardSlashes(absUrl);
-
-			// if the path ends with ".." we need to add a terminating slash
-			// or
-			// else the link will not be resolved correctly. (it will look
-			// like
-			// /url/path/to/somewhere/.. instead of /url/path/to/
-			if (absUrl.endsWith(FORWARD_SLASH + RELATIVE_PATH_SIG)) {
-				absUrl += FORWARD_SLASH;
-			}
-		}
-
-		// resolve relative path to absolute
-		absUrl = PathHelper.adjustPath(absUrl);
-		return absUrl;
-	}
-
-	private void initialize(String baseUrl, String docRoot) {
-		//
-		// Find out whether baes url is a url or file name
-		//
-		try {
-			String temp = PathHelper.appendTrailingURLSlash(baseUrl);
-			fBaseUrl = new URL(temp);
-		}
-		catch (MalformedURLException mue) {
-		}
-		if (fBaseUrl == null) {
-			// it is a file based url
-			fBaseUrlString = baseUrl;
-		}
-
-		// do the same for doc root
-		if (docRoot != null) {
-			try {
-				String temp = PathHelper.appendTrailingURLSlash(docRoot);
-				fDocRoot = new URL(temp);
-
-			}
-			catch (MalformedURLException mue) {
-			}
-			if (fDocRoot == null) {
-				// it is a file based url
-				fDocRootString = docRoot;
-			}
-		}
-	}
-
-	/**
-	 * Convert the given url to a abolute url using the base url Input url can
-	 * be of any othe following format Absolute urls -------------- .
-	 * http://www.foo.com/ . http://www.foo.com . http://www.foo.com/folder .
-	 * http://www.foo.com/folder/ . http://www.foo.com/index.html .
-	 * http://www.foo.com/folder/index.html .
-	 * http://www.foo.com/folder/../index.html Url relative on document root
-	 * ------------------------- . / . /folder . /index.html .
-	 * /folder/index.html . /folder/../index.html
-	 * 
-	 * Self relative ------------------------- . index.html . ./index.html .
-	 * ../index.html . folder/index.html . folder/../index.html
-	 * 
-	 * file based url adds another dimension since it doesn't have a document
-	 * root So uses fDocRoot if provided
-	 */
-	public String toAbsolute(String url) {
-		String absUrl = url;
-
-		URL newUrl = null;
-		// try to see it is a absolute url
-		try {
-			newUrl = new URL(url);
-		}
-		catch (MalformedURLException me) {
-		}
-		// if document root is provided
-		// do special case
-		if (newUrl == null) {
-			if (fDocRoot == null && fDocRootString == null) {
-				// try to check relative url
-				absUrl = convert(url, fBaseUrl, fBaseUrlString);
-			}
-			else {
-				// doc root is provided
-				// if the url is a doc root based use doc root
-
-				if (url.startsWith("/"))//$NON-NLS-1$
-					absUrl = convert(url, fDocRoot, fDocRootString);
-				else
-					absUrl = convert(url, fBaseUrl, fBaseUrlString);
-
-			}
-		}
-		return absUrl;
-	}
-
-	/**
-	 * Convert from an absolute url to relative url based on the given url
-	 * Both are assumed to be ablsute url
-	 */
-	public String toRelative(String url, String documentUrl) {
-		String output = url;
-		// assuming both urls are absolute
-		try {
-			URL inputUrl = new URL(url);
-			URL docUrl = new URL(documentUrl);
-			// filter out if the urls are not fro the same domain
-			if (!inputUrl.getProtocol().equals(docUrl.getProtocol()) || !inputUrl.getHost().equals(docUrl.getHost()) || inputUrl.getPort() != docUrl.getPort())
-				return output;
-			// both url are coming form the same place
-			// strip off the domain parts
-			String inputName = inputUrl.getFile();
-			String docName = docUrl.getFile();
-			output = PathHelper.convertToRelative(inputName, docName);
-		}
-		catch (MalformedURLException me) {
-			output = null;
-		}
-		return output;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/URLModelProviderCSS.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/URLModelProviderCSS.java
deleted file mode 100644
index c25e9a2..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/URLModelProviderCSS.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util;
-
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.charset.UnsupportedCharsetException;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingRule;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.util.PathHelper;
-import org.eclipse.wst.sse.core.internal.util.ProjectResolver;
-import org.eclipse.wst.sse.core.internal.util.URIResolver;
-
-/**
- */
-public class URLModelProviderCSS {
-
-	private static final int GET_MODEL_FOR_READ = 1;
-	// private static final int GET_NEW_MODEL_FOR_READ = 2;
-	private static final int GET_MODEL_FOR_EDIT = 3;
-	// private static final int GET_NEW_MODEL_FOR_EDIT = 4;
-	// private static final int READ_BUFFER_SIZE = 4096;
-	// IModelManager
-	private IModelManager modelManager = null;
-
-	/**
-	 */
-	public URLModelProviderCSS() {
-		super();
-
-		// obtain model manager
-		modelManager = StructuredModelManager.getModelManager();
-	}
-
-	/**
-	 * Calculate ID from a filename. This must be same as
-	 * FileModelProvider.calculateId(IFile)
-	 */
-	private static String calculateId(IPath fullIPath) {
-		return fullIPath.toString();
-	}
-
-	/**
-	 * <code>baseModel</code>: the model containing the link
-	 * <code>ref</code>: the link URL string
-	 */
-	private IStructuredModel getCommonModelFor(final IStructuredModel baseModel, final String ref, final int which) throws IOException {
-		// first, create absolute url
-		String absURL = resolveURI(baseModel, ref, true);
-		if ((absURL == null) || (absURL.length() == 0)) {
-			return null;
-		}
-
-		// need to remove file:// scheme if necessary
-		try {
-			final URL aURL = new URL(absURL);
-			// An actual URL was given, only file:/// is supported
-			// resolve it by finding the file it points to
-			if (!aURL.getProtocol().equals("platform")) { //$NON-NLS-1$
-				if (aURL.getProtocol().equals("file") && (aURL.getHost().equals("localhost") || aURL.getHost().length() == 0)) { //$NON-NLS-2$//$NON-NLS-1$
-					absURL = aURL.getFile();
-					final IPath ipath = new Path(absURL);
-					// if path has a device, and if it begins with
-					// IPath.SEPARATOR, remove it
-					final String device = ipath.getDevice();
-					if ((device != null) && (device.length() > 0)) {
-						if (device.charAt(0) == IPath.SEPARATOR) {
-							final String newDevice = device.substring(1);
-							absURL = ipath.setDevice(newDevice).toString();
-						}
-					}
-
-				}
-			}
-		}
-		catch (MalformedURLException mfuExc) {
-		}
-
-		// next, decide project
-		IProject project = null;
-		final IPath fullIPath = new Path(absURL);
-		IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
-		IContainer container = workspace.getContainerForLocation(fullIPath);
-		if (container != null) {
-			// fullIPath doesn't exist in workspace
-			project = container.getProject();
-		}
-
-		// If HTML document has a link to an extern CSS which is not in
-		// IProject
-		// workspace.getContainerForLoation() may return null. We need to take
-		// care
-		// of this case
-
-		// now, get absURL's IFile
-		if ((project != null) && (project.getLocation().isPrefixOf(fullIPath) == false)) {
-			// it's at outside of Project
-			return null;
-		}
-
-		IStructuredModel model = null;
-		if (project != null) {
-			IPath filePath = fullIPath.removeFirstSegments(project.getLocation().segmentCount());
-			IFile file = (filePath != null && !filePath.isEmpty()) ? project.getFile(filePath) : null;
-			if (file == null) {
-				return null;
-			}
-
-			// obtain model
-			if (which == GET_MODEL_FOR_EDIT) {
-				model = getModelForEdit(file);
-			}
-			else if (which == GET_MODEL_FOR_READ) {
-				model = getModelForRead(file);
-			}
-
-			// setting synchronization stamp is IModelManager's client's
-			// responsibility
-			if (model != null && model.getSynchronizationStamp() == IResource.NULL_STAMP)
-				model.resetSynchronizationStamp(file);
-		}
-		else {
-			String id = null;
-			InputStream inStream = null;
-			// obtain resolver
-			URIResolver resolver = (project != null) ? (URIResolver) project.getAdapter(URIResolver.class) : null;
-			if (resolver == null) {
-				// ProjectResolver can take care of the case if project is
-				// null.
-				resolver = new ProjectResolver(project);
-			}
-			if (resolver == null) {
-				return null;
-			}
-
-			// there is no project. we can't expect IProject help to create
-			// id/inputStream
-			File file = fullIPath.toFile();
-
-			// obatin id
-			id = calculateId(fullIPath);
-
-			// obtain InputStream
-			try {
-				inStream = new FileInputStream(file);
-			}
-			catch (FileNotFoundException fnfe) {
-				// the file does not exist, or we don't have read permission
-				return null;
-			}
-
-			// obtain model
-			try {
-				if (which == GET_MODEL_FOR_EDIT) {
-					model = getModelManager().getModelForEdit(id, inStream, resolver);
-				}
-				else if (which == GET_MODEL_FOR_READ) {
-					model = getModelManager().getModelForRead(id, inStream, resolver);
-				}
-			}
-			catch (UnsupportedEncodingException ue) {
-			}
-			catch (IOException ioe) {
-			}
-			finally {
-				// close now !
-				if (inStream != null) {
-					inStream.close();
-				}
-			}
-		}
-
-		// set locationid
-		if (model != null && model.getBaseLocation() == null) {
-			model.setBaseLocation(fullIPath.toString());
-		}
-
-		return model;
-	}
-
-	/**
-	 * <code>baseModel</code>: the model containing the link
-	 * <code>ref</code>: the link URL string
-	 */
-	public IStructuredModel getModelForEdit(IStructuredModel baseModel, String ref) throws IOException {
-		return getCommonModelFor(baseModel, ref, GET_MODEL_FOR_EDIT);
-	}
-
-	/**
-	 */
-	private IStructuredModel getModelForEdit(IFile file) throws IOException {
-		if (file == null)
-			return null;
-		IModelManager manager = getModelManager();
-
-		// create a fake InputStream
-		IStructuredModel model = null;
-		try {
-			model = manager.getModelForEdit(file);
-		}
-		catch (UnsupportedCharsetException ex) {
-			try {
-				model = manager.getModelForEdit(file, EncodingRule.FORCE_DEFAULT);
-			}
-			catch (IOException ioe) {
-			}
-			catch (CoreException ce) {
-			}
-		}
-		catch (CoreException ce) {
-		}
-		return model;
-	}
-
-	/**
-	 * <code>baseModel</code>: the model containing the link
-	 * <code>ref</code>: the link URL string
-	 */
-	public IStructuredModel getModelForRead(IStructuredModel baseModel, String ref) throws UnsupportedEncodingException, IOException {
-		return getCommonModelFor(baseModel, ref, GET_MODEL_FOR_READ);
-	}
-
-	/**
-	 */
-	private IStructuredModel getModelForRead(IFile file) throws IOException {
-		if (file == null)
-			return null;
-		IModelManager manager = getModelManager();
-
-		// create a fake InputStream
-		IStructuredModel model = null;
-		try {
-			model = manager.getModelForRead(file);
-		}
-		catch (UnsupportedCharsetException ex) {
-			try {
-				model = manager.getModelForRead(file, EncodingRule.FORCE_DEFAULT);
-			}
-			catch (IOException ioe) {
-			}
-			catch (CoreException ce) {
-			}
-		}
-		catch (CoreException ce) {
-		}
-		return model;
-	}
-
-	/**
-	 */
-	private IModelManager getModelManager() {
-		return modelManager;
-	}
-
-	public IStructuredModel getNewModelForEdit(IFile iFile) {
-		if (iFile == null)
-			return null;
-		IModelManager manager = getModelManager();
-		if (manager == null)
-			return null;
-
-		IStructuredModel model = null;
-		try {
-			model = manager.getNewModelForEdit(iFile, false);
-		}
-		catch (IOException ex) {
-		}
-		catch (ResourceInUse riu) {
-		}
-		catch (ResourceAlreadyExists rae) {
-		}
-		catch (CoreException ce) {
-		}
-		return model;
-	}
-
-	public IStructuredModel getNewModelForRead(IFile iFile) {
-		if (iFile == null)
-			return null;
-		IModelManager manager = getModelManager();
-		if (manager == null)
-			return null;
-
-		IStructuredModel model = null;
-		try {
-			model = manager.getNewModelForEdit(iFile, false);
-		}
-		catch (IOException ex) {
-		}
-		catch (ResourceInUse riu) {
-		}
-		catch (ResourceAlreadyExists rae) {
-		}
-		catch (CoreException ce) {
-		}
-		return model;
-	}
-
-	/**
-	 * <code>baseModel</code>: the model containing the link
-	 * <code>ref</code>: the link URL string
-	 * <code>resolveCrossProjectLinks</code>: If resolveCrossProjectLinks
-	 * is set to true, then this method will properly resolve the URI if it is
-	 * a valid URI pointing to another (appropriate) project.
-	 */
-	public static String resolveURI(IStructuredModel baseModel, String ref, boolean resolveCrossProjectLinks) {
-		if (baseModel == null)
-			return null;
-
-		// get resolver in Model
-		final URIResolver resolver = baseModel.getResolver();
-
-		// resolve to absolute url
-		final String absurl = (resolver != null) ? resolver.getLocationByURI(ref, resolveCrossProjectLinks) : null;
-		if ((resolver != null) && (absurl == null) && (ref != null) && (ref.trim().length() > 0) && (ref.trim().charAt(0) == '/')) {
-			// to reach here means :
-			// ref is a Docroot relative
-			// resolver can't resolve ref
-			// so that href is a broken and should not create model
-			return null;
-		}
-		if ((absurl != null) && (absurl.length() > 0)) {
-			return absurl;
-		}
-
-		// maybe ref is at outside of the Project
-		// obtain docroot;
-		final IContainer container = (resolver != null) ? resolver.getRootLocation() : null;
-		String docroot = null;
-		if (container != null) {
-			docroot = container.getLocation().toString();
-		}
-		if (docroot == null) {
-			docroot = baseModel.getBaseLocation();
-		}
-		if (docroot == null) {
-			// should not be
-			return null;
-		}
-
-		// obtain document url
-		String modelBaseLocation = baseModel.getBaseLocation();
-		if ((modelBaseLocation == null) || (modelBaseLocation.length() == 0)) {
-			// fallback...
-			modelBaseLocation = baseModel.getId();
-		}
-		if ((modelBaseLocation == null) || (modelBaseLocation.length() == 0)) {
-			// i can't resolve uri !
-			return null;
-		}
-
-		// resolve url
-		URLHelper helper = new URLHelper(PathHelper.getContainingFolderPath(modelBaseLocation), PathHelper.getContainingFolderPath(PathHelper.appendTrailingURLSlash(docroot)));
-		return helper.toAbsolute(ref);
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BackgroundPositionXSubStyleAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BackgroundPositionXSubStyleAdapter.java
deleted file mode 100644
index 29ab93c..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BackgroundPositionXSubStyleAdapter.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.contentmodel.IValID;
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMSubProperty;
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMUtil;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSValueList;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSValue;
-
-
-/**
- * for horizontal value of 'background-position'
- */
-public class BackgroundPositionXSubStyleAdapter implements ISubPropertyAdapter {
-
-	/**
-	 * 
-	 */
-	public BackgroundPositionXSubStyleAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	protected CSSTextToken[] correctMeaningToken(CSSTextToken[] src) {
-		java.util.ArrayList list = new java.util.ArrayList();
-		for (int i = 0; i < src.length; i++) {
-			if (src[i].kind != CSSRegionContexts.CSS_S && src[i].kind != CSSRegionContexts.CSS_DECLARATION_VALUE_S && src[i].kind != CSSRegionContexts.CSS_COMMENT)
-				list.add(src[i]);
-		}
-		CSSTextToken[] ret = new CSSTextToken[list.size()];
-		list.toArray(ret);
-		return ret;
-	}
-
-	/**
-	 * 
-	 */
-	public String get(ICSS2Properties properties) {
-		String str = null;
-		Object obj = properties.get(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_POSITION));
-		if (obj != null) {
-			PropCMProperty propX = PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_X);
-			PropCMProperty propY = PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_Y);
-			if (obj instanceof ICSSValueList) {
-				ICSSValueList list = (ICSSValueList) obj;
-				ICSSValue value = (ICSSValue) list.item(0);
-				if (value.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) {
-					ICSSPrimitiveValue prim = (ICSSPrimitiveValue) value;
-					if (prim.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT) {
-						// check not top or bottom
-						if (!propX.canHave(prim.getStringValue()) && propY.canHave(prim.getStringValue())) {
-							// case order is vertical -> horizontal
-							value = (ICSSValue) list.item(1);
-						}
-					}
-				}
-				str = value.getCSSValueText();
-			}
-			else if (obj instanceof ICSSValue) {
-				str = ((ICSSValue) obj).getCSSValueText();
-				if (str.equalsIgnoreCase(IValID.V_BOTTOM) || str.equalsIgnoreCase(IValID.V_TOP))
-					str = "";//$NON-NLS-1$
-			}
-			else {
-				str = obj.toString();
-				CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, str);
-				CSSTextToken[] tokens = parser.getTokens();
-
-				tokens = correctMeaningToken(tokens);
-				if (tokens.length == 0)
-					str = "";//$NON-NLS-1$
-				else if (tokens.length == 1 && (tokens[0].image.equalsIgnoreCase(IValID.V_BOTTOM) || tokens[0].image.equalsIgnoreCase(IValID.V_TOP)))
-					str = "";//$NON-NLS-1$
-				else
-					str = tokens[0].image;
-			}
-		}
-		return (str != null) ? str : "";//$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 */
-	public void set(ICSS2Properties properties, String value) throws org.w3c.dom.DOMException {
-		String newValue = null;
-		String valH = value;
-		String valV = properties.getBackgroundPositionY();
-		if (valV == null || valV.length() == 0)
-			newValue = valH;
-		else if (valH == null || valH.length() == 0) {
-			Collection valX = PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_X).getValues();
-			Collection valY = PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_Y).getValues();
-			PropCMUtil.minus(valY, valX);
-			Iterator it = valY.iterator();
-			while (it.hasNext()) {
-				Object obj = it.next();
-				if (obj.toString().equals(valV.toLowerCase())) {
-					// need not compensate for ...
-					newValue = valV;
-					break;
-				}
-			}
-			// compensate for Horizontal value
-			if (newValue == null) {
-				// check valV is length or not
-				CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, valV.trim());
-				CSSTextToken[] tokens = parser.getTokens();
-				if (tokens != null && tokens.length > 0 && tokens[0].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-					newValue = IValID.V_LEFT + " " + valV;//$NON-NLS-1$
-				}
-				else
-					newValue = "0% " + valV;//$NON-NLS-1$
-			}
-		}
-		else
-			newValue = valH + " " + valV;//$NON-NLS-1$
-		properties.setBackgroundPosition(newValue);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BackgroundPositionYSubStyleAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BackgroundPositionYSubStyleAdapter.java
deleted file mode 100644
index bb9e9a7..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BackgroundPositionYSubStyleAdapter.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.contentmodel.IValID;
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMSubProperty;
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMUtil;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSValueList;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSValue;
-
-
-/**
- * for vertical value of 'background-position'
- */
-public class BackgroundPositionYSubStyleAdapter implements ISubPropertyAdapter {
-
-	/**
-	 * 
-	 */
-	public BackgroundPositionYSubStyleAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	protected CSSTextToken[] correctMeaningToken(CSSTextToken[] src) {
-		java.util.ArrayList list = new java.util.ArrayList();
-		for (int i = 0; i < src.length; i++) {
-			if (src[i].kind != CSSRegionContexts.CSS_S && src[i].kind != CSSRegionContexts.CSS_DECLARATION_VALUE_S && src[i].kind != CSSRegionContexts.CSS_COMMENT)
-				list.add(src[i]);
-		}
-		CSSTextToken[] ret = new CSSTextToken[list.size()];
-		list.toArray(ret);
-		return ret;
-	}
-
-	/**
-	 * 
-	 */
-	public String get(ICSS2Properties properties) {
-		String str = null;
-		Object obj = properties.get(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_POSITION));
-		if (obj != null) {
-			PropCMProperty propX = PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_X);
-			PropCMProperty propY = PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_Y);
-			if (obj instanceof ICSSValueList) {
-				ICSSValueList list = (ICSSValueList) obj;
-				int index = 1;
-				ICSSValue value = (ICSSValue) list.item(0);
-				if (value.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) {
-					ICSSPrimitiveValue prim = (ICSSPrimitiveValue) value;
-					if (prim.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT) {
-						// check not top or bottom
-						if (!propX.canHave(prim.getStringValue()) && propY.canHave(prim.getStringValue())) {
-							// case order is vertical -> horizontal
-							index = 0;
-						}
-					}
-				}
-				str = ((ICSSValue) list.item(index)).getCSSValueText();
-			}
-			else if (obj instanceof ICSSValue) {
-				str = ((ICSSValue) obj).getCSSValueText();
-				if (!str.equalsIgnoreCase(IValID.V_BOTTOM) && !str.equalsIgnoreCase(IValID.V_TOP))
-					str = "";//$NON-NLS-1$
-			}
-			else {
-				str = obj.toString();
-				CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, str);
-				CSSTextToken[] tokens = parser.getTokens();
-
-				tokens = correctMeaningToken(tokens);
-				if (tokens.length == 1 && (tokens[0].image.equalsIgnoreCase(IValID.V_BOTTOM) || tokens[0].image.equalsIgnoreCase(IValID.V_TOP)))
-					str = tokens[0].image;
-				else if (tokens.length > 1)
-					str = tokens[1].image;
-				else
-					str = "";//$NON-NLS-1$
-			}
-		}
-		return (str != null) ? str : "";//$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 */
-	public void set(ICSS2Properties properties, String value) throws org.w3c.dom.DOMException {
-		String newValue = null;
-		String valH = properties.getBackgroundPositionX();
-		String valV = value;
-		if (valH != null && (valH.trim().equals("0%") /* default value */|| //$NON-NLS-1$
-					valH.trim().equalsIgnoreCase(IValID.V_LEFT) /*
-																 * another
-																 * default
-																 * value
-																 */))
-			valH = null;
-		if (valV == null || valV.length() == 0)
-			newValue = valH;
-		else if (valH == null || valH.length() == 0) {
-			Collection valX = PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_X).getValues();
-			Collection valY = PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_Y).getValues();
-			PropCMUtil.minus(valY, valX);
-			Iterator it = valY.iterator();
-			while (it.hasNext()) {
-				Object obj = it.next();
-				if (obj.toString().equals(valV.toLowerCase())) {
-					// need not compensate for ...
-					newValue = valV;
-					break;
-				}
-			}
-			// compensate for Horizontal value
-			if (newValue == null) {
-				// check valV is length or not
-				CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, valV.trim());
-				CSSTextToken[] tokens = parser.getTokens();
-				if (tokens != null && tokens.length > 0 && tokens[0].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-					newValue = IValID.V_LEFT + " " + valV;//$NON-NLS-1$
-				}
-				else
-					newValue = "0% " + valV;//$NON-NLS-1$
-			}
-		}
-		else
-			newValue = valH + " " + valV;//$NON-NLS-1$
-		properties.setBackgroundPosition(newValue);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BackgroundShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BackgroundShorthandAdapter.java
deleted file mode 100644
index d9b5fe6..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BackgroundShorthandAdapter.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-
-
-/**
- * For 'background' property 'background' will be expanded to
- * 'background-attachment', 'background-color', 'background-image',
- * 'background-position', 'background-repeat',
- */
-public class BackgroundShorthandAdapter implements IShorthandAdapter {
-
-	/**
-	 * 
-	 */
-	public BackgroundShorthandAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public boolean expand(String source, CSSPropertyContext dest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return false;
-		}
-		String color = "", image = "", repeat = "", attach = "", pos = "";//$NON-NLS-5$//$NON-NLS-4$//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-		PropCMProperty propColor = PropCMProperty.getInstanceOf(PropCMProperty.P_BG_COLOR);
-		PropCMProperty propImage = PropCMProperty.getInstanceOf(PropCMProperty.P_BG_IMAGE);
-		PropCMProperty propRepeat = PropCMProperty.getInstanceOf(PropCMProperty.P_BG_REPEAT);
-		PropCMProperty propAttach = PropCMProperty.getInstanceOf(PropCMProperty.P_BG_ATTACHMENT);
-		PropCMProperty propPos = PropCMProperty.getInstanceOf(PropCMProperty.P_BG_POSITION);
-
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				if (propColor.canHave(tokens[i].image))
-					color = tokens[i].image;
-				else if (propImage.canHave(tokens[i].image))
-					image = tokens[i].image;
-				else if (propRepeat.canHave(tokens[i].image))
-					repeat = tokens[i].image;
-				else if (propAttach.canHave(tokens[i].image))
-					attach = tokens[i].image;
-				else if (propPos.canHave(tokens[i].image)) {
-					if (pos == null || pos.length() <= 0)
-						pos = tokens[i].image;
-					else
-						pos = pos + " " + tokens[i].image;//$NON-NLS-1$
-				}
-			}
-			else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) {
-				if (pos == null || pos.length() <= 0)
-					pos = tokens[i].image;
-				else
-					pos = pos + " " + tokens[i].image;//$NON-NLS-1$
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_URI) {
-				image = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) {
-				color = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-				StringBuffer buf = new StringBuffer();
-				while (i < tokens.length) {
-					if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT) {
-						i++;
-						continue;
-					}
-					buf.append(tokens[i].image);
-					if (tokens[i++].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-						break;
-				}
-				i--;
-				color = buf.toString();
-			}
-		}
-
-		dest.set(propColor.getName(), color);
-		dest.set(propImage.getName(), image);
-		dest.set(propRepeat.getName(), repeat);
-		dest.set(propAttach.getName(), attach);
-		dest.set(propPos.getName(), pos);
-
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	public String extract(String source, PropCMProperty propDest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return null;
-		}
-		String color = null, image = null, repeat = null, attach = null, pos = null;
-		PropCMProperty propColor = PropCMProperty.getInstanceOf(PropCMProperty.P_BG_COLOR);
-		PropCMProperty propImage = PropCMProperty.getInstanceOf(PropCMProperty.P_BG_IMAGE);
-		PropCMProperty propRepeat = PropCMProperty.getInstanceOf(PropCMProperty.P_BG_REPEAT);
-		PropCMProperty propAttach = PropCMProperty.getInstanceOf(PropCMProperty.P_BG_ATTACHMENT);
-		PropCMProperty propPos = PropCMProperty.getInstanceOf(PropCMProperty.P_BG_POSITION);
-
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				if (propColor.canHave(tokens[i].image))
-					color = tokens[i].image;
-				else if (propImage.canHave(tokens[i].image))
-					image = tokens[i].image;
-				else if (propRepeat.canHave(tokens[i].image))
-					repeat = tokens[i].image;
-				else if (propAttach.canHave(tokens[i].image))
-					attach = tokens[i].image;
-				else if (propPos.canHave(tokens[i].image)) {
-					if (pos == null)
-						pos = tokens[i].image;
-					else
-						pos = pos + " " + tokens[i].image;//$NON-NLS-1$
-				}
-			}
-			else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) {
-				if (pos == null)
-					pos = tokens[i].image;
-				else
-					pos = pos + " " + tokens[i].image;//$NON-NLS-1$
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_URI) {
-				image = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) {
-				color = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-				StringBuffer buf = new StringBuffer();
-				while (i < tokens.length) {
-					if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT) {
-						i++;
-						continue;
-					}
-					buf.append(tokens[i].image);
-					if (tokens[i++].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-						break;
-				}
-				i--;
-				color = buf.toString();
-			}
-		}
-
-		if (propColor == propDest)
-			return color;
-		else if (propImage == propDest)
-			return image;
-		else if (propRepeat == propDest)
-			return repeat;
-		else if (propAttach == propDest)
-			return attach;
-		else if (propPos == propDest)
-			return pos;
-		else
-			return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderBottomShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderBottomShorthandAdapter.java
deleted file mode 100644
index 09b505e..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderBottomShorthandAdapter.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-
-
-/**
- * For 'border-bottom' property 'border-bottom' will be expanded to
- * 'border-bottom-color', 'border-bottom-style', 'border-bottom-width',
- */
-public class BorderBottomShorthandAdapter implements IShorthandAdapter {
-
-	/**
-	 * 
-	 */
-	public BorderBottomShorthandAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public boolean expand(String source, CSSPropertyContext dest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return false;
-		}
-		String color = "", style = "", width = "";//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-		PropCMProperty propColor = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_COLOR);
-		PropCMProperty propStyle = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_STYLE);
-		PropCMProperty propWidth = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_WIDTH);
-
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				if (propStyle.canHave(tokens[i].image))
-					style = tokens[i].image;
-				else if (propWidth.canHave(tokens[i].image))
-					width = tokens[i].image;
-				else if (propColor.canHave(tokens[i].image))
-					color = tokens[i].image;
-			}
-			else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) {
-				width = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) {
-				color = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-				StringBuffer buf = new StringBuffer();
-				while (i < tokens.length) {
-					if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT) {
-						i++;
-						continue;
-					}
-					buf.append(tokens[i].image);
-					if (tokens[i++].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-						break;
-				}
-				i--;
-				color = buf.toString();
-			}
-		}
-
-		dest.set(propColor.getName(), color);
-		dest.set(propStyle.getName(), style);
-		dest.set(propWidth.getName(), width);
-
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	public String extract(String source, PropCMProperty propDest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return null;
-		}
-		String color = null, style = null, width = null;
-		PropCMProperty propColor = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_COLOR);
-		PropCMProperty propStyle = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_STYLE);
-		PropCMProperty propWidth = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_WIDTH);
-
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				if (propStyle.canHave(tokens[i].image))
-					style = tokens[i].image;
-				else if (propWidth.canHave(tokens[i].image))
-					width = tokens[i].image;
-				else if (propColor.canHave(tokens[i].image))
-					color = tokens[i].image;
-			}
-			else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) {
-				width = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) {
-				color = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-				StringBuffer buf = new StringBuffer();
-				while (i < tokens.length) {
-					if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT) {
-						i++;
-						continue;
-					}
-					buf.append(tokens[i].image);
-					if (tokens[i++].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-						break;
-				}
-				i--;
-				color = buf.toString();
-			}
-		}
-
-		if (propColor == propDest)
-			return color;
-		else if (propStyle == propDest)
-			return style;
-		else if (propWidth == propDest)
-			return width;
-		else
-			return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderColorShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderColorShorthandAdapter.java
deleted file mode 100644
index e314007..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderColorShorthandAdapter.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-
-
-/**
- * For 'border-color' property 'border-color' will be expanded to
- * 'border-top-color', 'border-right-color', 'border-bottom-color',
- * 'border-left-color',
- */
-public class BorderColorShorthandAdapter implements IShorthandAdapter {
-
-	/**
-	 * 
-	 */
-	public BorderColorShorthandAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public boolean expand(String source, CSSPropertyContext dest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return false;
-		}
-		String[] idents = new String[4];
-		int j = 0;
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH)
-				idents[j++] = tokens[i].image;
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-				StringBuffer buf = new StringBuffer();
-				while (i < tokens.length) {
-					if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT) {
-						i++;
-						continue;
-					}
-					buf.append(tokens[i].image);
-					if (tokens[i++].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-						break;
-				}
-				i--;
-				idents[j++] = buf.toString();
-			}
-			if (j == 4)
-				break;
-		}
-
-		String[] dests = new String[4];
-		if (j == 0)
-			return true;
-		else if (j == 1) {
-			dests[0] = dests[1] = dests[2] = dests[3] = idents[0];
-		}
-		else if (j == 2) {
-			dests[0] = dests[2] = idents[0];
-			dests[1] = dests[3] = idents[1];
-		}
-		else if (j == 3) {
-			dests[0] = idents[0];
-			dests[1] = dests[3] = idents[1];
-			dests[2] = idents[2];
-		}
-		else {
-			for (int k = 0; k < 4; k++)
-				dests[k] = idents[k];
-		}
-		dest.set(PropCMProperty.P_BORDER_TOP_COLOR, dests[0]);
-		dest.set(PropCMProperty.P_BORDER_RIGHT_COLOR, dests[1]);
-		dest.set(PropCMProperty.P_BORDER_BOTTOM_COLOR, dests[2]);
-		dest.set(PropCMProperty.P_BORDER_LEFT_COLOR, dests[3]);
-
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	public String extract(String source, PropCMProperty propDest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return null;
-		}
-		String[] idents = new String[4];
-		int j = 0;
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH)
-				idents[j++] = tokens[i].image;
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-				StringBuffer buf = new StringBuffer();
-				while (i < tokens.length) {
-					if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT) {
-						i++;
-						continue;
-					}
-					buf.append(tokens[i].image);
-					if (tokens[i++].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-						break;
-				}
-				i--;
-				idents[j++] = buf.toString();
-			}
-			if (j == 4)
-				break;
-		}
-
-		if (j == 0)
-			return null;
-		else if (j == 1)
-			return idents[0];
-		else if (j == 2) {
-			if (propDest.getName() == PropCMProperty.P_BORDER_TOP_COLOR || propDest.getName() == PropCMProperty.P_BORDER_BOTTOM_COLOR)
-				return idents[0];
-			else
-				return idents[1];
-		}
-		else if (j == 3) {
-			if (propDest.getName() == PropCMProperty.P_BORDER_TOP_COLOR)
-				return idents[0];
-			else if (propDest.getName() == PropCMProperty.P_BORDER_BOTTOM_COLOR)
-				return idents[2];
-			else
-				return idents[1];
-		}
-		else {
-			if (propDest.getName() == PropCMProperty.P_BORDER_TOP_COLOR)
-				return idents[0];
-			else if (propDest.getName() == PropCMProperty.P_BORDER_RIGHT_COLOR)
-				return idents[1];
-			else if (propDest.getName() == PropCMProperty.P_BORDER_BOTTOM_COLOR)
-				return idents[2];
-			else if (propDest.getName() == PropCMProperty.P_BORDER_LEFT_COLOR)
-				return idents[3];
-			else
-				return null;
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderLeftShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderLeftShorthandAdapter.java
deleted file mode 100644
index cbc7930..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderLeftShorthandAdapter.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-
-
-/**
- * For 'border-left' property 'border-left' will be expanded to
- * 'border-left-color', 'border-left-style', 'border-left-width',
- */
-public class BorderLeftShorthandAdapter implements IShorthandAdapter {
-
-	/**
-	 * 
-	 */
-	public BorderLeftShorthandAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public boolean expand(String source, CSSPropertyContext dest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return false;
-		}
-		String color = "", style = "", width = "";//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-		PropCMProperty propColor = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_COLOR);
-		PropCMProperty propStyle = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_STYLE);
-		PropCMProperty propWidth = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_WIDTH);
-
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				if (propStyle.canHave(tokens[i].image))
-					style = tokens[i].image;
-				else if (propWidth.canHave(tokens[i].image))
-					width = tokens[i].image;
-				else if (propColor.canHave(tokens[i].image))
-					color = tokens[i].image;
-			}
-			else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) {
-				width = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) {
-				color = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-				StringBuffer buf = new StringBuffer();
-				while (i < tokens.length) {
-					if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT) {
-						i++;
-						continue;
-					}
-					buf.append(tokens[i].image);
-					if (tokens[i++].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-						break;
-				}
-				i--;
-				color = buf.toString();
-			}
-		}
-
-		dest.set(propColor.getName(), color);
-		dest.set(propStyle.getName(), style);
-		dest.set(propWidth.getName(), width);
-
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	public String extract(String source, PropCMProperty propDest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return null;
-		}
-		String color = null, style = null, width = null;
-		PropCMProperty propColor = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_COLOR);
-		PropCMProperty propStyle = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_STYLE);
-		PropCMProperty propWidth = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_WIDTH);
-
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				if (propStyle.canHave(tokens[i].image))
-					style = tokens[i].image;
-				else if (propWidth.canHave(tokens[i].image))
-					width = tokens[i].image;
-				else if (propColor.canHave(tokens[i].image))
-					color = tokens[i].image;
-			}
-			else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) {
-				width = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) {
-				color = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-				StringBuffer buf = new StringBuffer();
-				while (i < tokens.length) {
-					if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT) {
-						i++;
-						continue;
-					}
-					buf.append(tokens[i].image);
-					if (tokens[i++].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-						break;
-				}
-				i--;
-				color = buf.toString();
-			}
-		}
-
-		if (propColor == propDest)
-			return color;
-		else if (propStyle == propDest)
-			return style;
-		else if (propWidth == propDest)
-			return width;
-		else
-			return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderRightShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderRightShorthandAdapter.java
deleted file mode 100644
index d74e440..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderRightShorthandAdapter.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-
-
-/**
- * For 'border-right' property 'border-right' will be expanded to
- * 'border-right-color', 'border-right-style', 'border-right-width',
- */
-public class BorderRightShorthandAdapter implements IShorthandAdapter {
-
-	/**
-	 * 
-	 */
-	public BorderRightShorthandAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public boolean expand(String source, CSSPropertyContext dest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return false;
-		}
-		String color = "", style = "", width = "";//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-		PropCMProperty propColor = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_COLOR);
-		PropCMProperty propStyle = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_STYLE);
-		PropCMProperty propWidth = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_WIDTH);
-
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				if (propStyle.canHave(tokens[i].image))
-					style = tokens[i].image;
-				else if (propWidth.canHave(tokens[i].image))
-					width = tokens[i].image;
-				else if (propColor.canHave(tokens[i].image))
-					color = tokens[i].image;
-			}
-			else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) {
-				width = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) {
-				color = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-				StringBuffer buf = new StringBuffer();
-				while (i < tokens.length) {
-					if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT) {
-						i++;
-						continue;
-					}
-					buf.append(tokens[i].image);
-					if (tokens[i++].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-						break;
-				}
-				i--;
-				color = buf.toString();
-			}
-		}
-
-		dest.set(propColor.getName(), color);
-		dest.set(propStyle.getName(), style);
-		dest.set(propWidth.getName(), width);
-
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	public String extract(String source, PropCMProperty propDest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return null;
-		}
-		String color = null, style = null, width = null;
-		PropCMProperty propColor = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_COLOR);
-		PropCMProperty propStyle = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_STYLE);
-		PropCMProperty propWidth = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_WIDTH);
-
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				if (propStyle.canHave(tokens[i].image))
-					style = tokens[i].image;
-				else if (propWidth.canHave(tokens[i].image))
-					width = tokens[i].image;
-				else if (propColor.canHave(tokens[i].image))
-					color = tokens[i].image;
-			}
-			else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) {
-				width = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) {
-				color = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-				StringBuffer buf = new StringBuffer();
-				while (i < tokens.length) {
-					if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT) {
-						i++;
-						continue;
-					}
-					buf.append(tokens[i].image);
-					if (tokens[i++].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-						break;
-				}
-				i--;
-				color = buf.toString();
-			}
-		}
-
-		if (propColor == propDest)
-			return color;
-		else if (propStyle == propDest)
-			return style;
-		else if (propWidth == propDest)
-			return width;
-		else
-			return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderShorthandAdapter.java
deleted file mode 100644
index 6da3333..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderShorthandAdapter.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-
-
-/**
- * For 'border' property 'border' will be expanded to 'border-color',
- * 'border-style', 'border-width',
- */
-public class BorderShorthandAdapter implements IShorthandAdapter {
-
-	/**
-	 * 
-	 */
-	public BorderShorthandAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public boolean expand(String source, CSSPropertyContext dest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return false;
-		}
-		String color = "", style = "", width = "";//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-		PropCMProperty propColor = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_COLOR);
-		PropCMProperty propStyle = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_STYLE);
-		PropCMProperty propWidth = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_WIDTH);
-
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				if (propStyle.canHave(tokens[i].image))
-					style = tokens[i].image;
-				else if (propWidth.canHave(tokens[i].image))
-					width = tokens[i].image;
-				else if (propColor.canHave(tokens[i].image))
-					color = tokens[i].image;
-			}
-			else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) {
-				width = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) {
-				color = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-				StringBuffer buf = new StringBuffer();
-				while (i < tokens.length) {
-					if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT) {
-						i++;
-						continue;
-					}
-					buf.append(tokens[i].image);
-					if (tokens[i++].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-						break;
-				}
-				i--;
-				color = buf.toString();
-			}
-		}
-
-		dest.set(propColor.getName(), color);
-		dest.set(propStyle.getName(), style);
-		dest.set(propWidth.getName(), width);
-
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	public String extract(String source, PropCMProperty propDest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return null;
-		}
-		String color = null, style = null, width = null;
-		PropCMProperty propColor = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_COLOR);
-		PropCMProperty propStyle = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_STYLE);
-		PropCMProperty propWidth = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_WIDTH);
-
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				if (propStyle.canHave(tokens[i].image))
-					style = tokens[i].image;
-				else if (propWidth.canHave(tokens[i].image))
-					width = tokens[i].image;
-				else if (propColor.canHave(tokens[i].image))
-					color = tokens[i].image;
-			}
-			else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) {
-				width = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) {
-				color = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-				StringBuffer buf = new StringBuffer();
-				while (i < tokens.length) {
-					if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT) {
-						i++;
-						continue;
-					}
-					buf.append(tokens[i].image);
-					if (tokens[i++].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-						break;
-				}
-				i--;
-				color = buf.toString();
-			}
-		}
-
-		if (propColor == propDest)
-			return color;
-		else if (propStyle == propDest)
-			return style;
-		else if (propWidth == propDest)
-			return width;
-		else
-			return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderStyleShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderStyleShorthandAdapter.java
deleted file mode 100644
index b5fb962..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderStyleShorthandAdapter.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-
-
-/**
- * For 'border-style' property 'border-style' will be expanded to
- * 'border-top-style', 'border-right-style', 'border-bottom-style',
- * 'border-left-style',
- */
-public class BorderStyleShorthandAdapter implements IShorthandAdapter {
-
-	/**
-	 * 
-	 */
-	public BorderStyleShorthandAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public boolean expand(String source, CSSPropertyContext dest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return false;
-		}
-		String[] idents = new String[4];
-		int j = 0;
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT)
-				idents[j++] = tokens[i].image;
-			if (j == 4)
-				break;
-		}
-
-		String[] dests = new String[4];
-		if (j == 0)
-			return true;
-		else if (j == 1) {
-			dests[0] = dests[1] = dests[2] = dests[3] = idents[0];
-		}
-		else if (j == 2) {
-			dests[0] = dests[2] = idents[0];
-			dests[1] = dests[3] = idents[1];
-		}
-		else if (j == 3) {
-			dests[0] = idents[0];
-			dests[1] = dests[3] = idents[1];
-			dests[2] = idents[2];
-		}
-		else {
-			for (int k = 0; k < 4; k++)
-				dests[k] = idents[k];
-		}
-		dest.set(PropCMProperty.P_BORDER_TOP_STYLE, dests[0]);
-		dest.set(PropCMProperty.P_BORDER_RIGHT_STYLE, dests[1]);
-		dest.set(PropCMProperty.P_BORDER_BOTTOM_STYLE, dests[2]);
-		dest.set(PropCMProperty.P_BORDER_LEFT_STYLE, dests[3]);
-
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	public String extract(String source, PropCMProperty propDest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return null;
-		}
-		String[] idents = new String[4];
-		int j = 0;
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT)
-				idents[j++] = tokens[i].image;
-			if (j == 4)
-				break;
-		}
-
-		if (j == 0)
-			return null;
-		else if (j == 1)
-			return idents[0];
-		else if (j == 2) {
-			if (propDest.getName() == PropCMProperty.P_BORDER_TOP_STYLE || propDest.getName() == PropCMProperty.P_BORDER_BOTTOM_STYLE)
-				return idents[0];
-			else
-				return idents[1];
-		}
-		else if (j == 3) {
-			if (propDest.getName() == PropCMProperty.P_BORDER_TOP_STYLE)
-				return idents[0];
-			else if (propDest.getName() == PropCMProperty.P_BORDER_BOTTOM_STYLE)
-				return idents[2];
-			else
-				return idents[1];
-		}
-		else {
-			if (propDest.getName() == PropCMProperty.P_BORDER_TOP_STYLE)
-				return idents[0];
-			else if (propDest.getName() == PropCMProperty.P_BORDER_RIGHT_STYLE)
-				return idents[1];
-			else if (propDest.getName() == PropCMProperty.P_BORDER_BOTTOM_STYLE)
-				return idents[2];
-			else if (propDest.getName() == PropCMProperty.P_BORDER_LEFT_STYLE)
-				return idents[3];
-			else
-				return null;
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderTopShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderTopShorthandAdapter.java
deleted file mode 100644
index a728399..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderTopShorthandAdapter.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-
-
-/**
- * For 'border-top' property 'border-top' will be expanded to
- * 'border-top-color', 'border-top-style', 'border-top-width',
- */
-public class BorderTopShorthandAdapter implements IShorthandAdapter {
-
-	/**
-	 * 
-	 */
-	public BorderTopShorthandAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public boolean expand(String source, CSSPropertyContext dest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return false;
-		}
-		String color = "", style = "", width = "";//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-		PropCMProperty propColor = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_COLOR);
-		PropCMProperty propStyle = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_STYLE);
-		PropCMProperty propWidth = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_WIDTH);
-
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				if (propStyle.canHave(tokens[i].image))
-					style = tokens[i].image;
-				else if (propWidth.canHave(tokens[i].image))
-					width = tokens[i].image;
-				else if (propColor.canHave(tokens[i].image))
-					color = tokens[i].image;
-			}
-			else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) {
-				width = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) {
-				color = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-				StringBuffer buf = new StringBuffer();
-				while (i < tokens.length) {
-					if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT) {
-						i++;
-						continue;
-					}
-					buf.append(tokens[i].image);
-					if (tokens[i++].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-						break;
-				}
-				i--;
-				color = buf.toString();
-			}
-		}
-
-		dest.set(propColor.getName(), color);
-		dest.set(propStyle.getName(), style);
-		dest.set(propWidth.getName(), width);
-
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	public String extract(String source, PropCMProperty propDest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return null;
-		}
-		String color = null, style = null, width = null;
-		PropCMProperty propColor = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_COLOR);
-		PropCMProperty propStyle = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_STYLE);
-		PropCMProperty propWidth = PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_WIDTH);
-
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				if (propStyle.canHave(tokens[i].image))
-					style = tokens[i].image;
-				else if (propWidth.canHave(tokens[i].image))
-					width = tokens[i].image;
-				else if (propColor.canHave(tokens[i].image))
-					color = tokens[i].image;
-			}
-			else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) {
-				width = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) {
-				color = tokens[i].image;
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-				StringBuffer buf = new StringBuffer();
-				while (i < tokens.length) {
-					if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT) {
-						i++;
-						continue;
-					}
-					buf.append(tokens[i].image);
-					if (tokens[i++].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-						break;
-				}
-				i--;
-				color = buf.toString();
-			}
-		}
-
-		if (propColor == propDest)
-			return color;
-		else if (propStyle == propDest)
-			return style;
-		else if (propWidth == propDest)
-			return width;
-		else
-			return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderWidthShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderWidthShorthandAdapter.java
deleted file mode 100644
index cda09e6..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderWidthShorthandAdapter.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-
-
-/**
- * For 'border-width' property 'border-width' will be expanded to
- * 'border-top-width', 'border-right-width', 'border-bottom-width',
- * 'border-left-width',
- */
-public class BorderWidthShorthandAdapter implements IShorthandAdapter {
-
-	/**
-	 * 
-	 */
-	public BorderWidthShorthandAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public boolean expand(String source, CSSPropertyContext dest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return false;
-		}
-		String[] idents = new String[4];
-		int j = 0;
-		for (int i = 0; i < tokens.length; i++) {
-			if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT)
-				idents[j++] = tokens[i].image;
-			if (j == 4)
-				break;
-		}
-
-		String[] dests = new String[4];
-		if (j == 0)
-			return true;
-		else if (j == 1) {
-			dests[0] = dests[1] = dests[2] = dests[3] = idents[0];
-		}
-		else if (j == 2) {
-			dests[0] = dests[2] = idents[0];
-			dests[1] = dests[3] = idents[1];
-		}
-		else if (j == 3) {
-			dests[0] = idents[0];
-			dests[1] = dests[3] = idents[1];
-			dests[2] = idents[2];
-		}
-		else {
-			for (int k = 0; k < 4; k++)
-				dests[k] = idents[k];
-		}
-		dest.set(PropCMProperty.P_BORDER_TOP_WIDTH, dests[0]);
-		dest.set(PropCMProperty.P_BORDER_RIGHT_WIDTH, dests[1]);
-		dest.set(PropCMProperty.P_BORDER_BOTTOM_WIDTH, dests[2]);
-		dest.set(PropCMProperty.P_BORDER_LEFT_WIDTH, dests[3]);
-
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	public String extract(String source, PropCMProperty propDest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return null;
-		}
-		String[] idents = new String[4];
-		int j = 0;
-		for (int i = 0; i < tokens.length; i++) {
-			if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT)
-				idents[j++] = tokens[i].image;
-			if (j == 4)
-				break;
-		}
-
-		if (j == 0)
-			return null;
-		else if (j == 1)
-			return idents[0];
-		else if (j == 2) {
-			if (propDest.getName() == PropCMProperty.P_BORDER_TOP_WIDTH || propDest.getName() == PropCMProperty.P_BORDER_BOTTOM_WIDTH)
-				return idents[0];
-			else
-				return idents[1];
-		}
-		else if (j == 3) {
-			if (propDest.getName() == PropCMProperty.P_BORDER_TOP_WIDTH)
-				return idents[0];
-			else if (propDest.getName() == PropCMProperty.P_BORDER_BOTTOM_WIDTH)
-				return idents[2];
-			else
-				return idents[1];
-		}
-		else {
-			if (propDest.getName() == PropCMProperty.P_BORDER_TOP_WIDTH)
-				return idents[0];
-			else if (propDest.getName() == PropCMProperty.P_BORDER_RIGHT_WIDTH)
-				return idents[1];
-			else if (propDest.getName() == PropCMProperty.P_BORDER_BOTTOM_WIDTH)
-				return idents[2];
-			else if (propDest.getName() == PropCMProperty.P_BORDER_LEFT_WIDTH)
-				return idents[3];
-			else
-				return null;
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/CSSPropertyContext.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/CSSPropertyContext.java
deleted file mode 100644
index 1b40706..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/CSSPropertyContext.java
+++ /dev/null
@@ -1,2997 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMSubProperty;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue;
-import org.w3c.dom.css.CSSValue;
-
-
-/**
- * 
- */
-public class CSSPropertyContext implements ICSS2Properties {
-
-	protected Hashtable fProperties = new Hashtable();
-	HashSet fModified = null;
-	private static java.util.Hashtable subPropertyAdapters;
-	private static java.util.Hashtable shorthandAdapters;
-
-	/**
-	 * 
-	 */
-	public CSSPropertyContext() {
-		super();
-		initShorthandAdapters();
-		initSubPropertyAdapters();
-	}
-
-	/**
-	 * 
-	 */
-	public CSSPropertyContext(ICSSStyleDeclaration decl) {
-		super();
-		initShorthandAdapters();
-		initSubPropertyAdapters();
-		initialize(decl);
-	}
-
-	/**
-	 * This function exports all property/value pairs to 'decl' declaration
-	 */
-	public void applyFull(ICSSStyleDeclaration decl) {
-		if (decl == null)
-			return;
-		Enumeration keys = fProperties.keys();
-		while (keys.hasMoreElements()) {
-			Object key = keys.nextElement();
-			Object val = fProperties.get(key);
-			String value = (val instanceof ICSSValue) ? ((ICSSValue) val).getCSSValueText() : val.toString();
-
-			if (value == null || value.length() <= 0)
-				decl.removeProperty(key.toString());
-			else
-				decl.setProperty(key.toString(), value.trim(), (val instanceof ValueData && ((ValueData) val).important) ? "!important" : "");//$NON-NLS-2$//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * This function exports modified property/value pairs to 'decl'
-	 * declaration
-	 */
-	public void applyModified(ICSSStyleDeclaration decl) {
-		if (decl == null || fModified == null)
-			return;
-		Iterator it = fModified.iterator();
-		while (it.hasNext()) {
-			Object key = it.next();
-			Object val = fProperties.get(key);
-			String value = (val instanceof ICSSValue) ? ((ICSSValue) val).getCSSValueText() : ((val != null) ? val.toString() : null);
-
-			if (value == null || value.length() <= 0)
-				decl.removeProperty(key.toString());
-			else
-				decl.setProperty(key.toString(), value.trim(), (val instanceof ValueData && ((ValueData) val).important) ? "!important" : "");//$NON-NLS-2$//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * create clone of this context
-	 */
-	public Object clone() {
-		CSSPropertyContext clone = new CSSPropertyContext();
-		if (this.fModified != null)
-			clone.fModified = (HashSet) this.fModified.clone();
-		else
-			clone.fModified = null;
-		clone.fProperties = (Hashtable) this.fProperties.clone();
-		return clone;
-	}
-
-	/**
-	 * This function expands a short-hand property's value to each leaf
-	 * property's value and set them to 'foreign'
-	 * 
-	 * For example, given [prop=border-top, value="solid 1px yellow"] will be
-	 * expanded to [border-top-color=yellow, border-top-style=solid,
-	 * border-top-width=1px] and they are stored to 'foreign' context.
-	 * 
-	 * Note that recursively shorthanded property like 'border' will be
-	 * expanded to all descendant leaf properties like
-	 * 'border-[top/right/bottom/left]-[color/style/width]'
-	 * 
-	 * @param prop
-	 *            org.eclipse.wst.css.core.contentmodel.PropCMProperty
-	 * @param value
-	 *            java.lang.String
-	 * @param foreign
-	 *            org.eclipse.wst.css.core.util.declaration.CSSPropertyContext
-	 */
-	protected static void expandToLeaf(PropCMProperty prop, String value, CSSPropertyContext foreign) {
-		// expand shorthand property
-		if (value != null && value.trim().length() > 0) {
-			IShorthandAdapter adapter = (IShorthandAdapter) shorthandAdapters.get(prop);
-			if (adapter != null) {
-				adapter.expand(value, foreign);
-				foreign.set(prop.getName(), "");//$NON-NLS-1$
-				for (int i = 0; i < prop.getNumChild(); i++) {
-					Object obj = prop.getChildAt(i);
-					if (obj instanceof PropCMProperty && !(obj instanceof PropCMSubProperty)) {
-						PropCMProperty expandedProp = (PropCMProperty) obj;
-						value = foreign.get(expandedProp.getName());
-						expandToLeaf(expandedProp, value, foreign);
-					}
-				}
-			}
-			else if (!value.equals(foreign.get(prop.getName()))) {
-				foreign.set(prop.getName(), value);
-			}
-		}
-	}
-
-	/**
-	 * This function returns value of 'prop'. Querying value mechanism checks
-	 * short-hand properties.
-	 * 
-	 * For example, given "background=fixed white" is set in this insatnce and
-	 * param "prop=background-color", the return value will be "white".
-	 * 
-	 */
-	public java.lang.String get(org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty prop) {
-		if (prop instanceof PropCMSubProperty) {
-			ISubPropertyAdapter adapter = (ISubPropertyAdapter) subPropertyAdapters.get(prop.getName());
-			if (adapter != null)
-				return adapter.get(this);
-		}
-		String str = get(prop.getName());
-		if ((str == null || str.length() == 0) && prop.getShorthandContainerCount() > 0) {
-			// get expanded property
-			for (int i = 0; i < prop.getShorthandContainerCount(); i++) {
-				PropCMProperty propParent = prop.shorthandContainerAt(i);
-				String strParent = get(propParent);
-				if (strParent != null && strParent.trim().length() > 0) {
-					IShorthandAdapter adapter = (IShorthandAdapter) shorthandAdapters.get(propParent);
-					if (adapter != null) {
-						String extractedValue = adapter.extract(strParent, prop);
-						return (extractedValue != null) ? extractedValue : "";//$NON-NLS-1$
-					}
-				}
-			}
-		}
-		return str;
-	}
-
-	/**
-	 * This function returns value of 'prop'. Querying value mechanism does
-	 * not care shorthand properties.
-	 */
-	protected String get(String propName) {
-		String str = null;
-		Object obj = fProperties.get(propName);
-		if (obj != null) {
-			if (obj instanceof ICSSValue)
-				str = ((ICSSValue) obj).getCSSValueText();
-			else
-				str = obj.toString();
-		}
-		return (str != null) ? str : "";//$NON-NLS-1$
-	}
-
-	/**
-	 * See the azimuth property definition in CSS2.
-	 * 
-	 * @exception org.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getAzimuth() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_AZIMUTH));
-	}
-
-	/**
-	 * See the background property definition in CSS2.
-	 * 
-	 * @exception org.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBackground() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BG));
-	}
-
-	/**
-	 * See the background-attachment property definition in CSS2.
-	 * 
-	 * @exception org.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBackgroundAttachment() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_ATTACHMENT));
-	}
-
-	/**
-	 * See the background-color property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBackgroundColor() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_COLOR));
-	}
-
-	/**
-	 * See the background-image property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBackgroundImage() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_IMAGE));
-	}
-
-	/**
-	 * See the background-position property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBackgroundPosition() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_POSITION));
-	}
-
-	/**
-	 * 
-	 */
-	public java.lang.String getBackgroundPositionX() {
-		return get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_X));
-		/*
-		 * String str = null; Object obj =
-		 * fProperties.get(PropCMProperty.P_BG_POSITION); if (obj != null) {
-		 * PropCMProperty propX =
-		 * PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_X);
-		 * PropCMProperty propY =
-		 * PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_Y);
-		 * if (obj instanceof ICSSValueList) { ICSSValueList list =
-		 * (ICSSValueList) obj; ICSSValue value = (ICSSValue) list.item(0); if
-		 * (value.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) {
-		 * ICSSPrimitiveValue prim = (ICSSPrimitiveValue) value; if
-		 * (prim.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT) { // check
-		 * not top or bottom if (!propX.canHave(prim.getStringValue()) &&
-		 * propY.canHave(prim.getStringValue())) { // case order is vertical ->
-		 * horizontal value = (ICSSValue) list.item(1); } } } str =
-		 * value.getCSSValueText(); } else if (obj instanceof ICSSValue) { str =
-		 * ((ICSSValue)obj).getCSSValueText(); } else str = obj.toString(); }
-		 * return (str != null) ? str : "";
-		 */
-	}
-
-	/**
-	 * 
-	 */
-	public java.lang.String getBackgroundPositionY() {
-		return get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_Y));
-		/*
-		 * String str = null; Object obj =
-		 * fProperties.get(PropCMProperty.P_BG_POSITION); if (obj != null) {
-		 * PropCMProperty propX =
-		 * PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_X);
-		 * PropCMProperty propY =
-		 * PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_Y);
-		 * if (obj instanceof ICSSValueList) { ICSSValueList list =
-		 * (ICSSValueList) obj; int index = 1; ICSSValue value = (ICSSValue)
-		 * list.item(0); if (value.getCssValueType() ==
-		 * CSSValue.CSS_PRIMITIVE_VALUE) { ICSSPrimitiveValue prim =
-		 * (ICSSPrimitiveValue) value; if (prim.getPrimitiveType() ==
-		 * CSSPrimitiveValue.CSS_IDENT) { // check not top or bottom if
-		 * (!propX.canHave(prim.getStringValue()) &&
-		 * propY.canHave(prim.getStringValue())) { // case order is vertical ->
-		 * horizontal index = 0; } } } str =
-		 * ((ICSSValue)list.item(index)).getCSSValueText(); } else if (obj
-		 * instanceof ICSSValue) { // do nothing --- value is null } else str =
-		 * obj.toString(); } return (str != null) ? str : "";
-		 */
-	}
-
-	/**
-	 * See the background-repeat property definition in CSS2.
-	 * 
-	 * @exception org.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBackgroundRepeat() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_REPEAT));
-	}
-
-	/**
-	 * See the border property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorder() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER));
-	}
-
-	/**
-	 * See the border-bottom property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderBottom() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM));
-	}
-
-	/**
-	 * See the border-bottom-color property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderBottomColor() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_COLOR));
-	}
-
-	/**
-	 * See the border-bottom-style property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderBottomStyle() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_STYLE));
-	}
-
-	/**
-	 * See the border-bottom-width property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderBottomWidth() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_WIDTH));
-	}
-
-	/**
-	 * See the border-collapse property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderCollapse() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_COLLAPSE));
-	}
-
-	/**
-	 * See the border-color property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderColor() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_COLOR));
-	}
-
-	/**
-	 * See the border-left property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderLeft() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT));
-	}
-
-	/**
-	 * See the border-left-color property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderLeftColor() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_COLOR));
-	}
-
-	/**
-	 * See the border-left-style property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderLeftStyle() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_STYLE));
-	}
-
-	/**
-	 * See the border-left-width property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderLeftWidth() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_WIDTH));
-	}
-
-	/**
-	 * See the border-right property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderRight() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT));
-	}
-
-	/**
-	 * See the border-right-color property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderRightColor() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_COLOR));
-	}
-
-	/**
-	 * See the border-right-style property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderRightStyle() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_STYLE));
-	}
-
-	/**
-	 * See the border-right-width property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderRightWidth() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_WIDTH));
-	}
-
-	/**
-	 * See the border-spacing property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderSpacing() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_SPACING));
-	}
-
-	/**
-	 * See the border-style property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderStyle() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_STYLE));
-	}
-
-	/**
-	 * See the border-top property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderTop() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP));
-	}
-
-	/**
-	 * See the border-top-color property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderTopColor() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_COLOR));
-	}
-
-	/**
-	 * See the border-top-style property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderTopStyle() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_STYLE));
-	}
-
-	/**
-	 * See the border-top-width property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderTopWidth() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_WIDTH));
-	}
-
-	/**
-	 * See the border-width property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBorderWidth() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_WIDTH));
-	}
-
-	/**
-	 * See the bottom property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getBottom() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_BOTTOM));
-	}
-
-	/**
-	 * See the caption-side property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getCaptionSide() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_CAPTION_SIDE));
-	}
-
-	/**
-	 * See the clear property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getClear() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_CLEAR));
-	}
-
-	/**
-	 * See the clip property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getClip() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_CLIP));
-	}
-
-	/**
-	 * 
-	 */
-	public String getClipBottom() {
-		return get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_BOTTOM));
-	}
-
-	/**
-	 * 
-	 */
-	public String getClipLeft() {
-		return get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_LEFT));
-	}
-
-	/**
-	 * 
-	 */
-	public String getClipRight() {
-		return get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_RIGHT));
-	}
-
-	/**
-	 * 
-	 */
-	public String getClipTop() {
-		return get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_TOP));
-	}
-
-	/**
-	 * See the color property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getColor() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_COLOR));
-	}
-
-	/**
-	 * See the content property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getContent() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_CONTENT));
-	}
-
-	/**
-	 * See the counter-increment property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getCounterIncrement() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_COUNTER_INCREMENT));
-	}
-
-	/**
-	 * See the counter-reset property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getCounterReset() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_COUNTER_RESET));
-	}
-
-	/**
-	 * See the float property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getCssFloat() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_FLOAT));
-	}
-
-	/**
-	 * See the cue property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getCue() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_CUE));
-	}
-
-	/**
-	 * See the cue-after property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getCueAfter() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_CUE_AFTER));
-	}
-
-	/**
-	 * See the cue-before property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getCueBefore() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_CUE_BEFORE));
-	}
-
-	/**
-	 * See the cursor property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getCursor() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_CURSOR));
-	}
-
-	/**
-	 * See the direction property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getDirection() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_DIRECTION));
-	}
-
-	/**
-	 * See the display property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getDisplay() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_DISPLAY));
-	}
-
-	/**
-	 * See the elevation property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getElevation() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_ELEVATION));
-	}
-
-	/**
-	 * See the empty-cells property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getEmptyCells() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_EMPTY_CELLS));
-	}
-
-	/**
-	 * See the font property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getFont() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT));
-	}
-
-	/**
-	 * See the font-family property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getFontFamily() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_FAMILY));
-	}
-
-	/**
-	 * See the font-size property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getFontSize() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_SIZE));
-	}
-
-	/**
-	 * See the font-size-adjust property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getFontSizeAdjust() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_SIZE_ADJUST));
-	}
-
-	/**
-	 * See the font-stretch property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getFontStretch() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_STRETCH));
-	}
-
-	/**
-	 * See the font-style property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getFontStyle() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_STYLE));
-	}
-
-	/**
-	 * See the font-variant property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getFontVariant() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_VARIANT));
-	}
-
-	/**
-	 * See the font-weight property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getFontWeight() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_WEIGHT));
-	}
-
-	/**
-	 * See the height property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getHeight() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_HEIGHT));
-	}
-
-	/**
-	 * See the left property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getLeft() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_LEFT));
-	}
-
-	/**
-	 * See the letter-spacing property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getLetterSpacing() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_LETTER_SPACING));
-	}
-
-	/**
-	 * See the line-height property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getLineHeight() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_LINE_HEIGHT));
-	}
-
-	/**
-	 * See the list-style property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getListStyle() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE));
-	}
-
-	/**
-	 * See the list-style-image property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getListStyleImage() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_IMAGE));
-	}
-
-	/**
-	 * See the list-style-position property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getListStylePosition() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_POSITION));
-	}
-
-	/**
-	 * See the list-style-type property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getListStyleType() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_TYPE));
-	}
-
-	/**
-	 * See the margin property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getMargin() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN));
-	}
-
-	/**
-	 * See the margin-bottom property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getMarginBottom() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_BOTTOM));
-	}
-
-	/**
-	 * See the margin-left property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getMarginLeft() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_LEFT));
-	}
-
-	/**
-	 * See the margin-right property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getMarginRight() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_RIGHT));
-	}
-
-	/**
-	 * See the margin-top property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getMarginTop() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_TOP));
-	}
-
-	/**
-	 * See the marker-offset property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getMarkerOffset() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_MARKER_OFFSET));
-	}
-
-	/**
-	 * See the marks property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getMarks() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_MARKS));
-	}
-
-	/**
-	 * See the max-height property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getMaxHeight() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_MAX_HEIGHT));
-	}
-
-	/**
-	 * See the max-width property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getMaxWidth() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_MAX_WIDTH));
-	}
-
-	/**
-	 * See the min-height property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getMinHeight() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_MIN_HEIGHT));
-	}
-
-	/**
-	 * See the min-width property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getMinWidth() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_MIN_WIDTH));
-	}
-
-	/**
-	 * See the orphans property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getOrphans() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_ORPHANS));
-	}
-
-	/**
-	 * See the outline property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getOutline() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_OUTLINE));
-	}
-
-	/**
-	 * See the outline-color property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getOutlineColor() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_OUTLINE_COLOR));
-	}
-
-	/**
-	 * See the outline-style property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getOutlineStyle() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_OUTLINE_STYLE));
-	}
-
-	/**
-	 * See the outline-width property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getOutlineWidth() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_OUTLINE_WIDTH));
-	}
-
-	/**
-	 * See the overflow property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getOverflow() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_OVERFLOW));
-	}
-
-	/**
-	 * See the padding property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPadding() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING));
-	}
-
-	/**
-	 * See the padding-bottom property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPaddingBottom() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_BOTTOM));
-	}
-
-	/**
-	 * See the padding-left property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPaddingLeft() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_LEFT));
-	}
-
-	/**
-	 * See the padding-right property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPaddingRight() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_RIGHT));
-	}
-
-	/**
-	 * See the padding-top property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPaddingTop() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_TOP));
-	}
-
-	/**
-	 * See the page property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPage() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_PAGE));
-	}
-
-	/**
-	 * See the page-break-after property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPageBreakAfter() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_PAGE_BREAK_AFTER));
-	}
-
-	/**
-	 * See the page-break-before property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPageBreakBefore() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_PAGE_BREAK_BEFORE));
-	}
-
-	/**
-	 * See the page-break-inside property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPageBreakInside() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_PAGE_BREAK_INSIDE));
-	}
-
-	/**
-	 * See the pause property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPause() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_PAUSE));
-	}
-
-	/**
-	 * See the pause-after property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPauseAfter() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_PAUSE_AFTER));
-	}
-
-	/**
-	 * See the pause-before property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPauseBefore() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_PAUSE_BEFORE));
-	}
-
-	/**
-	 * See the pitch property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPitch() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_PITCH));
-	}
-
-	/**
-	 * See the pitch-range property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPitchRange() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_PITCH_RANGE));
-	}
-
-	/**
-	 * See the play-during property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPlayDuring() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_PLAY_DURING));
-	}
-
-	/**
-	 * See the position property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getPosition() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_POSITION));
-	}
-
-	/**
-	 * See the quotes property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getQuotes() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_QUOTES));
-	}
-
-	/**
-	 * See the richness property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getRichness() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_RICHNESS));
-	}
-
-	/**
-	 * See the right property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getRight() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_RIGHT));
-	}
-
-	/**
-	 * @return org.eclipse.wst.css.core.util.declaration.IShorthandAdapter
-	 * @param org.eclipse.wst.css.core.contentmodel.PropCMProperty
-	 */
-	public static IShorthandAdapter getShorthandAdapter(PropCMProperty prop) {
-		return (IShorthandAdapter) shorthandAdapters.get(prop);
-	}
-
-	/**
-	 * See the size property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getSize() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_SIZE));
-	}
-
-	/**
-	 * See the speak property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getSpeak() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_SPEAK));
-	}
-
-	/**
-	 * See the speak-header property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getSpeakHeader() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_SPEAK_HEADER));
-	}
-
-	/**
-	 * See the speak-numeral property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getSpeakNumeral() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_SPEAK_NUMERAL));
-	}
-
-	/**
-	 * See the speak-punctuation property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getSpeakPunctuation() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_SPEAK_PUNCTUATION));
-	}
-
-	/**
-	 * See the speech-rate property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getSpeechRate() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_SPEECH_RATE));
-	}
-
-	/**
-	 * See the stress property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getStress() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_STRESS));
-	}
-
-	/**
-	 * See the table-layout property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getTableLayout() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_TABLE_LAYOUT));
-	}
-
-	/**
-	 * See the text-align property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getTextAlign() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_TEXT_ALIGN));
-	}
-
-	/**
-	 * See the text-decoration property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getTextDecoration() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_TEXT_DECORATION));
-	}
-
-	/**
-	 * See the text-indent property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getTextIndent() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_TEXT_INDENT));
-	}
-
-	/**
-	 * See the text-shadow property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getTextShadow() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_TEXT_SHADOW));
-	}
-
-	/**
-	 * See the text-transform property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getTextTransform() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_TEXT_TRANSFORM));
-	}
-
-	/**
-	 * See the top property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getTop() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_TOP));
-	}
-
-	/**
-	 * See the unicode-bidi property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getUnicodeBidi() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_UNICODE_BIDI));
-	}
-
-	/**
-	 * See the vertical-align property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getVerticalAlign() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_VERTICAL_ALIGN));
-	}
-
-	/**
-	 * See the visibility property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getVisibility() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_VISIBILITY));
-	}
-
-	/**
-	 * See the voice-family property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getVoiceFamily() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_VOICE_FAMILY));
-	}
-
-	/**
-	 * See the volume property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getVolume() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_VOLUME));
-	}
-
-	/**
-	 * See the white-space property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getWhiteSpace() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_WHITE_SPACE));
-	}
-
-	/**
-	 * See the widows property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getWidows() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_WIDOWS));
-	}
-
-	/**
-	 * See the width property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getWidth() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_WIDTH));
-	}
-
-	/**
-	 * See the word-spacing property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getWordSpacing() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_WORD_SPACING));
-	}
-
-	/**
-	 * See the z-index property definition in CSS2.
-	 * 
-	 * @exceptionorg.w3c.dom.DOMException
-	 *                SYNTAX_ERR: Raised if the new value has a syntax error
-	 *                and is unparsable. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this property is
-	 *                readonly.
-	 */
-	public String getZIndex() {
-		return get(PropCMProperty.getInstanceOf(PropCMProperty.P_Z_INDEX));
-	}
-
-	/**
-	 * 
-	 */
-	public void initialize(ICSSStyleDeclaration decl) {
-		fProperties.clear();
-		if (fModified != null)
-			fModified.clear();
-		if (decl == null)
-			return;
-
-		int nProperties = decl.getLength();
-		for (int i = 0; i < nProperties; i++) {
-			String propName = decl.item(i);
-			if (propName != null) {
-				String propN = propName.trim().toLowerCase();
-				if (propN.length() != 0) {
-					CSSValue val = decl.getPropertyCSSValue(propName);
-					if (val != null)
-						fProperties.put(propN, val);
-				}
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	static void initShorthandAdapters() {
-		if (shorthandAdapters == null) {
-			shorthandAdapters = new Hashtable();
-			// register
-			shorthandAdapters.put(PropCMProperty.getInstanceOf(PropCMProperty.P_BG), new BackgroundShorthandAdapter());
-			shorthandAdapters.put(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER), new BorderShorthandAdapter());
-			shorthandAdapters.put(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_COLOR), new BorderColorShorthandAdapter());
-			shorthandAdapters.put(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_STYLE), new BorderStyleShorthandAdapter());
-			shorthandAdapters.put(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_WIDTH), new BorderWidthShorthandAdapter());
-			shorthandAdapters.put(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP), new BorderTopShorthandAdapter());
-			shorthandAdapters.put(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT), new BorderRightShorthandAdapter());
-			shorthandAdapters.put(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM), new BorderBottomShorthandAdapter());
-			shorthandAdapters.put(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT), new BorderLeftShorthandAdapter());
-			shorthandAdapters.put(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT), new FontShorthandAdapter());
-			shorthandAdapters.put(PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE), new ListStyleShorthandAdapter());
-			shorthandAdapters.put(PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN), new MarginShorthandAdapter());
-			shorthandAdapters.put(PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING), new PaddingShorthandAdapter());
-
-		}
-	}
-
-	/**
-	 * 
-	 */
-	static void initSubPropertyAdapters() {
-		if (subPropertyAdapters == null) {
-			subPropertyAdapters = new Hashtable();
-
-			// register
-			subPropertyAdapters.put(PropCMSubProperty.PSUB_BG_POSITION_X, new BackgroundPositionXSubStyleAdapter());
-			subPropertyAdapters.put(PropCMSubProperty.PSUB_BG_POSITION_Y, new BackgroundPositionYSubStyleAdapter());
-			subPropertyAdapters.put(PropCMSubProperty.PSUB_CLIP_TOP, new ClipTopSubStyleAdapter());
-			subPropertyAdapters.put(PropCMSubProperty.PSUB_CLIP_RIGHT, new ClipRightSubStyleAdapter());
-			subPropertyAdapters.put(PropCMSubProperty.PSUB_CLIP_BOTTOM, new ClipBottomSubStyleAdapter());
-			subPropertyAdapters.put(PropCMSubProperty.PSUB_CLIP_LEFT, new ClipLeftSubStyleAdapter());
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public boolean isModified() {
-		return (fModified != null && fModified.size() != 0);
-	}
-
-	/**
-	 * 
-	 */
-	public Enumeration properties() {
-		return fProperties.keys();
-	}
-
-	/**
-	 * 
-	 */
-	public Iterator propertiesModified() {
-		if (fModified != null) {
-			return ((Collection) fModified.clone()).iterator();
-		}
-		else
-			return new Iterator() {
-				public boolean hasNext() {
-					return false;
-				}
-
-				public Object next() {
-					return null;
-				}
-
-				public void remove() {
-				}
-			};
-	}
-
-	/**
-	 * This function expands the value of shorthand 'prop' to 'foreign'
-	 * context. Note that if this has parent shorthand properties of 'prop',
-	 * they are all expanded to 'foreign' context.
-	 */
-	protected void recursiveExtract(PropCMProperty prop, CSSPropertyContext foreign) {
-		// expand shorthand property
-		for (int i = 0; i < prop.getShorthandContainerCount(); i++) {
-			recursiveExtract(prop.shorthandContainerAt(i), foreign);
-		}
-		String str = get(prop.getName());
-		if (str == null || str.trim().length() == 0)
-			str = foreign.get(prop.getName());
-		if (str != null && str.trim().length() > 0) {
-			IShorthandAdapter adapter = (IShorthandAdapter) shorthandAdapters.get(prop);
-			if (adapter != null) {
-				adapter.expand(str, foreign);
-				foreign.set(prop.getName(), "");//$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void removeDescendants(PropCMProperty prop) {
-		if (prop.isShorthand()) {
-			// remove properties
-			int n = prop.getNumChild();
-			for (int i = 0; i < n; i++) {
-				Object obj = prop.getChildAt(i);
-				if (obj instanceof PropCMProperty) {
-					removeDescendants((PropCMProperty) obj);
-
-					String str = get(obj.toString());
-					if (str != null && str.length() > 0)
-						set(obj.toString(), "");//$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void resetModified() {
-		if (fModified != null)
-			fModified.clear();
-	}
-
-	/**
-	 * This function sets the pair of 'prop'/'value'. If shorthand properties
-	 * related to 'prop' are already defined, they will be expanded to avoid
-	 * property confliction. If descendant properties of 'prop' are already
-	 * defined, they will be removed to avoid property confliction.
-	 * 
-	 */
-	public void set(org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty prop, java.lang.String value) throws org.w3c.dom.DOMException {
-		if (prop instanceof PropCMSubProperty) {
-			ISubPropertyAdapter adapter = (ISubPropertyAdapter) subPropertyAdapters.get(prop.getName());
-			if (adapter != null) {
-				adapter.set(this, value);
-				return;
-			}
-		}
-		if (prop.getShorthandContainerCount() > 0) {
-			// expand shorthand property
-			CSSPropertyContext context = new CSSPropertyContext();
-			for (int i = 0; i < prop.getShorthandContainerCount(); i++) {
-				recursiveExtract(prop.shorthandContainerAt(i), context);
-			}
-			Enumeration properties = context.properties();
-			while (properties.hasMoreElements()) {
-				String propForeign = properties.nextElement().toString();
-				set(propForeign, context.get(propForeign));
-			}
-		}
-
-		removeDescendants(prop);
-
-		set(prop.getName(), value);
-	}
-
-	/**
-	 * This function sets the pair of 'propName'/'value' regardless of its
-	 * shorthand properties.
-	 */
-	protected void set(String propName, String value) throws org.w3c.dom.DOMException {
-		String key = propName;
-		if (value == null)
-			fProperties.remove(key);
-		else
-			fProperties.put(key, value);
-		if (fModified == null)
-			fModified = new HashSet();
-		fModified.add(key);
-	}
-
-	/**
-	 * 
-	 */
-	public void setAzimuth(String azimuth) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_AZIMUTH), azimuth);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBackground(String background) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BG), background);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBackgroundAttachment(String backgroundAttachment) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_ATTACHMENT), backgroundAttachment);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBackgroundColor(String backgroundColor) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_COLOR), backgroundColor);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBackgroundImage(String backgroundImage) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_IMAGE), backgroundImage);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBackgroundPosition(String backgroundPosition) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_POSITION), backgroundPosition);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBackgroundPositionX(java.lang.String backgroundPositionX) throws org.w3c.dom.DOMException {
-		set(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_X), backgroundPositionX);
-		/*
-		 * String newValue = null; String valH = backgroundPositionX; String
-		 * valV = getBackgroundPositionY(); if (valV == null ||
-		 * valV.length()== 0) newValue = valH; else if (valH == null ||
-		 * valH.length() == 0) { Collection valX =
-		 * PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_X).getValues();
-		 * Collection valY =
-		 * PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_Y).getValues();
-		 * PropCMUtil.minus(valY,valX); Iterator it = valY.iterator();
-		 * while(it.hasNext()) { Object obj = it.next(); if
-		 * (obj.toString().equals(valV.toLowerCase())) { // need not
-		 * compensate for ... newValue = valV; break; } } // compensate for
-		 * Horizontal value if (newValue == null) newValue = "0% " + valV; }
-		 * else newValue = valH + " " + valV; setBackgroundPosition(newValue);
-		 */
-	}
-
-	/**
-	 * 
-	 */
-	public void setBackgroundPositionY(java.lang.String backgroundPositionY) throws org.w3c.dom.DOMException {
-		set(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_Y), backgroundPositionY);
-		/*
-		 * String newValue = null; String valH = getBackgroundPositionX();
-		 * String valV = backgroundPositionY; if (valV == null ||
-		 * valV.length()== 0) newValue = valH; else if (valH == null ||
-		 * valH.length() == 0) { Collection valX =
-		 * PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_X).getValues();
-		 * Collection valY =
-		 * PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_BG_POSITION_Y).getValues();
-		 * PropCMUtil.minus(valY,valX); Iterator it = valY.iterator();
-		 * while(it.hasNext()) { Object obj = it.next(); if
-		 * (obj.toString().equals(valV.toLowerCase())) { // need not
-		 * compensate for ... newValue = valV; break; } } // compensate for
-		 * Horizontal value if (newValue == null) newValue = "0% " + valV; }
-		 * else newValue = valH + " " + valV; setBackgroundPosition(newValue);
-		 */
-	}
-
-	/**
-	 * 
-	 */
-	public void setBackgroundRepeat(String backgroundRepeat) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BG_REPEAT), backgroundRepeat);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorder(String border) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER), border);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderBottom(String borderBottom) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM), borderBottom);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderBottomColor(String borderBottomColor) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_COLOR), borderBottomColor);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderBottomStyle(String borderBottomStyle) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_STYLE), borderBottomStyle);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderBottomWidth(String borderBottomWidth) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_BOTTOM_WIDTH), borderBottomWidth);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderCollapse(String borderCollapse) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_COLLAPSE), borderCollapse);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderColor(String borderColor) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_COLOR), borderColor);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderLeft(String borderLeft) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT), borderLeft);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderLeftColor(String borderLeftColor) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_COLOR), borderLeftColor);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderLeftStyle(String borderLeftStyle) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_STYLE), borderLeftStyle);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderLeftWidth(String borderLeftWidth) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_LEFT_WIDTH), borderLeftWidth);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderRight(String borderRight) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT), borderRight);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderRightColor(String borderRightColor) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_COLOR), borderRightColor);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderRightStyle(String borderRightStyle) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_STYLE), borderRightStyle);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderRightWidth(String borderRightWidth) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_RIGHT_WIDTH), borderRightWidth);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderSpacing(String borderSpacing) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_SPACING), borderSpacing);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderStyle(String borderStyle) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_STYLE), borderStyle);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderTop(String borderTop) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP), borderTop);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderTopColor(String borderTopColor) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_COLOR), borderTopColor);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderTopStyle(String borderTopStyle) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_STYLE), borderTopStyle);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderTopWidth(String borderTopWidth) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_TOP_WIDTH), borderTopWidth);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBorderWidth(String borderWidth) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BORDER_WIDTH), borderWidth);
-	}
-
-	/**
-	 * 
-	 */
-	public void setBottom(String bottom) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_BOTTOM), bottom);
-	}
-
-	/**
-	 * 
-	 */
-	public void setCaptionSide(String captionSide) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_CAPTION_SIDE), captionSide);
-	}
-
-	/**
-	 * 
-	 */
-	public void setClear(String clear) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_CLEAR), clear);
-	}
-
-	/**
-	 * 
-	 */
-	public void setClip(String clip) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_CLIP), clip);
-	}
-
-	/**
-	 * 
-	 */
-	public void setClipBottom(java.lang.String clip) throws org.w3c.dom.DOMException {
-		set(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_BOTTOM), clip);
-	}
-
-	/**
-	 * 
-	 */
-	public void setClipLeft(java.lang.String clip) throws org.w3c.dom.DOMException {
-		set(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_LEFT), clip);
-	}
-
-	/**
-	 * 
-	 */
-	public void setClipRight(java.lang.String clip) throws org.w3c.dom.DOMException {
-		set(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_RIGHT), clip);
-	}
-
-	/**
-	 * 
-	 */
-	public void setClipTop(java.lang.String clip) throws org.w3c.dom.DOMException {
-		set(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_TOP), clip);
-	}
-
-	/**
-	 * 
-	 */
-	public void setColor(String color) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_COLOR), color);
-	}
-
-	/**
-	 * 
-	 */
-	public void setContent(String content) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_CONTENT), content);
-	}
-
-	/**
-	 * 
-	 */
-	public void setCounterIncrement(String counterIncrement) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_COUNTER_INCREMENT), counterIncrement);
-	}
-
-	/**
-	 * 
-	 */
-	public void setCounterReset(String counterReset) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_COUNTER_RESET), counterReset);
-	}
-
-	/**
-	 * 
-	 */
-	public void setCssFloat(String cssFloat) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_FLOAT), cssFloat);
-	}
-
-	/**
-	 * 
-	 */
-	public void setCue(String cue) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_CUE), cue);
-	}
-
-	/**
-	 * 
-	 */
-	public void setCueAfter(String cueAfter) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_CUE_AFTER), cueAfter);
-	}
-
-	/**
-	 * 
-	 */
-	public void setCueBefore(String cueBefore) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_CUE_BEFORE), cueBefore);
-	}
-
-	/**
-	 * 
-	 */
-	public void setCursor(String cursor) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_CURSOR), cursor);
-	}
-
-	/**
-	 * 
-	 */
-	public void setDirection(String direction) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_DIRECTION), direction);
-	}
-
-	/**
-	 * 
-	 */
-	public void setDisplay(String display) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_DISPLAY), display);
-	}
-
-	/**
-	 * 
-	 */
-	public void setElevation(String elevation) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_ELEVATION), elevation);
-	}
-
-	/**
-	 * 
-	 */
-	public void setEmptyCells(String emptyCells) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_EMPTY_CELLS), emptyCells);
-	}
-
-	/**
-	 * 
-	 */
-	public void setFont(String font) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT), font);
-	}
-
-	/**
-	 * 
-	 */
-	public void setFontFamily(String fontFamily) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_FAMILY), fontFamily);
-	}
-
-	/**
-	 * 
-	 */
-	public void setFontSize(String fontSize) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_SIZE), fontSize);
-	}
-
-	/**
-	 * 
-	 */
-	public void setFontSizeAdjust(String fontSizeAdjust) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_SIZE_ADJUST), fontSizeAdjust);
-	}
-
-	/**
-	 * 
-	 */
-	public void setFontStretch(String fontStretch) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_STRETCH), fontStretch);
-	}
-
-	/**
-	 * 
-	 */
-	public void setFontStyle(String fontStyle) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_STYLE), fontStyle);
-	}
-
-	/**
-	 * 
-	 */
-	public void setFontVariant(String fontVariant) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_VARIANT), fontVariant);
-	}
-
-	/**
-	 * 
-	 */
-	public void setFontWeight(String fontWeight) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_WEIGHT), fontWeight);
-	}
-
-	/**
-	 * 
-	 */
-	public void setHeight(String height) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_HEIGHT), height);
-	}
-
-	/**
-	 * 
-	 */
-	public void setLeft(String left) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_LEFT), left);
-	}
-
-	/**
-	 * 
-	 */
-	public void setLetterSpacing(String letterSpacing) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_LETTER_SPACING), letterSpacing);
-	}
-
-	/**
-	 * 
-	 */
-	public void setLineHeight(String lineHeight) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_LINE_HEIGHT), lineHeight);
-	}
-
-	/**
-	 * 
-	 */
-	public void setListStyle(String listStyle) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE), listStyle);
-	}
-
-	/**
-	 * 
-	 */
-	public void setListStyleImage(String listStyleImage) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_IMAGE), listStyleImage);
-	}
-
-	/**
-	 * 
-	 */
-	public void setListStylePosition(String listStylePosition) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_POSITION), listStylePosition);
-	}
-
-	/**
-	 * 
-	 */
-	public void setListStyleType(String listStyleType) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_TYPE), listStyleType);
-	}
-
-	/**
-	 * 
-	 */
-	public void setMargin(String margin) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN), margin);
-	}
-
-	/**
-	 * 
-	 */
-	public void setMarginBottom(String marginBottom) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_BOTTOM), marginBottom);
-	}
-
-	/**
-	 * 
-	 */
-	public void setMarginLeft(String marginLeft) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_LEFT), marginLeft);
-	}
-
-	/**
-	 * 
-	 */
-	public void setMarginRight(String marginRight) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_RIGHT), marginRight);
-	}
-
-	/**
-	 * 
-	 */
-	public void setMarginTop(String marginTop) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_MARGIN_TOP), marginTop);
-	}
-
-	/**
-	 * 
-	 */
-	public void setMarkerOffset(String markerOffset) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_MARKER_OFFSET), markerOffset);
-	}
-
-	/**
-	 * 
-	 */
-	public void setMarks(String marks) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_MARKS), marks);
-	}
-
-	/**
-	 * 
-	 */
-	public void setMaxHeight(String maxHeight) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_MAX_HEIGHT), maxHeight);
-	}
-
-	/**
-	 * 
-	 */
-	public void setMaxWidth(String maxWidth) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_MAX_WIDTH), maxWidth);
-	}
-
-	/**
-	 * 
-	 */
-	public void setMinHeight(String minHeight) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_MIN_HEIGHT), minHeight);
-	}
-
-	/**
-	 * 
-	 */
-	public void setMinWidth(String minWidth) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_MIN_WIDTH), minWidth);
-	}
-
-	/**
-	 * 
-	 */
-	public void setOrphans(String orphans) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_ORPHANS), orphans);
-	}
-
-	/**
-	 * 
-	 */
-	public void setOutline(String outline) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_OUTLINE), outline);
-	}
-
-	/**
-	 * 
-	 */
-	public void setOutlineColor(String outlineColor) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_OUTLINE_COLOR), outlineColor);
-	}
-
-	/**
-	 * 
-	 */
-	public void setOutlineStyle(String outlineStyle) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_OUTLINE_STYLE), outlineStyle);
-	}
-
-	/**
-	 * 
-	 */
-	public void setOutlineWidth(String outlineWidth) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_OUTLINE_WIDTH), outlineWidth);
-	}
-
-	/**
-	 * 
-	 */
-	public void setOverflow(String overflow) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_OVERFLOW), overflow);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPadding(String padding) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING), padding);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPaddingBottom(String paddingBottom) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_BOTTOM), paddingBottom);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPaddingLeft(String paddingLeft) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_LEFT), paddingLeft);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPaddingRight(String paddingRight) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_RIGHT), paddingRight);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPaddingTop(String paddingTop) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_PADDING_TOP), paddingTop);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPage(String page) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_PAGE), page);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPageBreakAfter(String pageBreakAfter) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_PAGE_BREAK_AFTER), pageBreakAfter);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPageBreakBefore(String pageBreakBefore) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_PAGE_BREAK_BEFORE), pageBreakBefore);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPageBreakInside(String pageBreakInside) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_PAGE_BREAK_INSIDE), pageBreakInside);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPause(String pause) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_PAUSE), pause);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPauseAfter(String pauseAfter) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_PAUSE_AFTER), pauseAfter);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPauseBefore(String pauseBefore) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_PAUSE_BEFORE), pauseBefore);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPitch(String pitch) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_PITCH), pitch);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPitchRange(String pitchRange) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_PITCH_RANGE), pitchRange);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPlayDuring(String playDuring) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_PLAY_DURING), playDuring);
-	}
-
-	/**
-	 * 
-	 */
-	public void setPosition(String position) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_POSITION), position);
-	}
-
-	/**
-	 * 
-	 */
-	public void setQuotes(String quotes) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_QUOTES), quotes);
-	}
-
-	/**
-	 * 
-	 */
-	public void setRichness(String richness) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_RICHNESS), richness);
-	}
-
-	/**
-	 * 
-	 */
-	public void setRight(String right) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_RIGHT), right);
-	}
-
-	/**
-	 * 
-	 */
-	public void setSize(String size) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_SIZE), size);
-	}
-
-	/**
-	 * 
-	 */
-	public void setSpeak(String speak) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_SPEAK), speak);
-	}
-
-	/**
-	 * 
-	 */
-	public void setSpeakHeader(String speakHeader) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_SPEAK_HEADER), speakHeader);
-	}
-
-	/**
-	 * 
-	 */
-	public void setSpeakNumeral(String speakNumeral) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_SPEAK_NUMERAL), speakNumeral);
-	}
-
-	/**
-	 * 
-	 */
-	public void setSpeakPunctuation(String speakPunctuation) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_SPEAK_PUNCTUATION), speakPunctuation);
-	}
-
-	/**
-	 * 
-	 */
-	public void setSpeechRate(String speechRate) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_SPEECH_RATE), speechRate);
-	}
-
-	/**
-	 * 
-	 */
-	public void setStress(String stress) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_STRESS), stress);
-	}
-
-	/**
-	 * 
-	 */
-	public void setTableLayout(String tableLayout) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_TABLE_LAYOUT), tableLayout);
-	}
-
-	/**
-	 * 
-	 */
-	public void setTextAlign(String textAlign) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_TEXT_ALIGN), textAlign);
-	}
-
-	/**
-	 * 
-	 */
-	public void setTextDecoration(String textDecoration) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_TEXT_DECORATION), textDecoration);
-	}
-
-	/**
-	 * 
-	 */
-	public void setTextIndent(String textIndent) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_TEXT_INDENT), textIndent);
-	}
-
-	/**
-	 * 
-	 */
-	public void setTextShadow(String textShadow) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_TEXT_SHADOW), textShadow);
-	}
-
-	/**
-	 * 
-	 */
-	public void setTextTransform(String textTransform) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_TEXT_TRANSFORM), textTransform);
-	}
-
-	/**
-	 * 
-	 */
-	public void setTop(String top) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_TOP), top);
-	}
-
-	/**
-	 * 
-	 */
-	public void setUnicodeBidi(String unicodeBidi) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_UNICODE_BIDI), unicodeBidi);
-	}
-
-	/**
-	 * 
-	 */
-	public void setVerticalAlign(String verticalAlign) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_VERTICAL_ALIGN), verticalAlign);
-	}
-
-	/**
-	 * 
-	 */
-	public void setVisibility(String visibility) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_VISIBILITY), visibility);
-	}
-
-	/**
-	 * 
-	 */
-	public void setVoiceFamily(String voiceFamily) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_VOICE_FAMILY), voiceFamily);
-	}
-
-	/**
-	 * 
-	 */
-	public void setVolume(String volume) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_VOLUME), volume);
-	}
-
-	/**
-	 * 
-	 */
-	public void setWhiteSpace(String whiteSpace) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_WHITE_SPACE), whiteSpace);
-	}
-
-	/**
-	 * 
-	 */
-	public void setWidows(String widows) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_WIDOWS), widows);
-	}
-
-	/**
-	 * 
-	 */
-	public void setWidth(String width) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_WIDTH), width);
-	}
-
-	/**
-	 * 
-	 */
-	public void setWordSpacing(String wordSpacing) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_WORD_SPACING), wordSpacing);
-	}
-
-	/**
-	 * 
-	 */
-	public void setZIndex(String zIndex) throws org.w3c.dom.DOMException {
-		set(PropCMProperty.getInstanceOf(PropCMProperty.P_Z_INDEX), zIndex);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipBottomSubStyleAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipBottomSubStyleAdapter.java
deleted file mode 100644
index 28f06fc..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipBottomSubStyleAdapter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMSubProperty;
-
-/**
- * For bottom value of 'clip' property's rect() function
- */
-public class ClipBottomSubStyleAdapter extends ClipSubStyleAdapter {
-
-	/**
-	 * 
-	 */
-	public ClipBottomSubStyleAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	String get(org.w3c.dom.css.Rect rect) {
-		return rect.getBottom().getCssText();
-	}
-
-	/**
-	 * 
-	 */
-	int index() {
-		return 2;
-	}
-
-	/**
-	 * 
-	 */
-	public void set(ICSS2Properties properties, String value) throws org.w3c.dom.DOMException {
-		String top = properties.get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_TOP));
-		String right = properties.get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_RIGHT));
-		String left = properties.get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_LEFT));
-
-		set(properties, top, right, value, left, value == null || value.length() == 0);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipLeftSubStyleAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipLeftSubStyleAdapter.java
deleted file mode 100644
index 58ba873..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipLeftSubStyleAdapter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMSubProperty;
-
-/**
- * For left value of 'clip' property's rect() function
- */
-public class ClipLeftSubStyleAdapter extends ClipSubStyleAdapter {
-
-	/**
-	 * 
-	 */
-	public ClipLeftSubStyleAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	String get(org.w3c.dom.css.Rect rect) {
-		return rect.getLeft().getCssText();
-	}
-
-	/**
-	 * 
-	 */
-	int index() {
-		return 3;
-	}
-
-	/**
-	 * 
-	 */
-	public void set(ICSS2Properties properties, String value) throws org.w3c.dom.DOMException {
-		String top = properties.get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_TOP));
-		String right = properties.get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_RIGHT));
-		String bottom = properties.get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_BOTTOM));
-
-		set(properties, top, right, bottom, value, value == null || value.length() == 0);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipRightSubStyleAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipRightSubStyleAdapter.java
deleted file mode 100644
index 1560afc..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipRightSubStyleAdapter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMSubProperty;
-
-/**
- * For right value of 'clip' property's rect() function
- */
-public class ClipRightSubStyleAdapter extends ClipSubStyleAdapter {
-
-	/**
-	 * 
-	 */
-	public ClipRightSubStyleAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	String get(org.w3c.dom.css.Rect rect) {
-		return rect.getRight().getCssText();
-	}
-
-	/**
-	 * 
-	 */
-	int index() {
-		return 1;
-	}
-
-	/**
-	 * 
-	 */
-	public void set(ICSS2Properties properties, String value) throws org.w3c.dom.DOMException {
-		String top = properties.get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_TOP));
-		String bottom = properties.get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_BOTTOM));
-		String left = properties.get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_LEFT));
-
-		set(properties, top, value, bottom, left, value == null || value.length() == 0);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipSubStyleAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipSubStyleAdapter.java
deleted file mode 100644
index e019a34..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipSubStyleAdapter.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.IValID;
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue;
-import org.w3c.dom.css.Rect;
-
-
-/**
- * Abstract class for clip sub-properties
- */
-abstract public class ClipSubStyleAdapter implements ISubPropertyAdapter {
-
-	/**
-	 * 
-	 */
-	public ClipSubStyleAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public String get(ICSS2Properties properties) {
-		String str = null;
-		Object obj = properties.get(PropCMProperty.getInstanceOf(PropCMProperty.P_CLIP));
-		if (obj != null) {
-			if (obj instanceof org.w3c.dom.css.Rect) {
-				str = get((org.w3c.dom.css.Rect) obj);
-			}
-			else {
-				if (obj instanceof ICSSValue) {
-					str = ((ICSSValue) obj).getCSSValueText();
-				}
-				else {
-					str = obj.toString();
-				}
-				str = str.trim().toLowerCase();
-				int pos = str.indexOf("rect(");//$NON-NLS-1$
-				if (pos >= 0) {
-					String subStr = null;
-					pos += 5;
-					int i = 0;
-					do {
-						int posEnd = str.indexOf(",", pos);//$NON-NLS-1$
-						if (posEnd < 0)
-							posEnd = str.indexOf(")", pos);//$NON-NLS-1$
-						if (posEnd < 0 && pos < str.length())
-							posEnd = str.length();
-						if (posEnd >= pos) {
-							subStr = str.substring(pos, posEnd);
-							pos = posEnd + 1;
-						}
-						else
-							pos = -1;
-					}
-					while (i++ < index() && pos > 0);
-
-					if (pos > 0)
-						str = subStr.trim();
-					else
-						str = null;
-				}
-				else
-					str = null;
-			}
-		}
-		return (str != null) ? str : "";//$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 */
-	abstract String get(Rect rect);
-
-	/**
-	 * 
-	 */
-	abstract int index();
-
-	/**
-	 * 
-	 */
-	public void set(ICSS2Properties properties, String value) throws org.w3c.dom.DOMException {
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (2001/10/04
-	 * 19:25:46)
-	 * 
-	 * @param properties
-	 *            org.eclipse.wst.css.core.util.declaration.ICSS2Properties
-	 * @param top
-	 *            java.lang.String
-	 * @param right
-	 *            java.lang.String
-	 * @param bottom
-	 *            java.lang.String
-	 * @param left
-	 *            java.lang.String
-	 * @param removeCheck
-	 *            boolean
-	 */
-	void set(ICSS2Properties properties, String top, String right, String bottom, String left, boolean removeCheck) {
-		if (top == null || top.length() == 0)
-			top = IValID.V_AUTO;
-		if (right == null || right.length() == 0)
-			right = IValID.V_AUTO;
-		if (bottom == null || bottom.length() == 0)
-			bottom = IValID.V_AUTO;
-		if (left == null || left.length() == 0)
-			left = IValID.V_AUTO;
-
-		if (removeCheck && top.trim().equalsIgnoreCase(IValID.V_AUTO) && right.trim().equalsIgnoreCase(IValID.V_AUTO) && bottom.trim().equalsIgnoreCase(IValID.V_AUTO) && left.trim().equalsIgnoreCase(IValID.V_AUTO)) {
-			properties.set(PropCMProperty.getInstanceOf(PropCMProperty.P_CLIP), null);
-		}
-		else
-			properties.set(PropCMProperty.getInstanceOf(PropCMProperty.P_CLIP), "rect(" + top + ", " + right + ", " + bottom + ", " + left + ")");//$NON-NLS-5$//$NON-NLS-4$//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipTopSubStyleAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipTopSubStyleAdapter.java
deleted file mode 100644
index 71b5d53..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipTopSubStyleAdapter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMSubProperty;
-
-/**
- * For top value of 'clip' property's rect() function
- */
-public class ClipTopSubStyleAdapter extends ClipSubStyleAdapter {
-
-	/**
-	 * 
-	 */
-	public ClipTopSubStyleAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	String get(org.w3c.dom.css.Rect rect) {
-		return rect.getTop().getCssText();
-	}
-
-	/**
-	 * 
-	 */
-	int index() {
-		return 0;
-	}
-
-	/**
-	 * 
-	 */
-	public void set(ICSS2Properties properties, String value) throws org.w3c.dom.DOMException {
-		String right = properties.get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_RIGHT));
-		String bottom = properties.get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_BOTTOM));
-		String left = properties.get(PropCMSubProperty.getInstanceOf(PropCMSubProperty.PSUB_CLIP_LEFT));
-
-		set(properties, value, right, bottom, left, value == null || value.length() == 0);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/FontShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/FontShorthandAdapter.java
deleted file mode 100644
index 41d49cc..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/FontShorthandAdapter.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.IValID;
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-
-
-/**
- * For 'font' property 'font' will be expanded to 'font-family', 'font-size',
- * 'font-style', 'font-variant', 'font-weight', 'line-height',
- */
-public class FontShorthandAdapter implements IShorthandAdapter {
-
-	/**
-	 * 
-	 */
-	public FontShorthandAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public boolean expand(String source, CSSPropertyContext dest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return false;
-		}
-		String style = null, variant = null, weight = null, size = null, height = null, family = null;
-		PropCMProperty propFont = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT);
-		PropCMProperty propStyle = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_STYLE);
-		PropCMProperty propVariant = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_VARIANT);
-		PropCMProperty propWeight = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_WEIGHT);
-		PropCMProperty propSize = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_SIZE);
-		boolean bNormalSpecified = false;
-
-		int i = 0;
-		for (; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				// first of all, check font idents
-				if (i == 0) {
-					for (int j = 0; j < propFont.getNumChild(); j++) {
-						Object obj = propFont.getChildAt(i);
-						if (obj instanceof String && tokens[i].image.compareToIgnoreCase(obj.toString()) == 0)
-							return false;
-					}
-				}
-				// value "normal" is shared !!
-				if (tokens[i].image.equalsIgnoreCase(IValID.V_NORMAL)) {
-					bNormalSpecified = true;
-				}
-				else {
-					if (propStyle.canHave(tokens[i].image))
-						style = tokens[i].image;
-					else if (propVariant.canHave(tokens[i].image))
-						variant = tokens[i].image;
-					else if (propWeight.canHave(tokens[i].image))
-						weight = tokens[i].image;
-					else if (propSize.canHave(tokens[i].image)) {
-						size = tokens[i].image;
-						break; // if size found, break loop
-					}
-				}
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER && weight == null && propWeight.canHave(tokens[i].image)) {
-				weight = tokens[i].image;
-			}
-			else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) {
-				size = tokens[i].image;
-				break; // if size found, break loop
-			}
-		}
-
-		if (bNormalSpecified) {
-			if (style == null)
-				style = IValID.V_NORMAL;
-			if (variant == null)
-				variant = IValID.V_NORMAL;
-			if (weight == null)
-				weight = IValID.V_NORMAL;
-		}
-
-		// skip whitespace
-		for (i++; i < tokens.length; i++) {
-			if (tokens[i].kind != CSSRegionContexts.CSS_S || tokens[i].kind != CSSRegionContexts.CSS_DECLARATION_VALUE_S)
-				break;
-		}
-
-		// line-height ?
-		if (i < tokens.length && tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR && tokens[i].image.equals("/")) { //$NON-NLS-1$
-			for (i++; i < tokens.length; i++) {
-				if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-					height = tokens[i++].image;
-					break;
-				}
-			}
-		}
-
-		// font-family
-		StringBuffer buf = new StringBuffer();
-		for (; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT)
-				buf.append(" ");//$NON-NLS-1$
-			else
-				buf.append(tokens[i].image);
-		}
-		family = buf.toString().trim();
-
-		dest.set(PropCMProperty.P_FONT_STYLE, style);
-		dest.set(PropCMProperty.P_FONT_VARIANT, variant);
-		dest.set(PropCMProperty.P_FONT_WEIGHT, weight);
-		dest.set(PropCMProperty.P_FONT_SIZE, size);
-		dest.set(PropCMProperty.P_LINE_HEIGHT, height);
-		dest.set(PropCMProperty.P_FONT_FAMILY, family);
-
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	public String extract(String source, PropCMProperty propDest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return null;
-		}
-		String style = null, variant = null, weight = null, size = null, height = null, family = null;
-		PropCMProperty propFont = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT);
-		PropCMProperty propStyle = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_STYLE);
-		PropCMProperty propVariant = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_VARIANT);
-		PropCMProperty propWeight = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_WEIGHT);
-		PropCMProperty propSize = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_SIZE);
-		PropCMProperty propHeight = PropCMProperty.getInstanceOf(PropCMProperty.P_LINE_HEIGHT);
-		PropCMProperty propFamily = PropCMProperty.getInstanceOf(PropCMProperty.P_FONT_FAMILY);
-		boolean bNormalSpecified = false;
-
-		int i = 0;
-		for (; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				// first of all, check font idents
-				if (i == 0) {
-					for (int j = 0; j < propFont.getNumChild(); j++) {
-						Object obj = propFont.getChildAt(i);
-						if (obj instanceof String && tokens[i].image.compareToIgnoreCase(obj.toString()) == 0)
-							return null;
-					}
-				}
-				// value "normal" is shared !!
-				if (tokens[i].image.equalsIgnoreCase(IValID.V_NORMAL)) {
-					bNormalSpecified = true;
-				}
-				else {
-					if (propStyle.canHave(tokens[i].image))
-						style = tokens[i].image;
-					else if (propVariant.canHave(tokens[i].image))
-						variant = tokens[i].image;
-					else if (propWeight.canHave(tokens[i].image))
-						weight = tokens[i].image;
-					else if (propSize.canHave(tokens[i].image)) {
-						size = tokens[i].image;
-						break; // if size found, break loop
-					}
-				}
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER && weight == null && propWeight.canHave(tokens[i].image)) {
-				weight = tokens[i].image;
-			}
-			else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) {
-				size = tokens[i].image;
-				break; // if size found, break loop
-			}
-		}
-
-		if (bNormalSpecified) {
-			if (style == null)
-				style = IValID.V_NORMAL;
-			if (variant == null)
-				variant = IValID.V_NORMAL;
-			if (weight == null)
-				weight = IValID.V_NORMAL;
-		}
-
-		// skip whitespace
-		for (i++; i < tokens.length; i++) {
-			if (tokens[i].kind != CSSRegionContexts.CSS_S || tokens[i].kind != CSSRegionContexts.CSS_DECLARATION_VALUE_S)
-				break;
-		}
-
-		// line-height ?
-		if (i < tokens.length && tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR && tokens[i].image.equals("/")) { //$NON-NLS-1$
-			for (i++; i < tokens.length; i++) {
-				if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-					height = tokens[i++].image;
-					break;
-				}
-			}
-		}
-
-		// font-family
-		StringBuffer buf = new StringBuffer();
-		for (; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_COMMENT)
-				buf.append(" ");//$NON-NLS-1$
-			else
-				buf.append(tokens[i].image);
-		}
-		family = buf.toString().trim();
-
-		if (propStyle == propDest)
-			return style;
-		else if (propVariant == propDest)
-			return variant;
-		else if (propWeight == propDest)
-			return weight;
-		else if (propSize == propDest)
-			return size;
-		else if (propHeight == propDest)
-			return height;
-		else if (propFamily == propDest)
-			return family;
-		else
-			return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ICSS2Properties.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ICSS2Properties.java
deleted file mode 100644
index 02d518c..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ICSS2Properties.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import java.util.Enumeration;
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.w3c.dom.css.CSS2Properties;
-
-
-/**
- * 
- */
-public interface ICSS2Properties extends CSS2Properties {
-
-	/**
-	 * 
-	 */
-	void applyFull(ICSSStyleDeclaration decl);
-
-	/**
-	 * 
-	 */
-	void applyModified(ICSSStyleDeclaration decl);
-
-	/**
-	 * 
-	 */
-	String get(PropCMProperty prop);
-
-	/**
-	 * 
-	 */
-	String getBackgroundPositionX();
-
-	/**
-	 * 
-	 */
-	String getBackgroundPositionY();
-
-	/**
-	 * 
-	 */
-	String getClipBottom();
-
-	/**
-	 * 
-	 */
-	String getClipLeft();
-
-	/**
-	 * 
-	 */
-	String getClipRight();
-
-	/**
-	 * 
-	 */
-	String getClipTop();
-
-	/**
-	 * 
-	 */
-	boolean isModified();
-
-	/**
-	 * 
-	 */
-	Enumeration properties();
-
-	/**
-	 * 
-	 */
-	Iterator propertiesModified();
-
-	/**
-	 * 
-	 */
-	void resetModified();
-
-	/**
-	 * 
-	 */
-	void set(PropCMProperty prop, String value) throws org.w3c.dom.DOMException;
-
-	/**
-	 * 
-	 */
-	void setBackgroundPositionX(String backgroundPosition) throws org.w3c.dom.DOMException;
-
-	/**
-	 * 
-	 */
-	void setBackgroundPositionY(String backgroundPosition) throws org.w3c.dom.DOMException;
-
-	/**
-	 * 
-	 */
-	void setClipBottom(String backgroundPosition) throws org.w3c.dom.DOMException;
-
-	/**
-	 * 
-	 */
-	void setClipLeft(String backgroundPosition) throws org.w3c.dom.DOMException;
-
-	/**
-	 * 
-	 */
-	void setClipRight(String backgroundPosition) throws org.w3c.dom.DOMException;
-
-	/**
-	 * 
-	 */
-	void setClipTop(String backgroundPosition) throws org.w3c.dom.DOMException;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/IShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/IShorthandAdapter.java
deleted file mode 100644
index 5a91f0a..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/IShorthandAdapter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-
-/**
- * 
- */
-public interface IShorthandAdapter {
-
-	/**
-	 * 
-	 */
-	boolean expand(String source, CSSPropertyContext dest);
-
-	/**
-	 * 
-	 */
-	String extract(String source, PropCMProperty propDest);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ISubPropertyAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ISubPropertyAdapter.java
deleted file mode 100644
index 7d87b6b..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ISubPropertyAdapter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-/**
- * 
- */
-public interface ISubPropertyAdapter {
-
-	/**
-	 * 
-	 */
-	String get(ICSS2Properties properties);
-
-	/**
-	 * 
-	 */
-	void set(ICSS2Properties properties, String value) throws org.w3c.dom.DOMException;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ListStyleShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ListStyleShorthandAdapter.java
deleted file mode 100644
index f602033..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ListStyleShorthandAdapter.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-
-
-/**
- * For 'list-style' property 'list-style' will be expanded to
- * 'list-style-image', 'list-style-position', 'list-style-type',
- */
-public class ListStyleShorthandAdapter implements IShorthandAdapter {
-
-	/**
-	 * 
-	 */
-	public ListStyleShorthandAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public boolean expand(String source, CSSPropertyContext dest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return false;
-		}
-		String image = "", pos = "", type = "";//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-		PropCMProperty propPos = PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_POSITION);
-		PropCMProperty propType = PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_TYPE);
-		PropCMProperty propImage = PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_IMAGE);
-
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				if (propPos.canHave(tokens[i].image))
-					pos = tokens[i].image;
-				else { // value="none" is shared !!
-					if (propType.canHave(tokens[i].image))
-						type = tokens[i].image;
-					if (propImage.canHave(tokens[i].image))
-						image = tokens[i].image;
-				}
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_URI) {
-				image = tokens[i].image;
-			}
-		}
-
-		dest.set(propPos.getName(), pos);
-		dest.set(propType.getName(), type);
-		dest.set(propImage.getName(), image);
-
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	public String extract(String source, PropCMProperty propDest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return null;
-		}
-		String image = null, pos = null, type = null;
-		PropCMProperty propPos = PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_POSITION);
-		PropCMProperty propType = PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_TYPE);
-		PropCMProperty propImage = PropCMProperty.getInstanceOf(PropCMProperty.P_LIST_STYLE_IMAGE);
-
-		for (int i = 0; i < tokens.length; i++) {
-			if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) {
-				if (propPos.canHave(tokens[i].image))
-					pos = tokens[i].image;
-				else { // value="none" is shared !!
-					if (propType.canHave(tokens[i].image))
-						type = tokens[i].image;
-					if (propImage.canHave(tokens[i].image))
-						image = tokens[i].image;
-				}
-			}
-			else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_URI) {
-				image = tokens[i].image;
-			}
-		}
-
-		if (propPos == propDest)
-			return pos;
-		else if (propType == propDest)
-			return type;
-		else if (propImage == propDest)
-			return image;
-		else
-			return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/MarginShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/MarginShorthandAdapter.java
deleted file mode 100644
index b53afc6..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/MarginShorthandAdapter.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-
-
-/**
- * For 'margin' property 'margin' will be expanded to 'margin-top',
- * 'margin-right', 'margin-bottom', 'margin-left',
- */
-public class MarginShorthandAdapter implements IShorthandAdapter {
-
-	/**
-	 * 
-	 */
-	public MarginShorthandAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public boolean expand(String source, CSSPropertyContext dest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return false;
-		}
-		String[] idents = new String[4];
-		int j = 0;
-		for (int i = 0; i < tokens.length; i++) {
-			if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE)
-				idents[j++] = tokens[i].image;
-			if (j == 4)
-				break;
-		}
-
-		String[] dests = new String[4];
-		if (j == 0)
-			return true;
-		else if (j == 1) {
-			dests[0] = dests[1] = dests[2] = dests[3] = idents[0];
-		}
-		else if (j == 2) {
-			dests[0] = dests[2] = idents[0];
-			dests[1] = dests[3] = idents[1];
-		}
-		else if (j == 3) {
-			dests[0] = idents[0];
-			dests[1] = dests[3] = idents[1];
-			dests[2] = idents[2];
-		}
-		else {
-			for (int k = 0; k < 4; k++)
-				dests[k] = idents[k];
-		}
-		dest.set(PropCMProperty.P_MARGIN_TOP, dests[0]);
-		dest.set(PropCMProperty.P_MARGIN_RIGHT, dests[1]);
-		dest.set(PropCMProperty.P_MARGIN_BOTTOM, dests[2]);
-		dest.set(PropCMProperty.P_MARGIN_LEFT, dests[3]);
-
-		return true;
-
-	}
-
-	/**
-	 * 
-	 */
-	public String extract(String source, PropCMProperty propDest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return null;
-		}
-		String[] idents = new String[4];
-		int j = 0;
-		for (int i = 0; i < tokens.length; i++) {
-			if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE)
-				idents[j++] = tokens[i].image;
-			if (j == 4)
-				break;
-		}
-
-		if (j == 0)
-			return null;
-		else if (j == 1)
-			return idents[0];
-		else if (j == 2) {
-			if (propDest.getName() == PropCMProperty.P_MARGIN_TOP || propDest.getName() == PropCMProperty.P_MARGIN_BOTTOM)
-				return idents[0];
-			else
-				return idents[1];
-		}
-		else if (j == 3) {
-			if (propDest.getName() == PropCMProperty.P_MARGIN_TOP)
-				return idents[0];
-			else if (propDest.getName() == PropCMProperty.P_MARGIN_BOTTOM)
-				return idents[2];
-			else
-				return idents[1];
-		}
-		else {
-			if (propDest.getName() == PropCMProperty.P_MARGIN_TOP)
-				return idents[0];
-			else if (propDest.getName() == PropCMProperty.P_MARGIN_RIGHT)
-				return idents[1];
-			else if (propDest.getName() == PropCMProperty.P_MARGIN_BOTTOM)
-				return idents[2];
-			else if (propDest.getName() == PropCMProperty.P_MARGIN_LEFT)
-				return idents[3];
-			else
-				return null;
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/PaddingShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/PaddingShorthandAdapter.java
deleted file mode 100644
index 5cde483..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/PaddingShorthandAdapter.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-
-
-/**
- * For 'padding' property 'padding' will be expanded to 'padding-top',
- * 'padding-right', 'padding-bottom', 'padding-left',
- */
-public class PaddingShorthandAdapter implements IShorthandAdapter {
-
-	/**
-	 * 
-	 */
-	public PaddingShorthandAdapter() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public boolean expand(String source, CSSPropertyContext dest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return false;
-		}
-		String[] idents = new String[4];
-		int j = 0;
-		for (int i = 0; i < tokens.length; i++) {
-			if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE)
-				idents[j++] = tokens[i].image;
-			if (j == 4)
-				break;
-		}
-
-		String[] dests = new String[4];
-		if (j == 0)
-			return true;
-		else if (j == 1) {
-			dests[0] = dests[1] = dests[2] = dests[3] = idents[0];
-		}
-		else if (j == 2) {
-			dests[0] = dests[2] = idents[0];
-			dests[1] = dests[3] = idents[1];
-		}
-		else if (j == 3) {
-			dests[0] = idents[0];
-			dests[1] = dests[3] = idents[1];
-			dests[2] = idents[2];
-		}
-		else {
-			for (int k = 0; k < 4; k++)
-				dests[k] = idents[k];
-		}
-		dest.set(PropCMProperty.P_PADDING_TOP, dests[0]);
-		dest.set(PropCMProperty.P_PADDING_RIGHT, dests[1]);
-		dest.set(PropCMProperty.P_PADDING_BOTTOM, dests[2]);
-		dest.set(PropCMProperty.P_PADDING_LEFT, dests[3]);
-
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	public String extract(String source, PropCMProperty propDest) {
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_DECLARATION_VALUE, source);
-		CSSTextToken[] tokens = parser.getTokens();
-		if (tokens.length <= 0) {
-			return null;
-		}
-		String[] idents = new String[4];
-		int j = 0;
-		for (int i = 0; i < tokens.length; i++) {
-			if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE)
-				idents[j++] = tokens[i].image;
-			if (j == 4)
-				break;
-		}
-
-		if (j == 0)
-			return null;
-		else if (j == 1)
-			return idents[0];
-		else if (j == 2) {
-			if (propDest.getName() == PropCMProperty.P_PADDING_TOP || propDest.getName() == PropCMProperty.P_PADDING_BOTTOM)
-				return idents[0];
-			else
-				return idents[1];
-		}
-		else if (j == 3) {
-			if (propDest.getName() == PropCMProperty.P_PADDING_TOP)
-				return idents[0];
-			else if (propDest.getName() == PropCMProperty.P_PADDING_BOTTOM)
-				return idents[2];
-			else
-				return idents[1];
-		}
-		else {
-			if (propDest.getName() == PropCMProperty.P_PADDING_TOP)
-				return idents[0];
-			else if (propDest.getName() == PropCMProperty.P_PADDING_RIGHT)
-				return idents[1];
-			else if (propDest.getName() == PropCMProperty.P_PADDING_BOTTOM)
-				return idents[2];
-			else if (propDest.getName() == PropCMProperty.P_PADDING_LEFT)
-				return idents[3];
-			else
-				return null;
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ValueData.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ValueData.java
deleted file mode 100644
index a64f3b1..0000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ValueData.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.internal.util.declaration;
-
-
-
-/**
- * 
- */
-public class ValueData {
-
-	public String value;
-	public boolean important = false;
-
-	/**
-	 * 
-	 */
-	public ValueData() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	public ValueData(String val, boolean imp) {
-		super();
-		value = val;
-		important = imp;
-	}
-
-	/**
-	 * 
-	 */
-	public String toString() {
-		return value;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.core/.classpath b/bundles/org.eclipse.wst.dtd.core/.classpath
deleted file mode 100644
index fe6106c..0000000
--- a/bundles/org.eclipse.wst.dtd.core/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="src" path="contentmodel/"/>
-	<classpathentry kind="src" path="emfmodel/"/>
-	<classpathentry kind="src" path="saxparser/"/>
-	<classpathentry kind="src" path="src-validation"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.dtd.core/.cvsignore b/bundles/org.eclipse.wst.dtd.core/.cvsignore
deleted file mode 100644
index 5879783..0000000
--- a/bundles/org.eclipse.wst.dtd.core/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-runtime
-dtdcore.jar
-*.zip
-build.xml
-temp.folder
-@dot
diff --git a/bundles/org.eclipse.wst.dtd.core/.project b/bundles/org.eclipse.wst.dtd.core/.project
deleted file mode 100644
index 76249e5..0000000
--- a/bundles/org.eclipse.wst.dtd.core/.project
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.dtd.core</name>
-	<comment></comment>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.dtd.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.dtd.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 468935e..0000000
--- a/bundles/org.eclipse.wst.dtd.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,69 +0,0 @@
-#Mon May 30 17:56:37 EDT 2005

-eclipse.preferences.version=1

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=500

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error

-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error

-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-org.eclipse.jdt.core.incompleteClasspath=error

diff --git a/bundles/org.eclipse.wst.dtd.core/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.dtd.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index c9a18d3..0000000
--- a/bundles/org.eclipse.wst.dtd.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,14 +0,0 @@
-#Fri May 27 23:56:32 EDT 2005

-compilers.p.deprecated=1

-compilers.p.illegal-att-value=0

-compilers.p.no-required-att=0

-compilers.p.not-externalized-att=1

-compilers.p.unknown-attribute=0

-compilers.p.unknown-class=0

-compilers.p.unknown-element=0

-compilers.p.unknown-resource=0

-compilers.p.unresolved-ex-points=0

-compilers.p.unresolved-import=0

-compilers.p.unused-element-or-attribute=0

-compilers.use-project=true

-eclipse.preferences.version=1

diff --git a/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 09dca67..0000000
--- a/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,39 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.dtd.core; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.wst.dtd.core.internal.DTDCorePlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.dtd.core.internal,
- org.eclipse.wst.dtd.core.internal.content,
- org.eclipse.wst.dtd.core.internal.contentmodel,
- org.eclipse.wst.dtd.core.internal.document,
- org.eclipse.wst.dtd.core.internal.emf,
- org.eclipse.wst.dtd.core.internal.emf.impl,
- org.eclipse.wst.dtd.core.internal.emf.util,
- org.eclipse.wst.dtd.core.internal.encoding,
- org.eclipse.wst.dtd.core.internal.event,
- org.eclipse.wst.dtd.core.internal.modelhandler,
- org.eclipse.wst.dtd.core.internal.parser,
- org.eclipse.wst.dtd.core.internal.provisional.contenttype,
- org.eclipse.wst.dtd.core.internal.provisional.document,
- org.eclipse.wst.dtd.core.internal.provisional.text,
- org.eclipse.wst.dtd.core.internal.saxparser,
- org.eclipse.wst.dtd.core.internal.tasks,
- org.eclipse.wst.dtd.core.internal.text,
- org.eclipse.wst.dtd.core.internal.tokenizer,
- org.eclipse.wst.dtd.core.internal.util,
- org.eclipse.wst.dtd.core.internal.validation,
- rose
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.validation
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.dtd.core/about.html b/bundles/org.eclipse.wst.dtd.core/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.wst.dtd.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.core/build.properties b/bundles/org.eclipse.wst.dtd.core/build.properties
deleted file mode 100644
index 633343e..0000000
--- a/bundles/org.eclipse.wst.dtd.core/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Jens Lukowski/Innoopract - initial renaming/restructuring
-#     
-###############################################################################
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               META-INF/,\
-               .,\
-               about.html
-bin.excludes = bin/**,\
-               @dot/**,\
-               temp.folder/**
-src.includes = component.xml
-source.. = src/,\
-           contentmodel/,\
-           emfmodel/,\
-           saxparser/,\
-           src-validation/
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.core/component.xml b/bundles/org.eclipse.wst.dtd.core/component.xml
deleted file mode 100644
index eb03334..0000000
--- a/bundles/org.eclipse.wst.dtd.core/component.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model"
-	name="org.eclipse.wst.dtd">
-	<component-depends unrestricted="true"/>
-	<plugin id="org.eclipse.wst.dtd.core" />
-	<plugin id="org.eclipse.wst.dtd.ui" />
-</component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMDocumentFactoryDTD.java b/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMDocumentFactoryDTD.java
deleted file mode 100644
index bae0593..0000000
--- a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMDocumentFactoryDTD.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.contentmodel;
-
-import org.eclipse.wst.dtd.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.factory.CMDocumentFactory;
-
-/**
- * This builder handles building .dtd grammar files
- */
-public class CMDocumentFactoryDTD implements CMDocumentFactory {
-	public CMDocumentFactoryDTD() {
-	}
-
-
-	public CMDocument createCMDocument(String uri) {
-		// work around a bug in our parsers
-		// todo... revisit this
-		//
-//		https://bugs.eclipse.org/bugs/show_bug.cgi?id=100481
-//		String fileProtocol = "file:"; //$NON-NLS-1$
-//		if (uri.startsWith(fileProtocol)) {
-//			uri = uri.substring(fileProtocol.length());
-//		}
-
-		CMDocument result = null;
-		try {
-			result = DTDImpl.buildCMDocument(uri);
-		}
-		catch (Exception e) {
-			Logger.logException("could not create content model for URI: " + uri, e);
-		}
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMNodeImpl.java b/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMNodeImpl.java
deleted file mode 100644
index df5d218..0000000
--- a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMNodeImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.contentmodel;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-public abstract class CMNodeImpl extends AdapterImpl implements CMNode {
-	protected static final String PROPERTY_DOCUMENTATION = "documentation"; //$NON-NLS-1$
-	protected static final String PROPERTY_DOCUMENTATION_SOURCE = "documentationSource"; //$NON-NLS-1$
-	protected static final String PROPERTY_DOCUMENTATION_LANGUAGE = "documentationLanguage"; //$NON-NLS-1$
-	protected static final String PROPERTY_MOF_NOTIFIER = "key"; //$NON-NLS-1$
-	protected static final String PROPERTY_DEFINITION_INFO = "http://org.eclipse.wst/cm/properties/definitionInfo"; //$NON-NLS-1$
-	protected static final String PROPERTY_DEFINITION = "http://org.eclipse.wst/cm/properties/definition"; //$NON-NLS-1$
-
-	public abstract Object getKey();
-
-	public boolean supports(String propertyName) {
-		return propertyName.equals(PROPERTY_MOF_NOTIFIER);
-	}
-
-	public Object getProperty(String propertyName) {
-		return null;
-	}
-
-	public void setProperty(String propertyName, Object object) {
-	}
-}
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
deleted file mode 100644
index e53f468..0000000
--- a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/DTDImpl.java
+++ /dev/null
@@ -1,775 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.contentmodel;
-
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAnyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute;
-import org.eclipse.wst.dtd.core.internal.emf.DTDBasicType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDBasicTypeKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDDefaultKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEmptyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDInternalEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPCDataContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDRepeatableContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDType;
-import org.eclipse.wst.dtd.core.internal.emf.impl.DTDBasicTypeImpl;
-import org.eclipse.wst.dtd.core.internal.emf.impl.DTDPackageImpl;
-import org.eclipse.wst.dtd.core.internal.emf.util.DTDMetrics;
-import org.eclipse.wst.dtd.core.internal.emf.util.DTDUtil;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocumentation;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMEntityDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.annotation.AnnotationMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMDataTypeImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMEntityDeclarationImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNamedNodeMapImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNodeListImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDescriptionBuilder;
-
-
-public class DTDImpl {
-	static {
-		// Call init on the DTD package to avoid strange initialization bugs
-		//
-		DTDPackageImpl.init();
-	}
-
-	protected static DTDAdapterFactoryImpl dtdAdapterFactoryImpl = new DTDAdapterFactoryImpl();
-	protected static CMDataTypeInfoTable cmDataTypeInfoTable = new CMDataTypeInfoTable();
-
-	public static CMDocument buildCMDocument(String uri) {
-		DTDFile dtdFile = buildDTDModel(uri);
-		CMDocument cmDocument = (CMDocument) getAdapter(dtdFile);
-		
-		return cmDocument;
-	}
-
-	public static DTDFile buildDTDModel(String uri) {
-		DTDUtil dtdUtil = new DTDUtil();
-		dtdUtil.setexpandEntityReferences(true);
-		dtdUtil.parse(new ResourceSetImpl(), uri);
-		return dtdUtil.getDTDFile();
-	}
-
-	public static CMDocument buildCMDocument(DTDFile dtdFile) {
-		return (CMDocument) getAdapter(dtdFile);
-	}
-
-	public static CMNode getAdapter(Notifier o) {
-		return (CMNode) dtdAdapterFactoryImpl.adapt(o);
-	}
-
-	public static int getMinOccurHelper(DTDRepeatableContent content) {
-		int occurence = content.getOccurrence().getValue();
-		boolean isOptional = (occurence == DTDOccurrenceType.OPTIONAL || occurence == DTDOccurrenceType.ZERO_OR_MORE);
-		return isOptional ? 0 : 1;
-	}
-
-	public static int getMaxOccurHelper(DTDRepeatableContent content) {
-		int occurence = content.getOccurrence().getValue();
-		boolean isMulti = (occurence == DTDOccurrenceType.ONE_OR_MORE || occurence == DTDOccurrenceType.ZERO_OR_MORE);
-		return isMulti ? -1 : 1;
-	}
-
-	public static class DTDAdapterFactoryImpl extends AdapterFactoryImpl {
-		public Adapter createAdapter(Notifier target) {
-			Adapter result = null;
-			if (target != null) {
-				if (target instanceof DTDAttribute) {
-					result = new DTDAttributeAdapter((DTDAttribute) target);
-				}
-				else if (target instanceof DTDElement) {
-					result = new DTDElementAdapter((DTDElement) target);
-				}
-				else if (target instanceof DTDElementReferenceContent) {
-					result = new DTDElementReferenceContentAdapter((DTDElementReferenceContent) target);
-				}
-				else if (target instanceof DTDFile) {
-					result = new DTDFileAdapter((DTDFile) target);
-				}
-				else if (target instanceof DTDGroupContent) {
-					result = new DTDGroupContentAdapter((DTDGroupContent) target);
-				}
-				else if (target instanceof DTDEntity) {
-					result = new DTDEntityAdapter((DTDEntity) target);
-				}
-			}
-			return result;
-		}
-
-		public Adapter adapt(Notifier target) {
-			return adapt(target, this);
-		}
-	}
-
-	/**
-	 * DTDBaseAdapter
-	 */
-	public static abstract class DTDBaseAdapter extends CMNodeImpl {
-		public String getNodeName() {
-			return ""; //$NON-NLS-1$
-		}
-
-		public boolean isAdapterForType(Object type) {
-			return type == dtdAdapterFactoryImpl;
-		}
-
-		public Object getProperty(String propertyName) {
-			Object result = null;
-			if (propertyName.equals("CMDocument")) { //$NON-NLS-1$
-				result = getCMDocument();
-			}
-			else if (propertyName.equals(PROPERTY_DOCUMENTATION)) {
-				result = getDocumentation();
-			}
-			else if (propertyName.equals(PROPERTY_DEFINITION_INFO)) {
-				result = getDefinitionInfo();
-			}
-			else if (propertyName.equals(PROPERTY_DEFINITION)) {
-				result = getDefinition();
-			}
-			else if (propertyName.equals(PROPERTY_MOF_NOTIFIER)) {
-				result = getKey();
-			}
-			else if (propertyName.equals("spec")) { //$NON-NLS-1$
-				result = getSpec();
-			}
-			else {
-				result = super.getProperty(propertyName);
-				if (result == null) {
-					CMDocument cmDocument = getCMDocument();
-					if (cmDocument instanceof DTDFileAdapter) {
-						AnnotationMap map = ((DTDFileAdapter) cmDocument).annotationMap;
-						if (map != null) {
-							String spec = getSpec();
-							if (spec != null) {
-								result = map.getProperty(getSpec(), propertyName);
-							}
-						}
-						if (result == null) {
-							Map globalPropertyMap = ((DTDFileAdapter) cmDocument).globalPropertyMap;
-							result = globalPropertyMap.get(propertyName);
-						}
-					}
-				}
-			}
-			return result;
-		}
-
-		public CMDocument getCMDocument() {
-			return null;
-		}
-
-		protected CMNodeList getDocumentation() {
-			return new CMNodeListImpl();
-		}
-
-		public String getDefinitionInfo() {
-			return null;
-		}
-
-		public CMNode getDefinition() {
-			return null;
-		}
-
-		public String getSpec() {
-			return getNodeName();
-		}
-	}
-
-	/**
-	 * DTDAttributeAdapter
-	 */
-	public static class DTDAttributeAdapter extends DTDBaseAdapter implements CMAttributeDeclaration {
-		protected DTDAttribute attribute;
-		protected CMDataType dataType;
-
-		public DTDAttributeAdapter(DTDAttribute attribute) {
-			this.attribute = attribute;
-			dataType = new DataTypeImpl();
-		}
-
-		public Object getKey() {
-			return attribute;
-		}
-
-		public String getSpec() {
-			return attribute.getDTDElement().getName() + "/@" + attribute.getName(); //$NON-NLS-1$
-		}
-
-		public int getNodeType() {
-			return ATTRIBUTE_DECLARATION;
-		}
-
-		public String getNodeName() {
-			return attribute.getName();
-		}
-
-		public String getAttrName() {
-			return attribute.getName();
-		}
-
-		public CMDataType getAttrType() {
-			return dataType;
-		}
-
-		public String getDefaultValue() {
-			return attribute.getDefaultValueString();
-		}
-
-		public Enumeration getEnumAttr() {
-			return Collections.enumeration(attribute.getEnumeratedValues());
-		}
-
-		public int getUsage() {
-			int usage = OPTIONAL;
-			switch (attribute.getDefaultKind().getValue()) {
-				case DTDDefaultKind.REQUIRED : {
-					usage = REQUIRED;
-					break;
-				}
-				case DTDDefaultKind.FIXED : {
-					usage = FIXED;
-					break;
-				}
-			}
-			return usage;
-		}
-
-		public CMDocument getCMDocument() {
-			DTDFile dtdFile = attribute.getDTDElement().getDTDFile();
-			return dtdFile != null ? (CMDocument) getAdapter(dtdFile) : null;
-		}
-
-		public class DataTypeImpl implements CMDataType {
-			public int getNodeType() {
-				return CMNode.DATA_TYPE;
-			}
-
-			public String getNodeName() {
-				return getDataTypeName();
-			}
-
-			public boolean supports(String propertyName) {
-				return false;
-			}
-
-			public Object getProperty(String propertyName) {
-				Object result = null;
-				if (propertyName.equals("isValidEmptyValue")) { //$NON-NLS-1$
-					String dataTypeName = getDataTypeName();
-					result = (dataTypeName == null || dataTypeName.equals(CMDataType.CDATA)) ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$
-				}
-				return result;
-			}
-
-			public String getDataTypeName() {
-				return cmDataTypeInfoTable.getDataTypeName(attribute.getDTDType());
-			}
-
-			public String generateInstanceValue() {
-				return cmDataTypeInfoTable.getInstanceValue(attribute.getDTDType());
-			}
-
-			public int getImpliedValueKind() {
-				int result = IMPLIED_VALUE_NONE;
-				int defaultValueKind = attribute.getDefaultKind().getValue();
-				if (defaultValueKind == DTDDefaultKind.NOFIXED) {
-					result = IMPLIED_VALUE_DEFAULT;
-				}
-				else if (defaultValueKind == DTDDefaultKind.FIXED) {
-					result = IMPLIED_VALUE_FIXED;
-				}
-				return result;
-			}
-
-			public String getImpliedValue() {
-				return attribute.getDefaultValueString();
-			}
-
-			public String[] getEnumeratedValues() {
-				Object[] objectList = attribute.getEnumeratedValues().toArray();
-				String[] result = new String[objectList.length];
-				for (int i = 0; i < objectList.length; i++) {
-					result[i] = objectList[i].toString();
-				}
-				return result;
-			}
-		}
-	}
-
-
-	/**
-	 * DTDElementBaseAdapter
-	 */
-	public static abstract class DTDElementBaseAdapter extends DTDBaseAdapter implements CMElementDeclaration {
-		protected CMDataType dataType;
-
-		protected abstract DTDElement getDTDElement();
-
-		protected CMDocumentation documentation = null;
-
-		public int getNodeType() {
-			return ELEMENT_DECLARATION;
-		}
-
-		public String getNodeName() {
-			return getDTDElement().getName();
-		}
-
-		public CMNamedNodeMap getAttributes() {
-			CMNamedNodeMapImpl result = new CMNamedNodeMapImpl();
-			List attributeList = getDTDElement().getDTDAttribute();
-			for (Iterator i = attributeList.iterator(); i.hasNext();) {
-				DTDAttribute attribute = (DTDAttribute) i.next();
-				result.getHashtable().put(attribute.getName(), getAdapter(attribute));
-			}
-			return result;
-		}
-
-		public CMContent getContent() {
-			return (CMContent) getAdapter(getDTDElement().getContent());
-		}
-
-		public int getContentType() {
-			// todo
-			int result = ELEMENT;
-			DTDElementContent dtdElementContent = getDTDElement().getContent();
-			if (dtdElementContent instanceof DTDPCDataContent) {
-				result = PCDATA;
-			}
-			else if (dtdElementContent instanceof DTDGroupContent) {
-				DTDGroupContent groupContent = (DTDGroupContent) dtdElementContent;
-				int groupKind = groupContent.getGroupKind().getValue();
-				if (groupKind == DTDGroupKind.CHOICE) {
-					List list = groupContent.getContent();
-					if (list.size() > 0 && list.get(0) instanceof DTDPCDataContent) {
-						result = MIXED;
-					}
-				}
-			}
-			else if (dtdElementContent instanceof DTDAnyContent) {
-				result = ANY;
-			}
-			else if (dtdElementContent instanceof DTDEmptyContent) {
-				result = EMPTY;
-			}
-
-			return result;
-		}
-
-		public String getElementName() {
-			return getDTDElement().getName();
-		}
-
-		public CMDataType getDataType() {
-			int contentType = getContentType();
-			boolean hasDataType = contentType == PCDATA || contentType == MIXED;
-			return hasDataType ? dataType : null;
-		}
-
-		public CMNamedNodeMap getLocalElements() {
-			return CMNamedNodeMapImpl.EMPTY_NAMED_NODE_MAP;
-		}
-
-		public CMDocument getCMDocument() {
-			DTDFile dtdFile = getDTDElement().getDTDFile();
-			return dtdFile != null ? (CMDocument) getAdapter(dtdFile) : null;
-		}
-
-		protected CMNodeList getDocumentation() {
-			CMNodeListImpl nodeList = new CMNodeListImpl();
-			if (documentation == null) {
-				String comment = getDTDElement().getComment();
-				if (comment != null) {
-					String value = ""; //$NON-NLS-1$
-					StringTokenizer st = new StringTokenizer(comment, "\n"); //$NON-NLS-1$
-					while (st.hasMoreTokens()) {
-						value += st.nextToken().trim() + "\n"; //$NON-NLS-1$
-					}
-					documentation = new CMDocumentationImpl(value);
-				}
-			}
-			if (documentation != null) {
-				nodeList.getList().add(documentation);
-			}
-			return nodeList;
-		}
-	}
-
-
-	public static class CMDocumentationImpl implements CMDocumentation {
-		protected String value;
-
-		public CMDocumentationImpl(String value) {
-			this.value = value;
-		}
-
-		public String getNodeName() {
-			return ""; //$NON-NLS-1$
-		}
-
-		public int getNodeType() {
-			return DOCUMENTATION;
-		}
-
-		public boolean supports(String propertyName) {
-			return false;
-		}
-
-		public Object getProperty(String propertyName) {
-			return null;
-		}
-
-		public String getValue() {
-			return value;
-		}
-
-		public String getLanguage() {
-			return null;
-		}
-
-		public String getSource() {
-			return null;
-		}
-	}
-
-
-	/**
-	 * DTDElementAdapter
-	 */
-	public static class DTDElementAdapter extends DTDElementBaseAdapter {
-		protected DTDElement element;
-
-		public DTDElementAdapter(DTDElement element) {
-			this.element = element;
-			dataType = new CMDataTypeImpl("#PCDATA", getDTDElement().getName()); //$NON-NLS-1$
-		}
-
-		public Object getKey() {
-			return element;
-		}
-
-		protected DTDElement getDTDElement() {
-			return element;
-		}
-
-		public int getMinOccur() {
-			return 1;
-		}
-
-		public int getMaxOccur() {
-			return 1;
-		}
-
-		public String getDefinitionInfo() {
-			return "global"; //$NON-NLS-1$
-		}
-
-		public CMNode getDefinition() {
-			return this;
-		}
-	}
-
-
-	/**
-	 * DTDElementReferenceContentAdapter
-	 */
-	public static class DTDElementReferenceContentAdapter extends DTDElementBaseAdapter {
-		protected DTDElementReferenceContent content;
-
-		public DTDElementReferenceContentAdapter(DTDElementReferenceContent content) {
-			this.content = content;
-			dataType = new CMDataTypeImpl("#PCDATA", getDTDElement().getName()); //$NON-NLS-1$
-		}
-
-		public Object getKey() {
-			return content;
-		}
-
-		protected DTDElement getDTDElement() {
-			return content.getReferencedElement();
-		}
-
-		public int getMinOccur() {
-			return getMinOccurHelper(content);
-		}
-
-		public int getMaxOccur() {
-			return getMaxOccurHelper(content);
-		}
-
-
-		public CMNode getDefinition() {
-			return getAdapter(getDTDElement());
-		}
-	}
-
-
-	/**
-	 * DTDEntityAdapter
-	 */
-	public static class DTDEntityAdapter extends DTDBaseAdapter implements CMEntityDeclaration {
-		protected DTDEntity dtdEntity;
-
-		public DTDEntityAdapter(DTDEntity dtdEntity) {
-			this.dtdEntity = dtdEntity;
-		}
-
-		public int getNodeType() {
-			return ENTITY_DECLARATION;
-		}
-
-		public Object getKey() {
-			return dtdEntity;
-		}
-
-		public String getName() {
-			return dtdEntity.getName();
-		}
-
-		public String getValue() {
-			String value = ""; //$NON-NLS-1$
-			if (dtdEntity.getContent() instanceof DTDInternalEntity) {
-				DTDInternalEntity content = (DTDInternalEntity) dtdEntity.getContent();
-				value = content.getValue();
-			}
-			return value;
-		}
-	}
-
-
-	/**
-	 * DTDGroupContentAdapter
-	 */
-	public static class DTDGroupContentAdapter extends DTDBaseAdapter implements CMGroup {
-		protected DTDGroupContent content;
-
-		public DTDGroupContentAdapter(DTDGroupContent content) {
-			this.content = content;
-		}
-
-		public Object getKey() {
-			return content;
-		}
-
-		public int getNodeType() {
-			return GROUP;
-		}
-
-		public String getNodeName() {
-			CMDescriptionBuilder descriptionBuilder = new CMDescriptionBuilder();
-			return descriptionBuilder.buildDescription(this);
-		}
-
-		public CMNodeList getChildNodes() {
-			List list = content.getContent();
-			CMNodeListImpl result = new CMNodeListImpl();
-			for (Iterator i = list.iterator(); i.hasNext();) {
-				CMNode node = getAdapter((Notifier) i.next());
-				if (node != null) {
-					result.getList().add(node);
-				}
-			}
-			return result;
-		}
-
-
-		public int getMaxOccur() {
-			return getMaxOccurHelper(content);
-		}
-
-		public int getMinOccur() {
-			return getMinOccurHelper(content);
-		}
-
-		public int getOperator() {
-			// todo... handle ALONE case by checkig if child count == 1
-			int groupKind = content.getGroupKind().getValue();
-			return (groupKind == DTDGroupKind.CHOICE) ? CHOICE : SEQUENCE;
-		}
-	}
-
-	/**
-	 * DTDFileAdapter
-	 */
-	public static class DTDFileAdapter extends DTDBaseAdapter implements CMDocument {
-		protected final String DEFAULT_ROOT_NAME = "http://org.eclipse.wst/cm/properties/defaultRootName"; //$NON-NLS-1$
-
-		protected DTDFile dtdFile;
-		protected CMNamedNodeMapImpl namedNodeMap;
-		protected CMNamedNodeMapImpl entityNodeMap;
-
-		protected AnnotationMap annotationMap = new AnnotationMap();
-		protected Map globalPropertyMap = new HashMap();
-
-		public DTDFileAdapter(DTDFile dtdFile) {
-			this.dtdFile = dtdFile;
-		}
-
-		public Object getKey() {
-			return dtdFile;
-		}
-
-		public AnnotationMap getAnnotationMap() {
-			return annotationMap;
-		}
-
-		public CMNamedNodeMap getElements() {
-			if (namedNodeMap == null) {
-				namedNodeMap = new CMNamedNodeMapImpl();
-				for (Iterator iterator = dtdFile.listDTDElement().iterator(); iterator.hasNext();) {
-					DTDElement dtdElement = (DTDElement) iterator.next();
-					namedNodeMap.getHashtable().put(dtdElement.getName(), getAdapter(dtdElement));
-				}
-			}
-			return namedNodeMap;
-		}
-
-		public CMNamedNodeMap getEntities() {
-			if (entityNodeMap == null) {
-				entityNodeMap = new CMNamedNodeMapImpl();
-
-				// add the built in entity declarations
-				//
-				entityNodeMap.getHashtable().put("amp", new CMEntityDeclarationImpl("amp", "&")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				entityNodeMap.getHashtable().put("lt", new CMEntityDeclarationImpl("lt", "<")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				entityNodeMap.getHashtable().put("gt", new CMEntityDeclarationImpl("gt", ">")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				entityNodeMap.getHashtable().put("quot", new CMEntityDeclarationImpl("quot", "\"")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				entityNodeMap.getHashtable().put("apos", new CMEntityDeclarationImpl("apos", "'")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-				for (Iterator i = dtdFile.listDTDEntity().iterator(); i.hasNext();) {
-					DTDEntity dtdEntity = (DTDEntity) i.next();
-					if (!dtdEntity.isParameterEntity() && dtdEntity.getName() != null) {
-						// for now... just handle DTDInternalEntity
-						//
-						if (dtdEntity.getContent() instanceof DTDInternalEntity) {
-							entityNodeMap.getHashtable().put(dtdEntity.getName(), getAdapter(dtdEntity));
-						}
-					}
-				}
-			}
-			return entityNodeMap;
-		}
-
-		public CMNamespace getNamespace() {
-			return null;
-		}
-
-		public int getNodeType() {
-			return DOCUMENT;
-		}
-
-		public String getNodeName() {
-			return dtdFile.getName() + ".dtd"; //$NON-NLS-1$
-		}
-
-		public Object getProperty(String propertyName) {
-			Object result = null;
-			if (propertyName.equals(DEFAULT_ROOT_NAME)) {
-				DTDMetrics metrics = new DTDMetrics(dtdFile);
-				DTDElement dtdElement = metrics.getLeastReferencedElement();
-				if (dtdElement != null) {
-					result = dtdElement.getName();
-				}
-			}
-			else if (propertyName.equals("annotationMap")) { //$NON-NLS-1$
-				result = annotationMap;
-			}
-			else if (propertyName.equals("globalPropertyMap")) { //$NON-NLS-1$
-				result = globalPropertyMap;
-			}
-			else {
-				result = super.getProperty(propertyName);
-			}
-			return result;
-		}
-	}
-
-
-	public static class CMDataTypeInfoTable {
-		protected String[] instanceValueTable;
-		protected String[] dataTypeNameTable;
-
-		public CMDataTypeInfoTable() {
-			// hashtable.put(DTDType.CDATA, null));
-			instanceValueTable = new String[DTDBasicTypeImpl.basicTypeKinds.length];
-			instanceValueTable[DTDBasicTypeKind.ENTITY] = "entity"; //$NON-NLS-1$
-			instanceValueTable[DTDBasicTypeKind.ENTITIES] = "entities"; //$NON-NLS-1$
-			instanceValueTable[DTDBasicTypeKind.NMTOKEN] = "nmtoken"; //$NON-NLS-1$
-			instanceValueTable[DTDBasicTypeKind.NMTOKENS] = "nmtokens"; //$NON-NLS-1$
-
-			dataTypeNameTable = new String[DTDBasicTypeImpl.basicTypeKinds.length];
-			dataTypeNameTable[DTDBasicTypeKind.CDATA] = CMDataType.CDATA;
-			dataTypeNameTable[DTDBasicTypeKind.ID] = CMDataType.ID;
-			dataTypeNameTable[DTDBasicTypeKind.IDREF] = CMDataType.IDREF;
-			dataTypeNameTable[DTDBasicTypeKind.ENTITY] = CMDataType.ENTITY;
-			dataTypeNameTable[DTDBasicTypeKind.ENTITIES] = CMDataType.ENTITIES;
-			dataTypeNameTable[DTDBasicTypeKind.NMTOKEN] = CMDataType.NMTOKEN;
-			dataTypeNameTable[DTDBasicTypeKind.NMTOKENS] = CMDataType.NMTOKENS;
-		}
-
-		public String getInstanceValue(DTDType dtdType) {
-			String result = null;
-			if (dtdType instanceof DTDBasicType) {
-				int kind = ((DTDBasicType) dtdType).getKind().getValue();
-				if (kind >= 0 && kind < DTDBasicTypeImpl.basicTypeDescriptions.length) {
-					result = instanceValueTable[kind];
-				}
-			}
-			return result;
-		}
-
-		public String getDataTypeName(DTDType dtdType) {
-			String result = null;
-			if (dtdType instanceof DTDBasicType) {
-				int kind = ((DTDBasicType) dtdType).getKind().getValue();
-				if (kind >= 0 && kind < DTDBasicTypeImpl.basicTypeDescriptions.length) {
-					result = dataTypeNameTable[kind];
-				}
-			}
-			else if (dtdType instanceof DTDEnumerationType) {
-				result = CMDataType.ENUM;
-			}
-			return result;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDAnyContent.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDAnyContent.java
deleted file mode 100644
index 3065392..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDAnyContent.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Any Content</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDAnyContent()
- * @model
- * @generated
- */
-public interface DTDAnyContent extends DTDElementContent {
-} // DTDAnyContent
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDAttribute.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDAttribute.java
deleted file mode 100644
index 89c5ae1..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDAttribute.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import java.util.Collection;
-
-import org.eclipse.emf.ecore.EAttribute;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getComment <em>Comment</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getDefaultKind <em>Default Kind</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getDefaultValueString <em>Default Value String</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getAttributeNameReferencedEntity <em>Attribute Name Referenced Entity</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getAttributeTypeReferencedEntity <em>Attribute Type Referenced Entity</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getDTDElement <em>DTD Element</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDAttribute()
- * @model
- * @generated
- */
-public interface DTDAttribute extends EAttribute, DTDObject, DTDSourceOffset {
-	// NON-GEN interfaces DTDObject, DTDSourceOffset
-
-	public DTDType getDTDType();
-
-	public void setDTDType(DTDType type);
-
-	public void setDTDBasicType(int value);
-
-	public DTDEnumerationType createDTDEnumeration(String[] enumValues, int enumKind);
-
-	public Collection getEnumeratedValues();
-
-	public String unparse();
-
-	/**
-	 * Returns the value of the '<em><b>Comment</b></em>' attribute. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Comment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Comment</em>' attribute.
-	 * @see #setComment(String)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDAttribute_Comment()
-	 * @model
-	 * @generated
-	 */
-	String getComment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getComment <em>Comment</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Comment</em>' attribute.
-	 * @see #getComment()
-	 * @generated
-	 */
-	void setComment(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Default Kind</b></em>' attribute.
-	 * The literals are from the enumeration
-	 * {@link org.eclipse.wst.dtd.core.internal.emf.DTDDefaultKind}. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Kind</em>' attribute isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Default Kind</em>' attribute.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDDefaultKind
-	 * @see #setDefaultKind(DTDDefaultKind)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDAttribute_DefaultKind()
-	 * @model
-	 * @generated
-	 */
-	DTDDefaultKind getDefaultKind();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getDefaultKind <em>Default Kind</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Default Kind</em>' attribute.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDDefaultKind
-	 * @see #getDefaultKind()
-	 * @generated
-	 */
-	void setDefaultKind(DTDDefaultKind value);
-
-	/**
-	 * Returns the value of the '<em><b>Default Value String</b></em>'
-	 * attribute. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Value String</em>' attribute
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Default Value String</em>' attribute.
-	 * @see #setDefaultValueString(String)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDAttribute_DefaultValueString()
-	 * @model
-	 * @generated
-	 */
-	String getDefaultValueString();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getDefaultValueString <em>Default Value String</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Default Value String</em>'
-	 *            attribute.
-	 * @see #getDefaultValueString()
-	 * @generated
-	 */
-	void setDefaultValueString(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Name Referenced Entity</b></em>'
-	 * reference. It is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getAttributeNameReference <em>Attribute Name Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute Name Referenced Entity</em>'
-	 * reference isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Attribute Name Referenced Entity</em>'
-	 *         reference.
-	 * @see #setAttributeNameReferencedEntity(DTDEntity)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDAttribute_AttributeNameReferencedEntity()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getAttributeNameReference
-	 * @model opposite="attributeNameReference"
-	 * @generated
-	 */
-	DTDEntity getAttributeNameReferencedEntity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getAttributeNameReferencedEntity <em>Attribute Name Referenced Entity</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Attribute Name Referenced Entity</em>'
-	 *            reference.
-	 * @see #getAttributeNameReferencedEntity()
-	 * @generated
-	 */
-	void setAttributeNameReferencedEntity(DTDEntity value);
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Type Referenced Entity</b></em>'
-	 * reference. It is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getAttributeTypeReference <em>Attribute Type Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute Type Referenced Entity</em>'
-	 * reference isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Attribute Type Referenced Entity</em>'
-	 *         reference.
-	 * @see #setAttributeTypeReferencedEntity(DTDEntity)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDAttribute_AttributeTypeReferencedEntity()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getAttributeTypeReference
-	 * @model opposite="attributeTypeReference"
-	 * @generated
-	 */
-	DTDEntity getAttributeTypeReferencedEntity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getAttributeTypeReferencedEntity <em>Attribute Type Referenced Entity</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Attribute Type Referenced Entity</em>'
-	 *            reference.
-	 * @see #getAttributeTypeReferencedEntity()
-	 * @generated
-	 */
-	void setAttributeTypeReferencedEntity(DTDEntity value);
-
-	/**
-	 * Returns the value of the '<em><b>DTD Element</b></em>' container
-	 * reference. It is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElement#getDTDAttribute <em>DTD Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>DTD Element</em>' container reference
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>DTD Element</em>' container
-	 *         reference.
-	 * @see #setDTDElement(DTDElement)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDAttribute_DTDElement()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDElement#getDTDAttribute
-	 * @model opposite="DTDAttribute"
-	 * @generated
-	 */
-	DTDElement getDTDElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getDTDElement <em>DTD Element</em>}'
-	 * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>DTD Element</em>' container
-	 *            reference.
-	 * @see #getDTDElement()
-	 * @generated
-	 */
-	void setDTDElement(DTDElement value);
-
-} // DTDAttribute
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDBasicType.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDBasicType.java
deleted file mode 100644
index 6d9985f..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDBasicType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Basic Type</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDBasicType#getKind <em>Kind</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDBasicType()
- * @model
- * @generated
- */
-public interface DTDBasicType extends EClass, DTDType {
-	// NON-GEN interfaces DTDType
-
-	public String getTypeDescription();
-
-	/**
-	 * Returns the value of the '<em><b>Kind</b></em>' attribute. The
-	 * literals are from the enumeration
-	 * {@link org.eclipse.wst.dtd.core.internal.emf.DTDBasicTypeKind}. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Kind</em>' attribute isn't clear, there
-	 * really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Kind</em>' attribute.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDBasicTypeKind
-	 * @see #setKind(DTDBasicTypeKind)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDBasicType_Kind()
-	 * @model
-	 * @generated
-	 */
-	DTDBasicTypeKind getKind();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDBasicType#getKind <em>Kind</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Kind</em>' attribute.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDBasicTypeKind
-	 * @see #getKind()
-	 * @generated
-	 */
-	void setKind(DTDBasicTypeKind value);
-} // DTDBasicType
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDBasicTypeKind.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDBasicTypeKind.java
deleted file mode 100644
index 1e82140..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDBasicTypeKind.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Basic Type Kind</b></em>',
- * and utility methods for working with them. <!-- end-user-doc -->
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDBasicTypeKind()
- * @model
- * @generated
- */
-public final class DTDBasicTypeKind extends AbstractEnumerator {
-	/**
-	 * The '<em><b>NONE</b></em>' literal value. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #NONE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NONE = 0;
-
-	/**
-	 * The '<em><b>CDATA</b></em>' literal value. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #CDATA_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CDATA = 1;
-
-	/**
-	 * The '<em><b>ID</b></em>' literal value. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #ID_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ID = 2;
-
-	/**
-	 * The '<em><b>IDREF</b></em>' literal value. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #IDREF_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IDREF = 3;
-
-	/**
-	 * The '<em><b>IDREFS</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #IDREFS_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IDREFS = 4;
-
-	/**
-	 * The '<em><b>ENTITY</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #ENTITY_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ENTITY = 5;
-
-	/**
-	 * The '<em><b>ENTITIES</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #ENTITIES_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ENTITIES = 6;
-
-	/**
-	 * The '<em><b>NMTOKEN</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #NMTOKEN_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NMTOKEN = 7;
-
-	/**
-	 * The '<em><b>NMTOKENS</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #NMTOKENS_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NMTOKENS = 8;
-
-	/**
-	 * The '<em><b>NONE</b></em>' literal object. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #NONE
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDBasicTypeKind NONE_LITERAL = new DTDBasicTypeKind(NONE, "NONE"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>CDATA</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>CDATA</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #CDATA
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDBasicTypeKind CDATA_LITERAL = new DTDBasicTypeKind(CDATA, "CDATA"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>ID</b></em>' literal object. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ID</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #ID
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDBasicTypeKind ID_LITERAL = new DTDBasicTypeKind(ID, "ID"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>IDREF</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>IDREF</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #IDREF
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDBasicTypeKind IDREF_LITERAL = new DTDBasicTypeKind(IDREF, "IDREF"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>IDREFS</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>IDREFS</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #IDREFS
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDBasicTypeKind IDREFS_LITERAL = new DTDBasicTypeKind(IDREFS, "IDREFS"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>ENTITY</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>ENTITY</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #ENTITY
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDBasicTypeKind ENTITY_LITERAL = new DTDBasicTypeKind(ENTITY, "ENTITY"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>ENTITIES</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>ENTITIES</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #ENTITIES
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDBasicTypeKind ENTITIES_LITERAL = new DTDBasicTypeKind(ENTITIES, "ENTITIES"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>NMTOKEN</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>NMTOKEN</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #NMTOKEN
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDBasicTypeKind NMTOKEN_LITERAL = new DTDBasicTypeKind(NMTOKEN, "NMTOKEN"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>NMTOKENS</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>NMTOKENS</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #NMTOKENS
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDBasicTypeKind NMTOKENS_LITERAL = new DTDBasicTypeKind(NMTOKENS, "NMTOKENS"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Basic Type Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private static final DTDBasicTypeKind[] VALUES_ARRAY = new DTDBasicTypeKind[]{NONE_LITERAL, CDATA_LITERAL, ID_LITERAL, IDREF_LITERAL, IDREFS_LITERAL, ENTITY_LITERAL, ENTITIES_LITERAL, NMTOKEN_LITERAL, NMTOKENS_LITERAL,};
-
-	/**
-	 * A public read-only list of all the '<em><b>Basic Type Kind</b></em>'
-	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Basic Type Kind</b></em>' literal with the
-	 * specified name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static DTDBasicTypeKind get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			DTDBasicTypeKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Basic Type Kind</b></em>' literal with the
-	 * specified value. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static DTDBasicTypeKind get(int value) {
-		switch (value) {
-			case NONE :
-				return NONE_LITERAL;
-			case CDATA :
-				return CDATA_LITERAL;
-			case ID :
-				return ID_LITERAL;
-			case IDREF :
-				return IDREF_LITERAL;
-			case IDREFS :
-				return IDREFS_LITERAL;
-			case ENTITY :
-				return ENTITY_LITERAL;
-			case ENTITIES :
-				return ENTITIES_LITERAL;
-			case NMTOKEN :
-				return NMTOKEN_LITERAL;
-			case NMTOKENS :
-				return NMTOKENS_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private DTDBasicTypeKind(int value, String name) {
-		super(value, name);
-	}
-
-} // DTDBasicTypeKind
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDConstants.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDConstants.java
deleted file mode 100644
index 5a1a9a2..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDConstants.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf;
-
-public class DTDConstants {
-	public static String DTD_ERROR_LINE_PREFIX = "<!--ERROR "; //$NON-NLS-1$
-	public static String DTD_ERROR_LINE_SUFFIX = " -->"; //$NON-NLS-1$
-	public static final String DTD_EXTENSION = "dtd"; //$NON-NLS-1$
-	public static final String XML_EXTENSION = "xml"; //$NON-NLS-1$
-	public static final String XMI_EXTENSION = "xmi"; //$NON-NLS-1$
-	public static final String DTD_XMI_EXTENSION = "dtd.xmi"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDContent.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDContent.java
deleted file mode 100644
index a773bcc..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDContent.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Content</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDContent#getDTDFile <em>DTD File</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDContent()
- * @model abstract="true"
- * @generated
- */
-public interface DTDContent extends EObject {
-	/**
-	 * Returns the value of the '<em><b>DTD File</b></em>' container
-	 * reference. It is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDFile#getDTDContent <em>DTD Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>DTD File</em>' container reference isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>DTD File</em>' container reference.
-	 * @see #setDTDFile(DTDFile)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDContent_DTDFile()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDFile#getDTDContent
-	 * @model opposite="DTDContent"
-	 * @generated
-	 */
-	DTDFile getDTDFile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDContent#getDTDFile <em>DTD File</em>}'
-	 * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>DTD File</em>' container
-	 *            reference.
-	 * @see #getDTDFile()
-	 * @generated
-	 */
-	void setDTDFile(DTDFile value);
-
-} // DTDContent
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDDefaultKind.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDDefaultKind.java
deleted file mode 100644
index 0f6378c..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDDefaultKind.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Default Kind</b></em>',
- * and utility methods for working with them. <!-- end-user-doc -->
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDDefaultKind()
- * @model
- * @generated
- */
-public final class DTDDefaultKind extends AbstractEnumerator {
-	/**
-	 * The '<em><b>IMPLIED</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #IMPLIED_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPLIED = 1;
-
-	/**
-	 * The '<em><b>REQUIRED</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #REQUIRED_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REQUIRED = 2;
-
-	/**
-	 * The '<em><b>FIXED</b></em>' literal value. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #FIXED_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FIXED = 3;
-
-	/**
-	 * The '<em><b>NOFIXED</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #NOFIXED_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NOFIXED = 4;
-
-	/**
-	 * The '<em><b>IMPLIED</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>IMPLIED</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #IMPLIED
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDDefaultKind IMPLIED_LITERAL = new DTDDefaultKind(IMPLIED, "IMPLIED"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>REQUIRED</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>REQUIRED</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #REQUIRED
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDDefaultKind REQUIRED_LITERAL = new DTDDefaultKind(REQUIRED, "REQUIRED"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>FIXED</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>FIXED</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #FIXED
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDDefaultKind FIXED_LITERAL = new DTDDefaultKind(FIXED, "FIXED"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>NOFIXED</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>NOFIXED</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #NOFIXED
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDDefaultKind NOFIXED_LITERAL = new DTDDefaultKind(NOFIXED, "NOFIXED"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Default Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private static final DTDDefaultKind[] VALUES_ARRAY = new DTDDefaultKind[]{IMPLIED_LITERAL, REQUIRED_LITERAL, FIXED_LITERAL, NOFIXED_LITERAL,};
-
-	/**
-	 * A public read-only list of all the '<em><b>Default Kind</b></em>'
-	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Default Kind</b></em>' literal with the
-	 * specified name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static DTDDefaultKind get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			DTDDefaultKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Default Kind</b></em>' literal with the
-	 * specified value. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static DTDDefaultKind get(int value) {
-		switch (value) {
-			case IMPLIED :
-				return IMPLIED_LITERAL;
-			case REQUIRED :
-				return REQUIRED_LITERAL;
-			case FIXED :
-				return FIXED_LITERAL;
-			case NOFIXED :
-				return NOFIXED_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private DTDDefaultKind(int value, String name) {
-		super(value, name);
-	}
-
-} // DTDDefaultKind
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDElement.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDElement.java
deleted file mode 100644
index 4222ef5..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDElement.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Element</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDElement#getComment <em>Comment</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDElement#getContent <em>Content</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDElement#getDTDAttribute <em>DTD Attribute</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDElement()
- * @model
- * @generated
- */
-public interface DTDElement extends EClass, DTDContent, DTDObject, DTDSourceOffset {
-
-	public void addDTDAttribute(DTDAttribute attribute);
-
-	// returns all references in the same DTDFile that reference this element
-	public Collection getReferences();
-
-	// return a brief string listing the attributes
-	public String getAttributeDetail();
-
-	/**
-	 * Returns the value of the '<em><b>Comment</b></em>' attribute. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Comment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Comment</em>' attribute.
-	 * @see #setComment(String)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDElement_Comment()
-	 * @model
-	 * @generated
-	 */
-	String getComment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElement#getComment <em>Comment</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Comment</em>' attribute.
-	 * @see #getComment()
-	 * @generated
-	 */
-	void setComment(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Content</b></em>' containment
-	 * reference. It is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElementContent#getElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Content</em>' containment reference
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Content</em>' containment reference.
-	 * @see #setContent(DTDElementContent)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDElement_Content()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDElementContent#getElement
-	 * @model opposite="element" containment="true" required="true"
-	 * @generated
-	 */
-	DTDElementContent getContent();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElement#getContent <em>Content</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Content</em>' containment
-	 *            reference.
-	 * @see #getContent()
-	 * @generated
-	 */
-	void setContent(DTDElementContent value);
-
-	/**
-	 * Returns the value of the '<em><b>DTD Attribute</b></em>'
-	 * containment reference list. The list contents are of type
-	 * {@link DTDAttribute}. It is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getDTDElement <em>DTD Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>DTD Attribute</em>' containment
-	 * reference list isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>DTD Attribute</em>' containment
-	 *         reference list.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDElement_DTDAttribute()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getDTDElement
-	 * @model type="DTDAttribute" opposite="DTDElement" containment="true"
-	 * @generated
-	 */
-	EList getDTDAttribute();
-
-} // DTDElement
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDElementContent.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDElementContent.java
deleted file mode 100644
index 10ce4fc..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDElementContent.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Element Content</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDElementContent#getGroup <em>Group</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDElementContent#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDElementContent()
- * @model abstract="true"
- * @generated
- */
-public interface DTDElementContent extends EObject, DTDObject, DTDSourceOffset {
-
-	// for showing names to be used in the tree
-	public String getContentName();
-
-	// for showing items in the table
-	public String getContentDetail();
-
-	public DTDElement getDTDElement();
-
-	// get the most outer DTDGroupContent
-	public DTDGroupContent getDTDGroupContent();
-
-	// returns true if this element content is the first
-	// in the element
-	// eg <!ELEMENT blah firstElement>
-	// <!ELEMENT blah ((firstElement, secondElement) | lastElement)
-	public boolean isFirstElementContent();
-
-	/**
-	 * Returns the value of the '<em><b>Group</b></em>' container
-	 * reference. It is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent#getContent <em>Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group</em>' container reference isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Group</em>' container reference.
-	 * @see #setGroup(DTDGroupContent)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDElementContent_Group()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent#getContent
-	 * @model opposite="content"
-	 * @generated
-	 */
-	DTDGroupContent getGroup();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElementContent#getGroup <em>Group</em>}'
-	 * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Group</em>' container
-	 *            reference.
-	 * @see #getGroup()
-	 * @generated
-	 */
-	void setGroup(DTDGroupContent value);
-
-	/**
-	 * Returns the value of the '<em><b>Element</b></em>' container
-	 * reference. It is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElement#getContent <em>Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Element</em>' container reference isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Element</em>' container reference.
-	 * @see #setElement(DTDElement)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDElementContent_Element()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDElement#getContent
-	 * @model opposite="content"
-	 * @generated
-	 */
-	DTDElement getElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElementContent#getElement <em>Element</em>}'
-	 * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Element</em>' container
-	 *            reference.
-	 * @see #getElement()
-	 * @generated
-	 */
-	void setElement(DTDElement value);
-
-} // DTDElementContent
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDElementReferenceContent.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDElementReferenceContent.java
deleted file mode 100644
index daeb25c..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDElementReferenceContent.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Element Reference Content</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent#getReferencedElement <em>Referenced Element</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDElementReferenceContent()
- * @model
- * @generated
- */
-public interface DTDElementReferenceContent extends DTDRepeatableContent {
-	/**
-	 * Returns the value of the '<em><b>Referenced Element</b></em>'
-	 * reference. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Referenced Element</em>' reference isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Referenced Element</em>' reference.
-	 * @see #setReferencedElement(DTDElement)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDElementReferenceContent_ReferencedElement()
-	 * @model required="true"
-	 * @generated
-	 */
-	DTDElement getReferencedElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent#getReferencedElement <em>Referenced Element</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Referenced Element</em>'
-	 *            reference.
-	 * @see #getReferencedElement()
-	 * @generated
-	 */
-	void setReferencedElement(DTDElement value);
-
-} // DTDElementReferenceContent
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEmptyContent.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEmptyContent.java
deleted file mode 100644
index 4f0d5c7..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEmptyContent.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Empty Content</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEmptyContent()
- * @model
- * @generated
- */
-public interface DTDEmptyContent extends DTDElementContent {
-} // DTDEmptyContent
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEntity.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEntity.java
deleted file mode 100644
index bcfc742..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEntity.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.ENamedElement;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Entity</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getComment <em>Comment</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#isParameterEntity <em>Parameter Entity</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getContent <em>Content</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getParmEntityRef <em>Parm Entity Ref</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getEntityReference <em>Entity Reference</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getAttributeNameReference <em>Attribute Name Reference</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getAttributeTypeReference <em>Attribute Type Reference</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEntity()
- * @model
- * @generated
- */
-public interface DTDEntity extends ENamedElement, DTDContent, DTDObject, DTDSourceOffset {
-	/**
-	 * Returns the value of the '<em><b>Comment</b></em>' attribute. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Comment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Comment</em>' attribute.
-	 * @see #setComment(String)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEntity_Comment()
-	 * @model
-	 * @generated
-	 */
-	String getComment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getComment <em>Comment</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Comment</em>' attribute.
-	 * @see #getComment()
-	 * @generated
-	 */
-	void setComment(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Parameter Entity</b></em>'
-	 * attribute. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parameter Entity</em>' attribute isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Parameter Entity</em>' attribute.
-	 * @see #setParameterEntity(boolean)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEntity_ParameterEntity()
-	 * @model
-	 * @generated
-	 */
-	boolean isParameterEntity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#isParameterEntity <em>Parameter Entity</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Parameter Entity</em>'
-	 *            attribute.
-	 * @see #isParameterEntity()
-	 * @generated
-	 */
-	void setParameterEntity(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Content</b></em>' containment
-	 * reference. It is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntityContent#getDTDEntity <em>DTD Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Content</em>' containment reference
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Content</em>' containment reference.
-	 * @see #setContent(DTDEntityContent)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEntity_Content()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntityContent#getDTDEntity
-	 * @model opposite="DTDEntity" containment="true" required="true"
-	 * @generated
-	 */
-	DTDEntityContent getContent();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getContent <em>Content</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Content</em>' containment
-	 *            reference.
-	 * @see #getContent()
-	 * @generated
-	 */
-	void setContent(DTDEntityContent value);
-
-	/**
-	 * Returns the value of the '<em><b>Parm Entity Ref</b></em>'
-	 * reference. It is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference#getEntity <em>Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parm Entity Ref</em>' reference isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Parm Entity Ref</em>' reference.
-	 * @see #setParmEntityRef(DTDParameterEntityReference)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEntity_ParmEntityRef()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference#getEntity
-	 * @model opposite="entity" required="true"
-	 * @generated
-	 */
-	DTDParameterEntityReference getParmEntityRef();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getParmEntityRef <em>Parm Entity Ref</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Parm Entity Ref</em>'
-	 *            reference.
-	 * @see #getParmEntityRef()
-	 * @generated
-	 */
-	void setParmEntityRef(DTDParameterEntityReference value);
-
-	/**
-	 * Returns the value of the '<em><b>Entity Reference</b></em>'
-	 * reference list. The list contents are of type
-	 * {@link DTDEntityReferenceContent}. It is bidirectional and its
-	 * opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent#getElementReferencedEntity <em>Element Referenced Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Entity Reference</em>' reference list
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Entity Reference</em>' reference
-	 *         list.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEntity_EntityReference()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent#getElementReferencedEntity
-	 * @model type="DTDEntityReferenceContent"
-	 *        opposite="elementReferencedEntity"
-	 * @generated
-	 */
-	EList getEntityReference();
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Name Reference</b></em>'
-	 * reference list. The list contents are of type {@link DTDAttribute}. It
-	 * is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getAttributeNameReferencedEntity <em>Attribute Name Referenced Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute Name Reference</em>' reference
-	 * list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Attribute Name Reference</em>'
-	 *         reference list.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEntity_AttributeNameReference()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getAttributeNameReferencedEntity
-	 * @model type="DTDAttribute" opposite="attributeNameReferencedEntity"
-	 * @generated
-	 */
-	EList getAttributeNameReference();
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Type Reference</b></em>'
-	 * reference list. The list contents are of type {@link DTDAttribute}. It
-	 * is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getAttributeTypeReferencedEntity <em>Attribute Type Referenced Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute Type Reference</em>' reference
-	 * list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Attribute Type Reference</em>'
-	 *         reference list.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEntity_AttributeTypeReference()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getAttributeTypeReferencedEntity
-	 * @model type="DTDAttribute" opposite="attributeTypeReferencedEntity"
-	 * @generated
-	 */
-	EList getAttributeTypeReference();
-
-} // DTDEntity
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEntityContent.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEntityContent.java
deleted file mode 100644
index de4c2b1..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEntityContent.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Entity Content</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntityContent#getDTDEntity <em>DTD Entity</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEntityContent()
- * @model abstract="true"
- * @generated
- */
-public interface DTDEntityContent extends EObject, DTDObject {
-
-	public String unparse();
-
-	/**
-	 * Returns the value of the '<em><b>DTD Entity</b></em>' container
-	 * reference. It is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getContent <em>Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>DTD Entity</em>' container reference
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>DTD Entity</em>' container reference.
-	 * @see #setDTDEntity(DTDEntity)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEntityContent_DTDEntity()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getContent
-	 * @model opposite="content"
-	 * @generated
-	 */
-	DTDEntity getDTDEntity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntityContent#getDTDEntity <em>DTD Entity</em>}'
-	 * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>DTD Entity</em>' container
-	 *            reference.
-	 * @see #getDTDEntity()
-	 * @generated
-	 */
-	void setDTDEntity(DTDEntity value);
-
-} // DTDEntityContent
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEntityReferenceContent.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEntityReferenceContent.java
deleted file mode 100644
index 8d4ab91..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEntityReferenceContent.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Entity Reference Content</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent#getElementReferencedEntity <em>Element Referenced Entity</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEntityReferenceContent()
- * @model
- * @generated
- */
-public interface DTDEntityReferenceContent extends DTDRepeatableContent {
-
-	/**
-	 * Returns the value of the '<em><b>Element Referenced Entity</b></em>'
-	 * reference. It is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getEntityReference <em>Entity Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Element Referenced Entity</em>'
-	 * reference isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Element Referenced Entity</em>'
-	 *         reference.
-	 * @see #setElementReferencedEntity(DTDEntity)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEntityReferenceContent_ElementReferencedEntity()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getEntityReference
-	 * @model opposite="entityReference" required="true"
-	 * @generated
-	 */
-	DTDEntity getElementReferencedEntity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent#getElementReferencedEntity <em>Element Referenced Entity</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Element Referenced Entity</em>'
-	 *            reference.
-	 * @see #getElementReferencedEntity()
-	 * @generated
-	 */
-	void setElementReferencedEntity(DTDEntity value);
-
-} // DTDEntityReferenceContent
-
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEnumGroupKind.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEnumGroupKind.java
deleted file mode 100644
index 7e0b8ed..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEnumGroupKind.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Enum Group Kind</b></em>',
- * and utility methods for working with them. <!-- end-user-doc -->
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEnumGroupKind()
- * @model
- * @generated
- */
-public final class DTDEnumGroupKind extends AbstractEnumerator {
-	/**
-	 * The '<em><b>NAME TOKEN GROUP</b></em>' literal value. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #NAME_TOKEN_GROUP_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NAME_TOKEN_GROUP = 1;
-
-	/**
-	 * The '<em><b>NOTATION GROUP</b></em>' literal value. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #NOTATION_GROUP_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NOTATION_GROUP = 2;
-
-	/**
-	 * The '<em><b>NAME TOKEN GROUP</b></em>' literal object. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NAME TOKEN GROUP</b></em>' literal
-	 * object isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #NAME_TOKEN_GROUP
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDEnumGroupKind NAME_TOKEN_GROUP_LITERAL = new DTDEnumGroupKind(NAME_TOKEN_GROUP, "NAME_TOKEN_GROUP"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>NOTATION GROUP</b></em>' literal object. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NOTATION GROUP</b></em>' literal object
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #NOTATION_GROUP
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDEnumGroupKind NOTATION_GROUP_LITERAL = new DTDEnumGroupKind(NOTATION_GROUP, "NOTATION_GROUP"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Enum Group Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private static final DTDEnumGroupKind[] VALUES_ARRAY = new DTDEnumGroupKind[]{NAME_TOKEN_GROUP_LITERAL, NOTATION_GROUP_LITERAL,};
-
-	/**
-	 * A public read-only list of all the '<em><b>Enum Group Kind</b></em>'
-	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Enum Group Kind</b></em>' literal with the
-	 * specified name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static DTDEnumGroupKind get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			DTDEnumGroupKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Enum Group Kind</b></em>' literal with the
-	 * specified value. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static DTDEnumGroupKind get(int value) {
-		switch (value) {
-			case NAME_TOKEN_GROUP :
-				return NAME_TOKEN_GROUP_LITERAL;
-			case NOTATION_GROUP :
-				return NOTATION_GROUP_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private DTDEnumGroupKind(int value, String name) {
-		super(value, name);
-	}
-
-} // DTDEnumGroupKind
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEnumerationType.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEnumerationType.java
deleted file mode 100644
index fd0ef4d..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEnumerationType.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EEnum;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Enumeration Type</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType#getKind <em>Kind</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType#getDTDFile <em>DTD File</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEnumerationType()
- * @model
- * @generated
- */
-public interface DTDEnumerationType extends EEnum, DTDType {
-
-	public EList getEnumLiterals();
-
-	public String getEnumerationTypeDescription();
-
-	/**
-	 * Returns the value of the '<em><b>Kind</b></em>' attribute. The
-	 * literals are from the enumeration
-	 * {@link org.eclipse.wst.dtd.core.internal.emf.DTDEnumGroupKind}. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Kind</em>' attribute isn't clear, there
-	 * really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Kind</em>' attribute.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEnumGroupKind
-	 * @see #setKind(DTDEnumGroupKind)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEnumerationType_Kind()
-	 * @model
-	 * @generated
-	 */
-	DTDEnumGroupKind getKind();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType#getKind <em>Kind</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Kind</em>' attribute.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEnumGroupKind
-	 * @see #getKind()
-	 * @generated
-	 */
-	void setKind(DTDEnumGroupKind value);
-
-	/**
-	 * Returns the value of the '<em><b>DTD File</b></em>' container
-	 * reference. It is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDFile#getDTDEnumerationType <em>DTD Enumeration Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>DTD File</em>' container reference isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>DTD File</em>' container reference.
-	 * @see #setDTDFile(DTDFile)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDEnumerationType_DTDFile()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDFile#getDTDEnumerationType
-	 * @model opposite="DTDEnumerationType"
-	 * @generated
-	 */
-	DTDFile getDTDFile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType#getDTDFile <em>DTD File</em>}'
-	 * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>DTD File</em>' container
-	 *            reference.
-	 * @see #getDTDFile()
-	 * @generated
-	 */
-	void setDTDFile(DTDFile value);
-
-} // DTDEnumerationType
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDErrorMessage.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDErrorMessage.java
deleted file mode 100644
index a815056..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDErrorMessage.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf;
-
-public class DTDErrorMessage {
-	public String errorKey;
-	public String errorMessage;
-	public String lineNo;
-	public String charOffSet;
-	public String declarationType;
-	public String declarationName;
-	public String sourceLine;
-
-
-	public DTDErrorMessage(String declarationType, String declarationName, String lineNo, String charOffSet, String errorKey, String errorMessage) {
-		this(declarationType, declarationName, lineNo, charOffSet, errorKey, errorMessage, null);
-	}
-
-	public DTDErrorMessage(String declarationType, String declarationName, String lineNo, String charOffSet, String errorKey, String errorMessage, String srcLine) {
-		this.declarationType = declarationType;
-		this.declarationName = declarationName;
-		this.lineNo = lineNo;
-		this.charOffSet = charOffSet;
-		this.errorKey = errorKey;
-		this.errorMessage = errorMessage;
-		this.sourceLine = srcLine;
-	}
-
-	public String toString() {
-		return "(" + declarationType + ":" + declarationName + ") " + lineNo + ":" + charOffSet + " " + errorMessage; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String toStringGen() {
-
-		return "(" + declarationType + ":" + declarationName + ") " + lineNo + ":" + charOffSet + " " + errorMessage; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDExtender.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDExtender.java
deleted file mode 100644
index 40f406b..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDExtender.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-/**
- * This interface can be implemented by an IDomainModel to augment
- * getElementProperty for any DTD object.
- */
-public interface DTDExtender {
-	public Object getElementProperty(DTDObject dtdObject, Object object);
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDExternalEntity.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDExternalEntity.java
deleted file mode 100644
index 3b5ca24..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDExternalEntity.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>External Entity</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getSystemID <em>System ID</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getPublicID <em>Public ID</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getNotation <em>Notation</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getEntityReferencedFromAnotherFile <em>Entity Referenced From Another File</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDExternalEntity()
- * @model
- * @generated
- */
-public interface DTDExternalEntity extends DTDEntityContent {
-
-	/**
-	 * Returns the value of the '<em><b>System ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>System ID</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>System ID</em>' attribute.
-	 * @see #setSystemID(String)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDExternalEntity_SystemID()
-	 * @model
-	 * @generated
-	 */
-	String getSystemID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getSystemID <em>System ID</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>System ID</em>' attribute.
-	 * @see #getSystemID()
-	 * @generated
-	 */
-	void setSystemID(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Public ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Public ID</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Public ID</em>' attribute.
-	 * @see #setPublicID(String)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDExternalEntity_PublicID()
-	 * @model
-	 * @generated
-	 */
-	String getPublicID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getPublicID <em>Public ID</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Public ID</em>' attribute.
-	 * @see #getPublicID()
-	 * @generated
-	 */
-	void setPublicID(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Notation</b></em>' reference. It
-	 * is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getEntity <em>Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Notation</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Notation</em>' reference.
-	 * @see #setNotation(DTDNotation)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDExternalEntity_Notation()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getEntity
-	 * @model opposite="entity"
-	 * @generated
-	 */
-	DTDNotation getNotation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getNotation <em>Notation</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Notation</em>' reference.
-	 * @see #getNotation()
-	 * @generated
-	 */
-	void setNotation(DTDNotation value);
-
-	/**
-	 * Returns the value of the '<em><b>Entity Referenced From Another File</b></em>'
-	 * reference. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Entity Referenced From Another File</em>'
-	 * reference isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Entity Referenced From Another File</em>'
-	 *         reference.
-	 * @see #setEntityReferencedFromAnotherFile(DTDFile)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDExternalEntity_EntityReferencedFromAnotherFile()
-	 * @model
-	 * @generated
-	 */
-	DTDFile getEntityReferencedFromAnotherFile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getEntityReferencedFromAnotherFile <em>Entity Referenced From Another File</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Entity Referenced From Another File</em>'
-	 *            reference.
-	 * @see #getEntityReferencedFromAnotherFile()
-	 * @generated
-	 */
-	void setEntityReferencedFromAnotherFile(DTDFile value);
-
-} // DTDExternalEntity
-
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDFactory.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDFactory.java
deleted file mode 100644
index 383d26e..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDFactory.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
- * create method for each non-abstract class of the model. <!-- end-user-doc
- * -->
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage
- * @generated
- */
-public interface DTDFactory extends EFactory {
-
-	/**
-	 * The singleton instance of the factory. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	DTDFactory eINSTANCE = new org.eclipse.wst.dtd.core.internal.emf.impl.DTDFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Group Content</em>'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>Group Content</em>'.
-	 * @generated
-	 */
-	DTDGroupContent createDTDGroupContent();
-
-	/**
-	 * Returns a new object of class '<em>Attribute</em>'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>Attribute</em>'.
-	 * @generated
-	 */
-	DTDAttribute createDTDAttribute();
-
-	/**
-	 * Returns a new object of class '<em>Element</em>'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>Element</em>'.
-	 * @generated
-	 */
-	DTDElement createDTDElement();
-
-	/**
-	 * Returns a new object of class '<em>Empty Content</em>'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>Empty Content</em>'.
-	 * @generated
-	 */
-	DTDEmptyContent createDTDEmptyContent();
-
-	/**
-	 * Returns a new object of class '<em>Any Content</em>'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>Any Content</em>'.
-	 * @generated
-	 */
-	DTDAnyContent createDTDAnyContent();
-
-	/**
-	 * Returns a new object of class '<em>PC Data Content</em>'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>PC Data Content</em>'.
-	 * @generated
-	 */
-	DTDPCDataContent createDTDPCDataContent();
-
-	/**
-	 * Returns a new object of class '<em>Element Reference Content</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>Element Reference Content</em>'.
-	 * @generated
-	 */
-	DTDElementReferenceContent createDTDElementReferenceContent();
-
-	/**
-	 * Returns a new object of class '<em>File</em>'. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>File</em>'.
-	 * @generated
-	 */
-	DTDFile createDTDFile();
-
-	/**
-	 * Returns a new object of class '<em>Basic Type</em>'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>Basic Type</em>'.
-	 * @generated
-	 */
-	DTDBasicType createDTDBasicType();
-
-	/**
-	 * Returns a new object of class '<em>Enumeration Type</em>'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>Enumeration Type</em>'.
-	 * @generated
-	 */
-	DTDEnumerationType createDTDEnumerationType();
-
-	/**
-	 * Returns a new object of class '<em>Notation</em>'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>Notation</em>'.
-	 * @generated
-	 */
-	DTDNotation createDTDNotation();
-
-	/**
-	 * Returns a new object of class '<em>Entity</em>'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>Entity</em>'.
-	 * @generated
-	 */
-	DTDEntity createDTDEntity();
-
-	/**
-	 * Returns a new object of class '<em>External Entity</em>'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>External Entity</em>'.
-	 * @generated
-	 */
-	DTDExternalEntity createDTDExternalEntity();
-
-	/**
-	 * Returns a new object of class '<em>Internal Entity</em>'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>Internal Entity</em>'.
-	 * @generated
-	 */
-	DTDInternalEntity createDTDInternalEntity();
-
-	/**
-	 * Returns a new object of class '<em>Parameter Entity Reference</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>Parameter Entity Reference</em>'.
-	 * @generated
-	 */
-	DTDParameterEntityReference createDTDParameterEntityReference();
-
-	/**
-	 * Returns a new object of class '<em>Entity Reference Content</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return a new object of class '<em>Entity Reference Content</em>'.
-	 * @generated
-	 */
-	DTDEntityReferenceContent createDTDEntityReferenceContent();
-
-	/**
-	 * Returns the package supported by this factory. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	DTDPackage getDTDPackage();
-
-} // DTDFactory
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDFile.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDFile.java
deleted file mode 100644
index 923c372..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDFile.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.ENamedElement;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>File</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDFile#getComment <em>Comment</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDFile#isParseError <em>Parse Error</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDFile#getDTDContent <em>DTD Content</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDFile#getDTDEnumerationType <em>DTD Enumeration Type</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDFile()
- * @model
- * @generated
- */
-public interface DTDFile extends ENamedElement, DTDObject {
-
-	public EList getDTDObject();
-
-	public List listDTDElement();
-
-	public List listDTDNotation();
-
-	public List listDTDEntity();
-
-	public List listDTDParameterEntityReference();
-
-	public List listDTDElementAndDTDParameterEntityReference();
-
-	public DTDElement findElement(String name);
-
-	public DTDEntity findEntity(String name);
-
-	public DTDNotation findNotation(String name);
-
-	public DTDParameterEntityReference findParameterEntityReference(String name);
-
-	public String unparse(boolean includeError);
-
-	/**
-	 * Returns the value of the '<em><b>Comment</b></em>' attribute. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Comment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Comment</em>' attribute.
-	 * @see #setComment(String)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDFile_Comment()
-	 * @model
-	 * @generated
-	 */
-	String getComment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDFile#getComment <em>Comment</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Comment</em>' attribute.
-	 * @see #getComment()
-	 * @generated
-	 */
-	void setComment(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Parse Error</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parse Error</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Parse Error</em>' attribute.
-	 * @see #setParseError(boolean)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDFile_ParseError()
-	 * @model
-	 * @generated
-	 */
-	boolean isParseError();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDFile#isParseError <em>Parse Error</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Parse Error</em>' attribute.
-	 * @see #isParseError()
-	 * @generated
-	 */
-	void setParseError(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>DTD Content</b></em>' containment
-	 * reference list. The list contents are of type {@link DTDContent}. It
-	 * is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDContent#getDTDFile <em>DTD File</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>DTD Content</em>' containment reference
-	 * list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>DTD Content</em>' containment
-	 *         reference list.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDFile_DTDContent()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDContent#getDTDFile
-	 * @model type="DTDContent" opposite="DTDFile" containment="true"
-	 * @generated
-	 */
-	EList getDTDContent();
-
-	/**
-	 * Returns the value of the '<em><b>DTD Enumeration Type</b></em>'
-	 * containment reference list. The list contents are of type
-	 * {@link DTDEnumerationType}. It is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType#getDTDFile <em>DTD File</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>DTD Enumeration Type</em>' containment
-	 * reference list isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>DTD Enumeration Type</em>'
-	 *         containment reference list.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDFile_DTDEnumerationType()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType#getDTDFile
-	 * @model type="DTDEnumerationType" opposite="DTDFile" containment="true"
-	 * @generated
-	 */
-	EList getDTDEnumerationType();
-
-} // DTDFile
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDGroupContent.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDGroupContent.java
deleted file mode 100644
index 06247d3..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDGroupContent.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Group Content</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent#getGroupKind <em>Group Kind</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent#getContent <em>Content</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDGroupContent()
- * @model
- * @generated
- */
-public interface DTDGroupContent extends DTDRepeatableContent {
-
-	public int getContentPosition(DTDElementContent content);
-
-	/**
-	 * Returns the value of the '<em><b>Group Kind</b></em>' attribute.
-	 * The literals are from the enumeration
-	 * {@link org.eclipse.wst.dtd.core.internal.emf.DTDGroupKind}. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of the '<em>Group Kind</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Group Kind</em>' attribute.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDGroupKind
-	 * @see #setGroupKind(DTDGroupKind)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDGroupContent_GroupKind()
-	 * @model
-	 * @generated
-	 */
-	DTDGroupKind getGroupKind();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent#getGroupKind <em>Group Kind</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Group Kind</em>' attribute.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDGroupKind
-	 * @see #getGroupKind()
-	 * @generated
-	 */
-	void setGroupKind(DTDGroupKind value);
-
-	/**
-	 * Returns the value of the '<em><b>Content</b></em>' containment
-	 * reference list. The list contents are of type {@link DTDElementContent}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElementContent#getGroup <em>Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Content</em>' containment reference list
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Content</em>' containment reference
-	 *         list.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDGroupContent_Content()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDElementContent#getGroup
-	 * @model type="DTDElementContent" opposite="group" containment="true"
-	 *        required="true"
-	 * @generated
-	 */
-	EList getContent();
-
-} // DTDGroupContent
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDGroupKind.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDGroupKind.java
deleted file mode 100644
index fb10de0..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDGroupKind.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Group Kind</b></em>',
- * and utility methods for working with them. <!-- end-user-doc -->
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDGroupKind()
- * @model
- * @generated
- */
-public final class DTDGroupKind extends AbstractEnumerator {
-	/**
-	 * The '<em><b>SEQUENCE</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #SEQUENCE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SEQUENCE = 1;
-
-	/**
-	 * The '<em><b>CHOICE</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #CHOICE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CHOICE = 2;
-
-	/**
-	 * The '<em><b>SEQUENCE</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>SEQUENCE</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #SEQUENCE
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDGroupKind SEQUENCE_LITERAL = new DTDGroupKind(SEQUENCE, "SEQUENCE"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>CHOICE</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>CHOICE</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #CHOICE
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDGroupKind CHOICE_LITERAL = new DTDGroupKind(CHOICE, "CHOICE"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Group Kind</b></em>' enumerators. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private static final DTDGroupKind[] VALUES_ARRAY = new DTDGroupKind[]{SEQUENCE_LITERAL, CHOICE_LITERAL,};
-
-	/**
-	 * A public read-only list of all the '<em><b>Group Kind</b></em>'
-	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Group Kind</b></em>' literal with the
-	 * specified name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static DTDGroupKind get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			DTDGroupKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Group Kind</b></em>' literal with the
-	 * specified value. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static DTDGroupKind get(int value) {
-		switch (value) {
-			case SEQUENCE :
-				return SEQUENCE_LITERAL;
-			case CHOICE :
-				return CHOICE_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private DTDGroupKind(int value, String name) {
-		super(value, name);
-	}
-
-} // DTDGroupKind
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDInternalEntity.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDInternalEntity.java
deleted file mode 100644
index a184a13..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDInternalEntity.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Internal Entity</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDInternalEntity#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDInternalEntity()
- * @model
- * @generated
- */
-public interface DTDInternalEntity extends DTDEntityContent {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there
-	 * really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDInternalEntity_Value()
-	 * @model
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDInternalEntity#getValue <em>Value</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-} // DTDInternalEntity
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDLexicalInfo.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDLexicalInfo.java
deleted file mode 100644
index 392d23c..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDLexicalInfo.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-public class DTDLexicalInfo implements DTDSourceOffset {
-	// Begin User Defined Methods
-	int startOffset;
-	int endOffset;
-
-	/**
-	 * Get the value of startOffset.
-	 * 
-	 * @return value of startOffset.
-	 */
-	public int getStartOffset() {
-		return startOffset;
-	}
-
-	/**
-	 * Set the value of startOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to startOffset.
-	 */
-	public void setStartOffset(int v) {
-		this.startOffset = v;
-	}
-
-	/**
-	 * Get the value of endOffset.
-	 * 
-	 * @return value of endOffset.
-	 */
-	public int getEndOffset() {
-		return endOffset;
-	}
-
-	/**
-	 * Set the value of endOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to endOffset.
-	 */
-	public void setEndOffset(int v) {
-
-		this.endOffset = v;
-	}
-
-	/**
-	 * Get the value of startOffset.
-	 * 
-	 * @return value of startOffset.
-	 */
-	protected int getStartOffsetGen() {
-
-		return startOffset;
-	}
-
-	/**
-	 * Set the value of startOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to startOffset.
-	 */
-	protected void setStartOffsetGen(int v) {
-
-		this.startOffset = v;
-	}
-
-	/**
-	 * Get the value of endOffset.
-	 * 
-	 * @return value of endOffset.
-	 */
-	protected int getEndOffsetGen() {
-
-		return endOffset;
-	}
-
-	/**
-	 * Set the value of endOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to endOffset.
-	 */
-	protected void setEndOffsetGen(int v) {
-
-
-		this.endOffset = v;
-	}
-}// DTDSourceOffset
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDNotation.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDNotation.java
deleted file mode 100644
index 8d23e2f..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDNotation.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.ENamedElement;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Notation</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getComment <em>Comment</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getSystemID <em>System ID</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getPublicID <em>Public ID</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getEntity <em>Entity</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDNotation()
- * @model
- * @generated
- */
-public interface DTDNotation extends ENamedElement, DTDContent, DTDObject, DTDSourceOffset {
-
-	/**
-	 * Returns the value of the '<em><b>Comment</b></em>' attribute. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Comment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Comment</em>' attribute.
-	 * @see #setComment(String)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDNotation_Comment()
-	 * @model
-	 * @generated
-	 */
-	String getComment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getComment <em>Comment</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Comment</em>' attribute.
-	 * @see #getComment()
-	 * @generated
-	 */
-	void setComment(String value);
-
-	/**
-	 * Returns the value of the '<em><b>System ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>System ID</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>System ID</em>' attribute.
-	 * @see #setSystemID(String)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDNotation_SystemID()
-	 * @model
-	 * @generated
-	 */
-	String getSystemID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getSystemID <em>System ID</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>System ID</em>' attribute.
-	 * @see #getSystemID()
-	 * @generated
-	 */
-	void setSystemID(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Public ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Public ID</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Public ID</em>' attribute.
-	 * @see #setPublicID(String)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDNotation_PublicID()
-	 * @model
-	 * @generated
-	 */
-	String getPublicID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getPublicID <em>Public ID</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Public ID</em>' attribute.
-	 * @see #getPublicID()
-	 * @generated
-	 */
-	void setPublicID(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Entity</b></em>' reference list.
-	 * The list contents are of type {@link DTDExternalEntity}. It is
-	 * bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getNotation <em>Notation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Entity</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Entity</em>' reference list.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDNotation_Entity()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getNotation
-	 * @model type="DTDExternalEntity" opposite="notation"
-	 * @generated
-	 */
-	EList getEntity();
-
-} // DTDNotation
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDObject.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDObject.java
deleted file mode 100644
index 68384ba..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDObject.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-// Ref package
-import org.eclipse.emf.ecore.EObject;
-
-public interface DTDObject extends EObject {
-	public String getPathname();
-
-	public DTDObject findObject(String relativePath);
-
-} // DTDObject
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDOccurrenceType.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDOccurrenceType.java
deleted file mode 100644
index 4439aa105..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDOccurrenceType.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Occurrence Type</b></em>',
- * and utility methods for working with them. <!-- end-user-doc -->
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDOccurrenceType()
- * @model
- * @generated
- */
-public final class DTDOccurrenceType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>ONE</b></em>' literal value. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #ONE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ONE = 49;
-
-	/**
-	 * The '<em><b>OPTIONAL</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #OPTIONAL_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OPTIONAL = 63;
-
-	/**
-	 * The '<em><b>ONE OR MORE</b></em>' literal value. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #ONE_OR_MORE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ONE_OR_MORE = 43;
-
-	/**
-	 * The '<em><b>ZERO OR MORE</b></em>' literal value. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #ZERO_OR_MORE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ZERO_OR_MORE = 42;
-
-	/**
-	 * The '<em><b>ONE</b></em>' literal object. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ONE</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #ONE
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDOccurrenceType ONE_LITERAL = new DTDOccurrenceType(ONE, "ONE"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>OPTIONAL</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>OPTIONAL</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #OPTIONAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDOccurrenceType OPTIONAL_LITERAL = new DTDOccurrenceType(OPTIONAL, "OPTIONAL"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>ONE OR MORE</b></em>' literal object. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ONE OR MORE</b></em>' literal object
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #ONE_OR_MORE
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDOccurrenceType ONE_OR_MORE_LITERAL = new DTDOccurrenceType(ONE_OR_MORE, "ONE_OR_MORE"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>ZERO OR MORE</b></em>' literal object. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ZERO OR MORE</b></em>' literal object
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #ZERO_OR_MORE
-	 * @generated
-	 * @ordered
-	 */
-	public static final DTDOccurrenceType ZERO_OR_MORE_LITERAL = new DTDOccurrenceType(ZERO_OR_MORE, "ZERO_OR_MORE"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Occurrence Type</b></em>' enumerators.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private static final DTDOccurrenceType[] VALUES_ARRAY = new DTDOccurrenceType[]{ONE_LITERAL, OPTIONAL_LITERAL, ONE_OR_MORE_LITERAL, ZERO_OR_MORE_LITERAL,};
-
-	/**
-	 * A public read-only list of all the '<em><b>Occurrence Type</b></em>'
-	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Occurrence Type</b></em>' literal with the
-	 * specified name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static DTDOccurrenceType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			DTDOccurrenceType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Occurrence Type</b></em>' literal with the
-	 * specified value. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static DTDOccurrenceType get(int value) {
-		switch (value) {
-			case ONE :
-				return ONE_LITERAL;
-			case OPTIONAL :
-				return OPTIONAL_LITERAL;
-			case ONE_OR_MORE :
-				return ONE_OR_MORE_LITERAL;
-			case ZERO_OR_MORE :
-				return ZERO_OR_MORE_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private DTDOccurrenceType(int value, String name) {
-		super(value, name);
-	}
-
-} // DTDOccurrenceType
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDPCDataContent.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDPCDataContent.java
deleted file mode 100644
index 043e554..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDPCDataContent.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>PC Data Content</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDPCDataContent()
- * @model
- * @generated
- */
-public interface DTDPCDataContent extends DTDElementContent {
-} // DTDPCDataContent
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDPackage.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDPackage.java
deleted file mode 100644
index e336a58..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDPackage.java
+++ /dev/null
@@ -1,2392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-/**
- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains
- * accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDFactory
- * @generated
- */
-public interface DTDPackage extends EPackage {
-
-	/**
-	 * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	String eNAME = "dtd"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	String eNS_URI = "http:///com/ibm/etools/dtd.ecore"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.wst.dtd.core.internal.emf"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	DTDPackage eINSTANCE = org.eclipse.wst.dtd.core.internal.emf.impl.DTDPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDElementContentImpl <em>Element Content</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDElementContentImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDElementContent()
-	 * @generated
-	 */
-	int DTD_ELEMENT_CONTENT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT_CONTENT__GROUP = 0;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT_CONTENT__ELEMENT = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Element Content</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT_CONTENT_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDRepeatableContentImpl <em>Repeatable Content</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDRepeatableContentImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDRepeatableContent()
-	 * @generated
-	 */
-	int DTD_REPEATABLE_CONTENT = 8;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_REPEATABLE_CONTENT__GROUP = DTD_ELEMENT_CONTENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_REPEATABLE_CONTENT__ELEMENT = DTD_ELEMENT_CONTENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_REPEATABLE_CONTENT__OCCURRENCE = DTD_ELEMENT_CONTENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Repeatable Content</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_REPEATABLE_CONTENT_FEATURE_COUNT = DTD_ELEMENT_CONTENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDGroupContentImpl <em>Group Content</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDGroupContentImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDGroupContent()
-	 * @generated
-	 */
-	int DTD_GROUP_CONTENT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_GROUP_CONTENT__GROUP = DTD_REPEATABLE_CONTENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_GROUP_CONTENT__ELEMENT = DTD_REPEATABLE_CONTENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_GROUP_CONTENT__OCCURRENCE = DTD_REPEATABLE_CONTENT__OCCURRENCE;
-
-	/**
-	 * The feature id for the '<em><b>Group Kind</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_GROUP_CONTENT__GROUP_KIND = DTD_REPEATABLE_CONTENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Content</b></em>' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_GROUP_CONTENT__CONTENT = DTD_REPEATABLE_CONTENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Group Content</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_GROUP_CONTENT_FEATURE_COUNT = DTD_REPEATABLE_CONTENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDAttributeImpl <em>Attribute</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDAttributeImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDAttribute()
-	 * @generated
-	 */
-	int DTD_ATTRIBUTE = 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__EANNOTATIONS = EcorePackage.EATTRIBUTE__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__NAME = EcorePackage.EATTRIBUTE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__ETYPE = EcorePackage.EATTRIBUTE__ETYPE;
-
-	/**
-	 * The feature id for the '<em><b>Changeable</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__CHANGEABLE = EcorePackage.EATTRIBUTE__CHANGEABLE;
-
-	/**
-	 * The feature id for the '<em><b>Volatile</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__VOLATILE = EcorePackage.EATTRIBUTE__VOLATILE;
-
-	/**
-	 * The feature id for the '<em><b>Transient</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__TRANSIENT = EcorePackage.EATTRIBUTE__TRANSIENT;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__UNIQUE = EcorePackage.EATTRIBUTE__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Default Value Literal</b></em>'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__DEFAULT_VALUE_LITERAL = EcorePackage.EATTRIBUTE__DEFAULT_VALUE_LITERAL;
-
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__DEFAULT_VALUE = EcorePackage.EATTRIBUTE__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__LOWER_BOUND = EcorePackage.EATTRIBUTE__LOWER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__UPPER_BOUND = EcorePackage.EATTRIBUTE__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Many</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__MANY = EcorePackage.EATTRIBUTE__MANY;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__REQUIRED = EcorePackage.EATTRIBUTE__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>EContaining Class</b></em>'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__ECONTAINING_CLASS = EcorePackage.EATTRIBUTE__ECONTAINING_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>Unsettable</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__UNSETTABLE = EcorePackage.EATTRIBUTE__UNSETTABLE;
-
-	/**
-	 * The feature id for the '<em><b>ID</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__ID = EcorePackage.EATTRIBUTE__ID;
-
-	/**
-	 * The feature id for the '<em><b>EAttribute Type</b></em>'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__EATTRIBUTE_TYPE = EcorePackage.EATTRIBUTE__EATTRIBUTE_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__COMMENT = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Default Kind</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__DEFAULT_KIND = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Default Value String</b></em>'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__DEFAULT_VALUE_STRING = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Attribute Name Referenced Entity</b></em>'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__ATTRIBUTE_NAME_REFERENCED_ENTITY = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Attribute Type Referenced Entity</b></em>'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__ATTRIBUTE_TYPE_REFERENCED_ENTITY = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>DTD Element</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE__DTD_ELEMENT = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the the '<em>Attribute</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ATTRIBUTE_FEATURE_COUNT = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDElementImpl <em>Element</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDElementImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDElement()
-	 * @generated
-	 */
-	int DTD_ELEMENT = 3;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__EANNOTATIONS = EcorePackage.ECLASS__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__NAME = EcorePackage.ECLASS__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Instance Class Name</b></em>'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__INSTANCE_CLASS_NAME = EcorePackage.ECLASS__INSTANCE_CLASS_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Instance Class</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__INSTANCE_CLASS = EcorePackage.ECLASS__INSTANCE_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__DEFAULT_VALUE = EcorePackage.ECLASS__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>EPackage</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__EPACKAGE = EcorePackage.ECLASS__EPACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Abstract</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__ABSTRACT = EcorePackage.ECLASS__ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Interface</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__INTERFACE = EcorePackage.ECLASS__INTERFACE;
-
-	/**
-	 * The feature id for the '<em><b>ESuper Types</b></em>' reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__ESUPER_TYPES = EcorePackage.ECLASS__ESUPER_TYPES;
-
-	/**
-	 * The feature id for the '<em><b>EOperations</b></em>' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__EOPERATIONS = EcorePackage.ECLASS__EOPERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>EAll Attributes</b></em>' reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__EALL_ATTRIBUTES = EcorePackage.ECLASS__EALL_ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>EAll References</b></em>' reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__EALL_REFERENCES = EcorePackage.ECLASS__EALL_REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>EReferences</b></em>' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__EREFERENCES = EcorePackage.ECLASS__EREFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>EAttributes</b></em>' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__EATTRIBUTES = EcorePackage.ECLASS__EATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>EAll Containments</b></em>'
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__EALL_CONTAINMENTS = EcorePackage.ECLASS__EALL_CONTAINMENTS;
-
-	/**
-	 * The feature id for the '<em><b>EAll Operations</b></em>' reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__EALL_OPERATIONS = EcorePackage.ECLASS__EALL_OPERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>EAll Structural Features</b></em>'
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__EALL_STRUCTURAL_FEATURES = EcorePackage.ECLASS__EALL_STRUCTURAL_FEATURES;
-
-	/**
-	 * The feature id for the '<em><b>EAll Super Types</b></em>'
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__EALL_SUPER_TYPES = EcorePackage.ECLASS__EALL_SUPER_TYPES;
-
-	/**
-	 * The feature id for the '<em><b>EID Attribute</b></em>' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__EID_ATTRIBUTE = EcorePackage.ECLASS__EID_ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>DTD File</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__DTD_FILE = EcorePackage.ECLASS_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__COMMENT = EcorePackage.ECLASS_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Content</b></em>' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__CONTENT = EcorePackage.ECLASS_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>DTD Attribute</b></em>' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT__DTD_ATTRIBUTE = EcorePackage.ECLASS_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the the '<em>Element</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT_FEATURE_COUNT = EcorePackage.ECLASS_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEmptyContentImpl <em>Empty Content</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEmptyContentImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDEmptyContent()
-	 * @generated
-	 */
-	int DTD_EMPTY_CONTENT = 4;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_EMPTY_CONTENT__GROUP = DTD_ELEMENT_CONTENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_EMPTY_CONTENT__ELEMENT = DTD_ELEMENT_CONTENT__ELEMENT;
-
-	/**
-	 * The number of structural features of the the '<em>Empty Content</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_EMPTY_CONTENT_FEATURE_COUNT = DTD_ELEMENT_CONTENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDAnyContentImpl <em>Any Content</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDAnyContentImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDAnyContent()
-	 * @generated
-	 */
-	int DTD_ANY_CONTENT = 5;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ANY_CONTENT__GROUP = DTD_ELEMENT_CONTENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ANY_CONTENT__ELEMENT = DTD_ELEMENT_CONTENT__ELEMENT;
-
-	/**
-	 * The number of structural features of the the '<em>Any Content</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ANY_CONTENT_FEATURE_COUNT = DTD_ELEMENT_CONTENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPCDataContentImpl <em>PC Data Content</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPCDataContentImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDPCDataContent()
-	 * @generated
-	 */
-	int DTD_PC_DATA_CONTENT = 6;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_PC_DATA_CONTENT__GROUP = DTD_ELEMENT_CONTENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_PC_DATA_CONTENT__ELEMENT = DTD_ELEMENT_CONTENT__ELEMENT;
-
-	/**
-	 * The number of structural features of the the '<em>PC Data Content</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_PC_DATA_CONTENT_FEATURE_COUNT = DTD_ELEMENT_CONTENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDElementReferenceContentImpl <em>Element Reference Content</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDElementReferenceContentImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDElementReferenceContent()
-	 * @generated
-	 */
-	int DTD_ELEMENT_REFERENCE_CONTENT = 7;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT_REFERENCE_CONTENT__GROUP = DTD_REPEATABLE_CONTENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT_REFERENCE_CONTENT__ELEMENT = DTD_REPEATABLE_CONTENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT_REFERENCE_CONTENT__OCCURRENCE = DTD_REPEATABLE_CONTENT__OCCURRENCE;
-
-	/**
-	 * The feature id for the '<em><b>Referenced Element</b></em>'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT_REFERENCE_CONTENT__REFERENCED_ELEMENT = DTD_REPEATABLE_CONTENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Element Reference Content</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ELEMENT_REFERENCE_CONTENT_FEATURE_COUNT = DTD_REPEATABLE_CONTENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDFileImpl <em>File</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDFileImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDFile()
-	 * @generated
-	 */
-	int DTD_FILE = 9;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_FILE__COMMENT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Parse Error</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_FILE__PARSE_ERROR = 1;
-
-	/**
-	 * The feature id for the '<em><b>DTD Content</b></em>' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_FILE__DTD_CONTENT = 2;
-
-	/**
-	 * The feature id for the '<em><b>DTD Enumeration Type</b></em>'
-	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_FILE__DTD_ENUMERATION_TYPE = 3;
-
-	/**
-	 * The number of structural features of the the '<em>File</em>' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_FILE_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDBasicTypeImpl <em>Basic Type</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDBasicTypeImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDBasicType()
-	 * @generated
-	 */
-	int DTD_BASIC_TYPE = 10;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__EANNOTATIONS = EcorePackage.ECLASS__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__NAME = EcorePackage.ECLASS__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Instance Class Name</b></em>'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__INSTANCE_CLASS_NAME = EcorePackage.ECLASS__INSTANCE_CLASS_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Instance Class</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__INSTANCE_CLASS = EcorePackage.ECLASS__INSTANCE_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__DEFAULT_VALUE = EcorePackage.ECLASS__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>EPackage</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__EPACKAGE = EcorePackage.ECLASS__EPACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Abstract</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__ABSTRACT = EcorePackage.ECLASS__ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Interface</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__INTERFACE = EcorePackage.ECLASS__INTERFACE;
-
-	/**
-	 * The feature id for the '<em><b>ESuper Types</b></em>' reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__ESUPER_TYPES = EcorePackage.ECLASS__ESUPER_TYPES;
-
-	/**
-	 * The feature id for the '<em><b>EOperations</b></em>' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__EOPERATIONS = EcorePackage.ECLASS__EOPERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>EAll Attributes</b></em>' reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__EALL_ATTRIBUTES = EcorePackage.ECLASS__EALL_ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>EAll References</b></em>' reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__EALL_REFERENCES = EcorePackage.ECLASS__EALL_REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>EReferences</b></em>' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__EREFERENCES = EcorePackage.ECLASS__EREFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>EAttributes</b></em>' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__EATTRIBUTES = EcorePackage.ECLASS__EATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>EAll Containments</b></em>'
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__EALL_CONTAINMENTS = EcorePackage.ECLASS__EALL_CONTAINMENTS;
-
-	/**
-	 * The feature id for the '<em><b>EAll Operations</b></em>' reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__EALL_OPERATIONS = EcorePackage.ECLASS__EALL_OPERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>EAll Structural Features</b></em>'
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__EALL_STRUCTURAL_FEATURES = EcorePackage.ECLASS__EALL_STRUCTURAL_FEATURES;
-
-	/**
-	 * The feature id for the '<em><b>EAll Super Types</b></em>'
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__EALL_SUPER_TYPES = EcorePackage.ECLASS__EALL_SUPER_TYPES;
-
-	/**
-	 * The feature id for the '<em><b>EID Attribute</b></em>' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__EID_ATTRIBUTE = EcorePackage.ECLASS__EID_ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Kind</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE__KIND = EcorePackage.ECLASS_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Basic Type</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_BASIC_TYPE_FEATURE_COUNT = EcorePackage.ECLASS_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEnumerationTypeImpl <em>Enumeration Type</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEnumerationTypeImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDEnumerationType()
-	 * @generated
-	 */
-	int DTD_ENUMERATION_TYPE = 11;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENUMERATION_TYPE__EANNOTATIONS = EcorePackage.EENUM__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENUMERATION_TYPE__NAME = EcorePackage.EENUM__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Instance Class Name</b></em>'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENUMERATION_TYPE__INSTANCE_CLASS_NAME = EcorePackage.EENUM__INSTANCE_CLASS_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Instance Class</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENUMERATION_TYPE__INSTANCE_CLASS = EcorePackage.EENUM__INSTANCE_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENUMERATION_TYPE__DEFAULT_VALUE = EcorePackage.EENUM__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>EPackage</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENUMERATION_TYPE__EPACKAGE = EcorePackage.EENUM__EPACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Serializable</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENUMERATION_TYPE__SERIALIZABLE = EcorePackage.EENUM__SERIALIZABLE;
-
-	/**
-	 * The feature id for the '<em><b>ELiterals</b></em>' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENUMERATION_TYPE__ELITERALS = EcorePackage.EENUM__ELITERALS;
-
-	/**
-	 * The feature id for the '<em><b>Kind</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENUMERATION_TYPE__KIND = EcorePackage.EENUM_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>DTD File</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENUMERATION_TYPE__DTD_FILE = EcorePackage.EENUM_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Enumeration Type</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENUMERATION_TYPE_FEATURE_COUNT = EcorePackage.EENUM_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDContentImpl <em>Content</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDContentImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDContent()
-	 * @generated
-	 */
-	int DTD_CONTENT = 19;
-
-	/**
-	 * The feature id for the '<em><b>DTD File</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_CONTENT__DTD_FILE = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Content</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_CONTENT_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDNotationImpl <em>Notation</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDNotationImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDNotation()
-	 * @generated
-	 */
-	int DTD_NOTATION = 12;
-
-	/**
-	 * The feature id for the '<em><b>DTD File</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_NOTATION__DTD_FILE = DTD_CONTENT__DTD_FILE;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_NOTATION__COMMENT = DTD_CONTENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>System ID</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_NOTATION__SYSTEM_ID = DTD_CONTENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Public ID</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_NOTATION__PUBLIC_ID = DTD_CONTENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Entity</b></em>' reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_NOTATION__ENTITY = DTD_CONTENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the the '<em>Notation</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_NOTATION_FEATURE_COUNT = DTD_CONTENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEntityImpl <em>Entity</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEntityImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDEntity()
-	 * @generated
-	 */
-	int DTD_ENTITY = 13;
-
-	/**
-	 * The feature id for the '<em><b>DTD File</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY__DTD_FILE = DTD_CONTENT__DTD_FILE;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY__COMMENT = DTD_CONTENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Entity</b></em>'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY__PARAMETER_ENTITY = DTD_CONTENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Content</b></em>' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY__CONTENT = DTD_CONTENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Parm Entity Ref</b></em>'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY__PARM_ENTITY_REF = DTD_CONTENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Entity Reference</b></em>'
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY__ENTITY_REFERENCE = DTD_CONTENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Attribute Name Reference</b></em>'
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY__ATTRIBUTE_NAME_REFERENCE = DTD_CONTENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Attribute Type Reference</b></em>'
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY__ATTRIBUTE_TYPE_REFERENCE = DTD_CONTENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the the '<em>Entity</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY_FEATURE_COUNT = DTD_CONTENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEntityContentImpl <em>Entity Content</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEntityContentImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDEntityContent()
-	 * @generated
-	 */
-	int DTD_ENTITY_CONTENT = 14;
-
-	/**
-	 * The feature id for the '<em><b>DTD Entity</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY_CONTENT__DTD_ENTITY = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Entity Content</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY_CONTENT_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDExternalEntityImpl <em>External Entity</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDExternalEntityImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDExternalEntity()
-	 * @generated
-	 */
-	int DTD_EXTERNAL_ENTITY = 15;
-
-	/**
-	 * The feature id for the '<em><b>DTD Entity</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_EXTERNAL_ENTITY__DTD_ENTITY = DTD_ENTITY_CONTENT__DTD_ENTITY;
-
-	/**
-	 * The feature id for the '<em><b>System ID</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_EXTERNAL_ENTITY__SYSTEM_ID = DTD_ENTITY_CONTENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Public ID</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_EXTERNAL_ENTITY__PUBLIC_ID = DTD_ENTITY_CONTENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Notation</b></em>' reference. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_EXTERNAL_ENTITY__NOTATION = DTD_ENTITY_CONTENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Entity Referenced From Another File</b></em>'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_EXTERNAL_ENTITY__ENTITY_REFERENCED_FROM_ANOTHER_FILE = DTD_ENTITY_CONTENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the the '<em>External Entity</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_EXTERNAL_ENTITY_FEATURE_COUNT = DTD_ENTITY_CONTENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDInternalEntityImpl <em>Internal Entity</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDInternalEntityImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDInternalEntity()
-	 * @generated
-	 */
-	int DTD_INTERNAL_ENTITY = 16;
-
-	/**
-	 * The feature id for the '<em><b>DTD Entity</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_INTERNAL_ENTITY__DTD_ENTITY = DTD_ENTITY_CONTENT__DTD_ENTITY;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_INTERNAL_ENTITY__VALUE = DTD_ENTITY_CONTENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Internal Entity</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_INTERNAL_ENTITY_FEATURE_COUNT = DTD_ENTITY_CONTENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDParameterEntityReferenceImpl <em>Parameter Entity Reference</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDParameterEntityReferenceImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDParameterEntityReference()
-	 * @generated
-	 */
-	int DTD_PARAMETER_ENTITY_REFERENCE = 17;
-
-	/**
-	 * The feature id for the '<em><b>DTD File</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_PARAMETER_ENTITY_REFERENCE__DTD_FILE = DTD_CONTENT__DTD_FILE;
-
-	/**
-	 * The feature id for the '<em><b>Entity</b></em>' reference. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_PARAMETER_ENTITY_REFERENCE__ENTITY = DTD_CONTENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Parameter Entity Reference</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_PARAMETER_ENTITY_REFERENCE_FEATURE_COUNT = DTD_CONTENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEntityReferenceContentImpl <em>Entity Reference Content</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEntityReferenceContentImpl
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDEntityReferenceContent()
-	 * @generated
-	 */
-	int DTD_ENTITY_REFERENCE_CONTENT = 18;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY_REFERENCE_CONTENT__GROUP = DTD_REPEATABLE_CONTENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' container
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY_REFERENCE_CONTENT__ELEMENT = DTD_REPEATABLE_CONTENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY_REFERENCE_CONTENT__OCCURRENCE = DTD_REPEATABLE_CONTENT__OCCURRENCE;
-
-	/**
-	 * The feature id for the '<em><b>Element Referenced Entity</b></em>'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY_REFERENCE_CONTENT__ELEMENT_REFERENCED_ENTITY = DTD_REPEATABLE_CONTENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Entity Reference Content</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DTD_ENTITY_REFERENCE_CONTENT_FEATURE_COUNT = DTD_REPEATABLE_CONTENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType <em>Occurrence Type</em>}'
-	 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDOccurrenceType()
-	 * @generated
-	 */
-	int DTD_OCCURRENCE_TYPE = 20;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDDefaultKind <em>Default Kind</em>}'
-	 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDDefaultKind
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDDefaultKind()
-	 * @generated
-	 */
-	int DTD_DEFAULT_KIND = 21;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDBasicTypeKind <em>Basic Type Kind</em>}'
-	 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDBasicTypeKind
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDBasicTypeKind()
-	 * @generated
-	 */
-	int DTD_BASIC_TYPE_KIND = 22;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEnumGroupKind <em>Enum Group Kind</em>}'
-	 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEnumGroupKind
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDEnumGroupKind()
-	 * @generated
-	 */
-	int DTD_ENUM_GROUP_KIND = 23;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDGroupKind <em>Group Kind</em>}'
-	 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDGroupKind
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getDTDGroupKind()
-	 * @generated
-	 */
-	int DTD_GROUP_KIND = 24;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.dtd.core.internal.emf.XMLSchemaDefinedType <em>XML Schema Defined Type</em>}'
-	 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.wst.dtd.core.internal.emf.XMLSchemaDefinedType
-	 * @see org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDPackageImpl#getXMLSchemaDefinedType()
-	 * @generated
-	 */
-	int XML_SCHEMA_DEFINED_TYPE = 25;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElementContent <em>Element Content</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Element Content</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDElementContent
-	 * @generated
-	 */
-	EClass getDTDElementContent();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElementContent#getGroup <em>Group</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the container reference '<em>Group</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDElementContent#getGroup()
-	 * @see #getDTDElementContent()
-	 * @generated
-	 */
-	EReference getDTDElementContent_Group();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElementContent#getElement <em>Element</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the container reference '<em>Element</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDElementContent#getElement()
-	 * @see #getDTDElementContent()
-	 * @generated
-	 */
-	EReference getDTDElementContent_Element();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent <em>Group Content</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Group Content</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent
-	 * @generated
-	 */
-	EClass getDTDGroupContent();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent#getGroupKind <em>Group Kind</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Group Kind</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent#getGroupKind()
-	 * @see #getDTDGroupContent()
-	 * @generated
-	 */
-	EAttribute getDTDGroupContent_GroupKind();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent#getContent <em>Content</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference list '<em>Content</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent#getContent()
-	 * @see #getDTDGroupContent()
-	 * @generated
-	 */
-	EReference getDTDGroupContent_Content();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute <em>Attribute</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Attribute</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDAttribute
-	 * @generated
-	 */
-	EClass getDTDAttribute();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getComment <em>Comment</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Comment</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getComment()
-	 * @see #getDTDAttribute()
-	 * @generated
-	 */
-	EAttribute getDTDAttribute_Comment();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getDefaultKind <em>Default Kind</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Default Kind</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getDefaultKind()
-	 * @see #getDTDAttribute()
-	 * @generated
-	 */
-	EAttribute getDTDAttribute_DefaultKind();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getDefaultValueString <em>Default Value String</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Default Value String</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getDefaultValueString()
-	 * @see #getDTDAttribute()
-	 * @generated
-	 */
-	EAttribute getDTDAttribute_DefaultValueString();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getAttributeNameReferencedEntity <em>Attribute Name Referenced Entity</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference '<em>Attribute Name Referenced Entity</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getAttributeNameReferencedEntity()
-	 * @see #getDTDAttribute()
-	 * @generated
-	 */
-	EReference getDTDAttribute_AttributeNameReferencedEntity();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getAttributeTypeReferencedEntity <em>Attribute Type Referenced Entity</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference '<em>Attribute Type Referenced Entity</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getAttributeTypeReferencedEntity()
-	 * @see #getDTDAttribute()
-	 * @generated
-	 */
-	EReference getDTDAttribute_AttributeTypeReferencedEntity();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getDTDElement <em>DTD Element</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the container reference '<em>DTD Element</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDAttribute#getDTDElement()
-	 * @see #getDTDAttribute()
-	 * @generated
-	 */
-	EReference getDTDAttribute_DTDElement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElement <em>Element</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Element</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDElement
-	 * @generated
-	 */
-	EClass getDTDElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElement#getComment <em>Comment</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Comment</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDElement#getComment()
-	 * @see #getDTDElement()
-	 * @generated
-	 */
-	EAttribute getDTDElement_Comment();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElement#getContent <em>Content</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference '<em>Content</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDElement#getContent()
-	 * @see #getDTDElement()
-	 * @generated
-	 */
-	EReference getDTDElement_Content();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElement#getDTDAttribute <em>DTD Attribute</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference list '<em>DTD Attribute</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDElement#getDTDAttribute()
-	 * @see #getDTDElement()
-	 * @generated
-	 */
-	EReference getDTDElement_DTDAttribute();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEmptyContent <em>Empty Content</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Empty Content</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEmptyContent
-	 * @generated
-	 */
-	EClass getDTDEmptyContent();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDAnyContent <em>Any Content</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Any Content</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDAnyContent
-	 * @generated
-	 */
-	EClass getDTDAnyContent();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDPCDataContent <em>PC Data Content</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>PC Data Content</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPCDataContent
-	 * @generated
-	 */
-	EClass getDTDPCDataContent();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent <em>Element Reference Content</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Element Reference Content</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent
-	 * @generated
-	 */
-	EClass getDTDElementReferenceContent();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent#getReferencedElement <em>Referenced Element</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference '<em>Referenced Element</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent#getReferencedElement()
-	 * @see #getDTDElementReferenceContent()
-	 * @generated
-	 */
-	EReference getDTDElementReferenceContent_ReferencedElement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDRepeatableContent <em>Repeatable Content</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Repeatable Content</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDRepeatableContent
-	 * @generated
-	 */
-	EClass getDTDRepeatableContent();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDRepeatableContent#getOccurrence <em>Occurrence</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Occurrence</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDRepeatableContent#getOccurrence()
-	 * @see #getDTDRepeatableContent()
-	 * @generated
-	 */
-	EAttribute getDTDRepeatableContent_Occurrence();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDFile <em>File</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>File</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDFile
-	 * @generated
-	 */
-	EClass getDTDFile();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDFile#getComment <em>Comment</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Comment</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDFile#getComment()
-	 * @see #getDTDFile()
-	 * @generated
-	 */
-	EAttribute getDTDFile_Comment();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDFile#isParseError <em>Parse Error</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Parse Error</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDFile#isParseError()
-	 * @see #getDTDFile()
-	 * @generated
-	 */
-	EAttribute getDTDFile_ParseError();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.dtd.core.internal.emf.DTDFile#getDTDContent <em>DTD Content</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference list '<em>DTD Content</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDFile#getDTDContent()
-	 * @see #getDTDFile()
-	 * @generated
-	 */
-	EReference getDTDFile_DTDContent();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.dtd.core.internal.emf.DTDFile#getDTDEnumerationType <em>DTD Enumeration Type</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference list '<em>DTD Enumeration Type</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDFile#getDTDEnumerationType()
-	 * @see #getDTDFile()
-	 * @generated
-	 */
-	EReference getDTDFile_DTDEnumerationType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDBasicType <em>Basic Type</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Basic Type</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDBasicType
-	 * @generated
-	 */
-	EClass getDTDBasicType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDBasicType#getKind <em>Kind</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Kind</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDBasicType#getKind()
-	 * @see #getDTDBasicType()
-	 * @generated
-	 */
-	EAttribute getDTDBasicType_Kind();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType <em>Enumeration Type</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Enumeration Type</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType
-	 * @generated
-	 */
-	EClass getDTDEnumerationType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType#getKind <em>Kind</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Kind</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType#getKind()
-	 * @see #getDTDEnumerationType()
-	 * @generated
-	 */
-	EAttribute getDTDEnumerationType_Kind();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType#getDTDFile <em>DTD File</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the container reference '<em>DTD File</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType#getDTDFile()
-	 * @see #getDTDEnumerationType()
-	 * @generated
-	 */
-	EReference getDTDEnumerationType_DTDFile();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDNotation <em>Notation</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Notation</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDNotation
-	 * @generated
-	 */
-	EClass getDTDNotation();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getComment <em>Comment</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Comment</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getComment()
-	 * @see #getDTDNotation()
-	 * @generated
-	 */
-	EAttribute getDTDNotation_Comment();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getSystemID <em>System ID</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>System ID</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getSystemID()
-	 * @see #getDTDNotation()
-	 * @generated
-	 */
-	EAttribute getDTDNotation_SystemID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getPublicID <em>Public ID</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Public ID</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getPublicID()
-	 * @see #getDTDNotation()
-	 * @generated
-	 */
-	EAttribute getDTDNotation_PublicID();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getEntity <em>Entity</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference list '<em>Entity</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDNotation#getEntity()
-	 * @see #getDTDNotation()
-	 * @generated
-	 */
-	EReference getDTDNotation_Entity();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity <em>Entity</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Entity</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntity
-	 * @generated
-	 */
-	EClass getDTDEntity();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getComment <em>Comment</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Comment</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getComment()
-	 * @see #getDTDEntity()
-	 * @generated
-	 */
-	EAttribute getDTDEntity_Comment();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#isParameterEntity <em>Parameter Entity</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Parameter Entity</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntity#isParameterEntity()
-	 * @see #getDTDEntity()
-	 * @generated
-	 */
-	EAttribute getDTDEntity_ParameterEntity();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getContent <em>Content</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference '<em>Content</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getContent()
-	 * @see #getDTDEntity()
-	 * @generated
-	 */
-	EReference getDTDEntity_Content();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getParmEntityRef <em>Parm Entity Ref</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference '<em>Parm Entity Ref</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getParmEntityRef()
-	 * @see #getDTDEntity()
-	 * @generated
-	 */
-	EReference getDTDEntity_ParmEntityRef();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getEntityReference <em>Entity Reference</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference list '<em>Entity Reference</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getEntityReference()
-	 * @see #getDTDEntity()
-	 * @generated
-	 */
-	EReference getDTDEntity_EntityReference();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getAttributeNameReference <em>Attribute Name Reference</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference list '<em>Attribute Name Reference</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getAttributeNameReference()
-	 * @see #getDTDEntity()
-	 * @generated
-	 */
-	EReference getDTDEntity_AttributeNameReference();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getAttributeTypeReference <em>Attribute Type Reference</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference list '<em>Attribute Type Reference</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getAttributeTypeReference()
-	 * @see #getDTDEntity()
-	 * @generated
-	 */
-	EReference getDTDEntity_AttributeTypeReference();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntityContent <em>Entity Content</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Entity Content</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntityContent
-	 * @generated
-	 */
-	EClass getDTDEntityContent();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntityContent#getDTDEntity <em>DTD Entity</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the container reference '<em>DTD Entity</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntityContent#getDTDEntity()
-	 * @see #getDTDEntityContent()
-	 * @generated
-	 */
-	EReference getDTDEntityContent_DTDEntity();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity <em>External Entity</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>External Entity</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity
-	 * @generated
-	 */
-	EClass getDTDExternalEntity();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getSystemID <em>System ID</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>System ID</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getSystemID()
-	 * @see #getDTDExternalEntity()
-	 * @generated
-	 */
-	EAttribute getDTDExternalEntity_SystemID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getPublicID <em>Public ID</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Public ID</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getPublicID()
-	 * @see #getDTDExternalEntity()
-	 * @generated
-	 */
-	EAttribute getDTDExternalEntity_PublicID();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getNotation <em>Notation</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference '<em>Notation</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getNotation()
-	 * @see #getDTDExternalEntity()
-	 * @generated
-	 */
-	EReference getDTDExternalEntity_Notation();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getEntityReferencedFromAnotherFile <em>Entity Referenced From Another File</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference '<em>Entity Referenced From Another File</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity#getEntityReferencedFromAnotherFile()
-	 * @see #getDTDExternalEntity()
-	 * @generated
-	 */
-	EReference getDTDExternalEntity_EntityReferencedFromAnotherFile();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDInternalEntity <em>Internal Entity</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Internal Entity</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDInternalEntity
-	 * @generated
-	 */
-	EClass getDTDInternalEntity();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.dtd.core.internal.emf.DTDInternalEntity#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDInternalEntity#getValue()
-	 * @see #getDTDInternalEntity()
-	 * @generated
-	 */
-	EAttribute getDTDInternalEntity_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference <em>Parameter Entity Reference</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Parameter Entity Reference</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference
-	 * @generated
-	 */
-	EClass getDTDParameterEntityReference();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference#getEntity <em>Entity</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference '<em>Entity</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference#getEntity()
-	 * @see #getDTDParameterEntityReference()
-	 * @generated
-	 */
-	EReference getDTDParameterEntityReference_Entity();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent <em>Entity Reference Content</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Entity Reference Content</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent
-	 * @generated
-	 */
-	EClass getDTDEntityReferenceContent();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent#getElementReferencedEntity <em>Element Referenced Entity</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference '<em>Element Referenced Entity</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent#getElementReferencedEntity()
-	 * @see #getDTDEntityReferenceContent()
-	 * @generated
-	 */
-	EReference getDTDEntityReferenceContent_ElementReferencedEntity();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.dtd.core.internal.emf.DTDContent <em>Content</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for class '<em>Content</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDContent
-	 * @generated
-	 */
-	EClass getDTDContent();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.wst.dtd.core.internal.emf.DTDContent#getDTDFile <em>DTD File</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the container reference '<em>DTD File</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDContent#getDTDFile()
-	 * @see #getDTDContent()
-	 * @generated
-	 */
-	EReference getDTDContent_DTDFile();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType <em>Occurrence Type</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for enum '<em>Occurrence Type</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType
-	 * @generated
-	 */
-	EEnum getDTDOccurrenceType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.wst.dtd.core.internal.emf.DTDDefaultKind <em>Default Kind</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for enum '<em>Default Kind</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDDefaultKind
-	 * @generated
-	 */
-	EEnum getDTDDefaultKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.wst.dtd.core.internal.emf.DTDBasicTypeKind <em>Basic Type Kind</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for enum '<em>Basic Type Kind</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDBasicTypeKind
-	 * @generated
-	 */
-	EEnum getDTDBasicTypeKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEnumGroupKind <em>Enum Group Kind</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for enum '<em>Enum Group Kind</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEnumGroupKind
-	 * @generated
-	 */
-	EEnum getDTDEnumGroupKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.wst.dtd.core.internal.emf.DTDGroupKind <em>Group Kind</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for enum '<em>Group Kind</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDGroupKind
-	 * @generated
-	 */
-	EEnum getDTDGroupKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.wst.dtd.core.internal.emf.XMLSchemaDefinedType <em>XML Schema Defined Type</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for enum '<em>XML Schema Defined Type</em>'.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.XMLSchemaDefinedType
-	 * @generated
-	 */
-	EEnum getXMLSchemaDefinedType();
-
-	/**
-	 * Returns the factory that creates the instances of the model. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	DTDFactory getDTDFactory();
-
-} // DTDPackage
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDParameterEntityReference.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDParameterEntityReference.java
deleted file mode 100644
index f26862b..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDParameterEntityReference.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import org.eclipse.emf.ecore.ENamedElement;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Parameter Entity Reference</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference#getEntity <em>Entity</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDParameterEntityReference()
- * @model
- * @generated
- */
-public interface DTDParameterEntityReference extends ENamedElement, DTDContent, DTDObject, DTDSourceOffset {
-	/**
-	 * Returns the value of the '<em><b>Entity</b></em>' reference. It is
-	 * bidirectional and its opposite is '{@link org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getParmEntityRef <em>Parm Entity Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Entity</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Entity</em>' reference.
-	 * @see #setEntity(DTDEntity)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDParameterEntityReference_Entity()
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDEntity#getParmEntityRef
-	 * @model opposite="parmEntityRef" required="true"
-	 * @generated
-	 */
-	DTDEntity getEntity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference#getEntity <em>Entity</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Entity</em>' reference.
-	 * @see #getEntity()
-	 * @generated
-	 */
-	void setEntity(DTDEntity value);
-
-} // DTDParameterEntityReference
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDRepeatableContent.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDRepeatableContent.java
deleted file mode 100644
index 779cd40..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDRepeatableContent.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Repeatable Content</b></em>'.
- * <!-- end-user-doc -->
- * 
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.DTDRepeatableContent#getOccurrence <em>Occurrence</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDRepeatableContent()
- * @model abstract="true"
- * @generated
- */
-public interface DTDRepeatableContent extends DTDElementContent {
-
-	public abstract String unparseRepeatableContent();
-
-	/**
-	 * Returns the value of the '<em><b>Occurrence</b></em>' attribute.
-	 * The literals are from the enumeration
-	 * {@link org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType}. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Occurrence</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Occurrence</em>' attribute.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType
-	 * @see #setOccurrence(DTDOccurrenceType)
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getDTDRepeatableContent_Occurrence()
-	 * @model
-	 * @generated
-	 */
-	DTDOccurrenceType getOccurrence();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.dtd.core.internal.emf.DTDRepeatableContent#getOccurrence <em>Occurrence</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Occurrence</em>' attribute.
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType
-	 * @see #getOccurrence()
-	 * @generated
-	 */
-	void setOccurrence(DTDOccurrenceType value);
-
-} // DTDRepeatableContent
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDResource.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDResource.java
deleted file mode 100644
index 5b2799e..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDResource.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf;
-
-
-public interface DTDResource {
-	// Enumeration Constants
-	public static final String ANYICON = "icons/any.gif"; //$NON-NLS-1$
-	public static final String ELEMENTICON = "icons/element.gif"; //$NON-NLS-1$
-	public static final String ENTITYICON = "icons/entity.gif"; //$NON-NLS-1$
-	public static final String ATTRIBUTEICON = "icons/attribute.gif"; //$NON-NLS-1$
-	public static final String NOTATIONICON = "icons/notation.gif"; //$NON-NLS-1$
-	public static final String EMPTYICON = "icons/emptycontent.gif"; //$NON-NLS-1$
-	public static final String PCDATAICON = "icons/one.gif"; //$NON-NLS-1$
-	public static final String ENTITYREFERENCEICON = "icons/entity_reference.gif"; //$NON-NLS-1$
-
-	public static final String ONEICON = "icons/one.gif"; //$NON-NLS-1$
-	public static final String OPTIONALICON = "icons/optional.gif"; //$NON-NLS-1$
-	public static final String ONEORMOREICON = "icons/oneormore.gif"; //$NON-NLS-1$
-	public static final String ZEROORMOREICON = "icons/zeroormore.gif"; //$NON-NLS-1$
-
-	public static final String ONESEQUENCEICON = "icons/onesequence.gif"; //$NON-NLS-1$
-	public static final String OPTIONALSEQUENCEICON = "icons/optionalsequence.gif"; //$NON-NLS-1$
-	public static final String ONEORMORESEQUENCEICON = "icons/oneormoresequence.gif"; //$NON-NLS-1$
-	public static final String ZEROORMORESEQUENCEICON = "icons/zeroormoresequence.gif"; //$NON-NLS-1$
-
-	public static final String ONECHOICEICON = "icons/onechoice.gif"; //$NON-NLS-1$
-	public static final String OPTIONALCHOICEICON = "icons/optionalchoice.gif"; //$NON-NLS-1$
-	public static final String ONEORMORECHOICEICON = "icons/oneormorechoice.gif"; //$NON-NLS-1$
-	public static final String ZEROORMORECHOICEICON = "icons/zeroormorechoice.gif"; //$NON-NLS-1$
-
-	public static final String DTDFILEICON = "icons/DTDFile.gif"; //$NON-NLS-1$
-
-	public static final String NEWDTD = "icons/newdtd_wiz.gif"; //$NON-NLS-1$
-	public static final String NEWHTMLFORM = "icons/genhtmform_wiz.gif"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDSourceOffset.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDSourceOffset.java
deleted file mode 100644
index ff32b1b..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDSourceOffset.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf;
-
-public interface DTDSourceOffset {
-	/**
-	 * Get the value of startOffset.
-	 * 
-	 * @return value of startOffset.
-	 */
-	public int getStartOffset();
-
-	/**
-	 * Set the value of startOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to startOffset.
-	 */
-	public void setStartOffset(int v);
-
-	/**
-	 * Get the value of endOffset.
-	 * 
-	 * @return value of endOffset.
-	 */
-	public int getEndOffset();
-
-	/**
-	 * Set the value of endOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to endOffset.
-	 */
-	public void setEndOffset(int v);
-
-}// DTDSourceOffset
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDType.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDType.java
deleted file mode 100644
index e48fdc9..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDType.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf;
-
-public interface DTDType extends DTDObject {
-	// constant strings for dtd attribute types
-	public static final String NONE = "None"; //$NON-NLS-1$
-
-	public static final String CDATA = "Character Data (CDATA)"; //$NON-NLS-1$
-	public static final String ID = "Identifier (ID)"; //$NON-NLS-1$
-	public static final String IDREF = "ID Reference (IDREF)"; //$NON-NLS-1$
-	public static final String IDREFS = "ID References (IDREFS)"; //$NON-NLS-1$
-	public static final String ENTITY = "Entity Name (ENTITY)"; //$NON-NLS-1$
-	public static final String ENTITIES = "Entity Names (ENTITIES)"; //$NON-NLS-1$
-	public static final String NMTOKEN = "Name Token (NMTOKEN)"; //$NON-NLS-1$
-	public static final String NMTOKENS = "Name Tokens (NMTOKENS)"; //$NON-NLS-1$
-	public static final String ENUM_NAME_TOKEN_GROUP = "Enumerated Name Tokens"; //$NON-NLS-1$
-	public static final String ENUM_NOTATION_GROUP = "Enumerated NOTATION"; //$NON-NLS-1$
-
-	public String toString();
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/XMLSchemaDefinedType.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/XMLSchemaDefinedType.java
deleted file mode 100644
index fd138f4..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/XMLSchemaDefinedType.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>XML Schema Defined Type</b></em>',
- * and utility methods for working with them. <!-- end-user-doc -->
- * 
- * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#getXMLSchemaDefinedType()
- * @model
- * @generated
- */
-public final class XMLSchemaDefinedType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>NONE</b></em>' literal value. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #NONE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NONE = -1;
-
-	/**
-	 * The '<em><b>STRING</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #STRING_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int STRING = 1;
-
-	/**
-	 * The '<em><b>BOOLEAN</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #BOOLEAN_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int BOOLEAN = 2;
-
-	/**
-	 * The '<em><b>FLOAT</b></em>' literal value. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #FLOAT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FLOAT = 3;
-
-	/**
-	 * The '<em><b>DOUBLE</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #DOUBLE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DOUBLE = 4;
-
-	/**
-	 * The '<em><b>DECIMAL</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #DECIMAL_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DECIMAL = 5;
-
-	/**
-	 * The '<em><b>TIMEINSTANT</b></em>' literal value. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #TIMEINSTANT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TIMEINSTANT = 6;
-
-	/**
-	 * The '<em><b>TIMEDURATION</b></em>' literal value. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #TIMEDURATION_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TIMEDURATION = 7;
-
-	/**
-	 * The '<em><b>RECURRINGINSTANT</b></em>' literal value. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #RECURRINGINSTANT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int RECURRINGINSTANT = 8;
-
-	/**
-	 * The '<em><b>BINARY</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #BINARY_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int BINARY = 9;
-
-	/**
-	 * The '<em><b>URI</b></em>' literal value. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #URI_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int URI = 10;
-
-	/**
-	 * The '<em><b>INTEGER</b></em>' literal value. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #INTEGER_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INTEGER = 11;
-
-	/**
-	 * The '<em><b>DATE</b></em>' literal value. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #DATE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DATE = 12;
-
-	/**
-	 * The '<em><b>TIME</b></em>' literal value. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #TIME_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TIME = 13;
-
-	/**
-	 * The '<em><b>NONE</b></em>' literal object. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #NONE
-	 * @generated
-	 * @ordered
-	 */
-	public static final XMLSchemaDefinedType NONE_LITERAL = new XMLSchemaDefinedType(NONE, "NONE"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>STRING</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>STRING</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #STRING
-	 * @generated
-	 * @ordered
-	 */
-	public static final XMLSchemaDefinedType STRING_LITERAL = new XMLSchemaDefinedType(STRING, "STRING"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>BOOLEAN</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>BOOLEAN</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #BOOLEAN
-	 * @generated
-	 * @ordered
-	 */
-	public static final XMLSchemaDefinedType BOOLEAN_LITERAL = new XMLSchemaDefinedType(BOOLEAN, "BOOLEAN"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>FLOAT</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>FLOAT</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #FLOAT
-	 * @generated
-	 * @ordered
-	 */
-	public static final XMLSchemaDefinedType FLOAT_LITERAL = new XMLSchemaDefinedType(FLOAT, "FLOAT"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>DOUBLE</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>DOUBLE</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #DOUBLE
-	 * @generated
-	 * @ordered
-	 */
-	public static final XMLSchemaDefinedType DOUBLE_LITERAL = new XMLSchemaDefinedType(DOUBLE, "DOUBLE"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>DECIMAL</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>DECIMAL</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #DECIMAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final XMLSchemaDefinedType DECIMAL_LITERAL = new XMLSchemaDefinedType(DECIMAL, "DECIMAL"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>TIMEINSTANT</b></em>' literal object. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>TIMEINSTANT</b></em>' literal object
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #TIMEINSTANT
-	 * @generated
-	 * @ordered
-	 */
-	public static final XMLSchemaDefinedType TIMEINSTANT_LITERAL = new XMLSchemaDefinedType(TIMEINSTANT, "TIMEINSTANT"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>TIMEDURATION</b></em>' literal object. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>TIMEDURATION</b></em>' literal object
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #TIMEDURATION
-	 * @generated
-	 * @ordered
-	 */
-	public static final XMLSchemaDefinedType TIMEDURATION_LITERAL = new XMLSchemaDefinedType(TIMEDURATION, "TIMEDURATION"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>RECURRINGINSTANT</b></em>' literal object. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>RECURRINGINSTANT</b></em>' literal
-	 * object isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #RECURRINGINSTANT
-	 * @generated
-	 * @ordered
-	 */
-	public static final XMLSchemaDefinedType RECURRINGINSTANT_LITERAL = new XMLSchemaDefinedType(RECURRINGINSTANT, "RECURRINGINSTANT"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>BINARY</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>BINARY</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #BINARY
-	 * @generated
-	 * @ordered
-	 */
-	public static final XMLSchemaDefinedType BINARY_LITERAL = new XMLSchemaDefinedType(BINARY, "BINARY"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>URI</b></em>' literal object. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>URI</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #URI
-	 * @generated
-	 * @ordered
-	 */
-	public static final XMLSchemaDefinedType URI_LITERAL = new XMLSchemaDefinedType(URI, "URI"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>INTEGER</b></em>' literal object. <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of '<em><b>INTEGER</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #INTEGER
-	 * @generated
-	 * @ordered
-	 */
-	public static final XMLSchemaDefinedType INTEGER_LITERAL = new XMLSchemaDefinedType(INTEGER, "INTEGER"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>DATE</b></em>' literal object. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>DATE</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #DATE
-	 * @generated
-	 * @ordered
-	 */
-	public static final XMLSchemaDefinedType DATE_LITERAL = new XMLSchemaDefinedType(DATE, "DATE"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>TIME</b></em>' literal object. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>TIME</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see #TIME
-	 * @generated
-	 * @ordered
-	 */
-	public static final XMLSchemaDefinedType TIME_LITERAL = new XMLSchemaDefinedType(TIME, "TIME"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>XML Schema Defined Type</b></em>'
-	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private static final XMLSchemaDefinedType[] VALUES_ARRAY = new XMLSchemaDefinedType[]{NONE_LITERAL, STRING_LITERAL, BOOLEAN_LITERAL, FLOAT_LITERAL, DOUBLE_LITERAL, DECIMAL_LITERAL, TIMEINSTANT_LITERAL, TIMEDURATION_LITERAL, RECURRINGINSTANT_LITERAL, BINARY_LITERAL, URI_LITERAL, INTEGER_LITERAL, DATE_LITERAL, TIME_LITERAL,};
-
-	/**
-	 * A public read-only list of all the '<em><b>XML Schema Defined Type</b></em>'
-	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>XML Schema Defined Type</b></em>' literal with
-	 * the specified name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static XMLSchemaDefinedType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			XMLSchemaDefinedType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>XML Schema Defined Type</b></em>' literal with
-	 * the specified value. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static XMLSchemaDefinedType get(int value) {
-		switch (value) {
-			case NONE :
-				return NONE_LITERAL;
-			case STRING :
-				return STRING_LITERAL;
-			case BOOLEAN :
-				return BOOLEAN_LITERAL;
-			case FLOAT :
-				return FLOAT_LITERAL;
-			case DOUBLE :
-				return DOUBLE_LITERAL;
-			case DECIMAL :
-				return DECIMAL_LITERAL;
-			case TIMEINSTANT :
-				return TIMEINSTANT_LITERAL;
-			case TIMEDURATION :
-				return TIMEDURATION_LITERAL;
-			case RECURRINGINSTANT :
-				return RECURRINGINSTANT_LITERAL;
-			case BINARY :
-				return BINARY_LITERAL;
-			case URI :
-				return URI_LITERAL;
-			case INTEGER :
-				return INTEGER_LITERAL;
-			case DATE :
-				return DATE_LITERAL;
-			case TIME :
-				return TIME_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private XMLSchemaDefinedType(int value, String name) {
-		super(value, name);
-	}
-
-} // XMLSchemaDefinedType
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDAnyContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDAnyContentImpl.java
deleted file mode 100644
index 66be313..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDAnyContentImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAnyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Any Content</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- * 
- * @generated
- */
-public class DTDAnyContentImpl extends DTDElementContentImpl implements DTDAnyContent {
-	public String getContentName() {
-		return "ANY"; //$NON-NLS-1$
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected DTDAnyContentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDAnyContent();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ANY_CONTENT__GROUP :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_ANY_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_ANY_CONTENT__ELEMENT :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_ANY_CONTENT__ELEMENT, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ANY_CONTENT__GROUP :
-					return eBasicSetContainer(null, DTDPackage.DTD_ANY_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_ANY_CONTENT__ELEMENT :
-					return eBasicSetContainer(null, DTDPackage.DTD_ANY_CONTENT__ELEMENT, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_ANY_CONTENT__GROUP :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_GROUP_CONTENT__CONTENT, DTDGroupContent.class, msgs);
-				case DTDPackage.DTD_ANY_CONTENT__ELEMENT :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_ELEMENT__CONTENT, DTDElement.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ANY_CONTENT__GROUP :
-				return getGroup();
-			case DTDPackage.DTD_ANY_CONTENT__ELEMENT :
-				return getElement();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ANY_CONTENT__GROUP :
-				setGroup((DTDGroupContent) newValue);
-				return;
-			case DTDPackage.DTD_ANY_CONTENT__ELEMENT :
-				setElement((DTDElement) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ANY_CONTENT__GROUP :
-				setGroup((DTDGroupContent) null);
-				return;
-			case DTDPackage.DTD_ANY_CONTENT__ELEMENT :
-				setElement((DTDElement) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ANY_CONTENT__GROUP :
-				return getGroup() != null;
-			case DTDPackage.DTD_ANY_CONTENT__ELEMENT :
-				return getElement() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDAttributeImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDAttributeImpl.java
deleted file mode 100644
index 14f80f7..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDAttributeImpl.java
+++ /dev/null
@@ -1,980 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.notify.impl.NotificationChainImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EAttributeImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute;
-import org.eclipse.wst.dtd.core.internal.emf.DTDBasicType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDBasicTypeKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDDefaultKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEnumGroupKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDLexicalInfo;
-import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-import org.eclipse.wst.dtd.core.internal.emf.DTDType;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDAttributeImpl#getComment <em>Comment</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDAttributeImpl#getDefaultKind <em>Default Kind</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDAttributeImpl#getDefaultValueString <em>Default Value String</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDAttributeImpl#getAttributeNameReferencedEntity <em>Attribute Name Referenced Entity</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDAttributeImpl#getAttributeTypeReferencedEntity <em>Attribute Type Referenced Entity</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDAttributeImpl#getDTDElement <em>DTD Element</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class DTDAttributeImpl extends EAttributeImpl implements DTDAttribute {
-
-	public DTDAttributeImpl() {
-		super();
-	}
-
-	public DTDType getDTDType() {
-		return (DTDType) getEType();
-	}
-
-
-	public void setDTDType(DTDType type) {
-		setEType((EClassifier) type);
-	}
-
-	public void setDTDBasicType(int value) {
-		DTDFactoryImpl factory = (DTDFactoryImpl) DTDFactoryImpl.instance();
-		// set attribute type
-		switch (value) {
-			case 0 :
-				setDTDType(factory.getDTDBasicType_NONE());
-				break;
-			case 1 :
-				setDTDType(factory.getDTDBasicType_CDATA());
-				break;
-			case 2 :
-				setDTDType(factory.getDTDBasicType_ID());
-				break;
-			case 3 :
-				setDTDType(factory.getDTDBasicType_IDREF());
-				break;
-			case 4 :
-				setDTDType(factory.getDTDBasicType_IDREFS());
-				break;
-			case 5 :
-				setDTDType(factory.getDTDBasicType_ENTITY());
-				break;
-			case 6 :
-				setDTDType(factory.getDTDBasicType_ENTITIES());
-				break;
-			case 7 :
-				setDTDType(factory.getDTDBasicType_NMTOKEN());
-				break;
-			case 8 :
-				setDTDType(factory.getDTDBasicType_NMTOKENS());
-				break;
-		}
-	}
-
-	public String unparse() {
-		StringBuffer result = new StringBuffer(128);
-
-
-		result.append(getName());
-
-
-		StringBuffer value = new StringBuffer();
-		switch (getDefaultKind().getValue()) {
-			case DTDDefaultKind.IMPLIED :
-				value.append("#IMPLIED"); //$NON-NLS-1$
-				break;
-			case DTDDefaultKind.REQUIRED :
-				value.append("#REQUIRED"); //$NON-NLS-1$
-				break;
-			case DTDDefaultKind.FIXED :
-				String type = getDTDType().toString();
-				if (!(type.equals(DTDType.ID) || type.equals(DTDType.IDREF) || type.equals(DTDType.ENUM_NAME_TOKEN_GROUP) || type.equals(DTDType.IDREFS))) {
-					value.append("#FIXED \"").append(getDefaultValueString()).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-				break;
-			case DTDDefaultKind.NOFIXED :
-				String defaultValue = getDefaultValueString();
-				if (defaultValue != null)
-					value.append("\"").append(defaultValue).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
-				break;
-		}
-
-
-		// Get the attribute type
-		DTDEntity typeEnt = getAttributeTypeReferencedEntity();
-		if (typeEnt != null) {
-			result.append(" %" + typeEnt.getName() + "; ").append(value); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		else {
-			DTDType dtdType = getDTDType();
-			if (dtdType instanceof DTDBasicType) {
-				switch (((DTDBasicType) dtdType).getKind().getValue()) {
-					case DTDBasicTypeKind.CDATA :
-						result.append(" CDATA ").append(value); //$NON-NLS-1$
-						break;
-					case DTDBasicTypeKind.ID :
-						result.append(" ID ").append(value); //$NON-NLS-1$
-						break;
-					case DTDBasicTypeKind.IDREF :
-						result.append(" IDREF ").append(value); //$NON-NLS-1$
-						break;
-					case DTDBasicTypeKind.IDREFS :
-						result.append(" IDREFS ").append(value); //$NON-NLS-1$
-						break;
-					case DTDBasicTypeKind.ENTITY :
-						result.append(" ENTITY ").append(value); //$NON-NLS-1$
-						break;
-					case DTDBasicTypeKind.ENTITIES :
-						result.append(" ENTITIES ").append(value); //$NON-NLS-1$
-						break;
-					case DTDBasicTypeKind.NMTOKEN :
-						result.append(" NMTOKEN ").append(value); //$NON-NLS-1$
-						break;
-					case DTDBasicTypeKind.NMTOKENS :
-						result.append(" NMTOKENS ").append(value); //$NON-NLS-1$
-						break;
-				}
-			}
-			else if (dtdType instanceof DTDEnumerationType) {
-				result.append(" ").append(buildEnumString((DTDEnumerationType) dtdType)).append(value); //$NON-NLS-1$
-			}
-		}
-
-
-		return result.toString();
-	}
-
-
-	private String buildEnumString(DTDEnumerationType enumType) {
-		String result = ""; //$NON-NLS-1$
-
-
-		if (enumType.getKind().getValue() == DTDEnumGroupKind.NOTATION_GROUP)
-			result += "NOTATION "; //$NON-NLS-1$
-
-
-		Iterator i = enumType.getEnumLiterals().iterator();
-		if (i.hasNext()) {
-			result += "(" + ((EEnumLiteral) i.next()).toString(); //$NON-NLS-1$
-			while (i.hasNext()) {
-				result += " | " + ((EEnumLiteral) i.next()).toString(); //$NON-NLS-1$
-			}
-			result += ") "; //$NON-NLS-1$
-		}
-
-
-		return result;
-	}
-
-	public DTDEnumerationType createDTDEnumeration(String[] enumValues, int enumKind) {
-		DTDEnumerationType enumeration = DTDFactoryImpl.instance().createDTDEnumerationType();
-		// enum.setID("Enum_" + ((DTDElement)getMOFDomain()).getName() + "_" +
-		// getName());
-		DTDEnumGroupKind groupKind = DTDEnumGroupKind.get(enumKind);
-		enumeration.setKind(groupKind);
-		// Enumeration values
-		if (enumValues != null) {
-			for (int i = 0; i < enumValues.length; i++) {
-				EcorePackage ePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-				EEnumLiteral enumLiteral = ((EcoreFactory) ePackage.getEFactoryInstance()).createEEnumLiteral();
-				// MOF2EMF Port
-				// enumLiteral.refSetLiteral(enumValues[i]);
-				enumLiteral.setName(enumValues[i]);
-				// MOF2EMF Port
-				// enumLiteral.refSetLiteral(i);
-				enumLiteral.setValue(i);
-
-				enumeration.getEnumLiterals().add(enumLiteral);
-			}
-		}
-		getDTDElement().getDTDFile().getDTDEnumerationType().add(enumeration);
-		return enumeration;
-	}
-
-	public String getPathname() {
-		return null;
-		// TODO: finish port
-		// return DTDPathnameUtil.makePath(getDTDElement().getPathname(),
-		// "Attr", getName(), -1);
-	}
-
-
-	public DTDObject findObject(String relativePath) {
-		return null;
-		// TODO: finish port
-		/*
-		 * Object[] result = DTDPathnameUtil.parsePathComponent(relativePath);
-		 * 
-		 * 
-		 * String type = (String)result[0];
-		 * 
-		 * 
-		 * if (type == null) return null;
-		 * 
-		 * 
-		 * DTDObject obj = null; if (type.equals("Type")) { obj =
-		 * getDataType(); } else { return null; }
-		 * 
-		 * 
-		 * String restPath = (String)result[3];
-		 * 
-		 * if ((restPath == null) || (obj == null)) { return obj; } else {
-		 * return obj.findObject(restPath); }
-		 */
-	}
-
-	public Collection getEnumeratedValues() {
-		Collection result = new ArrayList();
-
-
-		DTDType type = getDTDType();
-		if (type instanceof DTDEnumerationType) {
-			DTDEnumerationType enumType = (DTDEnumerationType) type;
-			Iterator i = enumType.getEnumLiterals().iterator();
-			while (i.hasNext()) {
-				result.add(((EEnumLiteral) i.next()).toString());
-			}
-		}
-		return result;
-	}
-
-
-	// ugly hack for now since we don't have multiple inheritance.
-	// Would rather have all this stuff in a base class but these
-	// classes are inheriting from sometimes different mof classes
-	DTDLexicalInfo lexInfo = new DTDLexicalInfo();
-
-	/**
-	 * Get the value of startOffset.
-	 * 
-	 * @return value of startOffset.
-	 */
-	public int getStartOffset() {
-		return lexInfo.getStartOffset();
-	}
-
-
-	/**
-	 * Set the value of startOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to startOffset.
-	 */
-	public void setStartOffset(int v) {
-		lexInfo.setStartOffset(v);
-	}
-
-
-	/**
-	 * Get the value of endOffset.
-	 * 
-	 * @return value of endOffset.
-	 */
-	public int getEndOffset() {
-		return lexInfo.getEndOffset();
-	}
-
-
-	/**
-	 * Set the value of endOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to endOffset.
-	 */
-	public void setEndOffset(int v) {
-		lexInfo.setEndOffset(v);
-	}
-
-
-	/**
-	 * The default value of the '{@link #getComment() <em>Comment</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getComment() <em>Comment</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected String comment = COMMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDefaultKind() <em>Default Kind</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getDefaultKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final DTDDefaultKind DEFAULT_KIND_EDEFAULT = DTDDefaultKind.IMPLIED_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getDefaultKind() <em>Default Kind</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getDefaultKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected DTDDefaultKind defaultKind = DEFAULT_KIND_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDefaultValueString() <em>Default Value String</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getDefaultValueString()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DEFAULT_VALUE_STRING_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDefaultValueString() <em>Default Value String</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getDefaultValueString()
-	 * @generated
-	 * @ordered
-	 */
-	protected String defaultValueString = DEFAULT_VALUE_STRING_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAttributeNameReferencedEntity() <em>Attribute Name Referenced Entity</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getAttributeNameReferencedEntity()
-	 * @generated
-	 * @ordered
-	 */
-	protected DTDEntity attributeNameReferencedEntity = null;
-
-	/**
-	 * The cached value of the '{@link #getAttributeTypeReferencedEntity() <em>Attribute Type Referenced Entity</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getAttributeTypeReferencedEntity()
-	 * @generated
-	 * @ordered
-	 */
-	protected DTDEntity attributeTypeReferencedEntity = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDAttribute();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String getComment() {
-		return comment;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setComment(String newComment) {
-		String oldComment = comment;
-		comment = newComment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ATTRIBUTE__COMMENT, oldComment, comment));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDDefaultKind getDefaultKind() {
-		return defaultKind;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setDefaultKind(DTDDefaultKind newDefaultKind) {
-		DTDDefaultKind oldDefaultKind = defaultKind;
-		defaultKind = newDefaultKind == null ? DEFAULT_KIND_EDEFAULT : newDefaultKind;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ATTRIBUTE__DEFAULT_KIND, oldDefaultKind, defaultKind));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String getDefaultValueString() {
-		return defaultValueString;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setDefaultValueString(String newDefaultValueString) {
-		String oldDefaultValueString = defaultValueString;
-		defaultValueString = newDefaultValueString;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ATTRIBUTE__DEFAULT_VALUE_STRING, oldDefaultValueString, defaultValueString));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDEntity getAttributeNameReferencedEntity() {
-		if (attributeNameReferencedEntity != null && attributeNameReferencedEntity.eIsProxy()) {
-			DTDEntity oldAttributeNameReferencedEntity = attributeNameReferencedEntity;
-			attributeNameReferencedEntity = (DTDEntity) EcoreUtil.resolve(attributeNameReferencedEntity, this);
-			if (attributeNameReferencedEntity != oldAttributeNameReferencedEntity) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_NAME_REFERENCED_ENTITY, oldAttributeNameReferencedEntity, attributeNameReferencedEntity));
-			}
-		}
-		return attributeNameReferencedEntity;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDEntity basicGetAttributeNameReferencedEntity() {
-		return attributeNameReferencedEntity;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain basicSetAttributeNameReferencedEntity(DTDEntity newAttributeNameReferencedEntity, NotificationChain msgs) {
-		DTDEntity oldAttributeNameReferencedEntity = attributeNameReferencedEntity;
-		attributeNameReferencedEntity = newAttributeNameReferencedEntity;
-		if (eNotificationRequired()) {
-			if (msgs == null)
-				msgs = new NotificationChainImpl(4);
-			msgs.add(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_NAME_REFERENCED_ENTITY, oldAttributeNameReferencedEntity, newAttributeNameReferencedEntity));
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setAttributeNameReferencedEntity(DTDEntity newAttributeNameReferencedEntity) {
-		if (newAttributeNameReferencedEntity != attributeNameReferencedEntity) {
-			NotificationChain msgs = null;
-			if (attributeNameReferencedEntity != null)
-				msgs = ((InternalEObject) attributeNameReferencedEntity).eInverseRemove(this, DTDPackage.DTD_ENTITY__ATTRIBUTE_NAME_REFERENCE, DTDEntity.class, msgs);
-			if (newAttributeNameReferencedEntity != null)
-				msgs = ((InternalEObject) newAttributeNameReferencedEntity).eInverseAdd(this, DTDPackage.DTD_ENTITY__ATTRIBUTE_NAME_REFERENCE, DTDEntity.class, msgs);
-			msgs = basicSetAttributeNameReferencedEntity(newAttributeNameReferencedEntity, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_NAME_REFERENCED_ENTITY, newAttributeNameReferencedEntity, newAttributeNameReferencedEntity));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDEntity getAttributeTypeReferencedEntity() {
-		if (attributeTypeReferencedEntity != null && attributeTypeReferencedEntity.eIsProxy()) {
-			DTDEntity oldAttributeTypeReferencedEntity = attributeTypeReferencedEntity;
-			attributeTypeReferencedEntity = (DTDEntity) EcoreUtil.resolve(attributeTypeReferencedEntity, this);
-			if (attributeTypeReferencedEntity != oldAttributeTypeReferencedEntity) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_TYPE_REFERENCED_ENTITY, oldAttributeTypeReferencedEntity, attributeTypeReferencedEntity));
-			}
-		}
-		return attributeTypeReferencedEntity;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDEntity basicGetAttributeTypeReferencedEntity() {
-		return attributeTypeReferencedEntity;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain basicSetAttributeTypeReferencedEntity(DTDEntity newAttributeTypeReferencedEntity, NotificationChain msgs) {
-		DTDEntity oldAttributeTypeReferencedEntity = attributeTypeReferencedEntity;
-		attributeTypeReferencedEntity = newAttributeTypeReferencedEntity;
-		if (eNotificationRequired()) {
-			if (msgs == null)
-				msgs = new NotificationChainImpl(4);
-			msgs.add(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_TYPE_REFERENCED_ENTITY, oldAttributeTypeReferencedEntity, newAttributeTypeReferencedEntity));
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setAttributeTypeReferencedEntity(DTDEntity newAttributeTypeReferencedEntity) {
-		if (newAttributeTypeReferencedEntity != attributeTypeReferencedEntity) {
-			NotificationChain msgs = null;
-			if (attributeTypeReferencedEntity != null)
-				msgs = ((InternalEObject) attributeTypeReferencedEntity).eInverseRemove(this, DTDPackage.DTD_ENTITY__ATTRIBUTE_TYPE_REFERENCE, DTDEntity.class, msgs);
-			if (newAttributeTypeReferencedEntity != null)
-				msgs = ((InternalEObject) newAttributeTypeReferencedEntity).eInverseAdd(this, DTDPackage.DTD_ENTITY__ATTRIBUTE_TYPE_REFERENCE, DTDEntity.class, msgs);
-			msgs = basicSetAttributeTypeReferencedEntity(newAttributeTypeReferencedEntity, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_TYPE_REFERENCED_ENTITY, newAttributeTypeReferencedEntity, newAttributeTypeReferencedEntity));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDElement getDTDElement() {
-		if (eContainerFeatureID != DTDPackage.DTD_ATTRIBUTE__DTD_ELEMENT)
-			return null;
-		return (DTDElement) eContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setDTDElement(DTDElement newDTDElement) {
-		if (newDTDElement != eContainer || (eContainerFeatureID != DTDPackage.DTD_ATTRIBUTE__DTD_ELEMENT && newDTDElement != null)) {
-			if (EcoreUtil.isAncestor(this, newDTDElement))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + "."); //$NON-NLS-1$ //$NON-NLS-2$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newDTDElement != null)
-				msgs = ((InternalEObject) newDTDElement).eInverseAdd(this, DTDPackage.DTD_ELEMENT__DTD_ATTRIBUTE, DTDElement.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject) newDTDElement, DTDPackage.DTD_ATTRIBUTE__DTD_ELEMENT, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ATTRIBUTE__DTD_ELEMENT, newDTDElement, newDTDElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ATTRIBUTE__EANNOTATIONS :
-					return ((InternalEList) getEAnnotations()).basicAdd(otherEnd, msgs);
-				case DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_NAME_REFERENCED_ENTITY :
-					if (attributeNameReferencedEntity != null)
-						msgs = ((InternalEObject) attributeNameReferencedEntity).eInverseRemove(this, DTDPackage.DTD_ENTITY__ATTRIBUTE_NAME_REFERENCE, DTDEntity.class, msgs);
-					return basicSetAttributeNameReferencedEntity((DTDEntity) otherEnd, msgs);
-				case DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_TYPE_REFERENCED_ENTITY :
-					if (attributeTypeReferencedEntity != null)
-						msgs = ((InternalEObject) attributeTypeReferencedEntity).eInverseRemove(this, DTDPackage.DTD_ENTITY__ATTRIBUTE_TYPE_REFERENCE, DTDEntity.class, msgs);
-					return basicSetAttributeTypeReferencedEntity((DTDEntity) otherEnd, msgs);
-				case DTDPackage.DTD_ATTRIBUTE__DTD_ELEMENT :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_ATTRIBUTE__DTD_ELEMENT, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ATTRIBUTE__EANNOTATIONS :
-					return ((InternalEList) getEAnnotations()).basicRemove(otherEnd, msgs);
-				case DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_NAME_REFERENCED_ENTITY :
-					return basicSetAttributeNameReferencedEntity(null, msgs);
-				case DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_TYPE_REFERENCED_ENTITY :
-					return basicSetAttributeTypeReferencedEntity(null, msgs);
-				case DTDPackage.DTD_ATTRIBUTE__DTD_ELEMENT :
-					return eBasicSetContainer(null, DTDPackage.DTD_ATTRIBUTE__DTD_ELEMENT, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_ATTRIBUTE__DTD_ELEMENT :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_ELEMENT__DTD_ATTRIBUTE, DTDElement.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ATTRIBUTE__EANNOTATIONS :
-				return getEAnnotations();
-			case DTDPackage.DTD_ATTRIBUTE__NAME :
-				return getName();
-			case DTDPackage.DTD_ATTRIBUTE__ETYPE :
-				if (resolve)
-					return getEType();
-				return basicGetEType();
-			case DTDPackage.DTD_ATTRIBUTE__CHANGEABLE :
-				return isChangeable() ? Boolean.TRUE : Boolean.FALSE;
-			case DTDPackage.DTD_ATTRIBUTE__VOLATILE :
-				return isVolatile() ? Boolean.TRUE : Boolean.FALSE;
-			case DTDPackage.DTD_ATTRIBUTE__TRANSIENT :
-				return isTransient() ? Boolean.TRUE : Boolean.FALSE;
-			case DTDPackage.DTD_ATTRIBUTE__UNIQUE :
-				return isUnique() ? Boolean.TRUE : Boolean.FALSE;
-			case DTDPackage.DTD_ATTRIBUTE__DEFAULT_VALUE_LITERAL :
-				return getDefaultValueLiteral();
-			case DTDPackage.DTD_ATTRIBUTE__DEFAULT_VALUE :
-				return getDefaultValue();
-			case DTDPackage.DTD_ATTRIBUTE__LOWER_BOUND :
-				return new Integer(getLowerBound());
-			case DTDPackage.DTD_ATTRIBUTE__UPPER_BOUND :
-				return new Integer(getUpperBound());
-			case DTDPackage.DTD_ATTRIBUTE__MANY :
-				return isMany() ? Boolean.TRUE : Boolean.FALSE;
-			case DTDPackage.DTD_ATTRIBUTE__REQUIRED :
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case DTDPackage.DTD_ATTRIBUTE__ECONTAINING_CLASS :
-				return getEContainingClass();
-			case DTDPackage.DTD_ATTRIBUTE__UNSETTABLE :
-				return isUnsettable() ? Boolean.TRUE : Boolean.FALSE;
-			case DTDPackage.DTD_ATTRIBUTE__ID :
-				return isID() ? Boolean.TRUE : Boolean.FALSE;
-			case DTDPackage.DTD_ATTRIBUTE__EATTRIBUTE_TYPE :
-				if (resolve)
-					return getEAttributeType();
-				return basicGetEAttributeType();
-			case DTDPackage.DTD_ATTRIBUTE__COMMENT :
-				return getComment();
-			case DTDPackage.DTD_ATTRIBUTE__DEFAULT_KIND :
-				return getDefaultKind();
-			case DTDPackage.DTD_ATTRIBUTE__DEFAULT_VALUE_STRING :
-				return getDefaultValueString();
-			case DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_NAME_REFERENCED_ENTITY :
-				if (resolve)
-					return getAttributeNameReferencedEntity();
-				return basicGetAttributeNameReferencedEntity();
-			case DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_TYPE_REFERENCED_ENTITY :
-				if (resolve)
-					return getAttributeTypeReferencedEntity();
-				return basicGetAttributeTypeReferencedEntity();
-			case DTDPackage.DTD_ATTRIBUTE__DTD_ELEMENT :
-				return getDTDElement();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ATTRIBUTE__EANNOTATIONS :
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__NAME :
-				setName((String) newValue);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__ETYPE :
-				setEType((EClassifier) newValue);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__CHANGEABLE :
-				setChangeable(((Boolean) newValue).booleanValue());
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__VOLATILE :
-				setVolatile(((Boolean) newValue).booleanValue());
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__TRANSIENT :
-				setTransient(((Boolean) newValue).booleanValue());
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__UNIQUE :
-				setUnique(((Boolean) newValue).booleanValue());
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__DEFAULT_VALUE_LITERAL :
-				setDefaultValueLiteral((String) newValue);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__LOWER_BOUND :
-				setLowerBound(((Integer) newValue).intValue());
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__UPPER_BOUND :
-				setUpperBound(((Integer) newValue).intValue());
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__UNSETTABLE :
-				setUnsettable(((Boolean) newValue).booleanValue());
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__ID :
-				setID(((Boolean) newValue).booleanValue());
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__COMMENT :
-				setComment((String) newValue);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__DEFAULT_KIND :
-				setDefaultKind((DTDDefaultKind) newValue);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__DEFAULT_VALUE_STRING :
-				setDefaultValueString((String) newValue);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_NAME_REFERENCED_ENTITY :
-				setAttributeNameReferencedEntity((DTDEntity) newValue);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_TYPE_REFERENCED_ENTITY :
-				setAttributeTypeReferencedEntity((DTDEntity) newValue);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__DTD_ELEMENT :
-				setDTDElement((DTDElement) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ATTRIBUTE__EANNOTATIONS :
-				getEAnnotations().clear();
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__NAME :
-				setName(NAME_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__ETYPE :
-				setEType((EClassifier) null);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__CHANGEABLE :
-				setChangeable(CHANGEABLE_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__VOLATILE :
-				setVolatile(VOLATILE_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__TRANSIENT :
-				setTransient(TRANSIENT_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__UNIQUE :
-				setUnique(UNIQUE_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__DEFAULT_VALUE_LITERAL :
-				setDefaultValueLiteral(DEFAULT_VALUE_LITERAL_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__LOWER_BOUND :
-				setLowerBound(LOWER_BOUND_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__UPPER_BOUND :
-				setUpperBound(UPPER_BOUND_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__UNSETTABLE :
-				setUnsettable(UNSETTABLE_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__ID :
-				setID(ID_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__COMMENT :
-				setComment(COMMENT_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__DEFAULT_KIND :
-				setDefaultKind(DEFAULT_KIND_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__DEFAULT_VALUE_STRING :
-				setDefaultValueString(DEFAULT_VALUE_STRING_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_NAME_REFERENCED_ENTITY :
-				setAttributeNameReferencedEntity((DTDEntity) null);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_TYPE_REFERENCED_ENTITY :
-				setAttributeTypeReferencedEntity((DTDEntity) null);
-				return;
-			case DTDPackage.DTD_ATTRIBUTE__DTD_ELEMENT :
-				setDTDElement((DTDElement) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ATTRIBUTE__EANNOTATIONS :
-				return eAnnotations != null && !getEAnnotations().isEmpty();
-			case DTDPackage.DTD_ATTRIBUTE__NAME :
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case DTDPackage.DTD_ATTRIBUTE__ETYPE :
-				return eType != null;
-			case DTDPackage.DTD_ATTRIBUTE__CHANGEABLE :
-				return ((eFlags & CHANGEABLE_EFLAG) != 0) != CHANGEABLE_EDEFAULT;
-			case DTDPackage.DTD_ATTRIBUTE__VOLATILE :
-				return ((eFlags & VOLATILE_EFLAG) != 0) != VOLATILE_EDEFAULT;
-			case DTDPackage.DTD_ATTRIBUTE__TRANSIENT :
-				return ((eFlags & TRANSIENT_EFLAG) != 0) != TRANSIENT_EDEFAULT;
-			case DTDPackage.DTD_ATTRIBUTE__UNIQUE :
-				return ((eFlags & UNIQUE_EFLAG) != 0) != UNIQUE_EDEFAULT;
-			case DTDPackage.DTD_ATTRIBUTE__DEFAULT_VALUE_LITERAL :
-				return DEFAULT_VALUE_LITERAL_EDEFAULT == null ? defaultValueLiteral != null : !DEFAULT_VALUE_LITERAL_EDEFAULT.equals(defaultValueLiteral);
-			case DTDPackage.DTD_ATTRIBUTE__DEFAULT_VALUE :
-				return getDefaultValue() != null;
-			case DTDPackage.DTD_ATTRIBUTE__LOWER_BOUND :
-				return lowerBound != LOWER_BOUND_EDEFAULT;
-			case DTDPackage.DTD_ATTRIBUTE__UPPER_BOUND :
-				return upperBound != UPPER_BOUND_EDEFAULT;
-			case DTDPackage.DTD_ATTRIBUTE__MANY :
-				return isMany() != false;
-			case DTDPackage.DTD_ATTRIBUTE__REQUIRED :
-				return isRequired() != false;
-			case DTDPackage.DTD_ATTRIBUTE__ECONTAINING_CLASS :
-				return getEContainingClass() != null;
-			case DTDPackage.DTD_ATTRIBUTE__UNSETTABLE :
-				return ((eFlags & UNSETTABLE_EFLAG) != 0) != UNSETTABLE_EDEFAULT;
-			case DTDPackage.DTD_ATTRIBUTE__ID :
-				return ((eFlags & ID_EFLAG) != 0) != ID_EDEFAULT;
-			case DTDPackage.DTD_ATTRIBUTE__EATTRIBUTE_TYPE :
-				return basicGetEAttributeType() != null;
-			case DTDPackage.DTD_ATTRIBUTE__COMMENT :
-				return COMMENT_EDEFAULT == null ? comment != null : !COMMENT_EDEFAULT.equals(comment);
-			case DTDPackage.DTD_ATTRIBUTE__DEFAULT_KIND :
-				return defaultKind != DEFAULT_KIND_EDEFAULT;
-			case DTDPackage.DTD_ATTRIBUTE__DEFAULT_VALUE_STRING :
-				return DEFAULT_VALUE_STRING_EDEFAULT == null ? defaultValueString != null : !DEFAULT_VALUE_STRING_EDEFAULT.equals(defaultValueString);
-			case DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_NAME_REFERENCED_ENTITY :
-				return attributeNameReferencedEntity != null;
-			case DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_TYPE_REFERENCED_ENTITY :
-				return attributeTypeReferencedEntity != null;
-			case DTDPackage.DTD_ATTRIBUTE__DTD_ELEMENT :
-				return getDTDElement() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (comment: "); //$NON-NLS-1$
-		result.append(comment);
-		result.append(", defaultKind: "); //$NON-NLS-1$
-		result.append(defaultKind);
-		result.append(", defaultValueString: "); //$NON-NLS-1$
-		result.append(defaultValueString);
-		result.append(')');
-		return result.toString();
-	}
-
-} // DTDAttributeImpl
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDBasicTypeImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDBasicTypeImpl.java
deleted file mode 100644
index c0918c7..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDBasicTypeImpl.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EClassImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.dtd.core.internal.DTDCoreMessages;
-import org.eclipse.wst.dtd.core.internal.emf.DTDBasicType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDBasicTypeKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-import org.eclipse.wst.dtd.core.internal.emf.DTDType;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Basic Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDBasicTypeImpl#getKind <em>Kind</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class DTDBasicTypeImpl extends EClassImpl implements DTDBasicType, EClass {
-
-	public final static String basicTypeStrings[] = {DTDType.NONE, DTDType.CDATA, DTDType.ID, DTDType.IDREF, DTDType.IDREFS, DTDType.ENTITY, DTDType.ENTITIES, DTDType.NMTOKEN, DTDType.NMTOKENS};
-
-	public final static String basicTypeDescriptions[] = {DTDCoreMessages._UI_NONE_DESC, DTDCoreMessages._UI_CHARACTER_DATA_DESC, DTDCoreMessages._UI_IDENTIFIER_DESC, DTDCoreMessages._UI_ID_REFERENCE_DESC, DTDCoreMessages._UI_ID_REFERENCES_DESC, DTDCoreMessages._UI_ENTITY_NAME_DESC, DTDCoreMessages._UI_ENTITY_NAMES_DESC, DTDCoreMessages._UI_NAME_TOKEN_DESC, DTDCoreMessages._UI_NAME_TOKENS_DESC}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-
-	public final static int basicTypeKinds[] = {DTDBasicTypeKind.NONE, DTDBasicTypeKind.CDATA, DTDBasicTypeKind.ID, DTDBasicTypeKind.IDREF, DTDBasicTypeKind.IDREFS, DTDBasicTypeKind.ENTITY, DTDBasicTypeKind.ENTITIES, DTDBasicTypeKind.NMTOKEN, DTDBasicTypeKind.NMTOKENS};
-
-	public String unparse() {
-		return getTypeString();
-	}
-
-	public String getTypeString() {
-		int kind = getKind().getValue();
-		if (kind >= 0 && kind < basicTypeStrings.length) {
-			return basicTypeStrings[kind];
-		} // end of if ()
-
-		return null;
-	}
-
-
-	public String getTypeDescription() {
-		return getTypeDescription(getKind().getValue());
-	}
-
-
-	public static String getTypeDescription(int typeKind) {
-		if (typeKind >= 0 && typeKind < basicTypeDescriptions.length) {
-			return basicTypeDescriptions[typeKind];
-		}
-		return null;
-	}
-
-	public String getPathname() {
-		// TBD
-		return ""; //$NON-NLS-1$
-	}
-
-	public DTDObject findObject(String relativePath) {
-		return null;
-	}
-
-
-
-	/**
-	 * The default value of the '{@link #getKind() <em>Kind</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final DTDBasicTypeKind KIND_EDEFAULT = DTDBasicTypeKind.NONE_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected DTDBasicTypeKind kind = KIND_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected DTDBasicTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDBasicType();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDBasicTypeKind getKind() {
-		return kind;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setKind(DTDBasicTypeKind newKind) {
-		DTDBasicTypeKind oldKind = kind;
-		kind = newKind == null ? KIND_EDEFAULT : newKind;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_BASIC_TYPE__KIND, oldKind, kind));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_BASIC_TYPE__EANNOTATIONS :
-					return ((InternalEList) getEAnnotations()).basicAdd(otherEnd, msgs);
-				case DTDPackage.DTD_BASIC_TYPE__EPACKAGE :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_BASIC_TYPE__EPACKAGE, msgs);
-				case DTDPackage.DTD_BASIC_TYPE__EOPERATIONS :
-					return ((InternalEList) getEOperations()).basicAdd(otherEnd, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_BASIC_TYPE__EANNOTATIONS :
-					return ((InternalEList) getEAnnotations()).basicRemove(otherEnd, msgs);
-				case DTDPackage.DTD_BASIC_TYPE__EPACKAGE :
-					return eBasicSetContainer(null, DTDPackage.DTD_BASIC_TYPE__EPACKAGE, msgs);
-				case DTDPackage.DTD_BASIC_TYPE__EOPERATIONS :
-					return ((InternalEList) getEOperations()).basicRemove(otherEnd, msgs);
-				case DTDPackage.DTD_BASIC_TYPE__EREFERENCES :
-					return ((InternalEList) getEReferences()).basicRemove(otherEnd, msgs);
-				case DTDPackage.DTD_BASIC_TYPE__EATTRIBUTES :
-					return ((InternalEList) getEAttributes()).basicRemove(otherEnd, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_BASIC_TYPE__EPACKAGE :
-					return eContainer.eInverseRemove(this, EcorePackage.EPACKAGE__ECLASSIFIERS, EPackage.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_BASIC_TYPE__EANNOTATIONS :
-				return getEAnnotations();
-			case DTDPackage.DTD_BASIC_TYPE__NAME :
-				return getName();
-			case DTDPackage.DTD_BASIC_TYPE__INSTANCE_CLASS_NAME :
-				return getInstanceClassName();
-			case DTDPackage.DTD_BASIC_TYPE__INSTANCE_CLASS :
-				return getInstanceClass();
-			case DTDPackage.DTD_BASIC_TYPE__DEFAULT_VALUE :
-				return getDefaultValue();
-			case DTDPackage.DTD_BASIC_TYPE__EPACKAGE :
-				return getEPackage();
-			case DTDPackage.DTD_BASIC_TYPE__ABSTRACT :
-				return isAbstract() ? Boolean.TRUE : Boolean.FALSE;
-			case DTDPackage.DTD_BASIC_TYPE__INTERFACE :
-				return isInterface() ? Boolean.TRUE : Boolean.FALSE;
-			case DTDPackage.DTD_BASIC_TYPE__ESUPER_TYPES :
-				return getESuperTypes();
-			case DTDPackage.DTD_BASIC_TYPE__EOPERATIONS :
-				return getEOperations();
-			case DTDPackage.DTD_BASIC_TYPE__EALL_ATTRIBUTES :
-				return getEAllAttributes();
-			case DTDPackage.DTD_BASIC_TYPE__EALL_REFERENCES :
-				return getEAllReferences();
-			case DTDPackage.DTD_BASIC_TYPE__EREFERENCES :
-				return getEReferences();
-			case DTDPackage.DTD_BASIC_TYPE__EATTRIBUTES :
-				return getEAttributes();
-			case DTDPackage.DTD_BASIC_TYPE__EALL_CONTAINMENTS :
-				return getEAllContainments();
-			case DTDPackage.DTD_BASIC_TYPE__EALL_OPERATIONS :
-				return getEAllOperations();
-			case DTDPackage.DTD_BASIC_TYPE__EALL_STRUCTURAL_FEATURES :
-				return getEAllStructuralFeatures();
-			case DTDPackage.DTD_BASIC_TYPE__EALL_SUPER_TYPES :
-				return getEAllSuperTypes();
-			case DTDPackage.DTD_BASIC_TYPE__EID_ATTRIBUTE :
-				return getEIDAttribute();
-			case DTDPackage.DTD_BASIC_TYPE__KIND :
-				return getKind();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_BASIC_TYPE__EANNOTATIONS :
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__NAME :
-				setName((String) newValue);
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__INSTANCE_CLASS_NAME :
-				setInstanceClassName((String) newValue);
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__INSTANCE_CLASS :
-				setInstanceClass((Class) newValue);
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__ABSTRACT :
-				setAbstract(((Boolean) newValue).booleanValue());
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__INTERFACE :
-				setInterface(((Boolean) newValue).booleanValue());
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__ESUPER_TYPES :
-				getESuperTypes().clear();
-				getESuperTypes().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__EOPERATIONS :
-				getEOperations().clear();
-				getEOperations().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__EREFERENCES :
-				getEReferences().clear();
-				getEReferences().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__EATTRIBUTES :
-				getEAttributes().clear();
-				getEAttributes().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__KIND :
-				setKind((DTDBasicTypeKind) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_BASIC_TYPE__EANNOTATIONS :
-				getEAnnotations().clear();
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__NAME :
-				setName(NAME_EDEFAULT);
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__INSTANCE_CLASS_NAME :
-				setInstanceClassName(INSTANCE_CLASS_NAME_EDEFAULT);
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__INSTANCE_CLASS :
-				setInstanceClass(INSTANCE_CLASS_EDEFAULT);
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__ABSTRACT :
-				setAbstract(ABSTRACT_EDEFAULT);
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__INTERFACE :
-				setInterface(INTERFACE_EDEFAULT);
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__ESUPER_TYPES :
-				getESuperTypes().clear();
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__EOPERATIONS :
-				getEOperations().clear();
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__EREFERENCES :
-				getEReferences().clear();
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__EATTRIBUTES :
-				getEAttributes().clear();
-				return;
-			case DTDPackage.DTD_BASIC_TYPE__KIND :
-				setKind(KIND_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_BASIC_TYPE__EANNOTATIONS :
-				return eAnnotations != null && !getEAnnotations().isEmpty();
-			case DTDPackage.DTD_BASIC_TYPE__NAME :
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case DTDPackage.DTD_BASIC_TYPE__INSTANCE_CLASS_NAME :
-				return INSTANCE_CLASS_NAME_EDEFAULT == null ? instanceClassName != null : !INSTANCE_CLASS_NAME_EDEFAULT.equals(instanceClassName);
-			case DTDPackage.DTD_BASIC_TYPE__INSTANCE_CLASS :
-				return INSTANCE_CLASS_EDEFAULT == null ? instanceClass != null : !INSTANCE_CLASS_EDEFAULT.equals(instanceClass);
-			case DTDPackage.DTD_BASIC_TYPE__DEFAULT_VALUE :
-				return getDefaultValue() != null;
-			case DTDPackage.DTD_BASIC_TYPE__EPACKAGE :
-				return getEPackage() != null;
-			case DTDPackage.DTD_BASIC_TYPE__ABSTRACT :
-				return ((eFlags & ABSTRACT_EFLAG) != 0) != ABSTRACT_EDEFAULT;
-			case DTDPackage.DTD_BASIC_TYPE__INTERFACE :
-				return ((eFlags & INTERFACE_EFLAG) != 0) != INTERFACE_EDEFAULT;
-			case DTDPackage.DTD_BASIC_TYPE__ESUPER_TYPES :
-				return eSuperTypes != null && !getESuperTypes().isEmpty();
-			case DTDPackage.DTD_BASIC_TYPE__EOPERATIONS :
-				return eOperations != null && !getEOperations().isEmpty();
-			case DTDPackage.DTD_BASIC_TYPE__EALL_ATTRIBUTES :
-				return !getEAllAttributes().isEmpty();
-			case DTDPackage.DTD_BASIC_TYPE__EALL_REFERENCES :
-				return !getEAllReferences().isEmpty();
-			case DTDPackage.DTD_BASIC_TYPE__EREFERENCES :
-				return eReferences != null && !getEReferences().isEmpty();
-			case DTDPackage.DTD_BASIC_TYPE__EATTRIBUTES :
-				return eAttributes != null && !getEAttributes().isEmpty();
-			case DTDPackage.DTD_BASIC_TYPE__EALL_CONTAINMENTS :
-				return !getEAllContainments().isEmpty();
-			case DTDPackage.DTD_BASIC_TYPE__EALL_OPERATIONS :
-				return !getEAllOperations().isEmpty();
-			case DTDPackage.DTD_BASIC_TYPE__EALL_STRUCTURAL_FEATURES :
-				return !getEAllStructuralFeatures().isEmpty();
-			case DTDPackage.DTD_BASIC_TYPE__EALL_SUPER_TYPES :
-				return !getEAllSuperTypes().isEmpty();
-			case DTDPackage.DTD_BASIC_TYPE__EID_ATTRIBUTE :
-				return getEIDAttribute() != null;
-			case DTDPackage.DTD_BASIC_TYPE__KIND :
-				return kind != KIND_EDEFAULT;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (kind: "); //$NON-NLS-1$
-		result.append(kind);
-		result.append(')');
-		return result.toString();
-	}
-
-} // DTDBasicTypeImpl
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDContentImpl.java
deleted file mode 100644
index 7f39b9d..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDContentImpl.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENamedElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.dtd.core.internal.emf.DTDContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-
-
-public class DTDContentImpl extends ENamedElementImpl implements DTDContent, EObject {
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected DTDContentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDContent();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDFile getDTDFile() {
-		if (eContainerFeatureID != DTDPackage.DTD_CONTENT__DTD_FILE)
-			return null;
-		return (DTDFile) eContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setDTDFile(DTDFile newDTDFile) {
-		if (newDTDFile != eContainer || (eContainerFeatureID != DTDPackage.DTD_CONTENT__DTD_FILE && newDTDFile != null)) {
-			if (EcoreUtil.isAncestor(this, newDTDFile))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + "."); //$NON-NLS-1$ //$NON-NLS-2$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newDTDFile != null)
-				msgs = ((InternalEObject) newDTDFile).eInverseAdd(this, DTDPackage.DTD_FILE__DTD_CONTENT, DTDFile.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject) newDTDFile, DTDPackage.DTD_CONTENT__DTD_FILE, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_CONTENT__DTD_FILE, newDTDFile, newDTDFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_CONTENT__DTD_FILE :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_CONTENT__DTD_FILE, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_CONTENT__DTD_FILE :
-					return eBasicSetContainer(null, DTDPackage.DTD_CONTENT__DTD_FILE, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_CONTENT__DTD_FILE :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_FILE__DTD_CONTENT, DTDFile.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_CONTENT__DTD_FILE :
-				return getDTDFile();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_CONTENT__DTD_FILE :
-				setDTDFile((DTDFile) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_CONTENT__DTD_FILE :
-				setDTDFile((DTDFile) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_CONTENT__DTD_FILE :
-				return getDTDFile() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} // DTDContentImpl
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementContentImpl.java
deleted file mode 100644
index be81da8..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementContentImpl.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDLexicalInfo;
-import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-import org.eclipse.wst.dtd.core.internal.emf.util.DTDPathnameUtil;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Element Content</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDElementContentImpl#getGroup <em>Group</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDElementContentImpl#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public abstract class DTDElementContentImpl extends EObjectImpl implements DTDElementContent {
-
-	public DTDElementContentImpl() {
-		super();
-	}
-
-	public DTDElement getDTDElement() {
-		DTDElementContent c = getDTDGroupContent();
-		if (c != null)
-			return c.getElement();
-		else
-			return getElement();
-	}
-
-	// get the most outer DTDGroupContent
-	public DTDGroupContent getDTDGroupContent() {
-		DTDElementContent c = this;
-		while (c.getGroup() != null) {
-			c = c.getGroup();
-		}
-		return ((c instanceof DTDGroupContent) ? (DTDGroupContent) c : null);
-	}
-
-	public String getPathname() {
-		int cnt = 0;
-		DTDObject parent = getGroup();
-		if (parent == null) {
-			parent = getElement();
-		}
-		else {
-			DTDGroupContent group = (DTDGroupContent) parent;
-			Iterator i = group.getContent().iterator();
-			while (i.hasNext()) {
-				DTDElementContent content = (DTDElementContent) i.next();
-				if (content == this) {
-					break;
-				}
-				if ((content instanceof DTDElementReferenceContent) || (content instanceof DTDEntityReferenceContent)) {
-					continue;
-				}
-				cnt++;
-			}
-		}
-		return DTDPathnameUtil.makePath(((parent == null) ? "NULL_PARENT" : parent.getPathname()), "Content", null, cnt); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public DTDObject findObject(String relativePath) {
-		return null;
-	}
-
-	public boolean isFirstElementContent() {
-		DTDElement element = getElement();
-
-		if (element != null) {
-			// This means this is the only element content in the element
-			return true;
-		} // end of if ()
-
-		DTDGroupContent group = getGroup();
-		int pos = group.getContentPosition(this);
-		if (pos == 0) {
-			// now recurse and ensure this group is the first group
-			return group.isFirstElementContent();
-		} // end of if ()
-		else {
-			return false;
-		}
-	}
-
-	public String getContentDetail() {
-		// most times, content name is fine. However for groups,
-		// we didn't want a long name to show up in the tree,
-		// so we created a get contentdetail to get to the long
-		// name (getContentName will get the short one.
-		return getContentName();
-	}
-
-	// ugly hack for now since we don't have multiple inheritance.
-	// Would rather have all this stuff in a base class but these
-	// classes are inheriting from sometimes different mof classes
-	DTDLexicalInfo lexInfo = new DTDLexicalInfo();
-
-	/**
-	 * Get the value of startOffset.
-	 * 
-	 * @return value of startOffset.
-	 */
-	public int getStartOffset() {
-		return lexInfo.getStartOffset();
-	}
-
-	/**
-	 * Set the value of startOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to startOffset.
-	 */
-	public void setStartOffset(int v) {
-		lexInfo.setStartOffset(v);
-	}
-
-	/**
-	 * Get the value of endOffset.
-	 * 
-	 * @return value of endOffset.
-	 */
-	public int getEndOffset() {
-		return lexInfo.getEndOffset();
-	}
-
-	/**
-	 * Set the value of endOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to endOffset.
-	 */
-	public void setEndOffset(int v) {
-		lexInfo.setEndOffset(v);
-	}
-
-	/*
-	 * @see DTDElementContent#getContentName()
-	 */
-	public String getContentName() {
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDElementContent();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDGroupContent getGroup() {
-		if (eContainerFeatureID != DTDPackage.DTD_ELEMENT_CONTENT__GROUP)
-			return null;
-		return (DTDGroupContent) eContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setGroup(DTDGroupContent newGroup) {
-		if (newGroup != eContainer || (eContainerFeatureID != DTDPackage.DTD_ELEMENT_CONTENT__GROUP && newGroup != null)) {
-			if (EcoreUtil.isAncestor(this, newGroup))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + "."); //$NON-NLS-1$ //$NON-NLS-2$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newGroup != null)
-				msgs = ((InternalEObject) newGroup).eInverseAdd(this, DTDPackage.DTD_GROUP_CONTENT__CONTENT, DTDGroupContent.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject) newGroup, DTDPackage.DTD_ELEMENT_CONTENT__GROUP, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ELEMENT_CONTENT__GROUP, newGroup, newGroup));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDElement getElement() {
-		if (eContainerFeatureID != DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT)
-			return null;
-		return (DTDElement) eContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setElement(DTDElement newElement) {
-		if (newElement != eContainer || (eContainerFeatureID != DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT && newElement != null)) {
-			if (EcoreUtil.isAncestor(this, newElement))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + "."); //$NON-NLS-1$ //$NON-NLS-2$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newElement != null)
-				msgs = ((InternalEObject) newElement).eInverseAdd(this, DTDPackage.DTD_ELEMENT__CONTENT, DTDElement.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject) newElement, DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT, newElement, newElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ELEMENT_CONTENT__GROUP :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_ELEMENT_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ELEMENT_CONTENT__GROUP :
-					return eBasicSetContainer(null, DTDPackage.DTD_ELEMENT_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT :
-					return eBasicSetContainer(null, DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_ELEMENT_CONTENT__GROUP :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_GROUP_CONTENT__CONTENT, DTDGroupContent.class, msgs);
-				case DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_ELEMENT__CONTENT, DTDElement.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ELEMENT_CONTENT__GROUP :
-				return getGroup();
-			case DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT :
-				return getElement();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ELEMENT_CONTENT__GROUP :
-				setGroup((DTDGroupContent) newValue);
-				return;
-			case DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT :
-				setElement((DTDElement) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ELEMENT_CONTENT__GROUP :
-				setGroup((DTDGroupContent) null);
-				return;
-			case DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT :
-				setElement((DTDElement) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ELEMENT_CONTENT__GROUP :
-				return getGroup() != null;
-			case DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT :
-				return getElement() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} // DTDElementContentImpl
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementImpl.java
deleted file mode 100644
index 400234c..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementImpl.java
+++ /dev/null
@@ -1,656 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.notify.impl.NotificationChainImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EClassImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute;
-import org.eclipse.wst.dtd.core.internal.emf.DTDContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDLexicalInfo;
-import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-import org.eclipse.wst.dtd.core.internal.emf.util.DTDPathnameUtil;
-import org.eclipse.wst.dtd.core.internal.emf.util.DTDVisitor;
-
-
-/**
- * @generated
- */
-public class DTDElementImpl extends EClassImpl implements DTDElement {
-	/**
-	 * The default value of the '{@link #getComment() <em>Comment</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMMENT_EDEFAULT = null;
-
-	public DTDElementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDElement();
-	}
-
-	public void addDTDAttribute(DTDAttribute attribute) {
-		getDTDAttribute().add(attribute);
-	}
-
-	public String getPathname() {
-		return DTDPathnameUtil.makePath(null, "Elem", getName(), -1); //$NON-NLS-1$
-	}
-
-	public DTDObject findObject(String relativePath) {
-		Object[] result = DTDPathnameUtil.parsePathComponent(relativePath);
-
-		String type = (String) result[0];
-
-		if (type == null)
-			return null;
-
-		String name = (String) result[1];
-
-		DTDObject obj = null;
-		if (type.equals("Attr")) { //$NON-NLS-1$
-			// TODO: fix port
-			// obj = findAttribute(name);
-		}
-		else if ((type.equals("Content")) || (type.equals("ElemRef")) || (type.equals("EntRef"))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			obj = getContent();
-		}
-		else {
-			return null;
-		}
-
-		String restPath = (String) result[3];
-
-		if ((restPath == null) || (obj == null)) {
-			return obj;
-		}
-		else {
-			return obj.findObject(restPath);
-		}
-	}
-
-	// returns all references in the same DTDFile that reference this element
-	public Collection getReferences() {
-		DTDFile file = getDTDFile();
-		final Collection result = new ArrayList();
-
-		DTDVisitor visitRefs = new DTDVisitor() {
-			public void visitDTDElementReferenceContent(DTDElementReferenceContent elementReferenceContent) {
-				if (elementReferenceContent.getReferencedElement() == DTDElementImpl.this) {
-					result.add(elementReferenceContent);
-				} // end of if ()
-			}
-		};
-		visitRefs.visitDTDFile(file);
-		return result;
-	}
-
-	public String getAttributeDetail() {
-		String attributeString = ""; //$NON-NLS-1$
-		Collection attributes = getDTDAttribute();
-		if (attributes != null) {
-			boolean seenOne = false;
-			for (java.util.Iterator i = attributes.iterator(); i.hasNext();) {
-				if (seenOne) {
-					attributeString = attributeString + ", "; //$NON-NLS-1$
-				}
-				else {
-					seenOne = true;
-				} // end of else
-
-				attributeString = attributeString + ((DTDAttribute) i.next()).getName();
-			}
-		} // end of if ()
-		return attributeString;
-	}
-
-
-	// ugly hack for now since we don't have multiple inheritance.
-	// Would rather have all this stuff in a base class but these
-	// classes are inheriting from sometimes different mof classes
-	DTDLexicalInfo lexInfo = new DTDLexicalInfo();
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String comment = COMMENT_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected DTDElementContent content = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList dtdAttribute = null;
-
-	/**
-	 * Get the value of startOffset.
-	 * 
-	 * @return value of startOffset.
-	 */
-	public int getStartOffset() {
-		return lexInfo.getStartOffset();
-	}
-
-	/**
-	 * Set the value of startOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to startOffset.
-	 */
-	public void setStartOffset(int v) {
-		lexInfo.setStartOffset(v);
-	}
-
-	/**
-	 * Get the value of endOffset.
-	 * 
-	 * @return value of endOffset.
-	 */
-	public int getEndOffset() {
-		return lexInfo.getEndOffset();
-	}
-
-	/**
-	 * Set the value of endOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to endOffset.
-	 */
-	public void setEndOffset(int v) {
-		lexInfo.setEndOffset(v);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public String getComment() {
-		return comment;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setComment(String newComment) {
-		String oldComment = comment;
-		comment = newComment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ELEMENT__COMMENT, oldComment, comment));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public DTDElementContent getContent() {
-		return content;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain basicSetContent(DTDElementContent newContent, NotificationChain msgs) {
-		DTDElementContent oldContent = content;
-		content = newContent;
-		if (eNotificationRequired()) {
-			if (msgs == null)
-				msgs = new NotificationChainImpl(4);
-			msgs.add(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ELEMENT__CONTENT, oldContent, newContent));
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setContent(DTDElementContent newContent) {
-		if (newContent != content) {
-			NotificationChain msgs = null;
-			if (content != null)
-				msgs = ((InternalEObject) content).eInverseRemove(this, DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT, DTDElementContent.class, msgs);
-			if (newContent != null)
-				msgs = ((InternalEObject) newContent).eInverseAdd(this, DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT, DTDElementContent.class, msgs);
-			msgs = basicSetContent(newContent, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ELEMENT__CONTENT, newContent, newContent));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public EList getDTDAttribute() {
-		if (dtdAttribute == null) {
-			dtdAttribute = new EObjectContainmentWithInverseEList(DTDAttribute.class, this, DTDPackage.DTD_ELEMENT__DTD_ATTRIBUTE, DTDPackage.DTD_ATTRIBUTE__DTD_ELEMENT);
-		}
-		return dtdAttribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ELEMENT__EANNOTATIONS :
-					return ((InternalEList) getEAnnotations()).basicAdd(otherEnd, msgs);
-				case DTDPackage.DTD_ELEMENT__EPACKAGE :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_ELEMENT__EPACKAGE, msgs);
-				case DTDPackage.DTD_ELEMENT__EOPERATIONS :
-					return ((InternalEList) getEOperations()).basicAdd(otherEnd, msgs);
-				case DTDPackage.DTD_ELEMENT__DTD_FILE :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_ELEMENT__DTD_FILE, msgs);
-				case DTDPackage.DTD_ELEMENT__CONTENT :
-					if (content != null)
-						msgs = ((InternalEObject) content).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DTDPackage.DTD_ELEMENT__CONTENT, null, msgs);
-					return basicSetContent((DTDElementContent) otherEnd, msgs);
-				case DTDPackage.DTD_ELEMENT__DTD_ATTRIBUTE :
-					return ((InternalEList) getDTDAttribute()).basicAdd(otherEnd, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ELEMENT__EANNOTATIONS :
-					return ((InternalEList) getEAnnotations()).basicRemove(otherEnd, msgs);
-				case DTDPackage.DTD_ELEMENT__EPACKAGE :
-					return eBasicSetContainer(null, DTDPackage.DTD_ELEMENT__EPACKAGE, msgs);
-				case DTDPackage.DTD_ELEMENT__EOPERATIONS :
-					return ((InternalEList) getEOperations()).basicRemove(otherEnd, msgs);
-				case DTDPackage.DTD_ELEMENT__EREFERENCES :
-					return ((InternalEList) getEReferences()).basicRemove(otherEnd, msgs);
-				case DTDPackage.DTD_ELEMENT__EATTRIBUTES :
-					return ((InternalEList) getEAttributes()).basicRemove(otherEnd, msgs);
-				case DTDPackage.DTD_ELEMENT__DTD_FILE :
-					return eBasicSetContainer(null, DTDPackage.DTD_ELEMENT__DTD_FILE, msgs);
-				case DTDPackage.DTD_ELEMENT__CONTENT :
-					return basicSetContent(null, msgs);
-				case DTDPackage.DTD_ELEMENT__DTD_ATTRIBUTE :
-					return ((InternalEList) getDTDAttribute()).basicRemove(otherEnd, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_ELEMENT__EPACKAGE :
-					return eContainer.eInverseRemove(this, EcorePackage.EPACKAGE__ECLASSIFIERS, EPackage.class, msgs);
-				case DTDPackage.DTD_ELEMENT__DTD_FILE :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_FILE__DTD_CONTENT, DTDFile.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ELEMENT__EANNOTATIONS :
-				return getEAnnotations();
-			case DTDPackage.DTD_ELEMENT__NAME :
-				return getName();
-			case DTDPackage.DTD_ELEMENT__INSTANCE_CLASS_NAME :
-				return getInstanceClassName();
-			case DTDPackage.DTD_ELEMENT__INSTANCE_CLASS :
-				return getInstanceClass();
-			case DTDPackage.DTD_ELEMENT__DEFAULT_VALUE :
-				return getDefaultValue();
-			case DTDPackage.DTD_ELEMENT__EPACKAGE :
-				return getEPackage();
-			case DTDPackage.DTD_ELEMENT__ABSTRACT :
-				return isAbstract() ? Boolean.TRUE : Boolean.FALSE;
-			case DTDPackage.DTD_ELEMENT__INTERFACE :
-				return isInterface() ? Boolean.TRUE : Boolean.FALSE;
-			case DTDPackage.DTD_ELEMENT__ESUPER_TYPES :
-				return getESuperTypes();
-			case DTDPackage.DTD_ELEMENT__EOPERATIONS :
-				return getEOperations();
-			case DTDPackage.DTD_ELEMENT__EALL_ATTRIBUTES :
-				return getEAllAttributes();
-			case DTDPackage.DTD_ELEMENT__EALL_REFERENCES :
-				return getEAllReferences();
-			case DTDPackage.DTD_ELEMENT__EREFERENCES :
-				return getEReferences();
-			case DTDPackage.DTD_ELEMENT__EATTRIBUTES :
-				return getEAttributes();
-			case DTDPackage.DTD_ELEMENT__EALL_CONTAINMENTS :
-				return getEAllContainments();
-			case DTDPackage.DTD_ELEMENT__EALL_OPERATIONS :
-				return getEAllOperations();
-			case DTDPackage.DTD_ELEMENT__EALL_STRUCTURAL_FEATURES :
-				return getEAllStructuralFeatures();
-			case DTDPackage.DTD_ELEMENT__EALL_SUPER_TYPES :
-				return getEAllSuperTypes();
-			case DTDPackage.DTD_ELEMENT__EID_ATTRIBUTE :
-				return getEIDAttribute();
-			case DTDPackage.DTD_ELEMENT__DTD_FILE :
-				return getDTDFile();
-			case DTDPackage.DTD_ELEMENT__COMMENT :
-				return getComment();
-			case DTDPackage.DTD_ELEMENT__CONTENT :
-				return getContent();
-			case DTDPackage.DTD_ELEMENT__DTD_ATTRIBUTE :
-				return getDTDAttribute();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ELEMENT__EANNOTATIONS :
-				return eAnnotations != null && !getEAnnotations().isEmpty();
-			case DTDPackage.DTD_ELEMENT__NAME :
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case DTDPackage.DTD_ELEMENT__INSTANCE_CLASS_NAME :
-				return INSTANCE_CLASS_NAME_EDEFAULT == null ? instanceClassName != null : !INSTANCE_CLASS_NAME_EDEFAULT.equals(instanceClassName);
-			case DTDPackage.DTD_ELEMENT__INSTANCE_CLASS :
-				return INSTANCE_CLASS_EDEFAULT == null ? instanceClass != null : !INSTANCE_CLASS_EDEFAULT.equals(instanceClass);
-			case DTDPackage.DTD_ELEMENT__DEFAULT_VALUE :
-				return getDefaultValue() != null;
-			case DTDPackage.DTD_ELEMENT__EPACKAGE :
-				return getEPackage() != null;
-			case DTDPackage.DTD_ELEMENT__ABSTRACT :
-				return ((eFlags & ABSTRACT_EFLAG) != 0) != ABSTRACT_EDEFAULT;
-			case DTDPackage.DTD_ELEMENT__INTERFACE :
-				return ((eFlags & INTERFACE_EFLAG) != 0) != INTERFACE_EDEFAULT;
-			case DTDPackage.DTD_ELEMENT__ESUPER_TYPES :
-				return eSuperTypes != null && !getESuperTypes().isEmpty();
-			case DTDPackage.DTD_ELEMENT__EOPERATIONS :
-				return eOperations != null && !getEOperations().isEmpty();
-			case DTDPackage.DTD_ELEMENT__EALL_ATTRIBUTES :
-				return !getEAllAttributes().isEmpty();
-			case DTDPackage.DTD_ELEMENT__EALL_REFERENCES :
-				return !getEAllReferences().isEmpty();
-			case DTDPackage.DTD_ELEMENT__EREFERENCES :
-				return eReferences != null && !getEReferences().isEmpty();
-			case DTDPackage.DTD_ELEMENT__EATTRIBUTES :
-				return eAttributes != null && !getEAttributes().isEmpty();
-			case DTDPackage.DTD_ELEMENT__EALL_CONTAINMENTS :
-				return !getEAllContainments().isEmpty();
-			case DTDPackage.DTD_ELEMENT__EALL_OPERATIONS :
-				return !getEAllOperations().isEmpty();
-			case DTDPackage.DTD_ELEMENT__EALL_STRUCTURAL_FEATURES :
-				return !getEAllStructuralFeatures().isEmpty();
-			case DTDPackage.DTD_ELEMENT__EALL_SUPER_TYPES :
-				return !getEAllSuperTypes().isEmpty();
-			case DTDPackage.DTD_ELEMENT__EID_ATTRIBUTE :
-				return getEIDAttribute() != null;
-			case DTDPackage.DTD_ELEMENT__DTD_FILE :
-				return getDTDFile() != null;
-			case DTDPackage.DTD_ELEMENT__COMMENT :
-				return COMMENT_EDEFAULT == null ? comment != null : !COMMENT_EDEFAULT.equals(comment);
-			case DTDPackage.DTD_ELEMENT__CONTENT :
-				return content != null;
-			case DTDPackage.DTD_ELEMENT__DTD_ATTRIBUTE :
-				return dtdAttribute != null && !getDTDAttribute().isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
-		if (baseClass == DTDContent.class) {
-			switch (derivedFeatureID) {
-				case DTDPackage.DTD_ELEMENT__DTD_FILE :
-					return DTDPackage.DTD_CONTENT__DTD_FILE;
-				default :
-					return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
-		if (baseClass == DTDContent.class) {
-			switch (baseFeatureID) {
-				case DTDPackage.DTD_CONTENT__DTD_FILE :
-					return DTDPackage.DTD_ELEMENT__DTD_FILE;
-				default :
-					return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (comment: "); //$NON-NLS-1$
-		result.append(comment);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ELEMENT__EANNOTATIONS :
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_ELEMENT__NAME :
-				setName((String) newValue);
-				return;
-			case DTDPackage.DTD_ELEMENT__INSTANCE_CLASS_NAME :
-				setInstanceClassName((String) newValue);
-				return;
-			case DTDPackage.DTD_ELEMENT__INSTANCE_CLASS :
-				setInstanceClass((Class) newValue);
-				return;
-			case DTDPackage.DTD_ELEMENT__ABSTRACT :
-				setAbstract(((Boolean) newValue).booleanValue());
-				return;
-			case DTDPackage.DTD_ELEMENT__INTERFACE :
-				setInterface(((Boolean) newValue).booleanValue());
-				return;
-			case DTDPackage.DTD_ELEMENT__ESUPER_TYPES :
-				getESuperTypes().clear();
-				getESuperTypes().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_ELEMENT__EOPERATIONS :
-				getEOperations().clear();
-				getEOperations().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_ELEMENT__EREFERENCES :
-				getEReferences().clear();
-				getEReferences().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_ELEMENT__EATTRIBUTES :
-				getEAttributes().clear();
-				getEAttributes().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_ELEMENT__DTD_FILE :
-				setDTDFile((DTDFile) newValue);
-				return;
-			case DTDPackage.DTD_ELEMENT__COMMENT :
-				setComment((String) newValue);
-				return;
-			case DTDPackage.DTD_ELEMENT__CONTENT :
-				setContent((DTDElementContent) newValue);
-				return;
-			case DTDPackage.DTD_ELEMENT__DTD_ATTRIBUTE :
-				getDTDAttribute().clear();
-				getDTDAttribute().addAll((Collection) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ELEMENT__EANNOTATIONS :
-				getEAnnotations().clear();
-				return;
-			case DTDPackage.DTD_ELEMENT__NAME :
-				setName(NAME_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ELEMENT__INSTANCE_CLASS_NAME :
-				setInstanceClassName(INSTANCE_CLASS_NAME_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ELEMENT__INSTANCE_CLASS :
-				setInstanceClass(INSTANCE_CLASS_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ELEMENT__ABSTRACT :
-				setAbstract(ABSTRACT_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ELEMENT__INTERFACE :
-				setInterface(INTERFACE_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ELEMENT__ESUPER_TYPES :
-				getESuperTypes().clear();
-				return;
-			case DTDPackage.DTD_ELEMENT__EOPERATIONS :
-				getEOperations().clear();
-				return;
-			case DTDPackage.DTD_ELEMENT__EREFERENCES :
-				getEReferences().clear();
-				return;
-			case DTDPackage.DTD_ELEMENT__EATTRIBUTES :
-				getEAttributes().clear();
-				return;
-			case DTDPackage.DTD_ELEMENT__DTD_FILE :
-				setDTDFile((DTDFile) null);
-				return;
-			case DTDPackage.DTD_ELEMENT__COMMENT :
-				setComment(COMMENT_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ELEMENT__CONTENT :
-				setContent((DTDElementContent) null);
-				return;
-			case DTDPackage.DTD_ELEMENT__DTD_ATTRIBUTE :
-				getDTDAttribute().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public DTDFile getDTDFile() {
-		if (eContainerFeatureID != DTDPackage.DTD_ELEMENT__DTD_FILE)
-			return null;
-		return (DTDFile) eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDTDFile(DTDFile newDTDFile) {
-		if (newDTDFile != eContainer || (eContainerFeatureID != DTDPackage.DTD_ELEMENT__DTD_FILE && newDTDFile != null)) {
-			if (EcoreUtil.isAncestor(this, newDTDFile))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + "."); //$NON-NLS-1$ //$NON-NLS-2$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newDTDFile != null)
-				msgs = ((InternalEObject) newDTDFile).eInverseAdd(this, DTDPackage.DTD_FILE__DTD_CONTENT, DTDFile.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject) newDTDFile, DTDPackage.DTD_ELEMENT__DTD_FILE, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ELEMENT__DTD_FILE, newDTDFile, newDTDFile));
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementReferenceContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementReferenceContentImpl.java
deleted file mode 100644
index fa2b885..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementReferenceContentImpl.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-
-
-/**
- * @generated
- */
-public class DTDElementReferenceContentImpl extends DTDRepeatableContentImpl implements DTDElementReferenceContent {
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected DTDElement referencedElement = null;
-
-	public DTDElementReferenceContentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDElementReferenceContent();
-	}
-
-	public String unparseRepeatableContent() {
-		return getContentName();
-	}
-
-	public String getContentName() {
-		DTDElement e = getReferencedElement();
-		if (e == null)
-			return ""; //$NON-NLS-1$
-		return e.getName();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public DTDElement getReferencedElement() {
-		if (referencedElement != null && referencedElement.eIsProxy()) {
-			DTDElement oldReferencedElement = referencedElement;
-			referencedElement = (DTDElement) EcoreUtil.resolve(referencedElement, this);
-			if (referencedElement != oldReferencedElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__REFERENCED_ELEMENT, oldReferencedElement, referencedElement));
-			}
-		}
-		return referencedElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDElement basicGetReferencedElement() {
-		return referencedElement;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setReferencedElement(DTDElement newReferencedElement) {
-		DTDElement oldReferencedElement = referencedElement;
-		referencedElement = newReferencedElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__REFERENCED_ELEMENT, oldReferencedElement, referencedElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__GROUP :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__ELEMENT :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__ELEMENT, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__GROUP :
-					return eBasicSetContainer(null, DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__ELEMENT :
-					return eBasicSetContainer(null, DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__ELEMENT, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__GROUP :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_GROUP_CONTENT__CONTENT, DTDGroupContent.class, msgs);
-				case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__ELEMENT :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_ELEMENT__CONTENT, DTDElement.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__GROUP :
-				return getGroup();
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__ELEMENT :
-				return getElement();
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__OCCURRENCE :
-				return getOccurrence();
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__REFERENCED_ELEMENT :
-				if (resolve)
-					return getReferencedElement();
-				return basicGetReferencedElement();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__GROUP :
-				return getGroup() != null;
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__ELEMENT :
-				return getElement() != null;
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__OCCURRENCE :
-				return occurrence != OCCURRENCE_EDEFAULT;
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__REFERENCED_ELEMENT :
-				return referencedElement != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__GROUP :
-				setGroup((DTDGroupContent) newValue);
-				return;
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__ELEMENT :
-				setElement((DTDElement) newValue);
-				return;
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__OCCURRENCE :
-				setOccurrence((DTDOccurrenceType) newValue);
-				return;
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__REFERENCED_ELEMENT :
-				setReferencedElement((DTDElement) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__GROUP :
-				setGroup((DTDGroupContent) null);
-				return;
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__ELEMENT :
-				setElement((DTDElement) null);
-				return;
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__OCCURRENCE :
-				setOccurrence(OCCURRENCE_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT__REFERENCED_ELEMENT :
-				setReferencedElement((DTDElement) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEmptyContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEmptyContentImpl.java
deleted file mode 100644
index 2077db2..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEmptyContentImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEmptyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-
-/**
- * @generated
- */
-public class DTDEmptyContentImpl extends DTDElementContentImpl implements DTDEmptyContent {
-
-	public DTDEmptyContentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDEmptyContent();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_EMPTY_CONTENT__GROUP :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_EMPTY_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_EMPTY_CONTENT__ELEMENT :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_EMPTY_CONTENT__ELEMENT, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_EMPTY_CONTENT__GROUP :
-					return eBasicSetContainer(null, DTDPackage.DTD_EMPTY_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_EMPTY_CONTENT__ELEMENT :
-					return eBasicSetContainer(null, DTDPackage.DTD_EMPTY_CONTENT__ELEMENT, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_EMPTY_CONTENT__GROUP :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_GROUP_CONTENT__CONTENT, DTDGroupContent.class, msgs);
-				case DTDPackage.DTD_EMPTY_CONTENT__ELEMENT :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_ELEMENT__CONTENT, DTDElement.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_EMPTY_CONTENT__GROUP :
-				return getGroup();
-			case DTDPackage.DTD_EMPTY_CONTENT__ELEMENT :
-				return getElement();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_EMPTY_CONTENT__GROUP :
-				setGroup((DTDGroupContent) newValue);
-				return;
-			case DTDPackage.DTD_EMPTY_CONTENT__ELEMENT :
-				setElement((DTDElement) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_EMPTY_CONTENT__GROUP :
-				setGroup((DTDGroupContent) null);
-				return;
-			case DTDPackage.DTD_EMPTY_CONTENT__ELEMENT :
-				setElement((DTDElement) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_EMPTY_CONTENT__GROUP :
-				return getGroup() != null;
-			case DTDPackage.DTD_EMPTY_CONTENT__ELEMENT :
-				return getElement() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String getContentName() {
-		return "EMPTY"; //$NON-NLS-1$
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityContentImpl.java
deleted file mode 100644
index 48cade3..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityContentImpl.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-import org.eclipse.wst.dtd.core.internal.emf.util.DTDPathnameUtil;
-
-/**
- * @generated
- */
-public abstract class DTDEntityContentImpl extends EObjectImpl implements DTDEntityContent {
-
-	public DTDEntityContentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDEntityContent();
-	}
-
-	public String getPathname() {
-		return DTDPathnameUtil.makePath(getDTDEntity().getPathname(), "Content", null, -1); //$NON-NLS-1$
-	}
-
-	public DTDObject findObject(String relativePath) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public DTDEntity getDTDEntity() {
-		if (eContainerFeatureID != DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY)
-			return null;
-		return (DTDEntity) eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDTDEntity(DTDEntity newDTDEntity) {
-		if (newDTDEntity != eContainer || (eContainerFeatureID != DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY && newDTDEntity != null)) {
-			if (EcoreUtil.isAncestor(this, newDTDEntity))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + "."); //$NON-NLS-1$ //$NON-NLS-2$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newDTDEntity != null)
-				msgs = ((InternalEObject) newDTDEntity).eInverseAdd(this, DTDPackage.DTD_ENTITY__CONTENT, DTDEntity.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject) newDTDEntity, DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY, newDTDEntity, newDTDEntity));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY :
-					return eBasicSetContainer(null, DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_ENTITY__CONTENT, DTDEntity.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY :
-				return getDTDEntity();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY :
-				return getDTDEntity() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY :
-				setDTDEntity((DTDEntity) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY :
-				setDTDEntity((DTDEntity) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/*
-	 * @see DTDEntityContent#unparse()
-	 */
-	public String unparse() {
-		return null;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityImpl.java
deleted file mode 100644
index eeeb09d..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityImpl.java
+++ /dev/null
@@ -1,1198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.notify.impl.NotificationChainImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute;
-import org.eclipse.wst.dtd.core.internal.emf.DTDContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDLexicalInfo;
-import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-import org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference;
-import org.eclipse.wst.dtd.core.internal.emf.util.DTDPathnameUtil;
-
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Entity</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEntityImpl#getComment <em>Comment</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEntityImpl#isParameterEntity <em>Parameter Entity</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEntityImpl#getContent <em>Content</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEntityImpl#getParmEntityRef <em>Parm Entity Ref</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEntityImpl#getEntityReference <em>Entity Reference</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEntityImpl#getAttributeNameReference <em>Attribute Name Reference</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDEntityImpl#getAttributeTypeReference <em>Attribute Type Reference</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class DTDEntityImpl extends DTDContentImpl implements DTDEntity, ENamedElement, DTDContent {
-
-	public String getPathname() {
-		return DTDPathnameUtil.makePath(null, "Ent", getName(), -1); //$NON-NLS-1$
-	}
-
-
-	public DTDObject findObject(String relativePath) {
-		Object[] result = DTDPathnameUtil.parsePathComponent(relativePath);
-
-
-		String type = (String) result[0];
-
-
-		if (type == null)
-			return null;
-
-
-		DTDObject obj = null;
-		if (type.equals("Content")) { //$NON-NLS-1$
-			obj = getContent();
-		}
-		else {
-			return null;
-		}
-
-
-		String restPath = (String) result[3];
-
-		if ((restPath == null) || (obj == null)) {
-			return obj;
-		}
-		else {
-			return obj.findObject(restPath);
-		}
-	}
-
-
-	// ugly hack for now since we don't have multiple inheritance.
-	// Would rather have all this stuff in a base class but these
-	// classes are inheriting from sometimes different mof classes
-	DTDLexicalInfo lexInfo = new DTDLexicalInfo();
-
-	/**
-	 * Get the value of startOffset.
-	 * 
-	 * @return value of startOffset.
-	 */
-	public int getStartOffset() {
-		return lexInfo.getStartOffset();
-	}
-
-	/**
-	 * Set the value of startOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to startOffset.
-	 */
-	public void setStartOffset(int v) {
-		lexInfo.setStartOffset(v);
-	}
-
-	/**
-	 * Get the value of endOffset.
-	 * 
-	 * @return value of endOffset.
-	 */
-	public int getEndOffset() {
-		return lexInfo.getEndOffset();
-	}
-
-	/**
-	 * Set the value of endOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to endOffset.
-	 */
-	public void setEndOffset(int v) {
-		lexInfo.setEndOffset(v);
-	}
-
-
-
-	/**
-	 * The default value of the '{@link #getComment() <em>Comment</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getComment() <em>Comment</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected String comment = COMMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isParameterEntity() <em>Parameter Entity</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #isParameterEntity()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean PARAMETER_ENTITY_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isParameterEntity() <em>Parameter Entity</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #isParameterEntity()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean parameterEntity = PARAMETER_ENTITY_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getContent() <em>Content</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getContent()
-	 * @generated
-	 * @ordered
-	 */
-	protected DTDEntityContent content = null;
-
-	/**
-	 * The cached value of the '{@link #getParmEntityRef() <em>Parm Entity Ref</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getParmEntityRef()
-	 * @generated
-	 * @ordered
-	 */
-	protected DTDParameterEntityReference parmEntityRef = null;
-
-	/**
-	 * The cached value of the '{@link #getEntityReference() <em>Entity Reference</em>}'
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getEntityReference()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList entityReference = null;
-
-	/**
-	 * The cached value of the '{@link #getAttributeNameReference() <em>Attribute Name Reference</em>}'
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getAttributeNameReference()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList attributeNameReference = null;
-
-	/**
-	 * The cached value of the '{@link #getAttributeTypeReference() <em>Attribute Type Reference</em>}'
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getAttributeTypeReference()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList attributeTypeReference = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected DTDEntityImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDEntity();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String getComment() {
-		return comment;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setComment(String newComment) {
-		String oldComment = comment;
-		comment = newComment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ENTITY__COMMENT, oldComment, comment));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean isParameterEntity() {
-		return parameterEntity;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setParameterEntity(boolean newParameterEntity) {
-		boolean oldParameterEntity = parameterEntity;
-		parameterEntity = newParameterEntity;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ENTITY__PARAMETER_ENTITY, oldParameterEntity, parameterEntity));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDEntityContent getContent() {
-		return content;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain basicSetContent(DTDEntityContent newContent, NotificationChain msgs) {
-		DTDEntityContent oldContent = content;
-		content = newContent;
-		if (eNotificationRequired()) {
-			if (msgs == null)
-				msgs = new NotificationChainImpl(4);
-			msgs.add(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ENTITY__CONTENT, oldContent, newContent));
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setContent(DTDEntityContent newContent) {
-		if (newContent != content) {
-			NotificationChain msgs = null;
-			if (content != null)
-				msgs = ((InternalEObject) content).eInverseRemove(this, DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY, DTDEntityContent.class, msgs);
-			if (newContent != null)
-				msgs = ((InternalEObject) newContent).eInverseAdd(this, DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY, DTDEntityContent.class, msgs);
-			msgs = basicSetContent(newContent, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ENTITY__CONTENT, newContent, newContent));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDParameterEntityReference getParmEntityRef() {
-		if (parmEntityRef != null && parmEntityRef.eIsProxy()) {
-			DTDParameterEntityReference oldParmEntityRef = parmEntityRef;
-			parmEntityRef = (DTDParameterEntityReference) EcoreUtil.resolve(parmEntityRef, this);
-			if (parmEntityRef != oldParmEntityRef) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DTDPackage.DTD_ENTITY__PARM_ENTITY_REF, oldParmEntityRef, parmEntityRef));
-			}
-		}
-		return parmEntityRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDParameterEntityReference basicGetParmEntityRef() {
-		return parmEntityRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain basicSetParmEntityRef(DTDParameterEntityReference newParmEntityRef, NotificationChain msgs) {
-		DTDParameterEntityReference oldParmEntityRef = parmEntityRef;
-		parmEntityRef = newParmEntityRef;
-		if (eNotificationRequired()) {
-			if (msgs == null)
-				msgs = new NotificationChainImpl(4);
-			msgs.add(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ENTITY__PARM_ENTITY_REF, oldParmEntityRef, newParmEntityRef));
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setParmEntityRef(DTDParameterEntityReference newParmEntityRef) {
-		if (newParmEntityRef != parmEntityRef) {
-			NotificationChain msgs = null;
-			if (parmEntityRef != null)
-				msgs = ((InternalEObject) parmEntityRef).eInverseRemove(this, DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY, DTDParameterEntityReference.class, msgs);
-			if (newParmEntityRef != null)
-				msgs = ((InternalEObject) newParmEntityRef).eInverseAdd(this, DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY, DTDParameterEntityReference.class, msgs);
-			msgs = basicSetParmEntityRef(newParmEntityRef, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ENTITY__PARM_ENTITY_REF, newParmEntityRef, newParmEntityRef));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EList getEntityReference() {
-		if (entityReference == null) {
-			entityReference = new EObjectWithInverseResolvingEList(DTDEntityReferenceContent.class, this, DTDPackage.DTD_ENTITY__ENTITY_REFERENCE, DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT_REFERENCED_ENTITY);
-		}
-		return entityReference;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EList getAttributeNameReference() {
-		if (attributeNameReference == null) {
-			attributeNameReference = new EObjectWithInverseResolvingEList(DTDAttribute.class, this, DTDPackage.DTD_ENTITY__ATTRIBUTE_NAME_REFERENCE, DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_NAME_REFERENCED_ENTITY);
-		}
-		return attributeNameReference;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EList getAttributeTypeReference() {
-		if (attributeTypeReference == null) {
-			attributeTypeReference = new EObjectWithInverseResolvingEList(DTDAttribute.class, this, DTDPackage.DTD_ENTITY__ATTRIBUTE_TYPE_REFERENCE, DTDPackage.DTD_ATTRIBUTE__ATTRIBUTE_TYPE_REFERENCED_ENTITY);
-		}
-		return attributeTypeReference;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ENTITY__DTD_FILE :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_ENTITY__DTD_FILE, msgs);
-				case DTDPackage.DTD_ENTITY__CONTENT :
-					if (content != null)
-						msgs = ((InternalEObject) content).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DTDPackage.DTD_ENTITY__CONTENT, null, msgs);
-					return basicSetContent((DTDEntityContent) otherEnd, msgs);
-				case DTDPackage.DTD_ENTITY__PARM_ENTITY_REF :
-					if (parmEntityRef != null)
-						msgs = ((InternalEObject) parmEntityRef).eInverseRemove(this, DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY, DTDParameterEntityReference.class, msgs);
-					return basicSetParmEntityRef((DTDParameterEntityReference) otherEnd, msgs);
-				case DTDPackage.DTD_ENTITY__ENTITY_REFERENCE :
-					return ((InternalEList) getEntityReference()).basicAdd(otherEnd, msgs);
-				case DTDPackage.DTD_ENTITY__ATTRIBUTE_NAME_REFERENCE :
-					return ((InternalEList) getAttributeNameReference()).basicAdd(otherEnd, msgs);
-				case DTDPackage.DTD_ENTITY__ATTRIBUTE_TYPE_REFERENCE :
-					return ((InternalEList) getAttributeTypeReference()).basicAdd(otherEnd, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ENTITY__DTD_FILE :
-					return eBasicSetContainer(null, DTDPackage.DTD_ENTITY__DTD_FILE, msgs);
-				case DTDPackage.DTD_ENTITY__CONTENT :
-					return basicSetContent(null, msgs);
-				case DTDPackage.DTD_ENTITY__PARM_ENTITY_REF :
-					return basicSetParmEntityRef(null, msgs);
-				case DTDPackage.DTD_ENTITY__ENTITY_REFERENCE :
-					return ((InternalEList) getEntityReference()).basicRemove(otherEnd, msgs);
-				case DTDPackage.DTD_ENTITY__ATTRIBUTE_NAME_REFERENCE :
-					return ((InternalEList) getAttributeNameReference()).basicRemove(otherEnd, msgs);
-				case DTDPackage.DTD_ENTITY__ATTRIBUTE_TYPE_REFERENCE :
-					return ((InternalEList) getAttributeTypeReference()).basicRemove(otherEnd, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_ENTITY__DTD_FILE :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_FILE__DTD_CONTENT, DTDFile.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENTITY__DTD_FILE :
-				return getDTDFile();
-			case DTDPackage.DTD_ENTITY__COMMENT :
-				return getComment();
-			case DTDPackage.DTD_ENTITY__PARAMETER_ENTITY :
-				return isParameterEntity() ? Boolean.TRUE : Boolean.FALSE;
-			case DTDPackage.DTD_ENTITY__CONTENT :
-				return getContent();
-			case DTDPackage.DTD_ENTITY__PARM_ENTITY_REF :
-				if (resolve)
-					return getParmEntityRef();
-				return basicGetParmEntityRef();
-			case DTDPackage.DTD_ENTITY__ENTITY_REFERENCE :
-				return getEntityReference();
-			case DTDPackage.DTD_ENTITY__ATTRIBUTE_NAME_REFERENCE :
-				return getAttributeNameReference();
-			case DTDPackage.DTD_ENTITY__ATTRIBUTE_TYPE_REFERENCE :
-				return getAttributeTypeReference();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENTITY__DTD_FILE :
-				setDTDFile((DTDFile) newValue);
-				return;
-			case DTDPackage.DTD_ENTITY__COMMENT :
-				setComment((String) newValue);
-				return;
-			case DTDPackage.DTD_ENTITY__PARAMETER_ENTITY :
-				setParameterEntity(((Boolean) newValue).booleanValue());
-				return;
-			case DTDPackage.DTD_ENTITY__CONTENT :
-				setContent((DTDEntityContent) newValue);
-				return;
-			case DTDPackage.DTD_ENTITY__PARM_ENTITY_REF :
-				setParmEntityRef((DTDParameterEntityReference) newValue);
-				return;
-			case DTDPackage.DTD_ENTITY__ENTITY_REFERENCE :
-				getEntityReference().clear();
-				getEntityReference().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_ENTITY__ATTRIBUTE_NAME_REFERENCE :
-				getAttributeNameReference().clear();
-				getAttributeNameReference().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_ENTITY__ATTRIBUTE_TYPE_REFERENCE :
-				getAttributeTypeReference().clear();
-				getAttributeTypeReference().addAll((Collection) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENTITY__DTD_FILE :
-				setDTDFile((DTDFile) null);
-				return;
-			case DTDPackage.DTD_ENTITY__COMMENT :
-				setComment(COMMENT_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ENTITY__PARAMETER_ENTITY :
-				setParameterEntity(PARAMETER_ENTITY_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ENTITY__CONTENT :
-				setContent((DTDEntityContent) null);
-				return;
-			case DTDPackage.DTD_ENTITY__PARM_ENTITY_REF :
-				setParmEntityRef((DTDParameterEntityReference) null);
-				return;
-			case DTDPackage.DTD_ENTITY__ENTITY_REFERENCE :
-				getEntityReference().clear();
-				return;
-			case DTDPackage.DTD_ENTITY__ATTRIBUTE_NAME_REFERENCE :
-				getAttributeNameReference().clear();
-				return;
-			case DTDPackage.DTD_ENTITY__ATTRIBUTE_TYPE_REFERENCE :
-				getAttributeTypeReference().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENTITY__DTD_FILE :
-				return getDTDFile() != null;
-			case DTDPackage.DTD_ENTITY__COMMENT :
-				return COMMENT_EDEFAULT == null ? comment != null : !COMMENT_EDEFAULT.equals(comment);
-			case DTDPackage.DTD_ENTITY__PARAMETER_ENTITY :
-				return parameterEntity != PARAMETER_ENTITY_EDEFAULT;
-			case DTDPackage.DTD_ENTITY__CONTENT :
-				return content != null;
-			case DTDPackage.DTD_ENTITY__PARM_ENTITY_REF :
-				return parmEntityRef != null;
-			case DTDPackage.DTD_ENTITY__ENTITY_REFERENCE :
-				return entityReference != null && !getEntityReference().isEmpty();
-			case DTDPackage.DTD_ENTITY__ATTRIBUTE_NAME_REFERENCE :
-				return attributeNameReference != null && !getAttributeNameReference().isEmpty();
-			case DTDPackage.DTD_ENTITY__ATTRIBUTE_TYPE_REFERENCE :
-				return attributeTypeReference != null && !getAttributeTypeReference().isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (comment: "); //$NON-NLS-1$
-		result.append(comment);
-		result.append(", parameterEntity: "); //$NON-NLS-1$
-		result.append(parameterEntity);
-		result.append(')');
-		return result.toString();
-	}
-
-} // DTDEntityImpl
-
-// +++++++++++++++++++GENERICRULES.JSED+++++++++++++++++++
-//
-
-// +++++++++++++++++++GENERICRULES.JSED+++++++++++++++++++
-// //public class DTDEntityImpl extends ENamespaceImpl implements DTDEntity,
-// ENamespace, DTDContent{
-// -------------------GENERICRULES.JSED-------------------
-
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected String comment = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected Boolean parameterEntity = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected DTDEntityContent content = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected DTDParameterEntityReference parmEntityRef = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected EList entityReference = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected EList attributeNameReference = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected EList attributeTypeReference = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected boolean setComment = false;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected boolean setParameterEntity = false;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected boolean setContent = false;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected boolean setParmEntityRef = false;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// private DTDContentImpl dtdContentDelegate = null;
-
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public EObject initInstance() {
-// setEMetaObj(eClassDTDEntity());
-// initInstanceDelegates();
-// return this;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected void initInstanceDelegates() {
-// super.initInstanceDelegates();
-//
-// getDtdContentDelegate().refSetDelegateOwner(this);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public DTDPackage ePackageDTD() {
-// return
-// (DTDPackage)EPackage.Registry.INSTANCE.getEPackage(DTDPackage.eNS_URI);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public EClass eClassDTDEntity() {
-// return
-// ((DTDPackage)EPackage.Registry.INSTANCE.getEPackage(DTDPackage.eNS_URI)).getDTDEntity();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public String getComment() {
-// if (this.setComment) return this.comment;
-// else return
-// (String)DTDPackage.eINSTANCE.getDTDEntity_Comment().getDefaultValue();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void setComment(String value) {
-// refSetValueForSimpleSF(DTDPackage.eINSTANCE.getDTDEntity_Comment(),this.comment,value);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void unsetComment() {
-// eNotify(refBasicUnsetValue(DTDPackage.eINSTANCE.getDTDEntity_Comment()));
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean isSetComment() {
-// return setComment;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public Boolean getParameterEntity() {
-// if (this.setParameterEntity) return this.parameterEntity;
-// else return
-// (Boolean)DTDPackage.eINSTANCE.getDTDEntity_ParameterEntity().getDefaultValue();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public boolean isParameterEntity() {
-// Boolean result = getParameterEntity();
-// return result != null ? result.booleanValue() : false;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void setParameterEntity(Boolean value) {
-// refSetValueForSimpleSF(DTDPackage.eINSTANCE.getDTDEntity_ParameterEntity(),this.parameterEntity,value);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void setParameterEntity(boolean value) {
-// setParameterEntity(value?Boolean.TRUE:Boolean.FALSE);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void unsetParameterEntity() {
-// eNotify(refBasicUnsetValue(DTDPackage.eINSTANCE.getDTDEntity_ParameterEntity()));
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean isSetParameterEntity() {
-// return setParameterEntity;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public DTDEntityContent getContent() {
-// try {
-// if (this.content == null) return null;
-// this.content = (DTDEntityContent)
-// ((InternalEObject)this.content).resolve(this);
-// if (this.content==null) this.setContent = false;
-// return this.content;
-// } catch (Exception e) {
-// return null;
-// }
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void setContent(DTDEntityContent l) {
-// refSetValueForRefObjectSF(DTDPackage.eINSTANCE.getDTDEntity_Content(),this.content,l);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void unsetContent() {
-// refUnsetValueForRefObjectSF(DTDPackage.eINSTANCE.getDTDEntity_Content(),this.content);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean isSetContent() {
-// return setContent;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public DTDParameterEntityReference getParmEntityRef() {
-// try {
-// if (this.parmEntityRef == null) return null;
-// this.parmEntityRef = (DTDParameterEntityReference)
-// ((InternalEObject)this.parmEntityRef).resolve(this,
-// DTDPackage.eINSTANCE.getDTDEntity_ParmEntityRef());
-// if (this.parmEntityRef==null) this.setParmEntityRef = false;
-// return this.parmEntityRef;
-// } catch (Exception e) {
-// return null;
-// }
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void setParmEntityRef(DTDParameterEntityReference l) {
-// refSetValueForSVReference(DTDPackage.eINSTANCE.getDTDEntity_ParmEntityRef(),this.parmEntityRef,l);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void unsetParmEntityRef() {
-// refUnsetValueForSVReference(DTDPackage.eINSTANCE.getDTDEntity_ParmEntityRef(),this.parmEntityRef);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean isSetParmEntityRef() {
-// return setParmEntityRef;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public EList getEntityReference() {
-// if (this.entityReference==null) {
-// this.entityReference=newCollection(this,DTDPackage.eINSTANCE.getDTDEntity_EntityReference(),
-// true);
-// }
-// return this.entityReference;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public EList getAttributeNameReference() {
-// if (this.attributeNameReference==null) {
-// this.attributeNameReference=newCollection(this,DTDPackage.eINSTANCE.getDTDEntity_AttributeNameReference(),
-// true);
-// }
-// return this.attributeNameReference;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public EList getAttributeTypeReference() {
-// if (this.attributeTypeReference==null) {
-// this.attributeTypeReference=newCollection(this,DTDPackage.eINSTANCE.getDTDEntity_AttributeTypeReference(),
-// true);
-// }
-// return this.attributeTypeReference;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Object eGet(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.eGet(feature);
-// }
-// switch (eClassDTDEntity().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_ENTITY__COMMENT: return getComment();
-// case DTDPackage.DTD_ENTITY__PARAMETER_ENTITY: return getParameterEntity();
-// case DTDPackage.DTD_ENTITY__CONTENT: return getContent();
-// case DTDPackage.DTD_ENTITY__PARM_ENTITY_REF: return getParmEntityRef();
-// case DTDPackage.DTD_ENTITY__ENTITY_REFERENCE: return getEntityReference();
-// case DTDPackage.DTD_ENTITY__ATTRIBUTE_NAME_REFERENCE: return
-// getAttributeNameReference();
-// case DTDPackage.DTD_ENTITY__ATTRIBUTE_TYPE_REFERENCE: return
-// getAttributeTypeReference();
-// case DTDPackage.DTD_ENTITY__DTD_FILE: return getDTDFile();
-//
-// }
-// return super.eGet(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Object refBasicValue(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.refBasicValue(feature);
-// }
-// switch (eClassDTDEntity().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_ENTITY__COMMENT:
-// return this.setComment? this.comment : null;
-// case DTDPackage.DTD_ENTITY__PARAMETER_ENTITY:
-// return this.setParameterEntity? this.parameterEntity : null;
-// case DTDPackage.DTD_ENTITY__CONTENT:
-// if (!this.setContent||this.content==null) return null;
-// if (((InternalEObject)this.content).refIsDeleted()) {this.content=null;
-// this.setContent=false;}
-// return this.content;
-// case DTDPackage.DTD_ENTITY__PARM_ENTITY_REF:
-// if (!this.setParmEntityRef||this.parmEntityRef==null) return null;
-// if (((InternalEObject)this.parmEntityRef).refIsDeleted())
-// {this.parmEntityRef=null; this.setParmEntityRef=false;}
-// return this.parmEntityRef;
-// case DTDPackage.DTD_ENTITY__ENTITY_REFERENCE:
-// return this.entityReference;
-// case DTDPackage.DTD_ENTITY__ATTRIBUTE_NAME_REFERENCE:
-// return this.attributeNameReference;
-// case DTDPackage.DTD_ENTITY__ATTRIBUTE_TYPE_REFERENCE:
-// return this.attributeTypeReference;
-// case DTDPackage.DTD_ENTITY__DTD_FILE: return
-// ((InternalEObject)getDtdContentDelegate()).refBasicValue(feature);
-//
-// }
-// return super.refBasicValue(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean eIsSet(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.eIsSet(feature);
-// }
-// switch (eClassDTDEntity().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_ENTITY__COMMENT: return isSetComment();
-// case DTDPackage.DTD_ENTITY__PARAMETER_ENTITY: return
-// isSetParameterEntity();
-// case DTDPackage.DTD_ENTITY__CONTENT: return isSetContent();
-// case DTDPackage.DTD_ENTITY__PARM_ENTITY_REF: return isSetParmEntityRef();
-// case DTDPackage.DTD_ENTITY__DTD_FILE: return isSetDTDFile();
-//
-// }
-// return super.eIsSet(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void eSet(EStructuralFeature feature, Object newValue) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// super.eSet(feature, newValue);
-// }
-// switch (eClassDTDEntity().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_ENTITY__COMMENT: {
-// setComment((String)newValue);
-// return;
-// }
-// case DTDPackage.DTD_ENTITY__PARAMETER_ENTITY: {
-// setParameterEntity((newValue instanceof
-// String)?Boolean.valueOf((String)newValue):(Boolean)newValue);
-// return;
-// }
-// case DTDPackage.DTD_ENTITY__CONTENT: {
-// setContent((DTDEntityContent)newValue);
-// return;
-// }
-// case DTDPackage.DTD_ENTITY__PARM_ENTITY_REF: {
-// setParmEntityRef((DTDParameterEntityReference)newValue);
-// return;
-// }
-// case DTDPackage.DTD_ENTITY__DTD_FILE: {
-// setDTDFile((DTDFile)newValue);
-// return;
-// }
-//
-// }
-// super.eSet(feature, newValue);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Notification eBasicSet(EStructuralFeature feature, Object newValue)
-// {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.eBasicSet(feature, newValue);
-// }
-// switch (eClassDTDEntity().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_ENTITY__COMMENT: {
-// Object oldValue = this.comment;
-// this.comment = (String)newValue;
-// this.setComment = true;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.SET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDEntity_Comment(),oldValue,newValue);
-// }
-// case DTDPackage.DTD_ENTITY__PARAMETER_ENTITY: {
-// Object oldValue = this.parameterEntity;
-// this.parameterEntity = (Boolean)newValue;
-// this.setParameterEntity = true;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.SET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDEntity_ParameterEntity(),oldValue,newValue);
-// }
-// case DTDPackage.DTD_ENTITY__CONTENT: {
-// Object oldValue = this.content;
-// this.content = (DTDEntityContent)newValue;
-// this.setContent = true;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.SET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDEntity_Content(),oldValue,newValue);
-// }
-// case DTDPackage.DTD_ENTITY__PARM_ENTITY_REF: {
-// Object oldValue = this.parmEntityRef;
-// this.parmEntityRef = (DTDParameterEntityReference)newValue;
-// this.setParmEntityRef = true;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.SET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDEntity_ParmEntityRef(),oldValue,newValue);
-// }
-//
-// }
-// return super.eBasicSet(feature, newValue);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void eUnset(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// super.eUnset(feature);
-// }
-// switch (eClassDTDEntity().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_ENTITY__COMMENT: {
-// unsetComment();
-// return;
-// }
-// case DTDPackage.DTD_ENTITY__PARAMETER_ENTITY: {
-// unsetParameterEntity();
-// return;
-// }
-// case DTDPackage.DTD_ENTITY__CONTENT: {
-// unsetContent();
-// return;
-// }
-// case DTDPackage.DTD_ENTITY__PARM_ENTITY_REF: {
-// unsetParmEntityRef();
-// return;
-// }
-// case DTDPackage.DTD_ENTITY__DTD_FILE: {
-// unsetDTDFile();
-// return;
-// }
-//
-// }
-// super.eUnset(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Notification refBasicUnsetValue(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.refBasicUnsetValue(feature);
-// }
-// switch (eClassDTDEntity().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_ENTITY__COMMENT: {
-// Object oldValue = this.comment;
-// this.comment = null;
-// this.setComment = false;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.UNSET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDEntity_Comment(),oldValue,getComment());
-// }
-// case DTDPackage.DTD_ENTITY__PARAMETER_ENTITY: {
-// Object oldValue = this.parameterEntity;
-// this.parameterEntity = null;
-// this.setParameterEntity = false;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.UNSET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDEntity_ParameterEntity(),oldValue,getParameterEntity());
-// }
-// case DTDPackage.DTD_ENTITY__CONTENT: {
-// Object oldValue = this.content;
-// this.content = null;
-// this.setContent = false;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.UNSET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDEntity_Content(),oldValue,null);
-// }
-// case DTDPackage.DTD_ENTITY__PARM_ENTITY_REF: {
-// Object oldValue = this.parmEntityRef;
-// this.parmEntityRef = null;
-// this.setParmEntityRef = false;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.UNSET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDEntity_ParmEntityRef(),oldValue,null);
-// }
-//
-// }
-// return super.refBasicUnsetValue(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected DTDContentImpl getDtdContentDelegate() {
-// if (dtdContentDelegate == null) {
-// DTDPackage pkg =
-// (DTDPackage)EPackage.Registry.INSTANCE.getEPackage(DTDPackage.eNS_URI);
-// dtdContentDelegate=(DTDContentImpl)pkg.eCreateInstance(pkg.DTD_CONTENT);
-// dtdContentDelegate.initInstance();
-// }
-// return dtdContentDelegate;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public EClass eClassDTDContent() {
-// return getDtdContentDelegate().eClass();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public DTDFile getDTDFile() {
-// return getDtdContentDelegate().getDTDFile();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void setDTDFile(DTDFile value) {
-// getDtdContentDelegate().setDTDFile(value);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void unsetDTDFile() {
-// getDtdContentDelegate().unsetDTDFile();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean isSetDTDFile() {
-// return getDtdContentDelegate().isSetDTDFile();
-// }
-// }
-// -------------------GENERICRULES.JSED-------------------
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityReferenceContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityReferenceContentImpl.java
deleted file mode 100644
index 7d26a5a..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityReferenceContentImpl.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.notify.impl.NotificationChainImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDLexicalInfo;
-import org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-
-
-/**
- * @generated
- */
-public class DTDEntityReferenceContentImpl extends DTDRepeatableContentImpl implements DTDEntityReferenceContent {
-
-	public DTDEntityReferenceContentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDEntityReferenceContent();
-	}
-
-	public String getContentName() {
-		DTDEntity e = getElementReferencedEntity();
-		if (e == null)
-			return ""; //$NON-NLS-1$
-		return e.getName();
-	}
-
-	public String unparseRepeatableContent() {
-		DTDEntity entityRef = getElementReferencedEntity();
-		if (entityRef.isParameterEntity()) {
-			return "%" + getContentName() + ";"; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		else {
-			return "&" + getContentName() + ";"; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	// ugly hack for now since we don't have multiple inheritance.
-	// Would rather have all this stuff in a base class but these
-	// classes are inheriting from sometimes different mof classes
-	DTDLexicalInfo lexInfo = new DTDLexicalInfo();
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected DTDEntity elementReferencedEntity = null;
-
-	/**
-	 * Get the value of startOffset.
-	 * 
-	 * @return value of startOffset.
-	 */
-	public int getStartOffset() {
-		return lexInfo.getStartOffset();
-	}
-
-	/**
-	 * Set the value of startOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to startOffset.
-	 */
-	public void setStartOffset(int v) {
-		lexInfo.setStartOffset(v);
-	}
-
-	/**
-	 * Get the value of endOffset.
-	 * 
-	 * @return value of endOffset.
-	 */
-	public int getEndOffset() {
-		return lexInfo.getEndOffset();
-	}
-
-	/**
-	 * Set the value of endOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to endOffset.
-	 */
-	public void setEndOffset(int v) {
-		lexInfo.setEndOffset(v);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public DTDEntity getElementReferencedEntity() {
-		if (elementReferencedEntity != null && elementReferencedEntity.eIsProxy()) {
-			DTDEntity oldElementReferencedEntity = elementReferencedEntity;
-			elementReferencedEntity = (DTDEntity) EcoreUtil.resolve(elementReferencedEntity, this);
-			if (elementReferencedEntity != oldElementReferencedEntity) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT_REFERENCED_ENTITY, oldElementReferencedEntity, elementReferencedEntity));
-			}
-		}
-		return elementReferencedEntity;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDEntity basicGetElementReferencedEntity() {
-		return elementReferencedEntity;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain basicSetElementReferencedEntity(DTDEntity newElementReferencedEntity, NotificationChain msgs) {
-		DTDEntity oldElementReferencedEntity = elementReferencedEntity;
-		elementReferencedEntity = newElementReferencedEntity;
-		if (eNotificationRequired()) {
-			if (msgs == null)
-				msgs = new NotificationChainImpl(4);
-			msgs.add(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT_REFERENCED_ENTITY, oldElementReferencedEntity, newElementReferencedEntity));
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setElementReferencedEntity(DTDEntity newElementReferencedEntity) {
-		if (newElementReferencedEntity != elementReferencedEntity) {
-			NotificationChain msgs = null;
-			if (elementReferencedEntity != null)
-				msgs = ((InternalEObject) elementReferencedEntity).eInverseRemove(this, DTDPackage.DTD_ENTITY__ENTITY_REFERENCE, DTDEntity.class, msgs);
-			if (newElementReferencedEntity != null)
-				msgs = ((InternalEObject) newElementReferencedEntity).eInverseAdd(this, DTDPackage.DTD_ENTITY__ENTITY_REFERENCE, DTDEntity.class, msgs);
-			msgs = basicSetElementReferencedEntity(newElementReferencedEntity, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT_REFERENCED_ENTITY, newElementReferencedEntity, newElementReferencedEntity));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__GROUP :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT, msgs);
-				case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT_REFERENCED_ENTITY :
-					if (elementReferencedEntity != null)
-						msgs = ((InternalEObject) elementReferencedEntity).eInverseRemove(this, DTDPackage.DTD_ENTITY__ENTITY_REFERENCE, DTDEntity.class, msgs);
-					return basicSetElementReferencedEntity((DTDEntity) otherEnd, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__GROUP :
-					return eBasicSetContainer(null, DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT :
-					return eBasicSetContainer(null, DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT, msgs);
-				case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT_REFERENCED_ENTITY :
-					return basicSetElementReferencedEntity(null, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__GROUP :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_GROUP_CONTENT__CONTENT, DTDGroupContent.class, msgs);
-				case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_ELEMENT__CONTENT, DTDElement.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__GROUP :
-				return getGroup();
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT :
-				return getElement();
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__OCCURRENCE :
-				return getOccurrence();
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT_REFERENCED_ENTITY :
-				if (resolve)
-					return getElementReferencedEntity();
-				return basicGetElementReferencedEntity();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__GROUP :
-				return getGroup() != null;
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT :
-				return getElement() != null;
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__OCCURRENCE :
-				return occurrence != OCCURRENCE_EDEFAULT;
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT_REFERENCED_ENTITY :
-				return elementReferencedEntity != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__GROUP :
-				setGroup((DTDGroupContent) newValue);
-				return;
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT :
-				setElement((DTDElement) newValue);
-				return;
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__OCCURRENCE :
-				setOccurrence((DTDOccurrenceType) newValue);
-				return;
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT_REFERENCED_ENTITY :
-				setElementReferencedEntity((DTDEntity) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__GROUP :
-				setGroup((DTDGroupContent) null);
-				return;
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT :
-				setElement((DTDElement) null);
-				return;
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__OCCURRENCE :
-				setOccurrence(OCCURRENCE_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT__ELEMENT_REFERENCED_ENTITY :
-				setElementReferencedEntity((DTDEntity) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEnumerationTypeImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEnumerationTypeImpl.java
deleted file mode 100644
index 60a6d25..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEnumerationTypeImpl.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EEnumImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.dtd.core.internal.DTDCoreMessages;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEnumGroupKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-
-
-/**
- * @generated
- */
-public class DTDEnumerationTypeImpl extends EEnumImpl implements DTDEnumerationType {
-	/**
-	 * The default value of the '{@link #getKind() <em>Kind</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final DTDEnumGroupKind KIND_EDEFAULT = DTDEnumGroupKind.NAME_TOKEN_GROUP_LITERAL;
-
-	public final static String enumerationTypeDescriptions[] = {DTDCoreMessages._UI_ENUM_NAME_TOKENS_DESC, DTDCoreMessages._UI_ENUM_NOTATION_DESC}; //$NON-NLS-1$ //$NON-NLS-2$
-
-	public final static int enumerationTypeKinds[] = {DTDEnumGroupKind.NAME_TOKEN_GROUP, DTDEnumGroupKind.NOTATION_GROUP};
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected DTDEnumGroupKind kind = KIND_EDEFAULT;
-
-	public DTDEnumerationTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDEnumerationType();
-	}
-
-	public EList getEnumLiterals() {
-		return getELiterals();
-	}
-
-	public String getEnumerationTypeDescription() {
-		return getEnumerationTypeDescription(getKind().getValue());
-	}
-
-	public static String getEnumerationTypeDescription(int kind) {
-		// it can only be 1 or 2, but maybe later...
-		if (kind >= 1 && kind <= 2) {
-			// we subtract 1 since the kind is 1 - based not zero based
-			return enumerationTypeDescriptions[kind - 1];
-		}
-		return null;
-	}
-
-	public String getPathname() {
-		// TBD
-		return ""; //$NON-NLS-1$
-	}
-
-	public DTDObject findObject(String relativePath) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public DTDEnumGroupKind getKind() {
-		return kind;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setKind(DTDEnumGroupKind newKind) {
-		DTDEnumGroupKind oldKind = kind;
-		kind = newKind == null ? KIND_EDEFAULT : newKind;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ENUMERATION_TYPE__KIND, oldKind, kind));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public DTDFile getDTDFile() {
-		if (eContainerFeatureID != DTDPackage.DTD_ENUMERATION_TYPE__DTD_FILE)
-			return null;
-		return (DTDFile) eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDTDFile(DTDFile newDTDFile) {
-		if (newDTDFile != eContainer || (eContainerFeatureID != DTDPackage.DTD_ENUMERATION_TYPE__DTD_FILE && newDTDFile != null)) {
-			if (EcoreUtil.isAncestor(this, newDTDFile))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + "."); //$NON-NLS-1$ //$NON-NLS-2$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newDTDFile != null)
-				msgs = ((InternalEObject) newDTDFile).eInverseAdd(this, DTDPackage.DTD_FILE__DTD_ENUMERATION_TYPE, DTDFile.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject) newDTDFile, DTDPackage.DTD_ENUMERATION_TYPE__DTD_FILE, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_ENUMERATION_TYPE__DTD_FILE, newDTDFile, newDTDFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ENUMERATION_TYPE__EANNOTATIONS :
-					return ((InternalEList) getEAnnotations()).basicAdd(otherEnd, msgs);
-				case DTDPackage.DTD_ENUMERATION_TYPE__EPACKAGE :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_ENUMERATION_TYPE__EPACKAGE, msgs);
-				case DTDPackage.DTD_ENUMERATION_TYPE__ELITERALS :
-					return ((InternalEList) getELiterals()).basicAdd(otherEnd, msgs);
-				case DTDPackage.DTD_ENUMERATION_TYPE__DTD_FILE :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_ENUMERATION_TYPE__DTD_FILE, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_ENUMERATION_TYPE__EANNOTATIONS :
-					return ((InternalEList) getEAnnotations()).basicRemove(otherEnd, msgs);
-				case DTDPackage.DTD_ENUMERATION_TYPE__EPACKAGE :
-					return eBasicSetContainer(null, DTDPackage.DTD_ENUMERATION_TYPE__EPACKAGE, msgs);
-				case DTDPackage.DTD_ENUMERATION_TYPE__ELITERALS :
-					return ((InternalEList) getELiterals()).basicRemove(otherEnd, msgs);
-				case DTDPackage.DTD_ENUMERATION_TYPE__DTD_FILE :
-					return eBasicSetContainer(null, DTDPackage.DTD_ENUMERATION_TYPE__DTD_FILE, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_ENUMERATION_TYPE__EPACKAGE :
-					return eContainer.eInverseRemove(this, EcorePackage.EPACKAGE__ECLASSIFIERS, EPackage.class, msgs);
-				case DTDPackage.DTD_ENUMERATION_TYPE__DTD_FILE :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_FILE__DTD_ENUMERATION_TYPE, DTDFile.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENUMERATION_TYPE__EANNOTATIONS :
-				return getEAnnotations();
-			case DTDPackage.DTD_ENUMERATION_TYPE__NAME :
-				return getName();
-			case DTDPackage.DTD_ENUMERATION_TYPE__INSTANCE_CLASS_NAME :
-				return getInstanceClassName();
-			case DTDPackage.DTD_ENUMERATION_TYPE__INSTANCE_CLASS :
-				return getInstanceClass();
-			case DTDPackage.DTD_ENUMERATION_TYPE__DEFAULT_VALUE :
-				return getDefaultValue();
-			case DTDPackage.DTD_ENUMERATION_TYPE__EPACKAGE :
-				return getEPackage();
-			case DTDPackage.DTD_ENUMERATION_TYPE__SERIALIZABLE :
-				return isSerializable() ? Boolean.TRUE : Boolean.FALSE;
-			case DTDPackage.DTD_ENUMERATION_TYPE__ELITERALS :
-				return getELiterals();
-			case DTDPackage.DTD_ENUMERATION_TYPE__KIND :
-				return getKind();
-			case DTDPackage.DTD_ENUMERATION_TYPE__DTD_FILE :
-				return getDTDFile();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENUMERATION_TYPE__EANNOTATIONS :
-				return eAnnotations != null && !getEAnnotations().isEmpty();
-			case DTDPackage.DTD_ENUMERATION_TYPE__NAME :
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case DTDPackage.DTD_ENUMERATION_TYPE__INSTANCE_CLASS_NAME :
-				return INSTANCE_CLASS_NAME_EDEFAULT == null ? instanceClassName != null : !INSTANCE_CLASS_NAME_EDEFAULT.equals(instanceClassName);
-			case DTDPackage.DTD_ENUMERATION_TYPE__INSTANCE_CLASS :
-				return INSTANCE_CLASS_EDEFAULT == null ? instanceClass != null : !INSTANCE_CLASS_EDEFAULT.equals(instanceClass);
-			case DTDPackage.DTD_ENUMERATION_TYPE__DEFAULT_VALUE :
-				return getDefaultValue() != null;
-			case DTDPackage.DTD_ENUMERATION_TYPE__EPACKAGE :
-				return getEPackage() != null;
-			case DTDPackage.DTD_ENUMERATION_TYPE__SERIALIZABLE :
-				return ((eFlags & SERIALIZABLE_EFLAG) != 0) != SERIALIZABLE_EDEFAULT;
-			case DTDPackage.DTD_ENUMERATION_TYPE__ELITERALS :
-				return eLiterals != null && !getELiterals().isEmpty();
-			case DTDPackage.DTD_ENUMERATION_TYPE__KIND :
-				return kind != KIND_EDEFAULT;
-			case DTDPackage.DTD_ENUMERATION_TYPE__DTD_FILE :
-				return getDTDFile() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENUMERATION_TYPE__EANNOTATIONS :
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_ENUMERATION_TYPE__NAME :
-				setName((String) newValue);
-				return;
-			case DTDPackage.DTD_ENUMERATION_TYPE__INSTANCE_CLASS_NAME :
-				setInstanceClassName((String) newValue);
-				return;
-			case DTDPackage.DTD_ENUMERATION_TYPE__INSTANCE_CLASS :
-				setInstanceClass((Class) newValue);
-				return;
-			case DTDPackage.DTD_ENUMERATION_TYPE__SERIALIZABLE :
-				setSerializable(((Boolean) newValue).booleanValue());
-				return;
-			case DTDPackage.DTD_ENUMERATION_TYPE__ELITERALS :
-				getELiterals().clear();
-				getELiterals().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_ENUMERATION_TYPE__KIND :
-				setKind((DTDEnumGroupKind) newValue);
-				return;
-			case DTDPackage.DTD_ENUMERATION_TYPE__DTD_FILE :
-				setDTDFile((DTDFile) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_ENUMERATION_TYPE__EANNOTATIONS :
-				getEAnnotations().clear();
-				return;
-			case DTDPackage.DTD_ENUMERATION_TYPE__NAME :
-				setName(NAME_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ENUMERATION_TYPE__INSTANCE_CLASS_NAME :
-				setInstanceClassName(INSTANCE_CLASS_NAME_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ENUMERATION_TYPE__INSTANCE_CLASS :
-				setInstanceClass(INSTANCE_CLASS_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ENUMERATION_TYPE__SERIALIZABLE :
-				setSerializable(SERIALIZABLE_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ENUMERATION_TYPE__ELITERALS :
-				getELiterals().clear();
-				return;
-			case DTDPackage.DTD_ENUMERATION_TYPE__KIND :
-				setKind(KIND_EDEFAULT);
-				return;
-			case DTDPackage.DTD_ENUMERATION_TYPE__DTD_FILE :
-				setDTDFile((DTDFile) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (kind: "); //$NON-NLS-1$
-		result.append(kind);
-		result.append(')');
-		return result.toString();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDExternalEntityImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDExternalEntityImpl.java
deleted file mode 100644
index 5925a39..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDExternalEntityImpl.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.notify.impl.NotificationChainImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDNotation;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-
-
-/**
- * @generated
- */
-public class DTDExternalEntityImpl extends DTDEntityContentImpl implements DTDExternalEntity {
-	/**
-	 * The default value of the '{@link #getSystemID() <em>System ID</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getSystemID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SYSTEM_ID_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String systemID = SYSTEM_ID_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getPublicID() <em>Public ID</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getPublicID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PUBLIC_ID_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String publicID = PUBLIC_ID_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected DTDNotation notation = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected DTDFile entityReferencedFromAnotherFile = null;
-
-	public DTDExternalEntityImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDExternalEntity();
-	}
-
-	public String unparse() {
-		StringBuffer text = new StringBuffer(100);
-		if (getPublicID() == null || getPublicID().equals("")) { //$NON-NLS-1$
-			text.append("SYSTEM "); //$NON-NLS-1$
-		}
-		else {
-			text.append("PUBLIC \"").append(getPublicID()).append("\" "); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		String systemId = getSystemID();
-
-		text.append("\"").append(systemId).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
-
-		DTDNotation notation = getNotation();
-		if (notation != null)
-			text.append(" NDATA ").append(notation.getName()); //$NON-NLS-1$
-
-		return text.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public String getSystemID() {
-		return systemID;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSystemID(String newSystemID) {
-		String oldSystemID = systemID;
-		systemID = newSystemID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_EXTERNAL_ENTITY__SYSTEM_ID, oldSystemID, systemID));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public String getPublicID() {
-		return publicID;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setPublicID(String newPublicID) {
-		String oldPublicID = publicID;
-		publicID = newPublicID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_EXTERNAL_ENTITY__PUBLIC_ID, oldPublicID, publicID));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public DTDNotation getNotation() {
-		if (notation != null && notation.eIsProxy()) {
-			DTDNotation oldNotation = notation;
-			notation = (DTDNotation) EcoreUtil.resolve(notation, this);
-			if (notation != oldNotation) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DTDPackage.DTD_EXTERNAL_ENTITY__NOTATION, oldNotation, notation));
-			}
-		}
-		return notation;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDNotation basicGetNotation() {
-		return notation;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain basicSetNotation(DTDNotation newNotation, NotificationChain msgs) {
-		DTDNotation oldNotation = notation;
-		notation = newNotation;
-		if (eNotificationRequired()) {
-			if (msgs == null)
-				msgs = new NotificationChainImpl(4);
-			msgs.add(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_EXTERNAL_ENTITY__NOTATION, oldNotation, newNotation));
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setNotation(DTDNotation newNotation) {
-		if (newNotation != notation) {
-			NotificationChain msgs = null;
-			if (notation != null)
-				msgs = ((InternalEObject) notation).eInverseRemove(this, DTDPackage.DTD_NOTATION__ENTITY, DTDNotation.class, msgs);
-			if (newNotation != null)
-				msgs = ((InternalEObject) newNotation).eInverseAdd(this, DTDPackage.DTD_NOTATION__ENTITY, DTDNotation.class, msgs);
-			msgs = basicSetNotation(newNotation, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_EXTERNAL_ENTITY__NOTATION, newNotation, newNotation));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public DTDFile getEntityReferencedFromAnotherFile() {
-		if (entityReferencedFromAnotherFile != null && entityReferencedFromAnotherFile.eIsProxy()) {
-			DTDFile oldEntityReferencedFromAnotherFile = entityReferencedFromAnotherFile;
-			entityReferencedFromAnotherFile = (DTDFile) EcoreUtil.resolve(entityReferencedFromAnotherFile, this);
-			if (entityReferencedFromAnotherFile != oldEntityReferencedFromAnotherFile) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DTDPackage.DTD_EXTERNAL_ENTITY__ENTITY_REFERENCED_FROM_ANOTHER_FILE, oldEntityReferencedFromAnotherFile, entityReferencedFromAnotherFile));
-			}
-		}
-		return entityReferencedFromAnotherFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDFile basicGetEntityReferencedFromAnotherFile() {
-		return entityReferencedFromAnotherFile;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEntityReferencedFromAnotherFile(DTDFile newEntityReferencedFromAnotherFile) {
-		DTDFile oldEntityReferencedFromAnotherFile = entityReferencedFromAnotherFile;
-		entityReferencedFromAnotherFile = newEntityReferencedFromAnotherFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_EXTERNAL_ENTITY__ENTITY_REFERENCED_FROM_ANOTHER_FILE, oldEntityReferencedFromAnotherFile, entityReferencedFromAnotherFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_EXTERNAL_ENTITY__DTD_ENTITY :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_EXTERNAL_ENTITY__DTD_ENTITY, msgs);
-				case DTDPackage.DTD_EXTERNAL_ENTITY__NOTATION :
-					if (notation != null)
-						msgs = ((InternalEObject) notation).eInverseRemove(this, DTDPackage.DTD_NOTATION__ENTITY, DTDNotation.class, msgs);
-					return basicSetNotation((DTDNotation) otherEnd, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_EXTERNAL_ENTITY__DTD_ENTITY :
-					return eBasicSetContainer(null, DTDPackage.DTD_EXTERNAL_ENTITY__DTD_ENTITY, msgs);
-				case DTDPackage.DTD_EXTERNAL_ENTITY__NOTATION :
-					return basicSetNotation(null, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_EXTERNAL_ENTITY__DTD_ENTITY :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_ENTITY__CONTENT, DTDEntity.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_EXTERNAL_ENTITY__DTD_ENTITY :
-				return getDTDEntity();
-			case DTDPackage.DTD_EXTERNAL_ENTITY__SYSTEM_ID :
-				return getSystemID();
-			case DTDPackage.DTD_EXTERNAL_ENTITY__PUBLIC_ID :
-				return getPublicID();
-			case DTDPackage.DTD_EXTERNAL_ENTITY__NOTATION :
-				if (resolve)
-					return getNotation();
-				return basicGetNotation();
-			case DTDPackage.DTD_EXTERNAL_ENTITY__ENTITY_REFERENCED_FROM_ANOTHER_FILE :
-				if (resolve)
-					return getEntityReferencedFromAnotherFile();
-				return basicGetEntityReferencedFromAnotherFile();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_EXTERNAL_ENTITY__DTD_ENTITY :
-				return getDTDEntity() != null;
-			case DTDPackage.DTD_EXTERNAL_ENTITY__SYSTEM_ID :
-				return SYSTEM_ID_EDEFAULT == null ? systemID != null : !SYSTEM_ID_EDEFAULT.equals(systemID);
-			case DTDPackage.DTD_EXTERNAL_ENTITY__PUBLIC_ID :
-				return PUBLIC_ID_EDEFAULT == null ? publicID != null : !PUBLIC_ID_EDEFAULT.equals(publicID);
-			case DTDPackage.DTD_EXTERNAL_ENTITY__NOTATION :
-				return notation != null;
-			case DTDPackage.DTD_EXTERNAL_ENTITY__ENTITY_REFERENCED_FROM_ANOTHER_FILE :
-				return entityReferencedFromAnotherFile != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_EXTERNAL_ENTITY__DTD_ENTITY :
-				setDTDEntity((DTDEntity) newValue);
-				return;
-			case DTDPackage.DTD_EXTERNAL_ENTITY__SYSTEM_ID :
-				setSystemID((String) newValue);
-				return;
-			case DTDPackage.DTD_EXTERNAL_ENTITY__PUBLIC_ID :
-				setPublicID((String) newValue);
-				return;
-			case DTDPackage.DTD_EXTERNAL_ENTITY__NOTATION :
-				setNotation((DTDNotation) newValue);
-				return;
-			case DTDPackage.DTD_EXTERNAL_ENTITY__ENTITY_REFERENCED_FROM_ANOTHER_FILE :
-				setEntityReferencedFromAnotherFile((DTDFile) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_EXTERNAL_ENTITY__DTD_ENTITY :
-				setDTDEntity((DTDEntity) null);
-				return;
-			case DTDPackage.DTD_EXTERNAL_ENTITY__SYSTEM_ID :
-				setSystemID(SYSTEM_ID_EDEFAULT);
-				return;
-			case DTDPackage.DTD_EXTERNAL_ENTITY__PUBLIC_ID :
-				setPublicID(PUBLIC_ID_EDEFAULT);
-				return;
-			case DTDPackage.DTD_EXTERNAL_ENTITY__NOTATION :
-				setNotation((DTDNotation) null);
-				return;
-			case DTDPackage.DTD_EXTERNAL_ENTITY__ENTITY_REFERENCED_FROM_ANOTHER_FILE :
-				setEntityReferencedFromAnotherFile((DTDFile) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (systemID: "); //$NON-NLS-1$
-		result.append(systemID);
-		result.append(", publicID: "); //$NON-NLS-1$
-		result.append(publicID);
-		result.append(')');
-		return result.toString();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDFactoryImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDFactoryImpl.java
deleted file mode 100644
index 8e02c6a..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDFactoryImpl.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAnyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute;
-import org.eclipse.wst.dtd.core.internal.emf.DTDBasicType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDBasicTypeKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDDefaultKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEmptyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEnumGroupKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFactory;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDInternalEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDNotation;
-import org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPCDataContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-import org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference;
-import org.eclipse.wst.dtd.core.internal.emf.DTDType;
-import org.eclipse.wst.dtd.core.internal.emf.XMLSchemaDefinedType;
-
-/**
- * @generated
- */
-public class DTDFactoryImpl extends EFactoryImpl implements DTDFactory {
-	protected DTDBasicType dtdBasicType_NONE;
-	protected DTDBasicType dtdBasicType_CDATA;
-	protected DTDBasicType dtdBasicType_ID;
-	protected DTDBasicType dtdBasicType_IDREF;
-	protected DTDBasicType dtdBasicType_IDREFS;
-	protected DTDBasicType dtdBasicType_ENTITY;
-	protected DTDBasicType dtdBasicType_ENTITIES;
-	protected DTDBasicType dtdBasicType_NMTOKEN;
-	protected DTDBasicType dtdBasicType_NMTOKENS;
-
-
-
-	public static DTDFactory instance() {
-		return (DTDFactory) getPackage().getEFactoryInstance();
-	}
-
-	/**
-	 * Gets the dtdBasicType_NONE.
-	 * 
-	 * @return Returns a DTDType
-	 */
-	public DTDType getDTDBasicType_NONE() {
-		if (dtdBasicType_NONE == null) {
-			(dtdBasicType_NONE = createDTDBasicType()).setKind(DTDBasicTypeKind.CDATA_LITERAL);
-		}
-		return dtdBasicType_NONE;
-	}
-
-	/**
-	 * Gets the dtdBasicType_CDATA.
-	 * 
-	 * @return Returns a DTDType
-	 */
-	public DTDType getDTDBasicType_CDATA() {
-		if (dtdBasicType_CDATA == null) {
-			(dtdBasicType_CDATA = createDTDBasicType()).setKind(DTDBasicTypeKind.CDATA_LITERAL);
-		}
-		return dtdBasicType_CDATA;
-	}
-
-	/**
-	 * Gets the dtdBasicType_ID.
-	 * 
-	 * @return Returns a DTDType
-	 */
-	public DTDType getDTDBasicType_ID() {
-		if (dtdBasicType_ID == null) {
-			(dtdBasicType_ID = createDTDBasicType()).setKind(DTDBasicTypeKind.ID_LITERAL);
-		}
-		return dtdBasicType_ID;
-	}
-
-	/**
-	 * Gets the dtdBasicType_IDREF.
-	 * 
-	 * @return Returns a DTDType
-	 */
-	public DTDType getDTDBasicType_IDREF() {
-		if (dtdBasicType_IDREF == null) {
-			(dtdBasicType_IDREF = createDTDBasicType()).setKind(DTDBasicTypeKind.IDREF_LITERAL);
-		}
-		return dtdBasicType_IDREF;
-	}
-
-	/**
-	 * Gets the dtdBasicType_IDREFS.
-	 * 
-	 * @return Returns a DTDType
-	 */
-	public DTDType getDTDBasicType_IDREFS() {
-		if (dtdBasicType_IDREFS == null) {
-			(dtdBasicType_IDREFS = createDTDBasicType()).setKind(DTDBasicTypeKind.IDREFS_LITERAL);
-		}
-		return dtdBasicType_IDREFS;
-	}
-
-	/**
-	 * Gets the dtdBasicType_ENTITY.
-	 * 
-	 * @return Returns a DTDType
-	 */
-	public DTDType getDTDBasicType_ENTITY() {
-		if (dtdBasicType_ENTITY == null) {
-			(dtdBasicType_ENTITY = createDTDBasicType()).setKind(DTDBasicTypeKind.ENTITY_LITERAL);
-		}
-		return dtdBasicType_ENTITY;
-	}
-
-	/**
-	 * Gets the dtdBasicType_ENTITIES.
-	 * 
-	 * @return Returns a DTDType
-	 */
-	public DTDType getDTDBasicType_ENTITIES() {
-		if (dtdBasicType_ENTITIES == null) {
-			(dtdBasicType_ENTITIES = createDTDBasicType()).setKind(DTDBasicTypeKind.ENTITIES_LITERAL);
-		}
-		return dtdBasicType_ENTITIES;
-	}
-
-	/**
-	 * Gets the dtdBasicType_NMTOKEN.
-	 * 
-	 * @return Returns a DTDType
-	 */
-	public DTDType getDTDBasicType_NMTOKEN() {
-		if (dtdBasicType_NMTOKEN == null) {
-			(dtdBasicType_NMTOKEN = createDTDBasicType()).setKind(DTDBasicTypeKind.NMTOKEN_LITERAL);
-		}
-		return dtdBasicType_NMTOKEN;
-	}
-
-	/**
-	 * Gets the dtdBasicType_NMTOKENS.
-	 * 
-	 * @return Returns a DTDType
-	 */
-	public DTDType getDTDBasicType_NMTOKENS() {
-		if (dtdBasicType_NMTOKENS == null) {
-			(dtdBasicType_NMTOKENS = createDTDBasicType()).setKind(DTDBasicTypeKind.NMTOKENS_LITERAL);
-		}
-		return dtdBasicType_NMTOKENS;
-	}
-
-	/**
-	 * Creates and instance of the factory. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case DTDPackage.DTD_GROUP_CONTENT :
-				return createDTDGroupContent();
-			case DTDPackage.DTD_ATTRIBUTE :
-				return createDTDAttribute();
-			case DTDPackage.DTD_ELEMENT :
-				return createDTDElement();
-			case DTDPackage.DTD_EMPTY_CONTENT :
-				return createDTDEmptyContent();
-			case DTDPackage.DTD_ANY_CONTENT :
-				return createDTDAnyContent();
-			case DTDPackage.DTD_PC_DATA_CONTENT :
-				return createDTDPCDataContent();
-			case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT :
-				return createDTDElementReferenceContent();
-			case DTDPackage.DTD_FILE :
-				return createDTDFile();
-			case DTDPackage.DTD_BASIC_TYPE :
-				return createDTDBasicType();
-			case DTDPackage.DTD_ENUMERATION_TYPE :
-				return createDTDEnumerationType();
-			case DTDPackage.DTD_NOTATION :
-				return createDTDNotation();
-			case DTDPackage.DTD_ENTITY :
-				return createDTDEntity();
-			case DTDPackage.DTD_EXTERNAL_ENTITY :
-				return createDTDExternalEntity();
-			case DTDPackage.DTD_INTERNAL_ENTITY :
-				return createDTDInternalEntity();
-			case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE :
-				return createDTDParameterEntityReference();
-			case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT :
-				return createDTDEntityReferenceContent();
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case DTDPackage.DTD_OCCURRENCE_TYPE :
-				return DTDOccurrenceType.get(initialValue);
-			case DTDPackage.DTD_DEFAULT_KIND :
-				return DTDDefaultKind.get(initialValue);
-			case DTDPackage.DTD_BASIC_TYPE_KIND :
-				return DTDBasicTypeKind.get(initialValue);
-			case DTDPackage.DTD_ENUM_GROUP_KIND :
-				return DTDEnumGroupKind.get(initialValue);
-			case DTDPackage.DTD_GROUP_KIND :
-				return DTDGroupKind.get(initialValue);
-			case DTDPackage.XML_SCHEMA_DEFINED_TYPE :
-				return XMLSchemaDefinedType.get(initialValue);
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case DTDPackage.DTD_OCCURRENCE_TYPE :
-				return instanceValue == null ? null : instanceValue.toString();
-			case DTDPackage.DTD_DEFAULT_KIND :
-				return instanceValue == null ? null : instanceValue.toString();
-			case DTDPackage.DTD_BASIC_TYPE_KIND :
-				return instanceValue == null ? null : instanceValue.toString();
-			case DTDPackage.DTD_ENUM_GROUP_KIND :
-				return instanceValue == null ? null : instanceValue.toString();
-			case DTDPackage.DTD_GROUP_KIND :
-				return instanceValue == null ? null : instanceValue.toString();
-			case DTDPackage.XML_SCHEMA_DEFINED_TYPE :
-				return instanceValue == null ? null : instanceValue.toString();
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDGroupContent createDTDGroupContent() {
-		DTDGroupContentImpl dtdGroupContent = new DTDGroupContentImpl();
-		return dtdGroupContent;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDAttribute createDTDAttribute() {
-		DTDAttributeImpl dtdAttribute = new DTDAttributeImpl();
-		return dtdAttribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDElement createDTDElement() {
-		DTDElementImpl dtdElement = new DTDElementImpl();
-		return dtdElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDEmptyContent createDTDEmptyContent() {
-		DTDEmptyContentImpl dtdEmptyContent = new DTDEmptyContentImpl();
-		return dtdEmptyContent;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDAnyContent createDTDAnyContent() {
-		DTDAnyContentImpl dtdAnyContent = new DTDAnyContentImpl();
-		return dtdAnyContent;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDPCDataContent createDTDPCDataContent() {
-		DTDPCDataContentImpl dtdpcDataContent = new DTDPCDataContentImpl();
-		return dtdpcDataContent;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDElementReferenceContent createDTDElementReferenceContent() {
-		DTDElementReferenceContentImpl dtdElementReferenceContent = new DTDElementReferenceContentImpl();
-		return dtdElementReferenceContent;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDFile createDTDFile() {
-		DTDFileImpl dtdFile = new DTDFileImpl();
-		return dtdFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDBasicType createDTDBasicType() {
-		DTDBasicTypeImpl dtdBasicType = new DTDBasicTypeImpl();
-		return dtdBasicType;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDEnumerationType createDTDEnumerationType() {
-		DTDEnumerationTypeImpl dtdEnumerationType = new DTDEnumerationTypeImpl();
-		return dtdEnumerationType;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDNotation createDTDNotation() {
-		DTDNotationImpl dtdNotation = new DTDNotationImpl();
-		return dtdNotation;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDEntity createDTDEntity() {
-		DTDEntityImpl dtdEntity = new DTDEntityImpl();
-		return dtdEntity;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDExternalEntity createDTDExternalEntity() {
-		DTDExternalEntityImpl dtdExternalEntity = new DTDExternalEntityImpl();
-		return dtdExternalEntity;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDInternalEntity createDTDInternalEntity() {
-		DTDInternalEntityImpl dtdInternalEntity = new DTDInternalEntityImpl();
-		return dtdInternalEntity;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDParameterEntityReference createDTDParameterEntityReference() {
-		DTDParameterEntityReferenceImpl dtdParameterEntityReference = new DTDParameterEntityReferenceImpl();
-		return dtdParameterEntityReference;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDEntityReferenceContent createDTDEntityReferenceContent() {
-		DTDEntityReferenceContentImpl dtdEntityReferenceContent = new DTDEntityReferenceContentImpl();
-		return dtdEntityReferenceContent;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDPackage getDTDPackage() {
-		return (DTDPackage) getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static DTDPackage getPackage() {
-		return DTDPackage.eINSTANCE;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDFileImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDFileImpl.java
deleted file mode 100644
index 7446e88..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDFileImpl.java
+++ /dev/null
@@ -1,821 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENamedElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.dtd.core.internal.emf.DTDContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDNotation;
-import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-import org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference;
-import org.eclipse.wst.dtd.core.internal.emf.util.DTDPathnameUtil;
-import org.eclipse.wst.dtd.core.internal.emf.util.DTDPrinter;
-
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>File</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDFileImpl#getComment <em>Comment</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDFileImpl#isParseError <em>Parse Error</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDFileImpl#getDTDContent <em>DTD Content</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDFileImpl#getDTDEnumerationType <em>DTD Enumeration Type</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class DTDFileImpl extends ENamedElementImpl implements DTDFile, ENamedElement {
-
-	public EList getDTDObject() {
-		return getDTDContent();
-	}
-
-
-	public List listDTDElement() {
-		return getContentListOf(DTDElement.class, null);
-	}
-
-
-	public List listDTDNotation() {
-		return getContentListOf(DTDNotation.class, null);
-	}
-
-	public List listDTDEntity() {
-		return getContentListOf(DTDEntity.class, null);
-	}
-
-	public List listDTDParameterEntityReference() {
-		return getContentListOf(DTDParameterEntityReference.class, null);
-	}
-
-	public List listDTDElementAndDTDParameterEntityReference() {
-		return getContentListOf(DTDElement.class, DTDParameterEntityReference.class);
-	}
-
-	private List getContentListOf(Class class1, Class class2) {
-		List v = new ArrayList();
-		Iterator i = getDTDContent().iterator();
-		while (i.hasNext()) {
-			Object obj = i.next();
-			if (class1.isInstance(obj)) {
-				v.add(obj);
-			}
-			else if ((class2 != null) && (class2.isInstance(obj))) {
-				v.add(obj);
-			}
-		}
-		return v;
-	}
-
-	public DTDElement findElement(String name) {
-		for (Iterator i = listDTDElement().iterator(); i.hasNext();) {
-			DTDElement e = (DTDElement) i.next();
-			if (e.getName().equals(name)) {
-				return e;
-			}
-		}
-		return null;
-	}
-
-	public DTDEntity findEntity(String name) {
-		for (Iterator i = listDTDEntity().iterator(); i.hasNext();) {
-			DTDEntity e = (DTDEntity) i.next();
-			if (e.getName().equals(name)) {
-				return e;
-			}
-		}
-		return null;
-	}
-
-	public DTDNotation findNotation(String name) {
-		for (Iterator i = listDTDNotation().iterator(); i.hasNext();) {
-			DTDNotation e = (DTDNotation) i.next();
-			if (e.getName().equals(name)) {
-				return e;
-			}
-		}
-		return null;
-	}
-
-	public DTDParameterEntityReference findParameterEntityReference(String name) {
-		for (Iterator i = listDTDParameterEntityReference().iterator(); i.hasNext();) {
-			DTDParameterEntityReference e = (DTDParameterEntityReference) i.next();
-			if (e.getName().equals(name)) {
-				return e;
-			}
-		}
-		return null;
-	}
-
-	public String unparse(boolean include) {
-		DTDPrinter printer = new DTDPrinter(true);
-		printer.visitDTDFile(this);
-		return printer.getBuffer().toString();
-	}
-
-
-	public String getPathname() {
-		return ""; //$NON-NLS-1$
-	}
-
-
-	public DTDObject findObject(String relativePath) {
-		Object[] result = DTDPathnameUtil.parsePathComponent(relativePath);
-
-
-		String type = (String) result[0];
-
-
-		if (type == null)
-			return null;
-
-
-		String name = (String) result[1];
-
-		DTDObject obj = null;
-		if (type.equals("Elem")) { //$NON-NLS-1$
-			obj = findElement(name);
-		}
-		else if (type.equals("Ent")) { //$NON-NLS-1$
-			obj = findEntity(name);
-		}
-		else if (type.equals("PEnt")) { //$NON-NLS-1$
-			obj = findParameterEntityReference(name);
-		}
-		else if (type.equals("Nota")) { //$NON-NLS-1$
-			obj = findNotation(name);
-		}
-		else {
-			return null;
-		}
-
-
-		String restPath = (String) result[3];
-
-		if ((restPath == null) || (obj == null)) {
-			return obj;
-		}
-		else {
-			return obj.findObject(restPath);
-		}
-	}
-
-
-
-	/**
-	 * The default value of the '{@link #getComment() <em>Comment</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getComment() <em>Comment</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected String comment = COMMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isParseError() <em>Parse Error</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #isParseError()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean PARSE_ERROR_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isParseError() <em>Parse Error</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #isParseError()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean parseError = PARSE_ERROR_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getDTDContent() <em>DTD Content</em>}'
-	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @see #getDTDContent()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList dtdContent = null;
-
-	/**
-	 * The cached value of the '{@link #getDTDEnumerationType() <em>DTD Enumeration Type</em>}'
-	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @see #getDTDEnumerationType()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList dtdEnumerationType = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected DTDFileImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDFile();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String getComment() {
-		return comment;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setComment(String newComment) {
-		String oldComment = comment;
-		comment = newComment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_FILE__COMMENT, oldComment, comment));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean isParseError() {
-		return parseError;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setParseError(boolean newParseError) {
-		boolean oldParseError = parseError;
-		parseError = newParseError;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_FILE__PARSE_ERROR, oldParseError, parseError));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EList getDTDContent() {
-		if (dtdContent == null) {
-			dtdContent = new EObjectContainmentWithInverseEList(DTDContent.class, this, DTDPackage.DTD_FILE__DTD_CONTENT, DTDPackage.DTD_CONTENT__DTD_FILE);
-		}
-		return dtdContent;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EList getDTDEnumerationType() {
-		if (dtdEnumerationType == null) {
-			dtdEnumerationType = new EObjectContainmentWithInverseEList(DTDEnumerationType.class, this, DTDPackage.DTD_FILE__DTD_ENUMERATION_TYPE, DTDPackage.DTD_ENUMERATION_TYPE__DTD_FILE);
-		}
-		return dtdEnumerationType;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_FILE__DTD_CONTENT :
-					return ((InternalEList) getDTDContent()).basicAdd(otherEnd, msgs);
-				case DTDPackage.DTD_FILE__DTD_ENUMERATION_TYPE :
-					return ((InternalEList) getDTDEnumerationType()).basicAdd(otherEnd, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_FILE__DTD_CONTENT :
-					return ((InternalEList) getDTDContent()).basicRemove(otherEnd, msgs);
-				case DTDPackage.DTD_FILE__DTD_ENUMERATION_TYPE :
-					return ((InternalEList) getDTDEnumerationType()).basicRemove(otherEnd, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_FILE__COMMENT :
-				return getComment();
-			case DTDPackage.DTD_FILE__PARSE_ERROR :
-				return isParseError() ? Boolean.TRUE : Boolean.FALSE;
-			case DTDPackage.DTD_FILE__DTD_CONTENT :
-				return getDTDContent();
-			case DTDPackage.DTD_FILE__DTD_ENUMERATION_TYPE :
-				return getDTDEnumerationType();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_FILE__COMMENT :
-				setComment((String) newValue);
-				return;
-			case DTDPackage.DTD_FILE__PARSE_ERROR :
-				setParseError(((Boolean) newValue).booleanValue());
-				return;
-			case DTDPackage.DTD_FILE__DTD_CONTENT :
-				getDTDContent().clear();
-				getDTDContent().addAll((Collection) newValue);
-				return;
-			case DTDPackage.DTD_FILE__DTD_ENUMERATION_TYPE :
-				getDTDEnumerationType().clear();
-				getDTDEnumerationType().addAll((Collection) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_FILE__COMMENT :
-				setComment(COMMENT_EDEFAULT);
-				return;
-			case DTDPackage.DTD_FILE__PARSE_ERROR :
-				setParseError(PARSE_ERROR_EDEFAULT);
-				return;
-			case DTDPackage.DTD_FILE__DTD_CONTENT :
-				getDTDContent().clear();
-				return;
-			case DTDPackage.DTD_FILE__DTD_ENUMERATION_TYPE :
-				getDTDEnumerationType().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_FILE__COMMENT :
-				return COMMENT_EDEFAULT == null ? comment != null : !COMMENT_EDEFAULT.equals(comment);
-			case DTDPackage.DTD_FILE__PARSE_ERROR :
-				return parseError != PARSE_ERROR_EDEFAULT;
-			case DTDPackage.DTD_FILE__DTD_CONTENT :
-				return dtdContent != null && !getDTDContent().isEmpty();
-			case DTDPackage.DTD_FILE__DTD_ENUMERATION_TYPE :
-				return dtdEnumerationType != null && !getDTDEnumerationType().isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (comment: "); //$NON-NLS-1$
-		result.append(comment);
-		result.append(", parseError: "); //$NON-NLS-1$
-		result.append(parseError);
-		result.append(')');
-		return result.toString();
-	}
-
-} // DTDFileImpl
-
-// +++++++++++++++++++GENERICRULES.JSED+++++++++++++++++++
-//
-
-// +++++++++++++++++++GENERICRULES.JSED+++++++++++++++++++
-// //public class DTDFileImpl extends ENamespaceImpl implements DTDFile,
-// ENamespace{
-// -------------------GENERICRULES.JSED-------------------
-
-// public static final String copyright = "(c) Copyright IBM Corporation
-// 2002.";
-//
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected String comment = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected Boolean parseError = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected EList dtdContent = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected EList dtdEnumerationType = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected boolean setComment = false;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected boolean setParseError = false;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public EObject initInstance() {
-// setEMetaObj(eClassDTDFile());
-// initInstanceDelegates();
-// return this;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public DTDPackage ePackageDTD() {
-// return
-// (DTDPackage)EPackage.Registry.INSTANCE.getEPackage(DTDPackage.eNS_URI);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public EClass eClassDTDFile() {
-// return
-// ((DTDPackage)EPackage.Registry.INSTANCE.getEPackage(DTDPackage.eNS_URI)).getDTDFile();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public String getComment() {
-// if (this.setComment) return this.comment;
-// else return
-// (String)DTDPackage.eINSTANCE.getDTDFile_Comment().getDefaultValue();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void setComment(String value) {
-// refSetValueForSimpleSF(DTDPackage.eINSTANCE.getDTDFile_Comment(),this.comment,value);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void unsetComment() {
-// eNotify(refBasicUnsetValue(DTDPackage.eINSTANCE.getDTDFile_Comment()));
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean isSetComment() {
-// return setComment;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public Boolean getParseError() {
-// if (this.setParseError) return this.parseError;
-// else return
-// (Boolean)DTDPackage.eINSTANCE.getDTDFile_ParseError().getDefaultValue();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public boolean isParseError() {
-// Boolean result = getParseError();
-// return result != null ? result.booleanValue() : false;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void setParseError(Boolean value) {
-// refSetValueForSimpleSF(DTDPackage.eINSTANCE.getDTDFile_ParseError(),this.parseError,value);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void setParseError(boolean value) {
-// setParseError(value?Boolean.TRUE:Boolean.FALSE);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void unsetParseError() {
-// eNotify(refBasicUnsetValue(DTDPackage.eINSTANCE.getDTDFile_ParseError()));
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean isSetParseError() {
-// return setParseError;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public EList getDTDContent() {
-// if (this.dtdContent==null) {
-// this.dtdContent=newCollection(this,DTDPackage.eINSTANCE.getDTDFile_DTDContent(),
-// true);
-// }
-// return this.dtdContent;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public EList getDTDEnumerationType() {
-// if (this.dtdEnumerationType==null) {
-// this.dtdEnumerationType=newCollection(this,DTDPackage.eINSTANCE.getDTDFile_DTDEnumerationType(),
-// true);
-// }
-// return this.dtdEnumerationType;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Object eGet(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.eGet(feature);
-// }
-// switch (eClassDTDFile().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_FILE__COMMENT: return getComment();
-// case DTDPackage.DTD_FILE__PARSE_ERROR: return getParseError();
-// case DTDPackage.DTD_FILE__DTD_CONTENT: return getDTDContent();
-// case DTDPackage.DTD_FILE__DTD_ENUMERATION_TYPE: return
-// getDTDEnumerationType();
-//
-// }
-// return super.eGet(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Object refBasicValue(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.refBasicValue(feature);
-// }
-// switch (eClassDTDFile().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_FILE__COMMENT:
-// return this.setComment? this.comment : null;
-// case DTDPackage.DTD_FILE__PARSE_ERROR:
-// return this.setParseError? this.parseError : null;
-// case DTDPackage.DTD_FILE__DTD_CONTENT:
-// return this.dtdContent;
-// case DTDPackage.DTD_FILE__DTD_ENUMERATION_TYPE:
-// return this.dtdEnumerationType;
-//
-// }
-// return super.refBasicValue(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean eIsSet(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.eIsSet(feature);
-// }
-// switch (eClassDTDFile().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_FILE__COMMENT: return isSetComment();
-// case DTDPackage.DTD_FILE__PARSE_ERROR: return isSetParseError();
-//
-// }
-// return super.eIsSet(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void eSet(EStructuralFeature feature, Object newValue) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// super.eSet(feature, newValue);
-// }
-// switch (eClassDTDFile().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_FILE__COMMENT: {
-// setComment((String)newValue);
-// return;
-// }
-// case DTDPackage.DTD_FILE__PARSE_ERROR: {
-// setParseError((newValue instanceof
-// String)?Boolean.valueOf((String)newValue):(Boolean)newValue);
-// return;
-// }
-//
-// }
-// super.eSet(feature, newValue);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Notification eBasicSet(EStructuralFeature feature, Object newValue)
-// {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.eBasicSet(feature, newValue);
-// }
-// switch (eClassDTDFile().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_FILE__COMMENT: {
-// Object oldValue = this.comment;
-// this.comment = (String)newValue;
-// this.setComment = true;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.SET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDFile_Comment(),oldValue,newValue);
-// }
-// case DTDPackage.DTD_FILE__PARSE_ERROR: {
-// Object oldValue = this.parseError;
-// this.parseError = (Boolean)newValue;
-// this.setParseError = true;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.SET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDFile_ParseError(),oldValue,newValue);
-// }
-//
-// }
-// return super.eBasicSet(feature, newValue);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void eUnset(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// super.eUnset(feature);
-// }
-// switch (eClassDTDFile().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_FILE__COMMENT: {
-// unsetComment();
-// return;
-// }
-// case DTDPackage.DTD_FILE__PARSE_ERROR: {
-// unsetParseError();
-// return;
-// }
-//
-// }
-// super.eUnset(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Notification refBasicUnsetValue(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.refBasicUnsetValue(feature);
-// }
-// switch (eClassDTDFile().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_FILE__COMMENT: {
-// Object oldValue = this.comment;
-// this.comment = null;
-// this.setComment = false;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.UNSET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDFile_Comment(),oldValue,getComment());
-// }
-// case DTDPackage.DTD_FILE__PARSE_ERROR: {
-// Object oldValue = this.parseError;
-// this.parseError = null;
-// this.setParseError = false;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.UNSET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDFile_ParseError(),oldValue,getParseError());
-// }
-//
-// }
-// return super.refBasicUnsetValue(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public String toString() {
-// String out="("; //$NON-NLS-2$//$NON-NLS-1$
-// boolean first=true;
-// boolean emptyList=true;
-// if(isSetComment()) {
-// if(!emptyList) out+=", "; //$NON-NLS-2$//$NON-NLS-1$
-// out+="comment: "+this.comment; //$NON-NLS-2$//$NON-NLS-1$
-// first=false;
-// emptyList=false;
-// }
-// if(isSetParseError()) {
-// if(!emptyList) out+=", "; //$NON-NLS-2$//$NON-NLS-1$
-// out+="parseError: "+this.parseError; //$NON-NLS-2$//$NON-NLS-1$
-// first=false;
-// emptyList=false;
-// }
-// out+=")";
-// if (!first) return super.toString() + " " +out; //$NON-NLS-2$//$NON-NLS-1$
-// return super.toString();
-// }
-// }
-// -------------------GENERICRULES.JSED-------------------
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDGroupContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDGroupContentImpl.java
deleted file mode 100644
index 65011e6..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDGroupContentImpl.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-import org.eclipse.wst.dtd.core.internal.emf.util.DTDPrinter;
-
-
-/**
- * @generated
- */
-public class DTDGroupContentImpl extends DTDRepeatableContentImpl implements DTDGroupContent {
-	/**
-	 * The default value of the '{@link #getGroupKind() <em>Group Kind</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getGroupKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final DTDGroupKind GROUP_KIND_EDEFAULT = DTDGroupKind.SEQUENCE_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected DTDGroupKind groupKind = GROUP_KIND_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList content = null;
-
-	public DTDGroupContentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDGroupContent();
-	}
-
-	public int getContentPosition(DTDElementContent content) {
-		EList list = getContent();
-		return list.indexOf(content);
-	}
-
-	public String getContentName() {
-		return ""; //$NON-NLS-1$
-	}
-
-	public String getContentDetail() {
-		DTDPrinter printer = new DTDPrinter(false);
-		printer.visitDTDGroupContent(this);
-
-		return printer.getBuffer().toString();
-	}
-
-	public String unparseRepeatableContent() {
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public DTDGroupKind getGroupKind() {
-		return groupKind;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setGroupKind(DTDGroupKind newGroupKind) {
-		DTDGroupKind oldGroupKind = groupKind;
-		groupKind = newGroupKind == null ? GROUP_KIND_EDEFAULT : newGroupKind;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_GROUP_CONTENT__GROUP_KIND, oldGroupKind, groupKind));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public EList getContent() {
-		if (content == null) {
-			content = new EObjectContainmentWithInverseEList(DTDElementContent.class, this, DTDPackage.DTD_GROUP_CONTENT__CONTENT, DTDPackage.DTD_ELEMENT_CONTENT__GROUP);
-		}
-		return content;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_GROUP_CONTENT__GROUP :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_GROUP_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_GROUP_CONTENT__ELEMENT :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_GROUP_CONTENT__ELEMENT, msgs);
-				case DTDPackage.DTD_GROUP_CONTENT__CONTENT :
-					return ((InternalEList) getContent()).basicAdd(otherEnd, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_GROUP_CONTENT__GROUP :
-					return eBasicSetContainer(null, DTDPackage.DTD_GROUP_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_GROUP_CONTENT__ELEMENT :
-					return eBasicSetContainer(null, DTDPackage.DTD_GROUP_CONTENT__ELEMENT, msgs);
-				case DTDPackage.DTD_GROUP_CONTENT__CONTENT :
-					return ((InternalEList) getContent()).basicRemove(otherEnd, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_GROUP_CONTENT__GROUP :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_GROUP_CONTENT__CONTENT, DTDGroupContent.class, msgs);
-				case DTDPackage.DTD_GROUP_CONTENT__ELEMENT :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_ELEMENT__CONTENT, DTDElement.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_GROUP_CONTENT__GROUP :
-				return getGroup();
-			case DTDPackage.DTD_GROUP_CONTENT__ELEMENT :
-				return getElement();
-			case DTDPackage.DTD_GROUP_CONTENT__OCCURRENCE :
-				return getOccurrence();
-			case DTDPackage.DTD_GROUP_CONTENT__GROUP_KIND :
-				return getGroupKind();
-			case DTDPackage.DTD_GROUP_CONTENT__CONTENT :
-				return getContent();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_GROUP_CONTENT__GROUP :
-				return getGroup() != null;
-			case DTDPackage.DTD_GROUP_CONTENT__ELEMENT :
-				return getElement() != null;
-			case DTDPackage.DTD_GROUP_CONTENT__OCCURRENCE :
-				return occurrence != OCCURRENCE_EDEFAULT;
-			case DTDPackage.DTD_GROUP_CONTENT__GROUP_KIND :
-				return groupKind != GROUP_KIND_EDEFAULT;
-			case DTDPackage.DTD_GROUP_CONTENT__CONTENT :
-				return content != null && !getContent().isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_GROUP_CONTENT__GROUP :
-				setGroup((DTDGroupContent) newValue);
-				return;
-			case DTDPackage.DTD_GROUP_CONTENT__ELEMENT :
-				setElement((DTDElement) newValue);
-				return;
-			case DTDPackage.DTD_GROUP_CONTENT__OCCURRENCE :
-				setOccurrence((DTDOccurrenceType) newValue);
-				return;
-			case DTDPackage.DTD_GROUP_CONTENT__GROUP_KIND :
-				setGroupKind((DTDGroupKind) newValue);
-				return;
-			case DTDPackage.DTD_GROUP_CONTENT__CONTENT :
-				getContent().clear();
-				getContent().addAll((Collection) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_GROUP_CONTENT__GROUP :
-				setGroup((DTDGroupContent) null);
-				return;
-			case DTDPackage.DTD_GROUP_CONTENT__ELEMENT :
-				setElement((DTDElement) null);
-				return;
-			case DTDPackage.DTD_GROUP_CONTENT__OCCURRENCE :
-				setOccurrence(OCCURRENCE_EDEFAULT);
-				return;
-			case DTDPackage.DTD_GROUP_CONTENT__GROUP_KIND :
-				setGroupKind(GROUP_KIND_EDEFAULT);
-				return;
-			case DTDPackage.DTD_GROUP_CONTENT__CONTENT :
-				getContent().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (groupKind: "); //$NON-NLS-1$
-		result.append(groupKind);
-		result.append(')');
-		return result.toString();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDIdHelper.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDIdHelper.java
deleted file mode 100644
index 0007039..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDIdHelper.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEmptyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPCDataContent;
-
-public class DTDIdHelper {
-	public DTDIdHelper() {
-	}
-
-	public String computeContentId(DTDElementContent content) {
-		String id = ""; //$NON-NLS-1$
-		if (content instanceof DTDEmptyContent) {
-			id = "#EMPTY"; //$NON-NLS-1$
-		}
-		else if (content instanceof DTDPCDataContent) {
-			id = "#PCDATA"; //$NON-NLS-1$
-		}
-		else if (content instanceof DTDEmptyContent) {
-			id = "#EMPTY"; //$NON-NLS-1$
-		}
-		else if (content instanceof DTDElementReferenceContent) {
-			id = "#" + ((DTDElementReferenceContent) content).getReferencedElement().getName(); //$NON-NLS-1$
-		}
-		else if (content instanceof DTDEntityReferenceContent) {
-			id = "#" + ((DTDEntityReferenceContent) content).getElementReferencedEntity().getName(); //$NON-NLS-1$
-		}
-		else if (content instanceof DTDGroupContent) {
-			id = computeGroupId((DTDGroupContent) content);
-		}
-		return id;
-	}
-
-	public String computeGroupId(DTDGroupContent grp) {
-		String groupId = "_"; //$NON-NLS-1$
-		return groupId;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String computeContentIdGen(DTDElementContent content) {
-
-		String id = ""; //$NON-NLS-1$
-		if (content instanceof DTDEmptyContent) {
-			id = "#EMPTY"; //$NON-NLS-1$
-		}
-		else if (content instanceof DTDPCDataContent) {
-			id = "#PCDATA"; //$NON-NLS-1$
-		}
-		else if (content instanceof DTDEmptyContent) {
-			id = "#EMPTY"; //$NON-NLS-1$
-		}
-		else if (content instanceof DTDElementReferenceContent) {
-			id = "#" + ((DTDElementReferenceContent) content).getReferencedElement().getName(); //$NON-NLS-1$
-		}
-		else if (content instanceof DTDEntityReferenceContent) {
-			id = "#" + ((DTDEntityReferenceContent) content).getElementReferencedEntity().getName(); //$NON-NLS-1$
-		}
-		else if (content instanceof DTDGroupContent) {
-			id = computeGroupId((DTDGroupContent) content);
-		}
-		return id;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String computeGroupIdGen(DTDGroupContent grp) {
-
-		String groupId = "_"; //$NON-NLS-1$
-		return groupId;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDInternalEntityImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDInternalEntityImpl.java
deleted file mode 100644
index a825514..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDInternalEntityImpl.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import java.text.CharacterIterator;
-import java.text.StringCharacterIterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDInternalEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-
-
-/**
- * @generated
- */
-public class DTDInternalEntityImpl extends DTDEntityContentImpl implements DTDInternalEntity {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	public DTDInternalEntityImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDInternalEntity();
-	}
-
-	public String unparse() {
-		StringBuffer sb = new StringBuffer(64);
-		if (getValue() == null)
-			sb.append("\"\""); //$NON-NLS-1$
-		else {
-			sb.append("\"").append(replaceDoubleQuotes(getValue())).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return sb.toString();
-	}
-
-	// this method replaces any occurrence of ' " ' with the equivalent value
-	// of &#34;
-	private String replaceDoubleQuotes(String input) {
-		StringBuffer newValue = new StringBuffer();
-
-		StringCharacterIterator characters = new StringCharacterIterator(input);
-
-		while (characters.current() != CharacterIterator.DONE) {
-			char current = characters.current();
-
-			if (current == '"') {
-				newValue.append("&#34;"); //$NON-NLS-1$
-			}
-			else {
-				newValue.append(current);
-			}
-			characters.next();
-		}
-
-		return newValue.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_INTERNAL_ENTITY__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_INTERNAL_ENTITY__DTD_ENTITY :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_INTERNAL_ENTITY__DTD_ENTITY, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_INTERNAL_ENTITY__DTD_ENTITY :
-					return eBasicSetContainer(null, DTDPackage.DTD_INTERNAL_ENTITY__DTD_ENTITY, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_INTERNAL_ENTITY__DTD_ENTITY :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_ENTITY__CONTENT, DTDEntity.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_INTERNAL_ENTITY__DTD_ENTITY :
-				return getDTDEntity();
-			case DTDPackage.DTD_INTERNAL_ENTITY__VALUE :
-				return getValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_INTERNAL_ENTITY__DTD_ENTITY :
-				return getDTDEntity() != null;
-			case DTDPackage.DTD_INTERNAL_ENTITY__VALUE :
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_INTERNAL_ENTITY__DTD_ENTITY :
-				setDTDEntity((DTDEntity) newValue);
-				return;
-			case DTDPackage.DTD_INTERNAL_ENTITY__VALUE :
-				setValue((String) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_INTERNAL_ENTITY__DTD_ENTITY :
-				setDTDEntity((DTDEntity) null);
-				return;
-			case DTDPackage.DTD_INTERNAL_ENTITY__VALUE :
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: "); //$NON-NLS-1$
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDNotationImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDNotationImpl.java
deleted file mode 100644
index 30e3237..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDNotationImpl.java
+++ /dev/null
@@ -1,904 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.dtd.core.internal.emf.DTDContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDLexicalInfo;
-import org.eclipse.wst.dtd.core.internal.emf.DTDNotation;
-import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-import org.eclipse.wst.dtd.core.internal.emf.util.DTDPathnameUtil;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Notation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDNotationImpl#getComment <em>Comment</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDNotationImpl#getSystemID <em>System ID</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDNotationImpl#getPublicID <em>Public ID</em>}</li>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDNotationImpl#getEntity <em>Entity</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class DTDNotationImpl extends DTDContentImpl implements DTDNotation, DTDContent {
-
-	public String getPathname() {
-		return DTDPathnameUtil.makePath(null, "Nota", getName(), -1); //$NON-NLS-1$
-	}
-
-
-	public DTDObject findObject(String relativePath) {
-		return null;
-	}
-
-
-	// ugly hack for now since we don't have multiple inheritance.
-	// Would rather have all this stuff in a base class but these
-	// classes are inheriting from sometimes different mof classes
-	DTDLexicalInfo lexInfo = new DTDLexicalInfo();
-
-	/**
-	 * Get the value of startOffset.
-	 * 
-	 * @return value of startOffset.
-	 */
-	public int getStartOffset() {
-		return lexInfo.getStartOffset();
-	}
-
-	/**
-	 * Set the value of startOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to startOffset.
-	 */
-	public void setStartOffset(int v) {
-		lexInfo.setStartOffset(v);
-	}
-
-	/**
-	 * Get the value of endOffset.
-	 * 
-	 * @return value of endOffset.
-	 */
-	public int getEndOffset() {
-		return lexInfo.getEndOffset();
-	}
-
-	/**
-	 * Set the value of endOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to endOffset.
-	 */
-	public void setEndOffset(int v) {
-		lexInfo.setEndOffset(v);
-	}
-
-	/**
-	 * The default value of the '{@link #getComment() <em>Comment</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getComment() <em>Comment</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected String comment = COMMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSystemID() <em>System ID</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getSystemID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SYSTEM_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSystemID() <em>System ID</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getSystemID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String systemID = SYSTEM_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPublicID() <em>Public ID</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getPublicID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PUBLIC_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPublicID() <em>Public ID</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getPublicID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String publicID = PUBLIC_ID_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getEntity() <em>Entity</em>}'
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getEntity()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList entity = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected DTDNotationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDNotation();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String getComment() {
-		return comment;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setComment(String newComment) {
-		String oldComment = comment;
-		comment = newComment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_NOTATION__COMMENT, oldComment, comment));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String getSystemID() {
-		return systemID;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setSystemID(String newSystemID) {
-		String oldSystemID = systemID;
-		systemID = newSystemID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_NOTATION__SYSTEM_ID, oldSystemID, systemID));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String getPublicID() {
-		return publicID;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setPublicID(String newPublicID) {
-		String oldPublicID = publicID;
-		publicID = newPublicID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_NOTATION__PUBLIC_ID, oldPublicID, publicID));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EList getEntity() {
-		if (entity == null) {
-			entity = new EObjectWithInverseResolvingEList(DTDExternalEntity.class, this, DTDPackage.DTD_NOTATION__ENTITY, DTDPackage.DTD_EXTERNAL_ENTITY__NOTATION);
-		}
-		return entity;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_NOTATION__DTD_FILE :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_NOTATION__DTD_FILE, msgs);
-				case DTDPackage.DTD_NOTATION__ENTITY :
-					return ((InternalEList) getEntity()).basicAdd(otherEnd, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_NOTATION__DTD_FILE :
-					return eBasicSetContainer(null, DTDPackage.DTD_NOTATION__DTD_FILE, msgs);
-				case DTDPackage.DTD_NOTATION__ENTITY :
-					return ((InternalEList) getEntity()).basicRemove(otherEnd, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_NOTATION__DTD_FILE :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_FILE__DTD_CONTENT, DTDFile.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_NOTATION__DTD_FILE :
-				return getDTDFile();
-			case DTDPackage.DTD_NOTATION__COMMENT :
-				return getComment();
-			case DTDPackage.DTD_NOTATION__SYSTEM_ID :
-				return getSystemID();
-			case DTDPackage.DTD_NOTATION__PUBLIC_ID :
-				return getPublicID();
-			case DTDPackage.DTD_NOTATION__ENTITY :
-				return getEntity();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_NOTATION__DTD_FILE :
-				setDTDFile((DTDFile) newValue);
-				return;
-			case DTDPackage.DTD_NOTATION__COMMENT :
-				setComment((String) newValue);
-				return;
-			case DTDPackage.DTD_NOTATION__SYSTEM_ID :
-				setSystemID((String) newValue);
-				return;
-			case DTDPackage.DTD_NOTATION__PUBLIC_ID :
-				setPublicID((String) newValue);
-				return;
-			case DTDPackage.DTD_NOTATION__ENTITY :
-				getEntity().clear();
-				getEntity().addAll((Collection) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_NOTATION__DTD_FILE :
-				setDTDFile((DTDFile) null);
-				return;
-			case DTDPackage.DTD_NOTATION__COMMENT :
-				setComment(COMMENT_EDEFAULT);
-				return;
-			case DTDPackage.DTD_NOTATION__SYSTEM_ID :
-				setSystemID(SYSTEM_ID_EDEFAULT);
-				return;
-			case DTDPackage.DTD_NOTATION__PUBLIC_ID :
-				setPublicID(PUBLIC_ID_EDEFAULT);
-				return;
-			case DTDPackage.DTD_NOTATION__ENTITY :
-				getEntity().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_NOTATION__DTD_FILE :
-				return getDTDFile() != null;
-			case DTDPackage.DTD_NOTATION__COMMENT :
-				return COMMENT_EDEFAULT == null ? comment != null : !COMMENT_EDEFAULT.equals(comment);
-			case DTDPackage.DTD_NOTATION__SYSTEM_ID :
-				return SYSTEM_ID_EDEFAULT == null ? systemID != null : !SYSTEM_ID_EDEFAULT.equals(systemID);
-			case DTDPackage.DTD_NOTATION__PUBLIC_ID :
-				return PUBLIC_ID_EDEFAULT == null ? publicID != null : !PUBLIC_ID_EDEFAULT.equals(publicID);
-			case DTDPackage.DTD_NOTATION__ENTITY :
-				return entity != null && !getEntity().isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (comment: "); //$NON-NLS-1$
-		result.append(comment);
-		result.append(", systemID: "); //$NON-NLS-1$
-		result.append(systemID);
-		result.append(", publicID: "); //$NON-NLS-1$
-		result.append(publicID);
-		result.append(')');
-		return result.toString();
-	}
-
-} // DTDNotationImpl
-
-// +++++++++++++++++++GENERICRULES.JSED+++++++++++++++++++
-//
-
-// +++++++++++++++++++GENERICRULES.JSED+++++++++++++++++++
-// //public class DTDNotationImpl extends ENamespaceImpl implements
-// DTDNotation, ENamespace, DTDContent{
-// -------------------GENERICRULES.JSED-------------------
-
-// public static final String copyright = "(c) Copyright IBM Corporation
-// 2002.";
-//
-// public DTDNotationImpl()
-// {
-// super();
-// }
-// public String getPathname()
-// {
-// return DTDPathnameUtil.makePath(null, "Nota", getName(), -1);
-// }
-//
-// public DTDObject findObject(String relativePath)
-// {
-// return null;
-// }
-//
-// // ugly hack for now since we don't have multiple inheritance.
-// // Would rather have all this stuff in a base class but these
-// // classes are inheriting from sometimes different mof classes
-// DTDLexicalInfo lexInfo = new DTDLexicalInfo();
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected String comment = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected String systemID = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected String publicID = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected EList entity = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected boolean setComment = false;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected boolean setSystemID = false;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected boolean setPublicID = false;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// private DTDContentImpl dtdContentDelegate = null;
-// /**
-// * Get the value of startOffset.
-// * @return value of startOffset.
-// */
-// public int getStartOffset()
-// {
-// return lexInfo.getStartOffset();
-// }
-//  
-// /**
-// * Set the value of startOffset.
-// * @param v Value to assign to startOffset.
-// */
-// public void setStartOffset(int v)
-// {
-// lexInfo.setStartOffset(v);
-// }
-//  
-// /**
-// * Get the value of endOffset.
-// * @return value of endOffset.
-// */
-// public int getEndOffset()
-// {
-// return lexInfo.getEndOffset();
-// }
-//  
-// /**
-// * Set the value of endOffset.
-// * @param v Value to assign to endOffset.
-// */
-// public void setEndOffset(int v)
-// {
-// lexInfo.setEndOffset(v);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public EObject initInstance() {
-// setEMetaObj(eClassDTDNotation());
-// initInstanceDelegates();
-// return this;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected void initInstanceDelegates() {
-// super.initInstanceDelegates();
-//
-// getDtdContentDelegate().refSetDelegateOwner(this);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public DTDPackage ePackageDTD() {
-// return
-// (DTDPackage)EPackage.Registry.INSTANCE.getEPackage(DTDPackage.eNS_URI);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public EClass eClassDTDNotation() {
-// return
-// ((DTDPackage)EPackage.Registry.INSTANCE.getEPackage(DTDPackage.eNS_URI)).getDTDNotation();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public String getComment() {
-// if (this.setComment) return this.comment;
-// else return
-// (String)DTDPackage.eINSTANCE.getDTDNotation_Comment().getDefaultValue();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void setComment(String value) {
-// refSetValueForSimpleSF(DTDPackage.eINSTANCE.getDTDNotation_Comment(),this.comment,value);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void unsetComment() {
-// eNotify(refBasicUnsetValue(DTDPackage.eINSTANCE.getDTDNotation_Comment()));
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean isSetComment() {
-// return setComment;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public String getSystemID() {
-// if (this.setSystemID) return this.systemID;
-// else return
-// (String)DTDPackage.eINSTANCE.getDTDNotation_SystemID().getDefaultValue();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void setSystemID(String value) {
-// refSetValueForSimpleSF(DTDPackage.eINSTANCE.getDTDNotation_SystemID(),this.systemID,value);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void unsetSystemID() {
-// eNotify(refBasicUnsetValue(DTDPackage.eINSTANCE.getDTDNotation_SystemID()));
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean isSetSystemID() {
-// return setSystemID;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public String getPublicID() {
-// if (this.setPublicID) return this.publicID;
-// else return
-// (String)DTDPackage.eINSTANCE.getDTDNotation_PublicID().getDefaultValue();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void setPublicID(String value) {
-// refSetValueForSimpleSF(DTDPackage.eINSTANCE.getDTDNotation_PublicID(),this.publicID,value);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void unsetPublicID() {
-// eNotify(refBasicUnsetValue(DTDPackage.eINSTANCE.getDTDNotation_PublicID()));
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean isSetPublicID() {
-// return setPublicID;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public EList getEntity() {
-// if (this.entity==null) {
-// this.entity=newCollection(this,DTDPackage.eINSTANCE.getDTDNotation_Entity(),
-// true);
-// }
-// return this.entity;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Object eGet(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.eGet(feature);
-// }
-// switch (eClassDTDNotation().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_NOTATION__COMMENT: return getComment();
-// case DTDPackage.DTD_NOTATION__SYSTEM_ID: return getSystemID();
-// case DTDPackage.DTD_NOTATION__PUBLIC_ID: return getPublicID();
-// case DTDPackage.DTD_NOTATION__ENTITY: return getEntity();
-// case DTDPackage.DTD_NOTATION__DTD_FILE: return getDTDFile();
-//
-// }
-// return super.eGet(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Object refBasicValue(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.refBasicValue(feature);
-// }
-// switch (eClassDTDNotation().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_NOTATION__COMMENT:
-// return this.setComment? this.comment : null;
-// case DTDPackage.DTD_NOTATION__SYSTEM_ID:
-// return this.setSystemID? this.systemID : null;
-// case DTDPackage.DTD_NOTATION__PUBLIC_ID:
-// return this.setPublicID? this.publicID : null;
-// case DTDPackage.DTD_NOTATION__ENTITY:
-// return this.entity;
-// case DTDPackage.DTD_NOTATION__DTD_FILE: return
-// ((InternalEObject)getDtdContentDelegate()).refBasicValue(feature);
-//
-// }
-// return super.refBasicValue(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean eIsSet(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.eIsSet(feature);
-// }
-// switch (eClassDTDNotation().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_NOTATION__COMMENT: return isSetComment();
-// case DTDPackage.DTD_NOTATION__SYSTEM_ID: return isSetSystemID();
-// case DTDPackage.DTD_NOTATION__PUBLIC_ID: return isSetPublicID();
-// case DTDPackage.DTD_NOTATION__DTD_FILE: return isSetDTDFile();
-//
-// }
-// return super.eIsSet(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void eSet(EStructuralFeature feature, Object newValue) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// super.eSet(feature, newValue);
-// }
-// switch (eClassDTDNotation().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_NOTATION__COMMENT: {
-// setComment((String)newValue);
-// return;
-// }
-// case DTDPackage.DTD_NOTATION__SYSTEM_ID: {
-// setSystemID((String)newValue);
-// return;
-// }
-// case DTDPackage.DTD_NOTATION__PUBLIC_ID: {
-// setPublicID((String)newValue);
-// return;
-// }
-// case DTDPackage.DTD_NOTATION__DTD_FILE: {
-// setDTDFile((DTDFile)newValue);
-// return;
-// }
-//
-// }
-// super.eSet(feature, newValue);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Notification eBasicSet(EStructuralFeature feature, Object newValue)
-// {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.eBasicSet(feature, newValue);
-// }
-// switch (eClassDTDNotation().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_NOTATION__COMMENT: {
-// Object oldValue = this.comment;
-// this.comment = (String)newValue;
-// this.setComment = true;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.SET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDNotation_Comment(),oldValue,newValue);
-// }
-// case DTDPackage.DTD_NOTATION__SYSTEM_ID: {
-// Object oldValue = this.systemID;
-// this.systemID = (String)newValue;
-// this.setSystemID = true;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.SET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDNotation_SystemID(),oldValue,newValue);
-// }
-// case DTDPackage.DTD_NOTATION__PUBLIC_ID: {
-// Object oldValue = this.publicID;
-// this.publicID = (String)newValue;
-// this.setPublicID = true;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.SET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDNotation_PublicID(),oldValue,newValue);
-// }
-//
-// }
-// return super.eBasicSet(feature, newValue);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void eUnset(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// super.eUnset(feature);
-// }
-// switch (eClassDTDNotation().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_NOTATION__COMMENT: {
-// unsetComment();
-// return;
-// }
-// case DTDPackage.DTD_NOTATION__SYSTEM_ID: {
-// unsetSystemID();
-// return;
-// }
-// case DTDPackage.DTD_NOTATION__PUBLIC_ID: {
-// unsetPublicID();
-// return;
-// }
-// case DTDPackage.DTD_NOTATION__DTD_FILE: {
-// unsetDTDFile();
-// return;
-// }
-//
-// }
-// super.eUnset(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Notification refBasicUnsetValue(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.refBasicUnsetValue(feature);
-// }
-// switch (eClassDTDNotation().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_NOTATION__COMMENT: {
-// Object oldValue = this.comment;
-// this.comment = null;
-// this.setComment = false;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.UNSET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDNotation_Comment(),oldValue,getComment());
-// }
-// case DTDPackage.DTD_NOTATION__SYSTEM_ID: {
-// Object oldValue = this.systemID;
-// this.systemID = null;
-// this.setSystemID = false;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.UNSET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDNotation_SystemID(),oldValue,getSystemID());
-// }
-// case DTDPackage.DTD_NOTATION__PUBLIC_ID: {
-// Object oldValue = this.publicID;
-// this.publicID = null;
-// this.setPublicID = false;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.UNSET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDNotation_PublicID(),oldValue,getPublicID());
-// }
-//
-// }
-// return super.refBasicUnsetValue(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected DTDContentImpl getDtdContentDelegate() {
-// if (dtdContentDelegate == null) {
-// DTDPackage pkg =
-// (DTDPackage)EPackage.Registry.INSTANCE.getEPackage(DTDPackage.eNS_URI);
-// dtdContentDelegate=(DTDContentImpl)pkg.eCreateInstance(pkg.DTD_CONTENT);
-// dtdContentDelegate.initInstance();
-// }
-// return dtdContentDelegate;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public EClass eClassDTDContent() {
-// return getDtdContentDelegate().eClass();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public DTDFile getDTDFile() {
-// return getDtdContentDelegate().getDTDFile();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void setDTDFile(DTDFile value) {
-// getDtdContentDelegate().setDTDFile(value);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void unsetDTDFile() {
-// getDtdContentDelegate().unsetDTDFile();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean isSetDTDFile() {
-// return getDtdContentDelegate().isSetDTDFile();
-// }
-// }
-// -------------------GENERICRULES.JSED-------------------
-
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDPCDataContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDPCDataContentImpl.java
deleted file mode 100644
index 7340f57..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDPCDataContentImpl.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPCDataContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-
-/**
- * @generated
- */
-public class DTDPCDataContentImpl extends DTDElementContentImpl implements DTDPCDataContent {
-
-	public DTDPCDataContentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDPCDataContent();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_PC_DATA_CONTENT__GROUP :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_PC_DATA_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_PC_DATA_CONTENT__ELEMENT :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_PC_DATA_CONTENT__ELEMENT, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_PC_DATA_CONTENT__GROUP :
-					return eBasicSetContainer(null, DTDPackage.DTD_PC_DATA_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_PC_DATA_CONTENT__ELEMENT :
-					return eBasicSetContainer(null, DTDPackage.DTD_PC_DATA_CONTENT__ELEMENT, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_PC_DATA_CONTENT__GROUP :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_GROUP_CONTENT__CONTENT, DTDGroupContent.class, msgs);
-				case DTDPackage.DTD_PC_DATA_CONTENT__ELEMENT :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_ELEMENT__CONTENT, DTDElement.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_PC_DATA_CONTENT__GROUP :
-				return getGroup();
-			case DTDPackage.DTD_PC_DATA_CONTENT__ELEMENT :
-				return getElement();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_PC_DATA_CONTENT__GROUP :
-				setGroup((DTDGroupContent) newValue);
-				return;
-			case DTDPackage.DTD_PC_DATA_CONTENT__ELEMENT :
-				setElement((DTDElement) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_PC_DATA_CONTENT__GROUP :
-				setGroup((DTDGroupContent) null);
-				return;
-			case DTDPackage.DTD_PC_DATA_CONTENT__ELEMENT :
-				setElement((DTDElement) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_PC_DATA_CONTENT__GROUP :
-				return getGroup() != null;
-			case DTDPackage.DTD_PC_DATA_CONTENT__ELEMENT :
-				return getElement() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String getContentName() {
-		return "#PCDATA"; //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDPackageImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDPackageImpl.java
deleted file mode 100644
index bd01cd2..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDPackageImpl.java
+++ /dev/null
@@ -1,1217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAnyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute;
-import org.eclipse.wst.dtd.core.internal.emf.DTDBasicType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDBasicTypeKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDDefaultKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEmptyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEnumGroupKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFactory;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDInternalEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDNotation;
-import org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPCDataContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-import org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference;
-import org.eclipse.wst.dtd.core.internal.emf.DTDRepeatableContent;
-import org.eclipse.wst.dtd.core.internal.emf.XMLSchemaDefinedType;
-
-
-/**
- * @lastgen class DTDPackageImpl extends EPackageImpl implements DTDPackage,
- *          EPackage {}
- */
-public class DTDPackageImpl extends EPackageImpl implements DTDPackage {
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdElementContentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdGroupContentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdAttributeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdEmptyContentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdAnyContentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdpcDataContentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdElementReferenceContentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdRepeatableContentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdFileEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdBasicTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdEnumerationTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdNotationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdEntityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdEntityContentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdExternalEntityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdInternalEntityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdParameterEntityReferenceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdEntityReferenceContentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass dtdContentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EEnum dtdOccurrenceTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EEnum dtdDefaultKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EEnum dtdBasicTypeKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EEnum dtdEnumGroupKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EEnum dtdGroupKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EEnum xmlSchemaDefinedTypeEEnum = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by
-	 * the package package URI value.
-	 * <p>
-	 * Note: the correct way to create the package is via the static factory
-	 * method {@link #init init()}, which also performs initialization of the
-	 * package, or returns the registered package, if one already exists. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.wst.dtd.core.internal.emf.DTDPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private DTDPackageImpl() {
-		super(eNS_URI, DTDFactory.eINSTANCE);
-	}
-
-	// public DTDPackageImpl()
-	// {
-	// super(eNS_URI);
-	// initializePackage(null);
-	// }
-
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model,
-	 * and for any others upon which it depends. Simple dependencies are
-	 * satisfied by calling this method on all dependent packages before doing
-	 * anything else. This method drives initialization for interdependent
-	 * packages directly, in parallel with this package, itself.
-	 * <p>
-	 * Of this package and its interdependencies, all packages which have not
-	 * yet been registered by their URI values are first created and
-	 * registered. The packages are then initialized in two steps: meta-model
-	 * objects for all of the packages are created before any are initialized,
-	 * since one package's meta-model objects may refer to those of another.
-	 * <p>
-	 * Invocation of this method will not affect any packages that have
-	 * already been initialized. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static DTDPackage init() {
-		// Obtain or create and register package and interdependencies
-		DTDPackageImpl theDTDPackage = (DTDPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DTDPackageImpl());
-		EcorePackageImpl theEcorePackage = (EcorePackageImpl) (EPackage.Registry.INSTANCE.get(EcorePackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.get(EcorePackage.eNS_URI) : EcorePackage.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theDTDPackage.createPackageContents();
-		theEcorePackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theDTDPackage.initializePackageContents();
-		theEcorePackage.initializePackageContents();
-
-		return theDTDPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDElementContent() {
-		return dtdElementContentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDElementContent_Group() {
-		return (EReference) dtdElementContentEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDElementContent_Element() {
-		return (EReference) dtdElementContentEClass.getEReferences().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDGroupContent() {
-		return dtdGroupContentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDGroupContent_GroupKind() {
-		return (EAttribute) dtdGroupContentEClass.getEAttributes().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDGroupContent_Content() {
-		return (EReference) dtdGroupContentEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDAttribute() {
-		return dtdAttributeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDAttribute_Comment() {
-		return (EAttribute) dtdAttributeEClass.getEAttributes().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDAttribute_DefaultKind() {
-		return (EAttribute) dtdAttributeEClass.getEAttributes().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDAttribute_DefaultValueString() {
-		return (EAttribute) dtdAttributeEClass.getEAttributes().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDAttribute_AttributeNameReferencedEntity() {
-		return (EReference) dtdAttributeEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDAttribute_AttributeTypeReferencedEntity() {
-		return (EReference) dtdAttributeEClass.getEReferences().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDAttribute_DTDElement() {
-		return (EReference) dtdAttributeEClass.getEReferences().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDElement() {
-		return dtdElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDElement_Comment() {
-		return (EAttribute) dtdElementEClass.getEAttributes().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDElement_Content() {
-		return (EReference) dtdElementEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDElement_DTDAttribute() {
-		return (EReference) dtdElementEClass.getEReferences().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDEmptyContent() {
-		return dtdEmptyContentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDAnyContent() {
-		return dtdAnyContentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDPCDataContent() {
-		return dtdpcDataContentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDElementReferenceContent() {
-		return dtdElementReferenceContentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDElementReferenceContent_ReferencedElement() {
-		return (EReference) dtdElementReferenceContentEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDRepeatableContent() {
-		return dtdRepeatableContentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDRepeatableContent_Occurrence() {
-		return (EAttribute) dtdRepeatableContentEClass.getEAttributes().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDFile() {
-		return dtdFileEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDFile_Comment() {
-		return (EAttribute) dtdFileEClass.getEAttributes().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDFile_ParseError() {
-		return (EAttribute) dtdFileEClass.getEAttributes().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDFile_DTDContent() {
-		return (EReference) dtdFileEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDFile_DTDEnumerationType() {
-		return (EReference) dtdFileEClass.getEReferences().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDBasicType() {
-		return dtdBasicTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDBasicType_Kind() {
-		return (EAttribute) dtdBasicTypeEClass.getEAttributes().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDEnumerationType() {
-		return dtdEnumerationTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDEnumerationType_Kind() {
-		return (EAttribute) dtdEnumerationTypeEClass.getEAttributes().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDEnumerationType_DTDFile() {
-		return (EReference) dtdEnumerationTypeEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDNotation() {
-		return dtdNotationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDNotation_Comment() {
-		return (EAttribute) dtdNotationEClass.getEAttributes().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDNotation_SystemID() {
-		return (EAttribute) dtdNotationEClass.getEAttributes().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDNotation_PublicID() {
-		return (EAttribute) dtdNotationEClass.getEAttributes().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDNotation_Entity() {
-		return (EReference) dtdNotationEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDEntity() {
-		return dtdEntityEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDEntity_Comment() {
-		return (EAttribute) dtdEntityEClass.getEAttributes().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDEntity_ParameterEntity() {
-		return (EAttribute) dtdEntityEClass.getEAttributes().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDEntity_Content() {
-		return (EReference) dtdEntityEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDEntity_ParmEntityRef() {
-		return (EReference) dtdEntityEClass.getEReferences().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDEntity_EntityReference() {
-		return (EReference) dtdEntityEClass.getEReferences().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDEntity_AttributeNameReference() {
-		return (EReference) dtdEntityEClass.getEReferences().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDEntity_AttributeTypeReference() {
-		return (EReference) dtdEntityEClass.getEReferences().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDEntityContent() {
-		return dtdEntityContentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDEntityContent_DTDEntity() {
-		return (EReference) dtdEntityContentEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDExternalEntity() {
-		return dtdExternalEntityEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDExternalEntity_SystemID() {
-		return (EAttribute) dtdExternalEntityEClass.getEAttributes().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDExternalEntity_PublicID() {
-		return (EAttribute) dtdExternalEntityEClass.getEAttributes().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDExternalEntity_Notation() {
-		return (EReference) dtdExternalEntityEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDExternalEntity_EntityReferencedFromAnotherFile() {
-		return (EReference) dtdExternalEntityEClass.getEReferences().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDInternalEntity() {
-		return dtdInternalEntityEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDTDInternalEntity_Value() {
-		return (EAttribute) dtdInternalEntityEClass.getEAttributes().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDParameterEntityReference() {
-		return dtdParameterEntityReferenceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDParameterEntityReference_Entity() {
-		return (EReference) dtdParameterEntityReferenceEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDEntityReferenceContent() {
-		return dtdEntityReferenceContentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDEntityReferenceContent_ElementReferencedEntity() {
-		return (EReference) dtdEntityReferenceContentEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EClass getDTDContent() {
-		return dtdContentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getDTDContent_DTDFile() {
-		return (EReference) dtdContentEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EEnum getDTDOccurrenceType() {
-		return dtdOccurrenceTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EEnum getDTDDefaultKind() {
-		return dtdDefaultKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EEnum getDTDBasicTypeKind() {
-		return dtdBasicTypeKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EEnum getDTDEnumGroupKind() {
-		return dtdEnumGroupKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EEnum getDTDGroupKind() {
-		return dtdGroupKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EEnum getXMLSchemaDefinedType() {
-		return xmlSchemaDefinedTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDFactory getDTDFactory() {
-		return (DTDFactory) getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package. This method is guarded
-	 * to have no affect on any invocation but its first. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated)
-			return;
-		isCreated = true;
-
-		// Create classes and their features
-		dtdElementContentEClass = createEClass(DTD_ELEMENT_CONTENT);
-		createEReference(dtdElementContentEClass, DTD_ELEMENT_CONTENT__GROUP);
-		createEReference(dtdElementContentEClass, DTD_ELEMENT_CONTENT__ELEMENT);
-
-		dtdGroupContentEClass = createEClass(DTD_GROUP_CONTENT);
-		createEAttribute(dtdGroupContentEClass, DTD_GROUP_CONTENT__GROUP_KIND);
-		createEReference(dtdGroupContentEClass, DTD_GROUP_CONTENT__CONTENT);
-
-		dtdAttributeEClass = createEClass(DTD_ATTRIBUTE);
-		createEAttribute(dtdAttributeEClass, DTD_ATTRIBUTE__COMMENT);
-		createEAttribute(dtdAttributeEClass, DTD_ATTRIBUTE__DEFAULT_KIND);
-		createEAttribute(dtdAttributeEClass, DTD_ATTRIBUTE__DEFAULT_VALUE_STRING);
-		createEReference(dtdAttributeEClass, DTD_ATTRIBUTE__ATTRIBUTE_NAME_REFERENCED_ENTITY);
-		createEReference(dtdAttributeEClass, DTD_ATTRIBUTE__ATTRIBUTE_TYPE_REFERENCED_ENTITY);
-		createEReference(dtdAttributeEClass, DTD_ATTRIBUTE__DTD_ELEMENT);
-
-		dtdElementEClass = createEClass(DTD_ELEMENT);
-		createEAttribute(dtdElementEClass, DTD_ELEMENT__COMMENT);
-		createEReference(dtdElementEClass, DTD_ELEMENT__CONTENT);
-		createEReference(dtdElementEClass, DTD_ELEMENT__DTD_ATTRIBUTE);
-
-		dtdEmptyContentEClass = createEClass(DTD_EMPTY_CONTENT);
-
-		dtdAnyContentEClass = createEClass(DTD_ANY_CONTENT);
-
-		dtdpcDataContentEClass = createEClass(DTD_PC_DATA_CONTENT);
-
-		dtdElementReferenceContentEClass = createEClass(DTD_ELEMENT_REFERENCE_CONTENT);
-		createEReference(dtdElementReferenceContentEClass, DTD_ELEMENT_REFERENCE_CONTENT__REFERENCED_ELEMENT);
-
-		dtdRepeatableContentEClass = createEClass(DTD_REPEATABLE_CONTENT);
-		createEAttribute(dtdRepeatableContentEClass, DTD_REPEATABLE_CONTENT__OCCURRENCE);
-
-		dtdFileEClass = createEClass(DTD_FILE);
-		createEAttribute(dtdFileEClass, DTD_FILE__COMMENT);
-		createEAttribute(dtdFileEClass, DTD_FILE__PARSE_ERROR);
-		createEReference(dtdFileEClass, DTD_FILE__DTD_CONTENT);
-		createEReference(dtdFileEClass, DTD_FILE__DTD_ENUMERATION_TYPE);
-
-		dtdBasicTypeEClass = createEClass(DTD_BASIC_TYPE);
-		createEAttribute(dtdBasicTypeEClass, DTD_BASIC_TYPE__KIND);
-
-		dtdEnumerationTypeEClass = createEClass(DTD_ENUMERATION_TYPE);
-		createEAttribute(dtdEnumerationTypeEClass, DTD_ENUMERATION_TYPE__KIND);
-		createEReference(dtdEnumerationTypeEClass, DTD_ENUMERATION_TYPE__DTD_FILE);
-
-		dtdNotationEClass = createEClass(DTD_NOTATION);
-		createEAttribute(dtdNotationEClass, DTD_NOTATION__COMMENT);
-		createEAttribute(dtdNotationEClass, DTD_NOTATION__SYSTEM_ID);
-		createEAttribute(dtdNotationEClass, DTD_NOTATION__PUBLIC_ID);
-		createEReference(dtdNotationEClass, DTD_NOTATION__ENTITY);
-
-		dtdEntityEClass = createEClass(DTD_ENTITY);
-		createEAttribute(dtdEntityEClass, DTD_ENTITY__COMMENT);
-		createEAttribute(dtdEntityEClass, DTD_ENTITY__PARAMETER_ENTITY);
-		createEReference(dtdEntityEClass, DTD_ENTITY__CONTENT);
-		createEReference(dtdEntityEClass, DTD_ENTITY__PARM_ENTITY_REF);
-		createEReference(dtdEntityEClass, DTD_ENTITY__ENTITY_REFERENCE);
-		createEReference(dtdEntityEClass, DTD_ENTITY__ATTRIBUTE_NAME_REFERENCE);
-		createEReference(dtdEntityEClass, DTD_ENTITY__ATTRIBUTE_TYPE_REFERENCE);
-
-		dtdEntityContentEClass = createEClass(DTD_ENTITY_CONTENT);
-		createEReference(dtdEntityContentEClass, DTD_ENTITY_CONTENT__DTD_ENTITY);
-
-		dtdExternalEntityEClass = createEClass(DTD_EXTERNAL_ENTITY);
-		createEAttribute(dtdExternalEntityEClass, DTD_EXTERNAL_ENTITY__SYSTEM_ID);
-		createEAttribute(dtdExternalEntityEClass, DTD_EXTERNAL_ENTITY__PUBLIC_ID);
-		createEReference(dtdExternalEntityEClass, DTD_EXTERNAL_ENTITY__NOTATION);
-		createEReference(dtdExternalEntityEClass, DTD_EXTERNAL_ENTITY__ENTITY_REFERENCED_FROM_ANOTHER_FILE);
-
-		dtdInternalEntityEClass = createEClass(DTD_INTERNAL_ENTITY);
-		createEAttribute(dtdInternalEntityEClass, DTD_INTERNAL_ENTITY__VALUE);
-
-		dtdParameterEntityReferenceEClass = createEClass(DTD_PARAMETER_ENTITY_REFERENCE);
-		createEReference(dtdParameterEntityReferenceEClass, DTD_PARAMETER_ENTITY_REFERENCE__ENTITY);
-
-		dtdEntityReferenceContentEClass = createEClass(DTD_ENTITY_REFERENCE_CONTENT);
-		createEReference(dtdEntityReferenceContentEClass, DTD_ENTITY_REFERENCE_CONTENT__ELEMENT_REFERENCED_ENTITY);
-
-		dtdContentEClass = createEClass(DTD_CONTENT);
-		createEReference(dtdContentEClass, DTD_CONTENT__DTD_FILE);
-
-		// Create enums
-		dtdOccurrenceTypeEEnum = createEEnum(DTD_OCCURRENCE_TYPE);
-		dtdDefaultKindEEnum = createEEnum(DTD_DEFAULT_KIND);
-		dtdBasicTypeKindEEnum = createEEnum(DTD_BASIC_TYPE_KIND);
-		dtdEnumGroupKindEEnum = createEEnum(DTD_ENUM_GROUP_KIND);
-		dtdGroupKindEEnum = createEEnum(DTD_GROUP_KIND);
-		xmlSchemaDefinedTypeEEnum = createEEnum(XML_SCHEMA_DEFINED_TYPE);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model. This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized)
-			return;
-		isInitialized = true;
-		EOperation op;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		EcorePackageImpl theEcorePackage = (EcorePackageImpl) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-		// Add supertypes to classes
-		dtdGroupContentEClass.getESuperTypes().add(this.getDTDRepeatableContent());
-		dtdAttributeEClass.getESuperTypes().add(theEcorePackage.getEAttribute());
-		dtdElementEClass.getESuperTypes().add(theEcorePackage.getEClass());
-		dtdElementEClass.getESuperTypes().add(this.getDTDContent());
-		dtdEmptyContentEClass.getESuperTypes().add(this.getDTDElementContent());
-		dtdAnyContentEClass.getESuperTypes().add(this.getDTDElementContent());
-		dtdpcDataContentEClass.getESuperTypes().add(this.getDTDElementContent());
-		dtdElementReferenceContentEClass.getESuperTypes().add(this.getDTDRepeatableContent());
-		dtdRepeatableContentEClass.getESuperTypes().add(this.getDTDElementContent());
-		dtdBasicTypeEClass.getESuperTypes().add(theEcorePackage.getEClass());
-		dtdEnumerationTypeEClass.getESuperTypes().add(theEcorePackage.getEEnum());
-		dtdNotationEClass.getESuperTypes().add(this.getDTDContent());
-		dtdEntityEClass.getESuperTypes().add(this.getDTDContent());
-		dtdExternalEntityEClass.getESuperTypes().add(this.getDTDEntityContent());
-		dtdInternalEntityEClass.getESuperTypes().add(this.getDTDEntityContent());
-		dtdParameterEntityReferenceEClass.getESuperTypes().add(this.getDTDContent());
-		dtdEntityReferenceContentEClass.getESuperTypes().add(this.getDTDRepeatableContent());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(dtdElementContentEClass, DTDElementContent.class, "DTDElementContent", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getDTDElementContent_Group(), this.getDTDGroupContent(), this.getDTDGroupContent_Content(), "group", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
-		initEReference(getDTDElementContent_Element(), this.getDTDElement(), this.getDTDElement_Content(), "element", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
-
-		initEClass(dtdGroupContentEClass, DTDGroupContent.class, "DTDGroupContent", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getDTDGroupContent_GroupKind(), this.getDTDGroupKind(), "groupKind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-		initEReference(getDTDGroupContent_Content(), this.getDTDElementContent(), this.getDTDElementContent_Group(), "content", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
-
-		initEClass(dtdAttributeEClass, DTDAttribute.class, "DTDAttribute", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getDTDAttribute_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-		initEAttribute(getDTDAttribute_DefaultKind(), this.getDTDDefaultKind(), "defaultKind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-		initEAttribute(getDTDAttribute_DefaultValueString(), ecorePackage.getEString(), "defaultValueString", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-		initEReference(getDTDAttribute_AttributeNameReferencedEntity(), this.getDTDEntity(), this.getDTDEntity_AttributeNameReference(), "attributeNameReferencedEntity", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
-		initEReference(getDTDAttribute_AttributeTypeReferencedEntity(), this.getDTDEntity(), this.getDTDEntity_AttributeTypeReference(), "attributeTypeReferencedEntity", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
-		initEReference(getDTDAttribute_DTDElement(), this.getDTDElement(), this.getDTDElement_DTDAttribute(), "DTDElement", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
-
-		initEClass(dtdElementEClass, DTDElement.class, "DTDElement", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getDTDElement_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-		initEReference(getDTDElement_Content(), this.getDTDElementContent(), this.getDTDElementContent_Element(), "content", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
-		initEReference(getDTDElement_DTDAttribute(), this.getDTDAttribute(), this.getDTDAttribute_DTDElement(), "DTDAttribute", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
-
-		initEClass(dtdEmptyContentEClass, DTDEmptyContent.class, "DTDEmptyContent", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(dtdAnyContentEClass, DTDAnyContent.class, "DTDAnyContent", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(dtdpcDataContentEClass, DTDPCDataContent.class, "DTDPCDataContent", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(dtdElementReferenceContentEClass, DTDElementReferenceContent.class, "DTDElementReferenceContent", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getDTDElementReferenceContent_ReferencedElement(), this.getDTDElement(), null, "referencedElement", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
-
-		initEClass(dtdRepeatableContentEClass, DTDRepeatableContent.class, "DTDRepeatableContent", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getDTDRepeatableContent_Occurrence(), this.getDTDOccurrenceType(), "occurrence", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-
-		initEClass(dtdFileEClass, DTDFile.class, "DTDFile", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getDTDFile_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-		initEAttribute(getDTDFile_ParseError(), ecorePackage.getEBoolean(), "parseError", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-		initEReference(getDTDFile_DTDContent(), this.getDTDContent(), this.getDTDContent_DTDFile(), "DTDContent", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
-		initEReference(getDTDFile_DTDEnumerationType(), this.getDTDEnumerationType(), this.getDTDEnumerationType_DTDFile(), "DTDEnumerationType", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
-
-		initEClass(dtdBasicTypeEClass, DTDBasicType.class, "DTDBasicType", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getDTDBasicType_Kind(), this.getDTDBasicTypeKind(), "kind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-
-		initEClass(dtdEnumerationTypeEClass, DTDEnumerationType.class, "DTDEnumerationType", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getDTDEnumerationType_Kind(), this.getDTDEnumGroupKind(), "kind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-		initEReference(getDTDEnumerationType_DTDFile(), this.getDTDFile(), this.getDTDFile_DTDEnumerationType(), "DTDFile", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
-
-		initEClass(dtdNotationEClass, DTDNotation.class, "DTDNotation", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getDTDNotation_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-		initEAttribute(getDTDNotation_SystemID(), ecorePackage.getEString(), "systemID", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-		initEAttribute(getDTDNotation_PublicID(), ecorePackage.getEString(), "publicID", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-		initEReference(getDTDNotation_Entity(), this.getDTDExternalEntity(), this.getDTDExternalEntity_Notation(), "entity", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
-
-		initEClass(dtdEntityEClass, DTDEntity.class, "DTDEntity", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getDTDEntity_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-		initEAttribute(getDTDEntity_ParameterEntity(), ecorePackage.getEBoolean(), "parameterEntity", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-		initEReference(getDTDEntity_Content(), this.getDTDEntityContent(), this.getDTDEntityContent_DTDEntity(), "content", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
-		initEReference(getDTDEntity_ParmEntityRef(), this.getDTDParameterEntityReference(), this.getDTDParameterEntityReference_Entity(), "parmEntityRef", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
-		initEReference(getDTDEntity_EntityReference(), this.getDTDEntityReferenceContent(), this.getDTDEntityReferenceContent_ElementReferencedEntity(), "entityReference", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
-		initEReference(getDTDEntity_AttributeNameReference(), this.getDTDAttribute(), this.getDTDAttribute_AttributeNameReferencedEntity(), "attributeNameReference", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
-		initEReference(getDTDEntity_AttributeTypeReference(), this.getDTDAttribute(), this.getDTDAttribute_AttributeTypeReferencedEntity(), "attributeTypeReference", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
-
-		initEClass(dtdEntityContentEClass, DTDEntityContent.class, "DTDEntityContent", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getDTDEntityContent_DTDEntity(), this.getDTDEntity(), this.getDTDEntity_Content(), "DTDEntity", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
-
-		initEClass(dtdExternalEntityEClass, DTDExternalEntity.class, "DTDExternalEntity", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getDTDExternalEntity_SystemID(), ecorePackage.getEString(), "systemID", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-		initEAttribute(getDTDExternalEntity_PublicID(), ecorePackage.getEString(), "publicID", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-		initEReference(getDTDExternalEntity_Notation(), this.getDTDNotation(), this.getDTDNotation_Entity(), "notation", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
-		initEReference(getDTDExternalEntity_EntityReferencedFromAnotherFile(), this.getDTDFile(), null, "entityReferencedFromAnotherFile", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
-
-		initEClass(dtdInternalEntityEClass, DTDInternalEntity.class, "DTDInternalEntity", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getDTDInternalEntity_Value(), ecorePackage.getEString(), "value", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
-
-		initEClass(dtdParameterEntityReferenceEClass, DTDParameterEntityReference.class, "DTDParameterEntityReference", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getDTDParameterEntityReference_Entity(), this.getDTDEntity(), this.getDTDEntity_ParmEntityRef(), "entity", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
-
-		initEClass(dtdEntityReferenceContentEClass, DTDEntityReferenceContent.class, "DTDEntityReferenceContent", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getDTDEntityReferenceContent_ElementReferencedEntity(), this.getDTDEntity(), this.getDTDEntity_EntityReference(), "elementReferencedEntity", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
-
-		initEClass(dtdContentEClass, DTDContent.class, "DTDContent", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getDTDContent_DTDFile(), this.getDTDFile(), this.getDTDFile_DTDContent(), "DTDFile", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
-
-		// Initialize enums and add enum literals
-		initEEnum(dtdOccurrenceTypeEEnum, DTDOccurrenceType.class, "DTDOccurrenceType"); //$NON-NLS-1$
-		addEEnumLiteral(dtdOccurrenceTypeEEnum, DTDOccurrenceType.ONE_LITERAL);
-		addEEnumLiteral(dtdOccurrenceTypeEEnum, DTDOccurrenceType.OPTIONAL_LITERAL);
-		addEEnumLiteral(dtdOccurrenceTypeEEnum, DTDOccurrenceType.ONE_OR_MORE_LITERAL);
-		addEEnumLiteral(dtdOccurrenceTypeEEnum, DTDOccurrenceType.ZERO_OR_MORE_LITERAL);
-
-		initEEnum(dtdDefaultKindEEnum, DTDDefaultKind.class, "DTDDefaultKind"); //$NON-NLS-1$
-		addEEnumLiteral(dtdDefaultKindEEnum, DTDDefaultKind.IMPLIED_LITERAL);
-		addEEnumLiteral(dtdDefaultKindEEnum, DTDDefaultKind.REQUIRED_LITERAL);
-		addEEnumLiteral(dtdDefaultKindEEnum, DTDDefaultKind.FIXED_LITERAL);
-		addEEnumLiteral(dtdDefaultKindEEnum, DTDDefaultKind.NOFIXED_LITERAL);
-
-		initEEnum(dtdBasicTypeKindEEnum, DTDBasicTypeKind.class, "DTDBasicTypeKind"); //$NON-NLS-1$
-		addEEnumLiteral(dtdBasicTypeKindEEnum, DTDBasicTypeKind.NONE_LITERAL);
-		addEEnumLiteral(dtdBasicTypeKindEEnum, DTDBasicTypeKind.CDATA_LITERAL);
-		addEEnumLiteral(dtdBasicTypeKindEEnum, DTDBasicTypeKind.ID_LITERAL);
-		addEEnumLiteral(dtdBasicTypeKindEEnum, DTDBasicTypeKind.IDREF_LITERAL);
-		addEEnumLiteral(dtdBasicTypeKindEEnum, DTDBasicTypeKind.IDREFS_LITERAL);
-		addEEnumLiteral(dtdBasicTypeKindEEnum, DTDBasicTypeKind.ENTITY_LITERAL);
-		addEEnumLiteral(dtdBasicTypeKindEEnum, DTDBasicTypeKind.ENTITIES_LITERAL);
-		addEEnumLiteral(dtdBasicTypeKindEEnum, DTDBasicTypeKind.NMTOKEN_LITERAL);
-		addEEnumLiteral(dtdBasicTypeKindEEnum, DTDBasicTypeKind.NMTOKENS_LITERAL);
-
-		initEEnum(dtdEnumGroupKindEEnum, DTDEnumGroupKind.class, "DTDEnumGroupKind"); //$NON-NLS-1$
-		addEEnumLiteral(dtdEnumGroupKindEEnum, DTDEnumGroupKind.NAME_TOKEN_GROUP_LITERAL);
-		addEEnumLiteral(dtdEnumGroupKindEEnum, DTDEnumGroupKind.NOTATION_GROUP_LITERAL);
-
-		initEEnum(dtdGroupKindEEnum, DTDGroupKind.class, "DTDGroupKind"); //$NON-NLS-1$
-		addEEnumLiteral(dtdGroupKindEEnum, DTDGroupKind.SEQUENCE_LITERAL);
-		addEEnumLiteral(dtdGroupKindEEnum, DTDGroupKind.CHOICE_LITERAL);
-
-		initEEnum(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.class, "XMLSchemaDefinedType"); //$NON-NLS-1$
-		addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.NONE_LITERAL);
-		addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.STRING_LITERAL);
-		addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.BOOLEAN_LITERAL);
-		addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.FLOAT_LITERAL);
-		addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.DOUBLE_LITERAL);
-		addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.DECIMAL_LITERAL);
-		addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.TIMEINSTANT_LITERAL);
-		addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.TIMEDURATION_LITERAL);
-		addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.RECURRINGINSTANT_LITERAL);
-		addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.BINARY_LITERAL);
-		addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.URI_LITERAL);
-		addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.INTEGER_LITERAL);
-		addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.DATE_LITERAL);
-		addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.TIME_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-
-} // DTDPackageImpl
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDParameterEntityReferenceImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDParameterEntityReferenceImpl.java
deleted file mode 100644
index 7097166..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDParameterEntityReferenceImpl.java
+++ /dev/null
@@ -1,610 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.notify.impl.NotificationChainImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.dtd.core.internal.emf.DTDContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDLexicalInfo;
-import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-import org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference;
-import org.eclipse.wst.dtd.core.internal.emf.util.DTDPathnameUtil;
-
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Parameter Entity Reference</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.wst.dtd.core.internal.emf.internal.impl.DTDParameterEntityReferenceImpl#getEntity <em>Entity</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class DTDParameterEntityReferenceImpl extends DTDContentImpl implements DTDParameterEntityReference, ENamedElement, DTDContent {
-
-	public String getName() {
-		DTDEntity entity = getEntity();
-		if (entity != null) {
-			return getEntity().getName();
-		} // end of if ()
-		return ""; //$NON-NLS-1$
-	}
-
-	public String getPathname() {
-		return DTDPathnameUtil.makePath(null, "PEnt", getName(), -1); //$NON-NLS-1$
-	}
-
-	public DTDObject findObject(String relativePath) {
-		return null;
-	}
-
-	// ugly hack for now since we don't have multiple inheritance.
-	// Would rather have all this stuff in a base class but these
-	// classes are inheriting from sometimes different mof classes
-	DTDLexicalInfo lexInfo = new DTDLexicalInfo();
-
-	/**
-	 * Get the value of startOffset.
-	 * 
-	 * @return value of startOffset.
-	 */
-	public int getStartOffset() {
-		return lexInfo.getStartOffset();
-	}
-
-	/**
-	 * Set the value of startOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to startOffset.
-	 */
-	public void setStartOffset(int v) {
-		lexInfo.setStartOffset(v);
-	}
-
-	/**
-	 * Get the value of endOffset.
-	 * 
-	 * @return value of endOffset.
-	 */
-	public int getEndOffset() {
-		return lexInfo.getEndOffset();
-	}
-
-	/**
-	 * Set the value of endOffset.
-	 * 
-	 * @param v
-	 *            Value to assign to endOffset.
-	 */
-	public void setEndOffset(int v) {
-		lexInfo.setEndOffset(v);
-	}
-
-
-	/**
-	 * The cached value of the '{@link #getEntity() <em>Entity</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getEntity()
-	 * @generated
-	 * @ordered
-	 */
-	protected DTDEntity entity = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected DTDParameterEntityReferenceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDParameterEntityReference();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDEntity getEntity() {
-		if (entity != null && entity.eIsProxy()) {
-			DTDEntity oldEntity = entity;
-			entity = (DTDEntity) EcoreUtil.resolve(entity, this);
-			if (entity != oldEntity) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY, oldEntity, entity));
-			}
-		}
-		return entity;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DTDEntity basicGetEntity() {
-		return entity;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain basicSetEntity(DTDEntity newEntity, NotificationChain msgs) {
-		DTDEntity oldEntity = entity;
-		entity = newEntity;
-		if (eNotificationRequired()) {
-			if (msgs == null)
-				msgs = new NotificationChainImpl(4);
-			msgs.add(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY, oldEntity, newEntity));
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setEntity(DTDEntity newEntity) {
-		if (newEntity != entity) {
-			NotificationChain msgs = null;
-			if (entity != null)
-				msgs = ((InternalEObject) entity).eInverseRemove(this, DTDPackage.DTD_ENTITY__PARM_ENTITY_REF, DTDEntity.class, msgs);
-			if (newEntity != null)
-				msgs = ((InternalEObject) newEntity).eInverseAdd(this, DTDPackage.DTD_ENTITY__PARM_ENTITY_REF, DTDEntity.class, msgs);
-			msgs = basicSetEntity(newEntity, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY, newEntity, newEntity));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__DTD_FILE :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__DTD_FILE, msgs);
-				case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY :
-					if (entity != null)
-						msgs = ((InternalEObject) entity).eInverseRemove(this, DTDPackage.DTD_ENTITY__PARM_ENTITY_REF, DTDEntity.class, msgs);
-					return basicSetEntity((DTDEntity) otherEnd, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__DTD_FILE :
-					return eBasicSetContainer(null, DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__DTD_FILE, msgs);
-				case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY :
-					return basicSetEntity(null, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__DTD_FILE :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_FILE__DTD_CONTENT, DTDFile.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__DTD_FILE :
-				return getDTDFile();
-			case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY :
-				if (resolve)
-					return getEntity();
-				return basicGetEntity();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__DTD_FILE :
-				setDTDFile((DTDFile) newValue);
-				return;
-			case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY :
-				setEntity((DTDEntity) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__DTD_FILE :
-				setDTDFile((DTDFile) null);
-				return;
-			case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY :
-				setEntity((DTDEntity) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__DTD_FILE :
-				return getDTDFile() != null;
-			case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY :
-				return entity != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} // DTDParameterEntityReferenceImpl
-
-// +++++++++++++++++++GENERICRULES.JSED+++++++++++++++++++
-// //public class DTDParameterEntityReferenceImpl extends ENamespaceImpl
-// implements DTDParameterEntityReference, ENamespace, DTDContent{
-// -------------------GENERICRULES.JSED-------------------
-
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected DTDEntity entity = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected boolean setEntity = false;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// private DTDContentImpl dtdContentDelegate = null;
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public EObject initInstance() {
-// setEMetaObj(eClassDTDParameterEntityReference());
-// initInstanceDelegates();
-// return this;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected void initInstanceDelegates() {
-// super.initInstanceDelegates();
-//
-
-// getDtdContentDelegate().refSetDelegateOwner(this);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public DTDPackage ePackageDTD() {
-// return
-// (DTDPackage)EPackage.Registry.INSTANCE.getEPackage(DTDPackage.eNS_URI);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public EClass eClassDTDParameterEntityReference() {
-// return
-// ((DTDPackage)EPackage.Registry.INSTANCE.getEPackage(DTDPackage.eNS_URI)).getDTDParameterEntityReference();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation
-// */
-// public DTDEntity getEntity() {
-// try {
-// if (this.entity == null) return null;
-// this.entity = (DTDEntity) ((InternalEObject)this.entity).resolve(this,
-// DTDPackage.eINSTANCE.getDTDParameterEntityReference_Entity());
-// if (this.entity==null) this.setEntity = false;
-// return this.entity;
-// } catch (Exception e) {
-// return null;
-// }
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void setEntity(DTDEntity l) {
-// refSetValueForSVReference(DTDPackage.eINSTANCE.getDTDParameterEntityReference_Entity(),this.entity,l);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void unsetEntity() {
-// refUnsetValueForSVReference(DTDPackage.eINSTANCE.getDTDParameterEntityReference_Entity(),this.entity);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean isSetEntity() {
-// return setEntity;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Object eGet(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.eGet(feature);
-// }
-// switch (eClassDTDParameterEntityReference().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY: return getEntity();
-// case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__DTD_FILE: return
-// getDTDFile();
-//
-
-// }
-// return super.eGet(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Object refBasicValue(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.refBasicValue(feature);
-// }
-// switch (eClassDTDParameterEntityReference().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY:
-// if (!this.setEntity||this.entity==null) return null;
-// if (((InternalEObject)this.entity).refIsDeleted()) {this.entity=null;
-// this.setEntity=false;}
-// return this.entity;
-// case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__DTD_FILE: return
-// ((InternalEObject)getDtdContentDelegate()).refBasicValue(feature);
-//
-
-// }
-// return super.refBasicValue(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean eIsSet(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.eIsSet(feature);
-// }
-// switch (eClassDTDParameterEntityReference().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY: return
-// isSetEntity();
-// case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__DTD_FILE: return
-// isSetDTDFile();
-//
-
-// }
-// return super.eIsSet(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void eSet(EStructuralFeature feature, Object newValue) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// super.eSet(feature, newValue);
-// }
-// switch (eClassDTDParameterEntityReference().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY: {
-// setEntity((DTDEntity)newValue);
-// return;
-// }
-// case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__DTD_FILE: {
-// setDTDFile((DTDFile)newValue);
-// return;
-// }
-//
-
-// }
-// super.eSet(feature, newValue);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Notification eBasicSet(EStructuralFeature feature, Object newValue)
-// {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.eBasicSet(feature, newValue);
-// }
-// switch (eClassDTDParameterEntityReference().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY: {
-// Object oldValue = this.entity;
-// this.entity = (DTDEntity)newValue;
-// this.setEntity = true;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.SET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDParameterEntityReference_Entity(),oldValue,newValue);
-// }
-//
-
-// }
-// return super.eBasicSet(feature, newValue);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void eUnset(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// super.eUnset(feature);
-// }
-// switch (eClassDTDParameterEntityReference().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY: {
-// unsetEntity();
-// return;
-// }
-// case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__DTD_FILE: {
-// unsetDTDFile();
-// return;
-// }
-//
-
-// }
-// super.eUnset(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public Notification refBasicUnsetValue(EStructuralFeature feature) {
-// EStructuralFeature eFeature=null;
-// try {
-// eFeature=(EStructuralFeature)feature;
-// } catch (ClassCastException e) {
-// return super.refBasicUnsetValue(feature);
-// }
-// switch (eClassDTDParameterEntityReference().getEFeatureId(eFeature)) {
-// case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE__ENTITY: {
-// Object oldValue = this.entity;
-// this.entity = null;
-// this.setEntity = false;
-// return new
-// ENotificationImpl((InternalEObject)this,Notification.UNSET,(EStructuralFeature)DTDPackage.eINSTANCE.getDTDParameterEntityReference_Entity(),oldValue,null);
-// }
-//
-
-// }
-// return super.refBasicUnsetValue(feature);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// protected DTDContentImpl getDtdContentDelegate() {
-// if (dtdContentDelegate == null) {
-// DTDPackage pkg =
-// (DTDPackage)EPackage.Registry.INSTANCE.getEPackage(DTDPackage.eNS_URI);
-// dtdContentDelegate=(DTDContentImpl)pkg.eCreateInstance(pkg.DTD_CONTENT);
-// dtdContentDelegate.initInstance();
-// }
-// return dtdContentDelegate;
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public EClass eClassDTDContent() {
-// return getDtdContentDelegate().eClass();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public DTDFile getDTDFile() {
-// return getDtdContentDelegate().getDTDFile();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void setDTDFile(DTDFile value) {
-// getDtdContentDelegate().setDTDFile(value);
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public void unsetDTDFile() {
-// getDtdContentDelegate().unsetDTDFile();
-// }
-// /**
-// * @generated This field/method will be replaced during code generation.
-// */
-// public boolean isSetDTDFile() {
-// return getDtdContentDelegate().isSetDTDFile();
-// }
-// }
-// -------------------GENERICRULES.JSED-------------------
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDRepeatableContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDRepeatableContentImpl.java
deleted file mode 100644
index 5c470e9..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDRepeatableContentImpl.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-import org.eclipse.wst.dtd.core.internal.emf.DTDRepeatableContent;
-
-/**
- * @generated
- */
-public abstract class DTDRepeatableContentImpl extends DTDElementContentImpl implements DTDRepeatableContent {
-	/**
-	 * The default value of the '{@link #getOccurrence() <em>Occurrence</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getOccurrence()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final DTDOccurrenceType OCCURRENCE_EDEFAULT = DTDOccurrenceType.ONE_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected DTDOccurrenceType occurrence = OCCURRENCE_EDEFAULT;
-
-	public DTDRepeatableContentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return DTDPackage.eINSTANCE.getDTDRepeatableContent();
-	}
-
-	public String unparse() {
-		StringBuffer sb = new StringBuffer(128);
-		if (getOccurrence().getValue() != DTDOccurrenceType.ONE) {
-			if (this instanceof DTDEntityReferenceContent) {
-				sb.append("(").append(unparseRepeatableContent()).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			else {
-				sb.append(unparseRepeatableContent());
-			}
-
-			// MOF2EMF Port
-			// EEnumLiteral lit = getOccurrence();
-			DTDOccurrenceType lit = getOccurrence();
-			if (lit != null) {
-				sb.append((char) lit.getValue());
-			}
-		}
-		else {
-			sb.append(unparseRepeatableContent());
-		}
-
-		return sb.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 *            JUST_ONE= -1 ONE_OR_MORE=43 OPTIONAL=63 ZERO_OR_MORE=42
-	 */
-	public DTDOccurrenceType getOccurrence() {
-		return occurrence;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setOccurrence(DTDOccurrenceType newOccurrence) {
-		DTDOccurrenceType oldOccurrence = occurrence;
-		occurrence = newOccurrence == null ? OCCURRENCE_EDEFAULT : newOccurrence;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DTDPackage.DTD_REPEATABLE_CONTENT__OCCURRENCE, oldOccurrence, occurrence));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_REPEATABLE_CONTENT__GROUP :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_REPEATABLE_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_REPEATABLE_CONTENT__ELEMENT :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, DTDPackage.DTD_REPEATABLE_CONTENT__ELEMENT, msgs);
-				default :
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DTDPackage.DTD_REPEATABLE_CONTENT__GROUP :
-					return eBasicSetContainer(null, DTDPackage.DTD_REPEATABLE_CONTENT__GROUP, msgs);
-				case DTDPackage.DTD_REPEATABLE_CONTENT__ELEMENT :
-					return eBasicSetContainer(null, DTDPackage.DTD_REPEATABLE_CONTENT__ELEMENT, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case DTDPackage.DTD_REPEATABLE_CONTENT__GROUP :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_GROUP_CONTENT__CONTENT, DTDGroupContent.class, msgs);
-				case DTDPackage.DTD_REPEATABLE_CONTENT__ELEMENT :
-					return eContainer.eInverseRemove(this, DTDPackage.DTD_ELEMENT__CONTENT, DTDElement.class, msgs);
-				default :
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_REPEATABLE_CONTENT__GROUP :
-				return getGroup();
-			case DTDPackage.DTD_REPEATABLE_CONTENT__ELEMENT :
-				return getElement();
-			case DTDPackage.DTD_REPEATABLE_CONTENT__OCCURRENCE :
-				return getOccurrence();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_REPEATABLE_CONTENT__GROUP :
-				return getGroup() != null;
-			case DTDPackage.DTD_REPEATABLE_CONTENT__ELEMENT :
-				return getElement() != null;
-			case DTDPackage.DTD_REPEATABLE_CONTENT__OCCURRENCE :
-				return occurrence != OCCURRENCE_EDEFAULT;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_REPEATABLE_CONTENT__GROUP :
-				setGroup((DTDGroupContent) newValue);
-				return;
-			case DTDPackage.DTD_REPEATABLE_CONTENT__ELEMENT :
-				setElement((DTDElement) newValue);
-				return;
-			case DTDPackage.DTD_REPEATABLE_CONTENT__OCCURRENCE :
-				setOccurrence((DTDOccurrenceType) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case DTDPackage.DTD_REPEATABLE_CONTENT__GROUP :
-				setGroup((DTDGroupContent) null);
-				return;
-			case DTDPackage.DTD_REPEATABLE_CONTENT__ELEMENT :
-				setElement((DTDElement) null);
-				return;
-			case DTDPackage.DTD_REPEATABLE_CONTENT__OCCURRENCE :
-				setOccurrence(OCCURRENCE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (occurrence: "); //$NON-NLS-1$
-		result.append(occurrence);
-		result.append(')');
-		return result.toString();
-	}
-
-	/*
-	 * @see DTDRepeatableContent#unparseRepeatableContent()
-	 */
-	public String unparseRepeatableContent() {
-		return null;
-	}
-
-	/*
-	 * @see DTDElementContent#getContentName()
-	 */
-	public String getContentName() {
-		return null;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDAdapterFactory.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDAdapterFactory.java
deleted file mode 100644
index fa06cdf..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDAdapterFactory.java
+++ /dev/null
@@ -1,440 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAnyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute;
-import org.eclipse.wst.dtd.core.internal.emf.DTDBasicType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEmptyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDInternalEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDNotation;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPCDataContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-import org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference;
-import org.eclipse.wst.dtd.core.internal.emf.DTDRepeatableContent;
-
-
-
-public class DTDAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected static DTDPackage modelPackage;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public DTDAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = DTDPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected DTDSwitch modelSwitch = new DTDSwitch() {
-		public Object caseDTDElementContent(DTDElementContent object) {
-			return createDTDElementContentAdapter();
-		}
-
-		public Object caseDTDGroupContent(DTDGroupContent object) {
-			return createDTDGroupContentAdapter();
-		}
-
-		public Object caseDTDAttribute(DTDAttribute object) {
-			return createDTDAttributeAdapter();
-		}
-
-		public Object caseDTDElement(DTDElement object) {
-			return createDTDElementAdapter();
-		}
-
-		public Object caseDTDEmptyContent(DTDEmptyContent object) {
-			return createDTDEmptyContentAdapter();
-		}
-
-		public Object caseDTDAnyContent(DTDAnyContent object) {
-			return createDTDAnyContentAdapter();
-		}
-
-		public Object caseDTDPCDataContent(DTDPCDataContent object) {
-			return createDTDPCDataContentAdapter();
-		}
-
-		public Object caseDTDElementReferenceContent(DTDElementReferenceContent object) {
-			return createDTDElementReferenceContentAdapter();
-		}
-
-		public Object caseDTDRepeatableContent(DTDRepeatableContent object) {
-			return createDTDRepeatableContentAdapter();
-		}
-
-		public Object caseDTDFile(DTDFile object) {
-			return createDTDFileAdapter();
-		}
-
-		public Object caseDTDBasicType(DTDBasicType object) {
-			return createDTDBasicTypeAdapter();
-		}
-
-		public Object caseDTDEnumerationType(DTDEnumerationType object) {
-			return createDTDEnumerationTypeAdapter();
-		}
-
-		public Object caseDTDNotation(DTDNotation object) {
-			return createDTDNotationAdapter();
-		}
-
-		public Object caseDTDEntity(DTDEntity object) {
-			return createDTDEntityAdapter();
-		}
-
-		public Object caseDTDEntityContent(DTDEntityContent object) {
-			return createDTDEntityContentAdapter();
-		}
-
-		public Object caseDTDExternalEntity(DTDExternalEntity object) {
-			return createDTDExternalEntityAdapter();
-		}
-
-		public Object caseDTDInternalEntity(DTDInternalEntity object) {
-			return createDTDInternalEntityAdapter();
-		}
-
-		public Object caseDTDParameterEntityReference(DTDParameterEntityReference object) {
-			return createDTDParameterEntityReferenceAdapter();
-		}
-
-		public Object caseDTDEntityReferenceContent(DTDEntityReferenceContent object) {
-			return createDTDEntityReferenceContentAdapter();
-		}
-
-		public Object caseDTDContent(DTDContent object) {
-			return createDTDContentAdapter();
-		}
-
-		public Object caseEModelElement(EModelElement object) {
-			return createEModelElementAdapter();
-		}
-
-		public Object caseENamedElement(ENamedElement object) {
-			return createENamedElementAdapter();
-		}
-
-		public Object caseETypedElement(ETypedElement object) {
-			return createETypedElementAdapter();
-		}
-
-		public Object caseEStructuralFeature(EStructuralFeature object) {
-			return createEStructuralFeatureAdapter();
-		}
-
-		public Object caseEAttribute(EAttribute object) {
-			return createEAttributeAdapter();
-		}
-
-		public Object caseEClassifier(EClassifier object) {
-			return createEClassifierAdapter();
-		}
-
-		public Object caseEClass(EClass object) {
-			return createEClassAdapter();
-		}
-
-		public Object caseEDataType(EDataType object) {
-			return createEDataTypeAdapter();
-		}
-
-		public Object caseEEnum(EEnum object) {
-			return createEEnumAdapter();
-		}
-
-		public Object defaultCase(EObject object) {
-			return createEObjectAdapter();
-		}
-	};
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter) modelSwitch.doSwitch((EObject) target);
-	}
-
-
-	/**
-	 * By default create methods return null so that we can easily ignore
-	 * cases. It's useful to ignore a case when inheritance will catch all the
-	 * cases anyway.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDFileAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDNotationAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDContentAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDEntityAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDEntityContentAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDExternalEntityAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDInternalEntityAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDParameterEntityReferenceAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDEntityReferenceContentAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDRepeatableContentAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDElementReferenceContentAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDElementContentAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDEmptyContentAdapter() {
-		return null;
-	}
-
-	/**
-	 * By default create methods return null so that we can easily ignore
-	 * cases. It's useful to ignore a case when inheritance will catch all the
-	 * cases anyway.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDAnyContentAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDPCDataContentAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDGroupContentAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDAttributeAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDEnumerationTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createDTDBasicTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEClassAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEAttributeAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEEnumAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEModelElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createENamedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEStructuralFeatureAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEDataTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createETypedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEClassifierAdapter() {
-		return null;
-	}
-
-} // DTDAdapterFactory
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDMetrics.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDMetrics.java
deleted file mode 100644
index 32c06e3..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDMetrics.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.util;
-
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-
-
-public class DTDMetrics {
-	protected DTDFile dtdFile;
-	protected Hashtable elementReferenceMap;
-
-	public DTDMetrics(DTDFile dtdFile) {
-		this.dtdFile = dtdFile;
-	}
-
-	public Hashtable getElementReferences() {
-		if (elementReferenceMap == null) {
-			elementReferenceMap = new Hashtable();
-			new DTDVisitor() {
-
-				public void visitDTDElementReferenceContent(DTDElementReferenceContent elementReferenceContent) {
-					DTDElement dtdElement = elementReferenceContent.getReferencedElement();
-					Object visitation = elementReferenceMap.get(dtdElement);
-					if (visitation == null) {
-						elementReferenceMap.put(dtdElement, visitation = new Vector());
-					}
-					((Vector) visitation).addElement(elementReferenceContent);
-				}
-			}.visitDTDFile(dtdFile);
-		}
-
-		return elementReferenceMap;
-	}
-
-	public int getElementReferenceCount(DTDElement dtdElement) {
-		Object elementReferences = getElementReferences().get(dtdElement);
-		return elementReferences == null ? 0 : ((Vector) elementReferences).size();
-	}
-
-	public DTDElement getLeastReferencedElement() {
-		DTDElement result = null;
-		int lowestReferenceCount = Integer.MAX_VALUE;
-
-		Collection elements = dtdFile.listDTDElement();
-		for (Iterator i = elements.iterator(); i.hasNext();) {
-			DTDElement element = (DTDElement) i.next();
-			int count = getElementReferenceCount(element);
-			if (count < lowestReferenceCount) {
-				result = element;
-				lowestReferenceCount = count;
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Hashtable getElementReferencesGen() {
-
-		if (elementReferenceMap == null) {
-			elementReferenceMap = new Hashtable();
-			new DTDVisitor() {
-
-				public void visitDTDElementReferenceContent(DTDElementReferenceContent elementReferenceContent) {
-					DTDElement dtdElement = elementReferenceContent.getReferencedElement();
-					Object visitation = elementReferenceMap.get(dtdElement);
-					if (visitation == null) {
-						elementReferenceMap.put(dtdElement, visitation = new Vector());
-					}
-					((Vector) visitation).addElement(elementReferenceContent);
-				}
-			}.visitDTDFile(dtdFile);
-		}
-
-		return elementReferenceMap;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected int getElementReferenceCountGen(DTDElement dtdElement) {
-
-		Object elementReferences = getElementReferences().get(dtdElement);
-		return elementReferences == null ? 0 : ((Vector) elementReferences).size();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DTDElement getLeastReferencedElementGen() {
-
-		DTDElement result = null;
-		int lowestReferenceCount = Integer.MAX_VALUE;
-
-		Collection elements = dtdFile.listDTDElement();
-		for (Iterator i = elements.iterator(); i.hasNext();) {
-			DTDElement element = (DTDElement) i.next();
-			int count = getElementReferenceCount(element);
-			if (count < lowestReferenceCount) {
-				result = element;
-				lowestReferenceCount = count;
-			}
-		}
-
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java
deleted file mode 100644
index ff9aaac..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java
+++ /dev/null
@@ -1,1856 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.util;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.dtd.core.internal.DTDCoreMessages;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAnyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute;
-import org.eclipse.wst.dtd.core.internal.emf.DTDBasicType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDBasicTypeKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDDefaultKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEmptyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEnumGroupKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFactory;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDInternalEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDNotation;
-import org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPCDataContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference;
-import org.eclipse.wst.dtd.core.internal.emf.DTDType;
-import org.eclipse.wst.dtd.core.internal.emf.impl.DTDAttributeImpl;
-import org.eclipse.wst.dtd.core.internal.emf.impl.DTDFactoryImpl;
-import org.eclipse.wst.dtd.core.internal.saxparser.AttNode;
-import org.eclipse.wst.dtd.core.internal.saxparser.Attlist;
-import org.eclipse.wst.dtd.core.internal.saxparser.CMBasicNode;
-import org.eclipse.wst.dtd.core.internal.saxparser.CMGroupNode;
-import org.eclipse.wst.dtd.core.internal.saxparser.CMNode;
-import org.eclipse.wst.dtd.core.internal.saxparser.CMNodeType;
-import org.eclipse.wst.dtd.core.internal.saxparser.CMReferenceNode;
-import org.eclipse.wst.dtd.core.internal.saxparser.CMRepeatableNode;
-import org.eclipse.wst.dtd.core.internal.saxparser.DTD;
-import org.eclipse.wst.dtd.core.internal.saxparser.DTDSaxArtifactVisitor;
-import org.eclipse.wst.dtd.core.internal.saxparser.ElementDecl;
-import org.eclipse.wst.dtd.core.internal.saxparser.EntityDecl;
-import org.eclipse.wst.dtd.core.internal.saxparser.ErrorMessage;
-import org.eclipse.wst.dtd.core.internal.saxparser.NotationDecl;
-
-public class DTDModelBuilder extends DTDSaxArtifactVisitor {
-	DTD dtd;
-	DTDUtil dtdUtil;
-	DTDFile dtdFile;
-	ResourceSet resources;
-
-	public DTDModelBuilder(ResourceSet resources, DTDUtil dtdUtil, DTD dtd, DTDFile dtdFile) {
-		this.resources = resources;
-		this.dtdUtil = dtdUtil;
-		this.dtd = dtd;
-		this.dtdFile = dtdFile;
-	}
-
-	public DTDFactoryImpl getFactory() {
-		return (DTDFactoryImpl) dtdUtil.getFactory();
-	}
-
-	public DTDFile getDTDFile() {
-		return dtdFile;
-	}
-
-	public void visitDTD(DTD dtd) {
-		super.visitDTD(dtd);
-
-		// - 2nd pass -
-		// do final processing for Attlists and adding contentModel
-		addAttlistAndContentModel(dtd, dtdFile);
-	}
-
-	public void visitElementDecl(ElementDecl element) {
-		// Element might have been added earlier because it is referenced
-		String declName = element.getNodeName();
-		// System.out.println("process ElementDecl:" + declName );
-		DTDElement dtdelement = (DTDElement) dtdUtil.getElementPool().get(declName);
-		if (dtdelement == null) {
-			// System.out.println("process ElementDecl - not found - create"
-			// );
-			dtdelement = getFactory().createDTDElement();
-			dtdelement.setName(declName);
-			dtdFile.getDTDObject().add(dtdelement);
-			dtdUtil.getElementPool().put(declName, dtdelement);
-		}
-
-		super.visitElementDecl(element);
-	}
-
-	public void visitNotationDecl(NotationDecl notation) {
-		// Notation might have been added earlier because it is referenced
-		// by an entity
-		DTDNotation dtdnot = dtdFile.findNotation(notation.getNodeName());
-		if (dtdnot == null) {
-			dtdnot = getFactory().createDTDNotation();
-			dtdFile.getDTDObject().add(dtdnot);
-		}
-		dtdnot.setName(notation.getNodeName());
-
-		if (notation.getSystemId() != null)
-			dtdnot.setSystemID(notation.getSystemId());
-		if (notation.getPublicId() != null)
-			dtdnot.setPublicID(notation.getPublicId());
-
-		if (notation.getComment() != null)
-			dtdnot.setComment(notation.getComment());
-		if (notation.getErrorMessage() != null) {
-			addErrorMessage(notation.getErrorMessage(), dtdnot);
-		}
-
-		super.visitNotationDecl(notation);
-	}
-
-	public void visitParameterEntityReferenceDecl(EntityDecl entity) {
-		// This is a parameter entity reference.
-		// Add the link to the real entity that it references
-		DTDParameterEntityReference parmEntRef = getFactory().createDTDParameterEntityReference();
-		dtdFile.getDTDObject().add(parmEntRef);
-
-		String entityName = entity.getNodeName();
-
-		// Add the reference to the DTDEntity
-		DTDEntity dtdentity = getDTDFile().findEntity(entityName);
-		if (dtdentity != null) {
-			parmEntRef.setEntity(dtdentity);
-		}
-		if (entity.getErrorMessage() != null) {
-			addErrorMessage(entity.getErrorMessage(), dtdentity);
-		}
-		// System.out.println("adding PE reference: " + declName);
-
-		super.visitParameterEntityReferenceDecl(entity);
-	}
-
-	public void visitExternalEntityDecl(EntityDecl entity) {
-		DTDEntity dtdEntity = createDTDEntity(entity);
-		// System.out.println("adding entity: " + declName);
-		DTDExternalEntity extEntity = getFactory().createDTDExternalEntity();
-		dtdEntity.setContent(extEntity);
-
-		finishExternalEntity(extEntity, entity);
-		// System.out.println(" ext entity toMof: " );
-		if (dtdEntity.isParameterEntity()) {
-
-			dtdUtil.getPEPool().put("%" + entity.getNodeName() + ";", dtdEntity); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		super.visitExternalEntityDecl(entity);
-	}
-
-	public void visitInternalEntityDecl(EntityDecl entity) {
-		DTDEntity dtdEntity = createDTDEntity(entity);
-
-		DTDInternalEntity intEntity = getFactory().createDTDInternalEntity();
-		dtdEntity.setContent(intEntity);
-		intEntity.setValue(entity.getValue());
-		// System.out.println(" int entity toMof: " );
-		if (dtdEntity.isParameterEntity()) {
-			dtdUtil.getPEPool().put("%" + entity.getNodeName() + ";", dtdEntity); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		super.visitInternalEntityDecl(entity);
-	}
-
-	private void addAttlistAndContentModel(DTD dtd, DTDFile dFile) {
-		// System.out.println("addAttListAndCotentModel - dtd:" +
-		// dtd.getName());
-		Enumeration en = dtd.externalElements();
-		while (en.hasMoreElements()) {
-			Object e = en.nextElement();
-			if (e instanceof ElementDecl) {
-				DTDElement dtdelement = (DTDElement) dtdUtil.getElementPool().get(((ElementDecl) e).getNodeName());
-				if (dtdelement == null) {
-					dtdelement = getFactory().createDTDElement();
-					dtdFile.getDTDObject().add(dtdelement);
-				}
-				finishElementDecl(dtdelement, (ElementDecl) e);
-			}
-			else if (e instanceof Attlist) {
-				processAttList((Attlist) e);
-			}
-		}
-	}
-
-
-	private void processAttList(Attlist attList) {
-		DTDElement e = (DTDElement) dtdUtil.getElementPool().get(attList.getNodeName());
-		if (e != null) {
-			// Element has been added. Add the attributes
-			// System.out.println(" processAttlist - adding Attlist:" +
-			// attList.getNodeName());
-			createAttributes(e, attList);
-		}
-		else {
-			// System.out.println("!!!!!!!!! element is null ");
-		}
-	}
-
-	// /////////////////////////////////////////////////////////////
-	//
-	// Methods for finishing the import of a DTDExternalEntity
-	//
-	// /////////////////////////////////////////////////////////////
-	void finishExternalEntity(DTDExternalEntity extEntity, EntityDecl entityDecl) {
-		updateSystemID(extEntity, entityDecl);
-		extEntity.setPublicID(entityDecl.getPublicId());
-
-		String notationName = entityDecl.getNotationName();
-		if (notationName != null) {
-			DTDNotation dtdNotation = createOrFindNotation(extEntity, notationName, true);
-			extEntity.setNotation(dtdNotation);
-		}
-	}
-
-	public DTDNotation createOrFindNotation(DTDExternalEntity extEntity, String name, boolean create) {
-		DTDNotation aNotation = extEntity.getDTDEntity().getDTDFile().findNotation(name);
-		if (aNotation != null) {
-			return aNotation;
-		}
-
-		//
-		// Create a notation for the reference
-		//
-		if (create) {
-			aNotation = getFactory().createDTDNotation();
-			dtdFile.getDTDObject().add(aNotation);
-			aNotation.setName(name);
-		}
-		return aNotation;
-	}
-
-	/**
-	 * The SystemID attribute is set to whatever the user enters e.g.
-	 * com/ibm/b2b/xmimodels/xxx.dtd.xmi
-	 * 
-	 * In the unparse() method, parse out the DTD file name from the classpath
-	 * name. e.g. returns xxx.dtd
-	 */
-	private void updateSystemID(DTDExternalEntity extEntity, EntityDecl entityDecl) {
-		String systemId = entityDecl.getSystemId();
-		String publicId = entityDecl.getPublicId();
-		if (systemId != null) {
-			URIResolver idResolver = URIResolverPlugin.createResolver();
-			String uri = idResolver.resolve(dtd.getName(), publicId, systemId);
-			ExternalDTDModel ed = dtdUtil.getExternalDTDModel(resources, uri);
-			if (ed != null) {
-				DTDFile referenceDtdFile = ed.getExternalDTDFile();
-				extEntity.setEntityReferencedFromAnotherFile(referenceDtdFile);
-				extEntity.setSystemID(systemId);
-			}
-			else {
-				if (entityDecl.getErrorMessage() == null) {
-					ErrorMessage dtdError = new ErrorMessage();
-					dtdError.setErrorMessage(DTDCoreMessages._ERROR_INCL_FILE_LOAD_FAILURE + " '" + systemId + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					addErrorMessage(dtdError, extEntity.getDTDEntity());
-				}
-
-				if (systemId != null) {
-					extEntity.setSystemID(systemId);
-				}
-				else {
-					extEntity.setSystemID(""); //$NON-NLS-1$
-				}
-			}
-		} // end of if ()
-		else {
-			// set the system id to be ""
-			extEntity.setSystemID(""); //$NON-NLS-1$
-		}
-	}
-
-	public DTDEntity createDTDEntity(EntityDecl entity) {
-		// create and do what we can to fill in some basic things
-		DTDEntity dtdEntity = getFactory().createDTDEntity();
-		dtdFile.getDTDObject().add(dtdEntity);
-
-		dtdEntity.setName(entity.getNodeName());
-		dtdEntity.setParameterEntity(entity.isParameter());
-		if (entity.getComment() != null) {
-			dtdEntity.setComment(entity.getComment());
-		}
-		if (entity.getErrorMessage() != null) {
-			addErrorMessage(entity.getErrorMessage(), dtdEntity);
-		}
-
-		return dtdEntity;
-	}
-
-
-	// /////////////////////////////////////////////////////////////
-	//
-	// Methods for finishing the import of a DTDElement
-	//
-	// /////////////////////////////////////////////////////////////
-	public void finishElementDecl(DTDElement dtdElement, ElementDecl ed) {
-		dtdElement.setName(ed.getNodeName());
-
-		CMNode cmNode = ed.getContentModelNode();
-
-		if (ed.getComment() != null) {
-			dtdElement.setComment(ed.getComment());
-		}
-		if (ed.getErrorMessage() != null) {
-			addErrorMessage(ed.getErrorMessage(), dtdElement);
-		}
-
-		if (cmNode instanceof CMBasicNode) {
-			CMBasicNode bn = (CMBasicNode) cmNode;
-			switch (bn.getType()) {
-				case CMNodeType.EMPTY :
-					DTDEmptyContent emptyContent = getFactory().createDTDEmptyContent();
-					dtdElement.setContent(emptyContent);
-					break;
-
-				case CMNodeType.ANY :
-					DTDAnyContent anyContent = getFactory().createDTDAnyContent();
-					dtdElement.setContent(anyContent);
-					break;
-
-				case CMNodeType.PCDATA :
-					DTDPCDataContent pcData = getFactory().createDTDPCDataContent();
-					dtdElement.setContent(pcData);
-			}
-
-		}
-		else if (cmNode instanceof CMReferenceNode) {
-			CMReferenceNode rn = (CMReferenceNode) cmNode;
-			if (rn.getType() == CMNodeType.ENTITY_REFERENCE) {
-				String entityName = rn.getName().trim();
-
-				DTDEntity anEntity = (DTDEntity) dtdUtil.getPEPool().get(entityName);
-				if (anEntity != null) {
-					//
-					// Create an DTDEntityReference and set its referenced
-					// element
-					//
-					DTDEntityReferenceContent enRef = getFactory().createDTDEntityReferenceContent();
-					enRef.setElementReferencedEntity(anEntity);
-
-					DTDOccurrenceType occurrenceType = DTDOccurrenceType.get(computeMofOccurrence(rn));
-					enRef.setOccurrence(occurrenceType);
-
-					dtdElement.setContent(enRef);
-				}
-				else { // create default content
-					DTDEmptyContent emptyContent = getFactory().createDTDEmptyContent();
-					dtdElement.setContent(emptyContent);
-				}
-			}
-			else {
-				//
-				// Find the real element for this element references
-				// If the real element does not yet exist, create it
-				//
-				DTDElement anElement = createOrFindElement(rn.getName(), dtdElement);
-
-				//
-				// Create an DTDElementReference and set its referenced
-				// element
-				//
-				DTDElementReferenceContent elemRef = getFactory().createDTDElementReferenceContent();
-				elemRef.setReferencedElement(anElement);
-
-				DTDOccurrenceType occurrenceType = DTDOccurrenceType.get(computeMofOccurrence(rn));
-				elemRef.setOccurrence(occurrenceType);
-
-				// setContent to DTDElementReference
-				dtdElement.setContent(elemRef);
-
-			}
-		}
-		else if (cmNode instanceof CMGroupNode) {
-			CMGroupNode grpNode = (CMGroupNode) cmNode;
-			DTDGroupContent groupContent = getFactory().createDTDGroupContent();
-			DTDGroupKind groupKind = DTDGroupKind.get(computeMofGroupKind(grpNode.getGroupKind()));
-			groupContent.setGroupKind(groupKind);
-			DTDOccurrenceType occurrenceType = DTDOccurrenceType.get(computeMofOccurrence(grpNode));
-			groupContent.setOccurrence(occurrenceType);
-
-			// just use the locator for the element as the closest guess
-			processGroupContent(groupContent, grpNode);
-			dtdElement.setContent(groupContent);
-		}
-		else if (cmNode == null) {
-			// bad thing happened here, just create a pcdata
-			DTDEmptyContent emptyContent = getFactory().createDTDEmptyContent();
-			dtdElement.setContent(emptyContent);
-		}
-
-
-	}
-
-
-	/**
-	 * Add a new group to the current group
-	 * 
-	 * @param parent -
-	 *            the parent node for this group element
-	 * @param op1Node -
-	 *            the group e.g. (a,b)
-	 * @param op2Node -
-	 *            set only if called by processCM1op e.g. (a,b)+
-	 */
-	void processGroupContent(DTDGroupContent parent, CMGroupNode grpNode) {
-		Enumeration children = grpNode.getChildren().elements();
-		DTDFactory factory = getFactory();
-		while (children.hasMoreElements()) {
-			CMNode cnode = (CMNode) children.nextElement();
-
-			if (cnode instanceof CMGroupNode) {
-				CMGroupNode gNode = (CMGroupNode) cnode;
-				DTDGroupContent groupContent = factory.createDTDGroupContent();
-				DTDGroupKind groupKind = DTDGroupKind.get(computeMofGroupKind(gNode.getGroupKind()));
-				groupContent.setGroupKind(groupKind);
-				DTDOccurrenceType occurrenceType = DTDOccurrenceType.get(computeMofOccurrence(gNode));
-				groupContent.setOccurrence(occurrenceType);
-
-				parent.getContent().add(groupContent);
-				processGroupContent(groupContent, gNode);
-			}
-			else if (cnode instanceof CMBasicNode) {
-				CMBasicNode n = (CMBasicNode) cnode;
-				if (n.getType() == CMNodeType.PCDATA) {
-					// Create a DTDPCDataContent for a leaf PCData node
-					//
-					DTDPCDataContent pcData = factory.createDTDPCDataContent();
-					// Add #PCDATA to the Group, i.e Mixed content model
-					parent.getContent().add(pcData);
-				}
-			}
-			else if (cnode instanceof CMReferenceNode) {
-				CMReferenceNode rn = (CMReferenceNode) cnode;
-				if (rn.getType() == CMNodeType.ELEMENT_REFERENCE) {
-					// System.out.println("CM Element Ref name: " +
-					// rn.getName());
-					//
-					// Create an DTDElementReference and set its referenced
-					// element
-					//
-					DTDElementReferenceContent elemRef = factory.createDTDElementReferenceContent();
-
-					//
-					// Find the real element for this element references
-					// If the real element does not yet exist, create it
-					//
-					DTDElement anElement = createOrFindElement(rn.getName(), elemRef);
-
-					elemRef.setReferencedElement(anElement);
-
-					DTDOccurrenceType occurrenceType = DTDOccurrenceType.get(computeMofOccurrence(rn));
-					elemRef.setOccurrence(occurrenceType);
-
-					// Add DTDElementReference to the Group
-					parent.getContent().add(elemRef);
-				}
-				else // PE Reference
-				{
-					String entityName = rn.getName().trim();
-
-					// System.out.println("CM PE Ref name: " + entityName);
-					DTDEntity anEntity = (DTDEntity) dtdUtil.getPEPool().get(entityName);
-					if (anEntity != null) {
-						//
-						// Create an DTDEntityReference and set its referenced
-						// element
-						//
-						DTDEntityReferenceContent enRef = factory.createDTDEntityReferenceContent();
-						enRef.setElementReferencedEntity(anEntity);
-
-						DTDOccurrenceType occurrenceType = DTDOccurrenceType.get(computeMofOccurrence(rn));
-						enRef.setOccurrence(occurrenceType);
-
-						// Add DTDEntityReference to the Group
-						parent.getContent().add(enRef);
-
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Find the real element that is referenced by the current element
-	 */
-	private DTDElement createOrFindElement(String name, Object obj) {
-		// DTDElement aElement = getDTDFile().findElement(name);
-
-		DTDElement aElement = (DTDElement) dtdUtil.getElementPool().get(name);
-
-		if (aElement != null) {
-			return aElement;
-		}
-
-		String errorMsg = DTDCoreMessages._ERROR_UNDECLARED_ELEMENT_1; //$NON-NLS-1$
-		errorMsg += "\"" + name + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-		errorMsg += DTDCoreMessages._UI_ERRORPART_UNDECLARED_ELEMENT_2; //$NON-NLS-1$
-
-		ErrorMessage dtdError = new ErrorMessage();
-
-		dtdError.setErrorMessage(errorMsg);
-		addErrorMessage(dtdError, obj);
-		// System.out.println(errorMsg);
-		// setDTDErrorMessage(errorMsg);
-		getDTDFile().setParseError(true);
-
-		//
-		// Create an empty element for the reference to make it valid
-		//
-
-		DTDFactory factory = getFactory();
-		DTDElement dtdelement = factory.createDTDElement();
-		dtdelement.setName(name);
-
-		DTDEmptyContent emptyContent = factory.createDTDEmptyContent();
-		dtdelement.setContent(emptyContent);
-
-		getDTDFile().getDTDObject().add(dtdelement);
-		dtdUtil.getElementPool().put(name, dtdelement);
-		return dtdelement;
-	}
-
-
-	/**
-	 * Compute the MOF occurrence from the xml4j occurrence
-	 */
-	private int computeMofOccurrence(CMRepeatableNode rnode) {
-		int occurrence = rnode.getOccurrence();
-		int mofoccur = DTDOccurrenceType.ONE;
-
-		if (occurrence == CMNodeType.ZERO_OR_MORE) {
-			mofoccur = DTDOccurrenceType.ZERO_OR_MORE;
-		}
-		else if (occurrence == CMNodeType.ONE_OR_MORE) {
-			mofoccur = DTDOccurrenceType.ONE_OR_MORE;
-		}
-		else if (occurrence == CMNodeType.OPTIONAL) {
-			mofoccur = DTDOccurrenceType.OPTIONAL;
-		}
-		return mofoccur;
-	}
-
-	/**
-	 * Compute the MOF model group from the xml4j model group
-	 */
-	private int computeMofGroupKind(int type) {
-		if (type == CMNodeType.GROUP_CHOICE) {
-			return DTDGroupKind.CHOICE;
-		}
-		else {
-			return DTDGroupKind.SEQUENCE;
-		}
-	}
-
-
-	// /////////////////////////////////////////////////////////////
-	//
-	// Methods for creating the attributes of a DTDElement
-	//
-	// /////////////////////////////////////////////////////////////
-	public void createAttributes(DTDElement element, Attlist attList) {
-		if (attList.getErrorMessage() != null) {
-			addErrorMessage(attList.getErrorMessage(), element);
-		}
-
-		for (int i = 0; i < attList.size(); i++) {
-			AttNode ad = attList.elementAt(i);
-			// DTDAttributeElement dtdAtt=
-			// getDTDAttributeElement(a.getName());
-
-			// only add the AttDef if it is not added yet
-			// ignore the dup AttDef as documented in the XML 1.0 specs
-			// if( dtdAtt==null)
-			addAttribute(element, ad);
-		}
-
-	}
-
-	/**
-	 * Create a DTDAttribute from the xml4j attribute
-	 */
-	public void addAttribute(DTDElement dtdelement, AttNode ad) {
-		DTDAttribute dtdattr = getFactory().createDTDAttribute();
-		dtdelement.getDTDAttribute().add(dtdattr);
-		finishAttribute(dtdattr, ad);
-	}
-
-	// Stuff for populating attribute
-	public void finishAttribute(DTDAttribute dtdattr, AttNode attdef) {
-		boolean parseError = false;
-
-		if (attdef.name.startsWith("%")) { //$NON-NLS-1$
-			String peName = attdef.name.trim();
-			DTDEntity en = (DTDEntity) dtdUtil.getPEPool().get(peName);
-			if (en != null) {
-				dtdattr.setAttributeNameReferencedEntity(en);
-			}
-		}
-
-		dtdattr.setName(attdef.name);
-
-		int attrType = attdef.getDeclaredType();
-
-		if (attrType == AttNode.PEREFERENCE && attdef.type != null) {
-			String peName = attdef.type.trim();
-			DTDEntity en = (DTDEntity) dtdUtil.getPEPool().get(peName);
-			if (en != null) {
-				dtdattr.setAttributeTypeReferencedEntity(en);
-				setAttrDTDType(dtdattr, getFactory().getDTDBasicType_CDATA()); // hack,
-																				// so
-																				// we
-																				// can
-																				// get
-																				// back
-																				// the
-																				// default
-																				// value
-			}
-			else
-				// set default type
-				setAttrDTDType(dtdattr, getFactory().getDTDBasicType_CDATA());
-
-		}
-		else {
-			switch (attrType) {
-				case AttNode.CDATA :
-					setAttrDTDType(dtdattr, getFactory().getDTDBasicType_CDATA());
-					break;
-
-				case AttNode.ENTITIES :
-					setAttrDTDType(dtdattr, getFactory().getDTDBasicType_ENTITIES());
-					break;
-
-				case AttNode.ENTITY :
-					setAttrDTDType(dtdattr, getFactory().getDTDBasicType_ENTITY());
-					break;
-
-				case AttNode.ID :
-					// check for duplicate ID attribute
-					if (hasIDAttribute(dtdattr)) {
-						String errMsg = DTDCoreMessages._ERROR_DUP_ID_ATTRIBUTE_1; //$NON-NLS-1$
-						errMsg += attdef.name + DTDCoreMessages._UI_ERRORPART_DUP_ID_ATTRIBUTE_2; //$NON-NLS-1$
-						// dtdattr.getDTDElement().getIElement().setDTDErrorMessage(errMsg);
-						// dtdattr.getDTDElement().getDTDFile().setParseError(true);
-						parseError = true;
-					}
-					setAttrDTDType(dtdattr, getFactory().getDTDBasicType_ID());
-					break;
-
-				case AttNode.IDREF :
-					setAttrDTDType(dtdattr, getFactory().getDTDBasicType_IDREF());
-					break;
-
-				case AttNode.IDREFS :
-					setAttrDTDType(dtdattr, getFactory().getDTDBasicType_IDREFS());
-					break;
-
-				case AttNode.ENUMERATION :
-					setAttrDTDType(dtdattr, createDTDEnumeration(dtdattr, attdef, DTDEnumGroupKind.NAME_TOKEN_GROUP));
-					break;
-
-				case AttNode.NOTATION :
-					setAttrDTDType(dtdattr, createDTDEnumeration(dtdattr, attdef, DTDEnumGroupKind.NOTATION_GROUP));
-					break;
-
-				case AttNode.NMTOKEN :
-					setAttrDTDType(dtdattr, getFactory().getDTDBasicType_NMTOKEN());
-					break;
-
-				case AttNode.NMTOKENS :
-					setAttrDTDType(dtdattr, getFactory().getDTDBasicType_NMTOKENS());
-					break;
-
-				default :
-			// System.out.println("DTDATTR '" +attdef.name + "'Unknown
-			// type..." + attrType);
-			}
-		}
-
-		int attrDefault = attdef.getDefaultType();
-		int defaultKind = DTDDefaultKind.IMPLIED;
-		switch (attrDefault) {
-			case AttNode.FIXED :
-				defaultKind = DTDDefaultKind.FIXED;
-				break;
-
-			case AttNode.IMPLIED :
-				defaultKind = DTDDefaultKind.IMPLIED;
-				break;
-
-			case AttNode.REQUIRED :
-				defaultKind = DTDDefaultKind.REQUIRED;
-				break;
-
-			case AttNode.NOFIXED :
-				defaultKind = DTDDefaultKind.NOFIXED;
-				break;
-
-			default :
-		// System.out.println("DTDATTR '" +attdef.name + "' Unknown default
-		// type... " + attrDefault);
-		}
-
-		DTDDefaultKind defaultKindObj = DTDDefaultKind.get(defaultKind);
-		dtdattr.setDefaultKind(defaultKindObj);
-
-		if (parseError) {
-			return;
-		}
-
-		String defaultValue = attdef.defaultValue;
-		if (defaultValue != null) {
-			if (attrType == AttNode.ENUMERATION || attrType == AttNode.NOTATION) {
-				if (!isDefaultEnumValueValid(attdef, defaultValue)) {
-					String typeString = (attrType == AttNode.ENUMERATION ? "enumeration" : "notation"); //$NON-NLS-1$ //$NON-NLS-2$
-					String errMsg = DTDCoreMessages._ERROR_INVALID_DEFAULT_ATTR_VALUE_1; //$NON-NLS-1$
-					errMsg += typeString + DTDCoreMessages._UI_ERRORPART_INVALID_DEFAULT_ATTR_VALUE_2; //$NON-NLS-1$
-					errMsg += attdef.name + "'"; //$NON-NLS-1$
-
-					// dtdattr.getDTDElement().getIElement().setDTDErrorMessage(errMsg);
-					// dtdattr.getDTDElement().getDTDFile().setParseError(true);
-					return;
-				}
-			}
-			dtdattr.setDefaultValueString(defaultValue);
-		}
-		// System.out.println("DTDAttr - toMof getDefaultValueString " +
-		// getDefaultValueString());
-		// System.out.println("DTDAttr - toMof getDefaultValue: " +
-		// getDefaultValue());
-	}
-
-	public boolean hasIDAttribute(DTDAttribute dtdattr) {
-		boolean hasID = false;
-
-		DTDElement element = dtdattr.getDTDElement();
-		EList attrs = element.getDTDAttribute();
-
-		Iterator i = attrs.iterator();
-		while (i.hasNext()) {
-			DTDAttribute attr = (DTDAttribute) i.next();
-			DTDType dType = attr.getDTDType();
-			if (dType instanceof DTDBasicType) {
-				if (((DTDBasicType) dType).getKind().getValue() == DTDBasicTypeKind.ID) {
-					hasID = true;
-					break;
-				}
-			}
-		}
-		return hasID;
-	}
-
-	public DTDEnumerationType createDTDEnumeration(DTDAttribute dtdattr, String[] enumValues, int enumKind) {
-		DTDEnumerationType enumeration = getFactory().createDTDEnumerationType();
-		// This is gross, but this is what was done before.
-		DTDAttributeImpl dtdattrimpl = (DTDAttributeImpl) dtdattr;
-		// enum.setID("Enum_" +
-		// ((DTDElement)dtdattrimpl.getMOFDomain()).getName() + "_" +
-		// dtdattr.getName());
-		DTDEnumGroupKind groupKind = DTDEnumGroupKind.get(enumKind);
-		enumeration.setKind(groupKind);
-		// Enumeration values
-		if (enumValues != null) {
-			for (int i = 0; i < enumValues.length; i++) {
-				EEnumLiteral enumLiteral = createEEnumLiteral();
-				// enumVal.setXMIDocument(dtdattr.getXMIDocument());
-				// MOF2EMF Port
-				// enumLiteral.refSetLiteral(enumValues[i]);
-				enumLiteral.setName(enumValues[i]);
-
-				// enumLiteral.setNumber(i);
-				enumeration.getEnumLiterals().add(enumLiteral);
-			}
-		}
-		dtdattr.getDTDElement().getDTDFile().getDTDEnumerationType().add(enumeration);
-		return enumeration;
-	}
-
-	private EEnumLiteral createEEnumLiteral() {
-		EcorePackage ePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-		// MOF2EMF Port
-		// return ((EcoreFactory)ePackage.getFactory()).createEEnumLiteral();
-		return ePackage.getEcoreFactory().createEEnumLiteral();
-	}
-
-	private DTDEnumerationType createDTDEnumeration(DTDAttribute dtdattr, AttNode attdef, int enumKind) {
-		DTDEnumerationType enumeration = getFactory().createDTDEnumerationType();
-		// This is gross, but this is what was done before.
-		DTDAttributeImpl dtdattrimpl = (DTDAttributeImpl) dtdattr;
-		// enum.setID("Enum_" +
-		// ((DTDElement)dtdattrimpl.getMOFDomain()).getName() + "_" +
-		// dtdattr.getName());
-		DTDEnumGroupKind groupKind = DTDEnumGroupKind.get(enumKind);
-		enumeration.setKind(groupKind);
-		dtdattr.getDTDElement().getDTDFile().getDTDEnumerationType().add(enumeration);
-
-		// Enumeration values
-		Enumeration tokenIter = attdef.elements();
-		if (tokenIter != null) {
-			int i = 0;
-			while (tokenIter.hasMoreElements()) {
-				String val = (String) tokenIter.nextElement();
-				EEnumLiteral enumLiteral = createEEnumLiteral();
-				// enumLiteral.setXMIDocument(dtdattr.getXMIDocument());
-				// MOF2EMF Port
-				// enumLiteral.refSetLiteral(val);
-				enumLiteral.setName(val);
-
-
-				// enumLiteral.setNumber(i++);
-				enumeration.getEnumLiterals().add(enumLiteral);
-			}
-		}
-
-		return enumeration;
-	}
-
-	private boolean isDefaultEnumValueValid(AttNode attdef, String defaultValue) {
-		boolean valid = false;
-		boolean containsPercent = false;
-
-		// Enumeration values
-		Enumeration enumValues = attdef.elements();
-		while (enumValues.hasMoreElements()) {
-			String val = (String) enumValues.nextElement();
-			if (val.equals(defaultValue)) {
-				valid = true;
-				break;
-			}
-			if (val.indexOf('%') >= 0) {
-				containsPercent = true;
-			}
-		}
-		return valid || containsPercent;
-	}
-
-	public void setAttrDTDType(DTDAttribute dtdattr, DTDType type) {
-		dtdattr.setDTDType(type);
-	}
-
-	protected void addErrorMessage(ErrorMessage errMsg, Object obj) {
-		errMsg.setObject(obj);
-		dtdUtil.addErrorMessage(errMsg);
-	}
-
-	// /**
-	// * @generated
-	// */
-	// protected DTDFactoryImpl getFactoryGen() {
-	//
-	// return (DTDFactoryImpl)dtdUtil.getFactory();
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected DTDFile getDTDFileGen() {
-	//
-	// return dtdFile;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void visitDTDGen(DTD dtd) {
-	//
-	// super.visitDTD(dtd);
-	//
-	//
-	// // - 2nd pass -
-	// // do final processing for Attlists and adding contentModel
-	// addAttlistAndContentModel(dtd,dtdFile);
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void visitElementDeclGen(ElementDecl element) {
-	//
-	// // Element might have been added earlier because it is referenced
-	// String declName = element.getNodeName() ;
-	// // System.out.println("process ElementDecl:" + declName );
-	// DTDElement dtdelement = (DTDElement)
-	// dtdUtil.getElementPool().get(declName);
-	// if (dtdelement == null)
-	// {
-	// // System.out.println("process ElementDecl - not found - create" );
-	// dtdelement = getFactory().createDTDElement();
-	// dtdelement.setName(declName);
-	// dtdFile.getDTDObject().add(dtdelement);
-	// dtdUtil.getElementPool().put(declName,dtdelement);
-	// }
-	//
-	//
-	// super.visitElementDecl(element);
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void visitNotationDeclGen(NotationDecl notation) {
-	//
-	// // Notation might have been added earlier because it is referenced
-	// // by an entity
-	// DTDNotation dtdnot = dtdFile.findNotation( notation.getNodeName() );
-	// if (dtdnot == null)
-	// {
-	// dtdnot = getFactory().createDTDNotation();
-	// dtdFile.getDTDObject().add(dtdnot);
-	// }
-	// dtdnot.setName(notation.getNodeName());
-	//
-	//
-	// if (notation.getSystemId()!= null )
-	// dtdnot.setSystemID(notation.getSystemId());
-	// if (notation.getPublicId()!= null )
-	// dtdnot.setPublicID(notation.getPublicId());
-	//
-	//
-	// if (notation.getComment()!=null)
-	// dtdnot.setComment(notation.getComment());
-	// if (notation.getErrorMessage()!=null)
-	// {
-	// addErrorMessage(notation.getErrorMessage(), dtdnot);
-	// }
-	//
-	//
-	// super.visitNotationDecl(notation);
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void visitParameterEntityReferenceDeclGen(EntityDecl entity)
-	// {
-	//
-	// // This is a parameter entity reference.
-	// // Add the link to the real entity that it references
-	// DTDParameterEntityReference parmEntRef =
-	// getFactory().createDTDParameterEntityReference();
-	// dtdFile.getDTDObject().add(parmEntRef);
-	//
-	//
-	// String entityName = entity.getNodeName();
-	//
-	//
-	// // Add the reference to the DTDEntity
-	// DTDEntity dtdentity = getDTDFile().findEntity(entityName);
-	// if (dtdentity != null)
-	// {
-	// parmEntRef.setEntity(dtdentity);
-	// }
-	// if (entity.getErrorMessage()!=null)
-	// {
-	// addErrorMessage(entity.getErrorMessage(), dtdentity);
-	// }
-	// // System.out.println("adding PE reference: " + declName);
-	//
-	//
-	// super.visitParameterEntityReferenceDecl(entity);
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void visitExternalEntityDeclGen(EntityDecl entity) {
-	//
-	// DTDEntity dtdEntity = createDTDEntity(entity);
-	// // System.out.println("adding entity: " + declName);
-	// DTDExternalEntity extEntity = getFactory().createDTDExternalEntity();
-	// dtdEntity.setContent(extEntity);
-	//
-	//
-	// finishExternalEntity(extEntity, entity);
-	// // System.out.println(" ext entity toMof: " );
-	// if (dtdEntity.isParameterEntity())
-	// {
-	//
-	//
-	// dtdUtil.getPEPool().put("%"+entity.getNodeName()+";", dtdEntity);
-	// }
-	//
-	//
-	// super.visitExternalEntityDecl(entity);
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void visitInternalEntityDeclGen(EntityDecl entity) {
-	//
-	// DTDEntity dtdEntity = createDTDEntity(entity);
-	//
-	//
-	// DTDInternalEntity intEntity = getFactory().createDTDInternalEntity();
-	// dtdEntity.setContent(intEntity);
-	// intEntity.setValue(entity.getValue());
-	// // System.out.println(" int entity toMof: " );
-	// if (dtdEntity.isParameterEntity())
-	// {
-	// dtdUtil.getPEPool().put("%"+entity.getNodeName()+";", dtdEntity);
-	// }
-	//
-	//
-	// super.visitInternalEntityDecl(entity);
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void addAttlistAndContentModelGen(DTD dtd, DTDFile dFile) {
-	//
-	// //System.out.println("addAttListAndCotentModel - dtd:" +
-	// dtd.getName());
-	// Enumeration en = dtd.externalElements();
-	// while (en.hasMoreElements())
-	// {
-	// Object e = en.nextElement();
-	// if ( e instanceof ElementDecl )
-	// {
-	// DTDElement dtdelement = (DTDElement) dtdUtil.getElementPool().get(
-	// ((ElementDecl)e).getNodeName() );
-	// if (dtdelement == null)
-	// {
-	// dtdelement = getFactory().createDTDElement();
-	// dtdFile.getDTDObject().add(dtdelement);
-	// }
-	// finishElementDecl(dtdelement, (ElementDecl) e);
-	// }
-	// else if ( e instanceof Attlist )
-	// {
-	// processAttList((Attlist) e);
-	// }
-	// }
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void processAttListGen(Attlist attList) {
-	//
-	// DTDElement e = (DTDElement)
-	// dtdUtil.getElementPool().get(attList.getNodeName());
-	// if ( e != null )
-	// {
-	// // Element has been added. Add the attributes
-	// //System.out.println(" processAttlist - adding Attlist:" +
-	// attList.getNodeName());
-	// createAttributes(e, attList);
-	// }
-	// else
-	// {
-	// //System.out.println("!!!!!!!!! element is null ");
-	// }
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void finishExternalEntityGen(DTDExternalEntity extEntity,
-	// EntityDecl entityDecl) {
-	//
-	// updateSystemID(extEntity, entityDecl);
-	// extEntity.setPublicID(entityDecl.getPublicId());
-	//
-	//
-	// String notationName = entityDecl.getNotationName();
-	// if (notationName != null)
-	// {
-	// DTDNotation dtdNotation = createOrFindNotation(extEntity,
-	// notationName,true);
-	// extEntity.setNotation(dtdNotation);
-	// }
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected DTDNotation createOrFindNotationGen(DTDExternalEntity
-	// extEntity, String name, boolean create) {
-	//
-	// DTDNotation aNotation =
-	// extEntity.getDTDEntity().getDTDFile().findNotation(name);
-	// if (aNotation != null)
-	// {
-	// return aNotation;
-	// }
-	//
-	//
-	// //
-	// // Create a notation for the reference
-	// //
-	// if (create)
-	// {
-	// aNotation = getFactory().createDTDNotation();
-	// dtdFile.getDTDObject().add(aNotation);
-	// aNotation.setName(name);
-	// }
-	// return aNotation;
-	// }
-	// /**
-	// * The SystemID attribute is set to whatever the user enters
-	// * e.g. com/ibm/b2b/xmimodels/xxx.dtd.xmi
-	// *
-	// * In the unparse() method, parse out the DTD file name from
-	// * the classpath name.
-	// * e.g. returns xxx.dtd
-	// */
-	// protected void updateSystemIDGen(DTDExternalEntity extEntity,
-	// EntityDecl entityDecl) {
-	//
-	// String systemId = entityDecl.getSystemId();
-	// String publicId = entityDecl.getPublicId();
-	// if (systemId != null)
-	// {
-	// IdResolver idResolver = new IdResolverImpl(dtd.getName());
-	// String uri = idResolver.resolveId(publicId, systemId);
-	// ExternalDTDModel ed = dtdUtil.getExternalDTDModel(resources, uri);
-	// if (ed != null)
-	// {
-	// DTDFile referenceDtdFile = ed.getExternalDTDFile();
-	// extEntity.setEntityReferencedFromAnotherFile(referenceDtdFile);
-	// extEntity.setSystemID(systemId);
-	// }
-	// else
-	// {
-	// if (entityDecl.getErrorMessage() == null)
-	// {
-	// ErrorMessage dtdError = new ErrorMessage();
-	// dtdError.setErrorMessage(DTDCoreMessages.getString("_ERROR_INCL_FILE_LOAD_FAILURE")
-	// + " '" + systemId + "'");
-	// addErrorMessage(dtdError, extEntity.getDTDEntity());
-	// }
-	//        
-	// if (systemId != null)
-	// {
-	// extEntity.setSystemID(systemId);
-	// }
-	// else
-	// {
-	// extEntity.setSystemID("");
-	// }
-	// }
-	// } // end of if ()
-	// else
-	// {
-	// // set the system id to be ""
-	// extEntity.setSystemID("");
-	// }
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected DTDEntity createDTDEntityGen(EntityDecl entity) {
-	//
-	// // create and do what we can to fill in some basic things
-	// DTDEntity dtdEntity = getFactory().createDTDEntity();
-	// dtdFile.getDTDObject().add(dtdEntity);
-	//
-	//
-	// dtdEntity.setName(entity.getNodeName());
-	// dtdEntity.setParameterEntity(entity.isParameter());
-	// if (entity.getComment()!=null)
-	// {
-	// dtdEntity.setComment(entity.getComment());
-	// }
-	// if (entity.getErrorMessage()!=null)
-	// {
-	// addErrorMessage(entity.getErrorMessage(), dtdEntity);
-	// }
-	//
-	//
-	// return dtdEntity;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void finishElementDeclGen(DTDElement dtdElement, ElementDecl
-	// ed) {
-	//
-	// dtdElement.setName(ed.getNodeName());
-	//
-	//
-	// CMNode cmNode = ed.getContentModelNode();
-	//
-	//
-	// if (ed.getComment()!=null)
-	// {
-	// dtdElement.setComment(ed.getComment());
-	// }
-	// if (ed.getErrorMessage()!=null)
-	// {
-	// addErrorMessage(ed.getErrorMessage(), dtdElement);
-	// }
-	//
-	//
-	// if (cmNode instanceof CMBasicNode)
-	// {
-	// CMBasicNode bn = (CMBasicNode)cmNode;
-	// switch (bn.getType())
-	// {
-	// case CMNodeType.EMPTY :
-	// DTDEmptyContent emptyContent = getFactory().createDTDEmptyContent();
-	// dtdElement.setContent(emptyContent);
-	// break;
-	//
-	//
-	// case CMNodeType.ANY :
-	// DTDAnyContent anyContent = getFactory().createDTDAnyContent();
-	// dtdElement.setContent(anyContent);
-	// break;
-	//
-	//
-	// case CMNodeType.PCDATA:
-	// DTDPCDataContent pcData = getFactory().createDTDPCDataContent();
-	// dtdElement.setContent(pcData);
-	// }
-	//
-	//
-	// }
-	// else if (cmNode instanceof CMReferenceNode)
-	// {
-	// CMReferenceNode rn = (CMReferenceNode) cmNode;
-	// if (rn.getType() == CMNodeType.ENTITY_REFERENCE)
-	// {
-	// String entityName = rn.getName().trim();
-	//
-	//
-	// DTDEntity anEntity = (DTDEntity) dtdUtil.getPEPool().get(entityName);
-	// if (anEntity!=null)
-	// {
-	// //
-	// // Create an DTDEntityReference and set its referenced element
-	// //
-	// DTDEntityReferenceContent enRef =
-	// getFactory().createDTDEntityReferenceContent();
-	// enRef.setElementReferencedEntity(anEntity);
-	//
-	// DTDOccurrenceType occurrenceType =
-	// DTDOccurrenceType.get(computeMofOccurrence(rn));
-	// enRef.setOccurrence(occurrenceType);
-	//
-	// dtdElement.setContent(enRef);
-	// }
-	// else
-	// { // create default content
-	// DTDEmptyContent emptyContent = getFactory().createDTDEmptyContent();
-	// dtdElement.setContent(emptyContent);
-	// }
-	// }
-	// else
-	// {
-	// //
-	// // Find the real element for this element references
-	// // If the real element does not yet exist, create it
-	// //
-	// DTDElement anElement = createOrFindElement(rn.getName(), dtdElement);
-	//
-	//
-	// //
-	// // Create an DTDElementReference and set its referenced element
-	// //
-	// DTDElementReferenceContent elemRef =
-	// getFactory().createDTDElementReferenceContent();
-	// elemRef.setReferencedElement(anElement);
-	//
-	// DTDOccurrenceType occurrenceType =
-	// DTDOccurrenceType.get(computeMofOccurrence(rn));
-	// elemRef.setOccurrence(occurrenceType);
-	//
-	// // setContent to DTDElementReference
-	// dtdElement.setContent(elemRef);
-	//
-	//
-	// }
-	// }
-	// else if (cmNode instanceof CMGroupNode)
-	// {
-	// CMGroupNode grpNode = (CMGroupNode)cmNode;
-	// DTDGroupContent groupContent = getFactory().createDTDGroupContent();
-	// DTDGroupKind groupKind =
-	// DTDGroupKind.get(computeMofGroupKind(grpNode.getGroupKind()));
-	// groupContent.setGroupKind(groupKind);
-	// DTDOccurrenceType occurrenceType =
-	// DTDOccurrenceType.get(computeMofOccurrence(grpNode));
-	// groupContent.setOccurrence(occurrenceType);
-	//
-	// // just use the locator for the element as the closest guess
-	// processGroupContent(groupContent, grpNode);
-	// dtdElement.setContent(groupContent);
-	// }
-	// else if (cmNode == null)
-	// {
-	// // bad thing happened here, just create a pcdata
-	// DTDEmptyContent emptyContent = getFactory().createDTDEmptyContent();
-	// dtdElement.setContent(emptyContent);
-	// }
-	// }
-	// /**
-	// * Add a new group to the current group
-	// * @param parent - the parent node for this group element
-	// * @param op1Node - the group
-	// * e.g. (a,b)
-	// * @param op2Node - set only if called by processCM1op
-	// * e.g. (a,b)+
-	// */
-	// protected void processGroupContentGen(DTDGroupContent parent,
-	// CMGroupNode grpNode) {
-	//
-	// Enumeration children = grpNode.getChildren().elements();
-	// DTDFactory factory = getFactory();
-	// while (children.hasMoreElements())
-	// {
-	// CMNode cnode = (CMNode) children.nextElement();
-	//
-	//
-	// if (cnode instanceof CMGroupNode)
-	// {
-	// CMGroupNode gNode = (CMGroupNode)cnode;
-	// DTDGroupContent groupContent = factory.createDTDGroupContent();
-	// DTDGroupKind groupKind =
-	// DTDGroupKind.get(computeMofGroupKind(gNode.getGroupKind()));
-	// groupContent.setGroupKind(groupKind);
-	// DTDOccurrenceType occurrenceType =
-	// DTDOccurrenceType.get(computeMofOccurrence(gNode));
-	// groupContent.setOccurrence(occurrenceType);
-	//
-	// parent.getContent().add(groupContent);
-	// processGroupContent(groupContent,gNode);
-	// }
-	// else if (cnode instanceof CMBasicNode)
-	// {
-	// CMBasicNode n = (CMBasicNode)cnode;
-	// if (n.getType() == CMNodeType.PCDATA)
-	// {
-	// // Create a DTDPCDataContent for a leaf PCData node
-	// //
-	// DTDPCDataContent pcData = factory.createDTDPCDataContent();
-	// // Add #PCDATA to the Group, i.e Mixed content model
-	// parent.getContent().add(pcData);
-	// }
-	// }
-	// else if (cnode instanceof CMReferenceNode)
-	// {
-	// CMReferenceNode rn = (CMReferenceNode)cnode;
-	// if (rn.getType()==CMNodeType.ELEMENT_REFERENCE)
-	// {
-	// // System.out.println("CM Element Ref name: " + rn.getName());
-	// //
-	// // Create an DTDElementReference and set its referenced element
-	// //
-	// DTDElementReferenceContent elemRef =
-	// factory.createDTDElementReferenceContent();
-	//
-	//
-	// //
-	// // Find the real element for this element references
-	// // If the real element does not yet exist, create it
-	// //
-	// DTDElement anElement = createOrFindElement(rn.getName(), elemRef);
-	//
-	//
-	// elemRef.setReferencedElement(anElement);
-	// DTDOccurrenceType occurrenceType =
-	// DTDOccurrenceType.get(computeMofOccurrence(rn));
-	// elemRef.setOccurrence(occurrenceType);
-	//
-	// // Add DTDElementReference to the Group
-	// parent.getContent().add(elemRef);
-	// }
-	// else // PE Reference
-	// {
-	// String entityName = rn.getName().trim();
-	//
-	//
-	// // System.out.println("CM PE Ref name: " + entityName);
-	// DTDEntity anEntity = (DTDEntity) dtdUtil.getPEPool().get(entityName);
-	// if (anEntity!=null)
-	// {
-	// //
-	// // Create an DTDEntityReference and set its referenced element
-	// //
-	// DTDEntityReferenceContent enRef =
-	// factory.createDTDEntityReferenceContent();
-	// enRef.setElementReferencedEntity(anEntity);
-	//             
-	// DTDOccurrenceType occurrenceType =
-	// DTDOccurrenceType.get(computeMofOccurrence(rn));
-	// enRef.setOccurrence(occurrenceType);
-	//
-	//
-	// // Add DTDEntityReference to the Group
-	// parent.getContent().add(enRef);
-	//
-	//
-	// }
-	// }
-	// }
-	// }
-	// }
-	// /**
-	// * Find the real element that is referenced by the current element
-	// */
-	// protected DTDElement createOrFindElementGen(String name, Object obj) {
-	//
-	// // DTDElement aElement = getDTDFile().findElement(name);
-	//
-	//
-	// DTDElement aElement = (DTDElement) dtdUtil.getElementPool().get(name);
-	//
-	//
-	// if (aElement != null)
-	// {
-	// return aElement;
-	// }
-	//
-	//
-	// String errorMsg =
-	// DTDCoreMessages.getString("_ERROR_UNDECLARED_ELEMENT_1");
-	// errorMsg += "\"" + name + "\"";
-	// errorMsg +=
-	// DTDCoreMessages.getString("_UI_ERRORPART_UNDECLARED_ELEMENT_2");
-	//
-	//
-	// ErrorMessage dtdError = new ErrorMessage();
-	//     
-	// dtdError.setErrorMessage(errorMsg);
-	// addErrorMessage(dtdError, obj);
-	// // System.out.println(errorMsg);
-	// // setDTDErrorMessage(errorMsg);
-	// getDTDFile().setParseError(true);
-	//
-	//
-	// //
-	// // Create an empty element for the reference to make it valid
-	// //
-	//
-	//
-	// DTDFactory factory = getFactory();
-	// DTDElement dtdelement = factory.createDTDElement();
-	// dtdelement.setName(name);
-	//
-	//
-	// DTDEmptyContent emptyContent = factory.createDTDEmptyContent();
-	// dtdelement.setContent(emptyContent);
-	//
-	//
-	// getDTDFile().getDTDObject().add(dtdelement);
-	// dtdUtil.getElementPool().put(name,dtdelement);
-	// return dtdelement;
-	// }
-	// /**
-	// * Compute the MOF occurrence from the xml4j occurrence
-	// */
-	// protected int computeMofOccurrenceGen(CMRepeatableNode rnode) {
-	//
-	// int occurrence = rnode.getOccurrence();
-	// int mofoccur = DTDOccurrenceType.ONE;
-	//
-	//
-	// if (occurrence == CMNodeType.ZERO_OR_MORE)
-	// {
-	// mofoccur = DTDOccurrenceType.ZERO_OR_MORE;
-	// }
-	// else if (occurrence == CMNodeType.ONE_OR_MORE)
-	// {
-	// mofoccur = DTDOccurrenceType.ONE_OR_MORE;
-	// }
-	// else if (occurrence == CMNodeType.OPTIONAL)
-	// {
-	// mofoccur = DTDOccurrenceType.OPTIONAL;
-	// }
-	// return mofoccur;
-	// }
-	// /**
-	// * Compute the MOF model group from the xml4j model group
-	// */
-	// protected int computeMofGroupKindGen(int type) {
-	//
-	// if (type == CMNodeType.GROUP_CHOICE)
-	// {
-	// return DTDGroupKind.CHOICE;
-	// }
-	// else
-	// {
-	// return DTDGroupKind.SEQUENCE;
-	// }
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void createAttributesGen(DTDElement element, Attlist attList)
-	// {
-	//
-	// if (attList.getErrorMessage()!=null)
-	// {
-	// addErrorMessage(attList.getErrorMessage(), element);
-	// }
-	//
-	//
-	// for (int i=0;i<attList.size();i++)
-	// {
-	// AttNode ad = (AttNode) attList.elementAt(i);
-	// // DTDAttributeElement dtdAtt= getDTDAttributeElement(a.getName());
-	//
-	//
-	// // only add the AttDef if it is not added yet
-	// // ignore the dup AttDef as documented in the XML 1.0 specs
-	// //if( dtdAtt==null)
-	// addAttribute(element, ad);
-	// }
-	// }
-	// /**
-	// * Create a DTDAttribute from the xml4j attribute
-	// */
-	// protected void addAttributeGen(DTDElement dtdelement, AttNode ad) {
-	//
-	// DTDAttribute dtdattr = getFactory().createDTDAttribute();
-	// dtdelement.getDTDAttribute().add(dtdattr);
-	// finishAttribute(dtdattr, ad);
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void finishAttributeGen(DTDAttribute dtdattr, AttNode attdef)
-	// {
-	//
-	// boolean parseError = false;
-	//
-	//
-	// if (attdef.name.startsWith("%"))
-	// {
-	// String peName = attdef.name.trim();
-	// DTDEntity en = (DTDEntity) dtdUtil.getPEPool().get(peName);
-	// if (en!=null)
-	// {
-	// dtdattr.setAttributeNameReferencedEntity(en);
-	// }
-	// }
-	//
-	//
-	// dtdattr.setName(attdef.name);
-	//
-	//
-	// int attrType = attdef.getDeclaredType();
-	//
-	//
-	// if (attrType==AttNode.PEREFERENCE && attdef.type!=null)
-	// {
-	// String peName = attdef.type.trim();
-	// DTDEntity en = (DTDEntity) dtdUtil.getPEPool().get(peName);
-	// if (en!=null)
-	// {
-	// dtdattr.setAttributeTypeReferencedEntity(en);
-	// setAttrDTDType(dtdattr, getFactory().getDTDBasicType_CDATA()); // hack,
-	// so we can get back the default value
-	// }
-	// else //set default type
-	// setAttrDTDType(dtdattr, getFactory().getDTDBasicType_CDATA());
-	//
-	//
-	// }
-	// else
-	// {
-	// switch (attrType)
-	// {
-	// case AttNode.CDATA:
-	// setAttrDTDType(dtdattr, getFactory().getDTDBasicType_CDATA());
-	// break;
-	//
-	//
-	// case AttNode.ENTITIES:
-	// setAttrDTDType(dtdattr, getFactory().getDTDBasicType_ENTITIES());
-	// break;
-	//
-	//
-	// case AttNode.ENTITY:
-	// setAttrDTDType(dtdattr, getFactory().getDTDBasicType_ENTITY());
-	// break;
-	//
-	//
-	// case AttNode.ID:
-	// // check for duplicate ID attribute
-	// if (hasIDAttribute(dtdattr))
-	// {
-	// String errMsg = DTDCoreMessages.getString("_ERROR_DUP_ID_ATTRIBUTE_1");
-	// errMsg += attdef.name +
-	// DTDCoreMessages.getString("_UI_ERRORPART_DUP_ID_ATTRIBUTE_2");
-	// // dtdattr.getDTDElement().getIElement().setDTDErrorMessage(errMsg);
-	// // dtdattr.getDTDElement().getDTDFile().setParseError(true);
-	// parseError = true;
-	// }
-	// setAttrDTDType(dtdattr, getFactory().getDTDBasicType_ID());
-	// break;
-	//
-	//
-	// case AttNode.IDREF:
-	// setAttrDTDType(dtdattr, getFactory().getDTDBasicType_IDREF());
-	// break;
-	//
-	//
-	// case AttNode.IDREFS:
-	// setAttrDTDType(dtdattr, getFactory().getDTDBasicType_IDREFS());
-	// break;
-	//
-	//
-	// case AttNode.ENUMERATION:
-	// setAttrDTDType(dtdattr, createDTDEnumeration(dtdattr, attdef,
-	// DTDEnumGroupKind.NAME_TOKEN_GROUP));
-	// break;
-	//
-	//
-	// case AttNode.NOTATION:
-	// setAttrDTDType(dtdattr, createDTDEnumeration(dtdattr, attdef,
-	// DTDEnumGroupKind.NOTATION_GROUP));
-	// break;
-	//
-	//
-	// case AttNode.NMTOKEN:
-	// setAttrDTDType(dtdattr, getFactory().getDTDBasicType_NMTOKEN());
-	// break;
-	//
-	//
-	// case AttNode.NMTOKENS:
-	// setAttrDTDType(dtdattr, getFactory().getDTDBasicType_NMTOKENS());
-	// break;
-	//
-	//
-	// default:
-	// // System.out.println("DTDATTR '" +attdef.name + "'Unknown type..." +
-	// attrType);
-	// }
-	// }
-	//
-	//
-	// int attrDefault = attdef.getDefaultType();
-	// int defaultKind = DTDDefaultKind.IMPLIED;
-	// switch (attrDefault)
-	// {
-	// case AttNode.FIXED:
-	// defaultKind = DTDDefaultKind.FIXED;
-	// break;
-	//
-	//
-	// case AttNode.IMPLIED:
-	// defaultKind = DTDDefaultKind.IMPLIED;
-	// break;
-	//
-	//
-	// case AttNode.REQUIRED:
-	// defaultKind = DTDDefaultKind.REQUIRED;
-	// break;
-	//
-	//
-	// case AttNode.NOFIXED:
-	// defaultKind = DTDDefaultKind.NOFIXED;
-	// break;
-	//
-	//
-	// default:
-	// // System.out.println("DTDATTR '" +attdef.name + "' Unknown default
-	// type... " + attrDefault);
-	// }
-	//
-	// DTDDefaultKind defaultKindObj = DTDDefaultKind.get(defaultKind);
-	// dtdattr.setDefaultKind(defaultKindObj);
-	//
-	// if (parseError)
-	// {
-	// return;
-	// }
-	//
-	//
-	// String defaultValue = attdef.defaultValue;
-	// if (defaultValue != null)
-	// {
-	// if (attrType == AttNode.ENUMERATION || attrType == AttNode.NOTATION)
-	// {
-	// if (! isDefaultEnumValueValid(attdef,defaultValue))
-	// {
-	// String typeString =
-	// (attrType==AttNode.ENUMERATION?"enumeration":"notation");
-	// String errMsg =
-	// DTDCoreMessages.getString("_ERROR_INVALID_DEFAULT_ATTR_VALUE_1");
-	// errMsg += typeString +
-	// DTDCoreMessages.getString("_UI_ERRORPART_INVALID_DEFAULT_ATTR_VALUE_2");
-	// errMsg += attdef.name + "'";
-	//
-	//
-	// // dtdattr.getDTDElement().getIElement().setDTDErrorMessage(errMsg);
-	// // dtdattr.getDTDElement().getDTDFile().setParseError(true);
-	// return;
-	// }
-	// }
-	// dtdattr.setDefaultValueString(defaultValue);
-	// }
-	// // System.out.println("DTDAttr - toMof getDefaultValueString " +
-	// getDefaultValueString());
-	// // System.out.println("DTDAttr - toMof getDefaultValue: " +
-	// getDefaultValue());
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected boolean hasIDAttributeGen(DTDAttribute dtdattr) {
-	//
-	// boolean hasID = false;
-	//
-	//
-	// DTDElement element = dtdattr.getDTDElement();
-	// EList attrs = element.getDTDAttribute();
-	//
-	//
-	// Iterator i = attrs.iterator();
-	// while (i.hasNext())
-	// {
-	// DTDAttribute attr = (DTDAttribute) i.next();
-	// DTDType dType = attr.getDTDType();
-	// if (dType instanceof DTDBasicType)
-	// {
-	// if ( ((DTDBasicType)dType).getKind().getValue() == DTDBasicTypeKind.ID)
-	// {
-	// hasID = true;
-	// break;
-	// }
-	// }
-	// }
-	// return hasID;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected DTDEnumerationType createDTDEnumerationGen(DTDAttribute
-	// dtdattr, String[] enumValues, int enumKind) {
-	//
-	// DTDEnumerationType enum = getFactory().createDTDEnumerationType();
-	// // This is gross, but this is what was done before.
-	// DTDAttributeImpl dtdattrimpl = (DTDAttributeImpl) dtdattr;
-	// // enum.setID("Enum_" +
-	// ((DTDElement)dtdattrimpl.getMOFDomain()).getName() + "_" +
-	// dtdattr.getName());
-	// DTDEnumGroupKind groupKind = DTDEnumGroupKind.get(enumKind);
-	// enum.setKind(groupKind);
-	// // Enumeration values
-	// if (enumValues!=null)
-	// {
-	// for(int i=0;i<enumValues.length;i++)
-	// {
-	// EEnumLiteral enumLiteral = createEEnumLiteral();
-	// // enumVal.setXMIDocument(dtdattr.getXMIDocument());
-	// enumLiteral.refSetLiteral(enumValues[i]);
-	// // enumLiteral.setNumber(i);
-	// enum.getEnumLiterals().add(enumLiteral);
-	// }
-	// }
-	// dtdattr.getDTDElement().getDTDFile().getDTDEnumerationType().add(enum);
-	// return enum;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected EEnumLiteral createEEnumLiteralGen() {
-	//
-	// EcorePackage ePackage =
-	// (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-	// return ((EcoreFactory)ePackage.getFactory()).createEEnumLiteral();
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected DTDEnumerationType createDTDEnumerationGen(DTDAttribute
-	// dtdattr, AttNode attdef, int enumKind) {
-	//
-	// DTDEnumerationType enum = getFactory().createDTDEnumerationType();
-	// // This is gross, but this is what was done before.
-	// DTDAttributeImpl dtdattrimpl = (DTDAttributeImpl) dtdattr;
-	// // enum.setID("Enum_" +
-	// ((DTDElement)dtdattrimpl.getMOFDomain()).getName() + "_" +
-	// dtdattr.getName());
-	// DTDEnumGroupKind groupKind = DTDEnumGroupKind.get(enumKind);
-	// enum.setKind(groupKind);
-	// dtdattr.getDTDElement().getDTDFile().getDTDEnumerationType().add(enum);
-	//
-	//
-	// // Enumeration values
-	// Enumeration tokenIter = attdef.elements();
-	// if (tokenIter != null) {
-	// int i=0;
-	// while (tokenIter.hasMoreElements())
-	// {
-	// String val = (String)tokenIter.nextElement();
-	// EEnumLiteral enumLiteral = createEEnumLiteral();
-	// // enumLiteral.setXMIDocument(dtdattr.getXMIDocument());
-	//        
-	//
-	// enumLiteral.refSetLiteral(val);
-	// // enumLiteral.setNumber(i++);
-	// enum.getEnumLiterals().add(enumLiteral);
-	// }
-	// }
-	//
-	//
-	// return enum;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected boolean isDefaultEnumValueValidGen(AttNode attdef, String
-	// defaultValue) {
-	//
-	// boolean valid = false;
-	// boolean containsPercent = false;
-	//
-	//
-	// // Enumeration values
-	// Enumeration enumValues = attdef.elements();
-	// while (enumValues.hasMoreElements())
-	// {
-	// String val = (String)enumValues.nextElement();
-	// if (val.equals(defaultValue))
-	// {
-	// valid = true;
-	// break;
-	// }
-	// if (val.indexOf('%') >= 0)
-	// {
-	// containsPercent = true;
-	// }
-	// }
-	// return valid || containsPercent;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void setAttrDTDTypeGen(DTDAttribute dtdattr, DTDType type) {
-	//
-	// dtdattr.setDTDType(type);
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void addErrorMessageGen(ErrorMessage errMsg, Object obj) {
-	//
-	// errMsg.setObject(obj);
-	// dtdUtil.addErrorMessage(errMsg);
-	// }
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDObjectFinder.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDObjectFinder.java
deleted file mode 100644
index f7b36b8..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDObjectFinder.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.util;
-
-import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDNotation;
-import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference;
-import org.eclipse.wst.dtd.core.internal.emf.DTDSourceOffset;
-
-public class DTDObjectFinder extends DTDVisitor {
-	public class SourceOffset {
-		// Convenience class to find containment of object
-		private int start, end;
-
-		public SourceOffset(int start, int end) {
-			this.start = start;
-			this.end = end;
-		}
-
-		public boolean contains(SourceOffset other) {
-			if (this.start <= other.start && other.start <= this.end) {
-				return true;
-			} // end of if ()
-			return false;
-		}
-
-	}
-
-	SourceOffset searchLocation;
-
-	private SourceOffset offsetObjectFor(DTDSourceOffset s) {
-		return new SourceOffset(s.getStartOffset(), s.getEndOffset());
-	}
-
-	private void checkContainment(DTDObject o) {
-		if (offsetObjectFor((DTDSourceOffset) o).contains(searchLocation)) {
-			closestObject = o;
-		} // end of if ()
-	}
-
-	public DTDObjectFinder(int startOffset, int endOffset) {
-		searchLocation = new SourceOffset(startOffset, endOffset);
-	}
-
-	public void visitDTDNotation(DTDNotation notation) {
-		checkContainment(notation);
-		super.visitDTDNotation(notation);
-	}
-
-	public void visitDTDEntity(DTDEntity entity) {
-		checkContainment(entity);
-		super.visitDTDEntity(entity);
-	}
-
-	public void visitDTDElement(DTDElement element) {
-		checkContainment(element);
-		super.visitDTDElement(element);
-	}
-
-	public void visitDTDAttribute(DTDAttribute attribute) {
-		checkContainment(attribute);
-		super.visitDTDAttribute(attribute);
-	}
-
-	public void visitDTDParameterEntityReference(DTDParameterEntityReference parmEntity) {
-		checkContainment(parmEntity);
-		super.visitDTDParameterEntityReference(parmEntity);
-	}
-
-	public void visitDTDElementContent(DTDElementContent content) {
-		checkContainment(content);
-		super.visitDTDElementContent(content);
-	}
-
-	private DTDObject closestObject = null;
-
-	public DTDObject getClosestObject() {
-		return closestObject;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected SourceOffset offsetObjectForGen(DTDSourceOffset s) {
-
-		return new SourceOffset(s.getStartOffset(), s.getEndOffset());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void checkContainmentGen(DTDObject o) {
-
-		if (offsetObjectFor((DTDSourceOffset) o).contains(searchLocation)) {
-			closestObject = o;
-		} // end of if ()
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDNotationGen(DTDNotation notation) {
-
-		checkContainment(notation);
-		super.visitDTDNotation(notation);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDEntityGen(DTDEntity entity) {
-
-		checkContainment(entity);
-		super.visitDTDEntity(entity);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDElementGen(DTDElement element) {
-
-		checkContainment(element);
-		super.visitDTDElement(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDAttributeGen(DTDAttribute attribute) {
-
-		checkContainment(attribute);
-		super.visitDTDAttribute(attribute);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDParameterEntityReferenceGen(DTDParameterEntityReference parmEntity) {
-
-		checkContainment(parmEntity);
-		super.visitDTDParameterEntityReference(parmEntity);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDElementContentGen(DTDElementContent content) {
-
-		checkContainment(content);
-		super.visitDTDElementContent(content);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DTDObject getClosestObjectGen() {
-
-		return closestObject;
-	}
-}// DTDObjectFinder
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDPathnameUtil.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDPathnameUtil.java
deleted file mode 100644
index 05abd2d..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDPathnameUtil.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.util;
-
-
-
-public class DTDPathnameUtil {
-	static public String makePath(String parentPath, String type, String name, int cnt) {
-		String pn = null;
-		name = encode(name);
-		if ((name == null) && (cnt <= 0)) {
-			pn = type;
-		}
-		else if (cnt <= 0) {
-			pn = type + ":" + ((name == null) ? "" : name); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		else {
-			pn = type + ":" + ((name == null) ? "" : name) + ":" + cnt; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-
-		if (parentPath != null) {
-			return parentPath + "." + pn; //$NON-NLS-1$
-		}
-		else {
-			return pn;
-		}
-	}
-
-	static public Object[] parsePathComponent(String path) {
-		/*
-		 * This routine parse the first component of the path and returns the
-		 * result in an arrray of Strings. result[0] = type (String) result[1] =
-		 * name (String) result[2] = count (Integer) result[3] = the rest of
-		 * the path (String)
-		 * 
-		 * E.g. PathComponent result[0] result[1] result[2] result[3]
-		 * ------------------------------------------------------------- type
-		 * type <null> <null> <null> type.rest type <null> <null> rest
-		 * type:name type name <null> <null> type:name.rest type name <null>
-		 * rest type::n type <null> n <null> type::n.rest type <null> n rest
-		 * type:name:n type name n <null> type:name:n.rest type name n rest
-		 */
-
-		Object[] result = new Object[4];
-		if (path == null)
-			return result;
-
-		int i = path.indexOf('.');
-		int length = path.length();
-
-		if (i < 0) {
-			i = length;
-		}
-
-		String type = null;
-		String name = null;
-		Integer n = null;
-		String rest = null;
-
-		// get the type
-		int j = path.indexOf(':');
-		if (j > i)
-			j = -1;
-		if (j < 0) {
-			type = path.substring(0, i);
-		}
-		else {
-			type = path.substring(0, j);
-
-			// get the name
-			int k = path.indexOf(':', j + 1);
-			if (k > i)
-				k = -1;
-			if (k < 0) {
-				name = path.substring(j + 1, i);
-			}
-			else {
-				name = path.substring(j + 1, k);
-
-				// get the count
-				try {
-					n = new Integer(path.substring(k + 1, i));
-				}
-				catch (Exception exc) {
-				}
-				if ((n != null) && (n.intValue() < 0)) {
-					n = null;
-				}
-			}
-		}
-
-		if ((name != null) && (name.length() == 0)) {
-			name = null;
-		}
-
-		if (i < length) {
-			rest = path.substring(i + 1);
-		}
-
-		result[0] = type;
-		result[1] = decode(name);
-		result[2] = n;
-		result[3] = rest;
-		return result;
-	}
-
-	static private String encode(String s) {
-		if (s == null)
-			return null;
-		StringBuffer o = new StringBuffer(s.length());
-		int len = s.length();
-		for (int i = 0; i < len; i++) {
-			char c = s.charAt(i);
-			if (Character.isLetterOrDigit(c) || (c == '-')) {
-				o.append(c);
-			}
-			else { // if ((c == '.') || (c == ':') || (c == '_') || ...)
-				// convert the character to a 4 digit hex code prefixed by "_"
-				String hex = Integer.toHexString(c);
-				int l = hex.length();
-				if (l == 1) {
-					o.append("_000"); //$NON-NLS-1$
-					o.append(hex);
-				}
-				else if (l == 2) {
-					o.append("_00"); //$NON-NLS-1$
-					o.append(hex);
-				}
-				else if (l == 3) {
-					o.append("_0"); //$NON-NLS-1$
-					o.append(hex);
-				}
-				else {
-					o.append('_');
-					o.append(hex);
-				}
-			}
-		} // for
-		return o.toString();
-	}
-
-	static private String decode(String s) {
-		if (s == null)
-			return null;
-		StringBuffer o = new StringBuffer(s.length());
-		int len = s.length();
-		for (int i = 0; i < len; i++) {
-			char c = s.charAt(i);
-			if (c != '_') {
-				o.append(c);
-			}
-			else { // next 4 characters are the hex code
-				String hex;
-				if (len > i + 4) {
-					hex = s.substring(i + 1, i + 5);
-					i += 4;
-				}
-				else {
-					hex = s.substring(i + 1);
-					i = len - 1;
-				}
-				o.append((char) Integer.parseInt(hex, 16));
-			}
-		} // for
-		return o.toString();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected static String makePathGen(String parentPath, String type, String name, int cnt) {
-
-		String pn = null;
-		name = encode(name);
-		if ((name == null) && (cnt <= 0)) {
-			pn = type;
-		}
-		else if (cnt <= 0) {
-			pn = type + ":" + ((name == null) ? "" : name); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		else {
-			pn = type + ":" + ((name == null) ? "" : name) + ":" + cnt; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-
-		if (parentPath != null) {
-			return parentPath + "." + pn; //$NON-NLS-1$
-		}
-		else {
-			return pn;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected static Object[] parsePathComponentGen(String path) {
-
-		/*
-		 * This routine parse the first component of the path and returns the
-		 * result in an arrray of Strings. result[0] = type (String) result[1] =
-		 * name (String) result[2] = count (Integer) result[3] = the rest of
-		 * the path (String)
-		 * 
-		 * E.g. PathComponent result[0] result[1] result[2] result[3]
-		 * ------------------------------------------------------------- type
-		 * type <null> <null> <null> type.rest type <null> <null> rest
-		 * type:name type name <null> <null> type:name.rest type name <null>
-		 * rest type::n type <null> n <null> type::n.rest type <null> n rest
-		 * type:name:n type name n <null> type:name:n.rest type name n rest
-		 */
-
-		Object[] result = new Object[4];
-		if (path == null)
-			return result;
-
-		int i = path.indexOf('.');
-		int length = path.length();
-
-		if (i < 0) {
-			i = length;
-		}
-
-		String type = null;
-		String name = null;
-		Integer n = null;
-		String rest = null;
-
-		// get the type
-		int j = path.indexOf(':');
-		if (j > i)
-			j = -1;
-		if (j < 0) {
-			type = path.substring(0, i);
-		}
-		else {
-			type = path.substring(0, j);
-
-			// get the name
-			int k = path.indexOf(':', j + 1);
-			if (k > i)
-				k = -1;
-			if (k < 0) {
-				name = path.substring(j + 1, i);
-			}
-			else {
-				name = path.substring(j + 1, k);
-
-				// get the count
-				try {
-					n = new Integer(path.substring(k + 1, i));
-				}
-				catch (Exception exc) {
-				}
-				if ((n != null) && (n.intValue() < 0)) {
-					n = null;
-				}
-			}
-		}
-
-		if ((name != null) && (name.length() == 0)) {
-			name = null;
-		}
-
-		if (i < length) {
-			rest = path.substring(i + 1);
-		}
-
-		result[0] = type;
-		result[1] = decode(name);
-		result[2] = n;
-		result[3] = rest;
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected static String encodeGen(String s) {
-
-		if (s == null)
-			return null;
-		StringBuffer o = new StringBuffer(s.length());
-		int len = s.length();
-		for (int i = 0; i < len; i++) {
-			char c = s.charAt(i);
-			if (Character.isLetterOrDigit(c) || (c == '-')) {
-				o.append(c);
-			}
-			else { // if ((c == '.') || (c == ':') || (c == '_') || ...)
-				// convert the character to a 4 digit hex code prefixed by "_"
-				String hex = Integer.toHexString(c);
-				int l = hex.length();
-				if (l == 1) {
-					o.append("_000"); //$NON-NLS-1$
-					o.append(hex);
-				}
-				else if (l == 2) {
-					o.append("_00"); //$NON-NLS-1$
-					o.append(hex);
-				}
-				else if (l == 3) {
-					o.append("_0"); //$NON-NLS-1$
-					o.append(hex);
-				}
-				else {
-					o.append('_');
-					o.append(hex);
-				}
-			}
-		} // for
-		return o.toString();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected static String decodeGen(String s) {
-
-		if (s == null)
-			return null;
-		StringBuffer o = new StringBuffer(s.length());
-		int len = s.length();
-		for (int i = 0; i < len; i++) {
-			char c = s.charAt(i);
-			if (c != '_') {
-				o.append(c);
-			}
-			else { // next 4 characters are the hex code
-				String hex;
-				if (len > i + 4) {
-					hex = s.substring(i + 1, i + 5);
-					i += 4;
-				}
-				else {
-					hex = s.substring(i + 1);
-					i = len - 1;
-				}
-				o.append((char) Integer.parseInt(hex, 16));
-			}
-		} // for
-		return o.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDPrinter.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDPrinter.java
deleted file mode 100644
index 16f4fa6..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDPrinter.java
+++ /dev/null
@@ -1,525 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.util;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDNotation;
-import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDOccurrenceType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPCDataContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference;
-import org.eclipse.wst.dtd.core.internal.emf.DTDRepeatableContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDSourceOffset;
-
-
-public class DTDPrinter extends DTDVisitor {
-	StringBuffer sb = new StringBuffer();
-	boolean updateOffset = true;
-
-	public DTDPrinter(boolean updateOffset) {
-		this.updateOffset = updateOffset;
-	}
-
-	public StringBuffer getBuffer() {
-		return sb;
-	}
-
-	public void visitDTDFile(DTDFile file) {
-		super.visitDTDFile(file);
-	}
-
-	public void visitDTDNotation(DTDNotation notation) {
-		generateComment(notation);
-		updateStartOffset(notation, sb.length());
-		sb.append("<!NOTATION "); //$NON-NLS-1$
-		sb.append(notation.getName()).append(" "); //$NON-NLS-1$
-
-		String publicID = notation.getPublicID();
-		String systemID = notation.getSystemID();
-		if (publicID == null || publicID.equals("")) { //$NON-NLS-1$
-			sb.append("SYSTEM "); //$NON-NLS-1$
-		}
-		else {
-			sb.append("PUBLIC \"").append(publicID).append("\" "); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		if (systemID == null) {
-			sb.append("\"\""); //$NON-NLS-1$
-		}
-		else {
-			sb.append("\"").append(systemID).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		endTag();
-		updateEndOffset(notation, sb.length() - 1); // -1 for the newline char
-		super.visitDTDNotation(notation);
-	}
-
-	public void visitDTDEntity(DTDEntity entity) {
-		generateComment(entity);
-		updateStartOffset(entity, sb.length());
-		sb.append("<!ENTITY "); //$NON-NLS-1$
-
-		if (entity.isParameterEntity())
-			sb.append("% "); //$NON-NLS-1$
-
-		sb.append(entity.getName()).append(" "); //$NON-NLS-1$
-		sb.append(entity.getContent().unparse());
-
-		endTag();
-		updateEndOffset(entity, sb.length() - 1); // -1 for the newline char
-		super.visitDTDEntity(entity);
-	}
-
-	public void visitDTDElement(DTDElement element) {
-		generateComment(element);
-		updateStartOffset(element, sb.length());
-		sb.append("<!ELEMENT " + element.getName()); //$NON-NLS-1$
-		DTDElementContent content = element.getContent();
-		if (content instanceof DTDPCDataContent || content instanceof DTDElementReferenceContent) {
-			sb.append(" ("); //$NON-NLS-1$
-			super.visitDTDElement(element);
-			sb.append(")"); //$NON-NLS-1$
-		} // end of if ()
-		else {
-			sb.append(" "); //$NON-NLS-1$
-			super.visitDTDElement(element);
-		} // end of else
-		endTag();
-		updateEndOffset(element, sb.length() - 1); // -1 for the newline char
-		visitAttributes(element);
-	}
-
-	public void visitDTDParameterEntityReference(DTDParameterEntityReference parmEntity) {
-		generateComment(parmEntity);
-		updateStartOffset(parmEntity, sb.length());
-		sb.append("%" + parmEntity.getName() + ";\n"); //$NON-NLS-1$ //$NON-NLS-2$
-		updateEndOffset(parmEntity, sb.length() - 1); // -1 for the newline
-														// char
-	}
-
-	public void visitDTDElementContent(DTDElementContent content) {
-		updateStartOffset(content, sb.length());
-		String trailingChars = ""; //$NON-NLS-1$
-		if (content instanceof DTDRepeatableContent) {
-			DTDRepeatableContent repeatContent = (DTDRepeatableContent) content;
-			DTDOccurrenceType occurrenceType = repeatContent.getOccurrence();
-			// Integer occurrence = repeatContent.getOccurrence();
-			if (occurrenceType != null) {
-				int occurType = occurrenceType.getValue();
-				if (occurType != DTDOccurrenceType.ONE) {
-					if (repeatContent instanceof DTDEntityReferenceContent) {
-						sb.append("("); //$NON-NLS-1$
-						trailingChars = ")"; //$NON-NLS-1$
-					}
-					trailingChars += (char) occurType;
-				}
-			} // end of if ()
-		} // end of if ()
-
-		if (content instanceof DTDGroupContent) {
-			super.visitDTDElementContent(content);
-		} // end of if ()
-		else if (content instanceof DTDElementReferenceContent || content instanceof DTDEntityReferenceContent) {
-			sb.append(((DTDRepeatableContent) content).unparseRepeatableContent());
-		} // end of if ()
-		else {
-			// handle DTDPCDataContent, DTDAnyContent and DTDEmptyContent here
-			sb.append(content.getContentName());
-		} // end of else
-		sb.append(trailingChars);
-		updateEndOffset(content, sb.length());
-	}
-
-	public void visitDTDGroupContent(DTDGroupContent group) {
-		sb.append("("); //$NON-NLS-1$
-		DTDGroupKind kind = group.getGroupKind();
-		// MOF2EMF Port
-		// Integer groupKind = group.getGroupKind();
-		if (kind == null) {
-			group.setGroupKind(DTDGroupKind.get(DTDGroupKind.SEQUENCE));
-		} // end of if ()
-
-		String con = group.getGroupKind().getValue() == DTDGroupKind.CHOICE ? " | " : ", "; //$NON-NLS-1$ //$NON-NLS-2$
-
-		// Loop thru the children of the current group
-		Collection content = group.getContent();
-		if (content != null) {
-			boolean firstContent = true;
-			for (Iterator i = content.iterator(); i.hasNext();) {
-				if (!firstContent) {
-					sb.append(con);
-				} // end of if ()
-				else {
-					firstContent = false;
-				} // end of else
-				visitDTDElementContent((DTDElementContent) i.next());
-			}
-		}
-
-		sb.append(")"); //$NON-NLS-1$
-	}
-
-	private void visitAttributes(DTDElement elem) {
-		Collection attrs = elem.getDTDAttribute();
-		Iterator i = attrs.iterator();
-		if (attrs != null && i.hasNext()) {
-			DTDAttribute attrib = (DTDAttribute) i.next();
-			String comment = attrib.getComment();
-			if (comment != null && comment.length() > 0)
-				sb.append("<!--\n ").append(comment).append("\n-->\n"); //$NON-NLS-1$ //$NON-NLS-2$
-			sb.append("<!ATTLIST " + elem.getName() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-			sb.append(" "); //$NON-NLS-1$
-			updateStartOffset(attrib, sb.length());
-			sb.append(attrib.unparse());
-			updateEndOffset(attrib, sb.length());
-			sb.append("\n"); //$NON-NLS-1$
-			for (; i.hasNext();) {
-				attrib = (DTDAttribute) i.next();
-				comment = attrib.getComment();
-				if (comment != null && comment.length() > 0) {
-					sb.append(">\n"); //$NON-NLS-1$
-					if (comment != null && comment.length() > 0)
-						sb.append("<!--\n ").append(comment).append("\n-->\n"); //$NON-NLS-1$ //$NON-NLS-2$
-					sb.append("<!ATTLIST " + elem.getName() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-				sb.append(" "); //$NON-NLS-1$
-				updateStartOffset(attrib, sb.length());
-				sb.append(attrib.unparse());
-				updateEndOffset(attrib, sb.length());
-				sb.append("\n"); //$NON-NLS-1$
-			}
-			sb.append(">\n"); //$NON-NLS-1$
-		}
-	}
-
-	private void endTag() {
-		sb.append(">\n"); //$NON-NLS-1$
-	}
-
-	private void updateStartOffset(DTDSourceOffset o, int offset) {
-		if (updateOffset) {
-			o.setStartOffset(offset);
-		} // end of if ()
-	}
-
-	private void updateEndOffset(DTDSourceOffset o, int offset) {
-		if (updateOffset) {
-			o.setEndOffset(offset);
-		} // end of if ()
-	}
-
-	private void generateComment(DTDObject dtdObject) {
-		String commentString = null;
-
-		if (dtdObject instanceof DTDElement)
-			commentString = ((DTDElement) dtdObject).getComment();
-		else if (dtdObject instanceof DTDEntity)
-			commentString = ((DTDEntity) dtdObject).getComment();
-		else if (dtdObject instanceof DTDNotation)
-			commentString = ((DTDNotation) dtdObject).getComment();
-
-		if (commentString != null && commentString.length() > 0) {
-			sb.append("<!--").append(commentString).append("-->\n"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-
-	// /**
-	// * @generated
-	// */
-	// protected StringBuffer getBufferGen() {
-	//
-	// return sb;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void visitDTDFileGen(DTDFile file) {
-	//
-	// super.visitDTDFile(file);
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void visitDTDNotationGen(DTDNotation notation) {
-	//
-	// generateComment(notation);
-	// updateStartOffset(notation, sb.length());
-	// sb.append("<!NOTATION ");
-	// sb.append(notation.getName()).append(" ");
-	//
-	//
-	// String publicID = notation.getPublicID();
-	// String systemID = notation.getSystemID();
-	// if (publicID == null || publicID.equals(""))
-	// {
-	// sb.append("SYSTEM ");
-	// }
-	// else
-	// {
-	// sb.append("PUBLIC \"").append(publicID).append("\" ");
-	// }
-	//
-	//
-	// if (systemID==null)
-	// {
-	// sb.append("\"\"");
-	// }
-	// else
-	// {
-	// sb.append("\"").append(systemID).append("\"");
-	// }
-	// endTag();
-	// updateEndOffset(notation, sb.length() - 1); // -1 for the newline char
-	// super.visitDTDNotation(notation);
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void visitDTDEntityGen(DTDEntity entity) {
-	//
-	// generateComment(entity);
-	// updateStartOffset(entity, sb.length());
-	// sb.append("<!ENTITY ");
-	//
-	//
-	// if (entity.isParameterEntity())
-	// sb.append("% ");
-	//
-	//
-	// sb.append(entity.getName()).append(" ");
-	// sb.append(entity.getContent().unparse());
-	//
-	//
-	// endTag();
-	// updateEndOffset(entity, sb.length() - 1); // -1 for the newline char
-	// super.visitDTDEntity(entity);
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void visitDTDElementGen(DTDElement element) {
-	//
-	// generateComment(element);
-	// updateStartOffset(element, sb.length());
-	// sb.append("<!ELEMENT " + element.getName());
-	// DTDElementContent content = element.getContent();
-	// if (content instanceof DTDPCDataContent ||
-	// content instanceof DTDElementReferenceContent)
-	// {
-	// sb.append(" (");
-	// super.visitDTDElement(element);
-	// sb.append(")");
-	// } // end of if ()
-	// else
-	// {
-	// sb.append(" ");
-	// super.visitDTDElement(element);
-	// } // end of else
-	// endTag();
-	// updateEndOffset(element, sb.length() - 1); // -1 for the newline char
-	// visitAttributes(element);
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void
-	// visitDTDParameterEntityReferenceGen(DTDParameterEntityReference
-	// parmEntity) {
-	//
-	// generateComment(parmEntity);
-	// updateStartOffset(parmEntity, sb.length());
-	// sb.append("%" + parmEntity.getName() + ";\n");
-	// updateEndOffset(parmEntity, sb.length() - 1); // -1 for the newline
-	// char
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void visitDTDElementContentGen(DTDElementContent content) {
-	//
-	// updateStartOffset(content, sb.length());
-	// String trailingChars = "";
-	// if (content instanceof DTDRepeatableContent )
-	// {
-	// DTDRepeatableContent repeatContent = (DTDRepeatableContent) content;
-	// Integer occurrence = repeatContent.getOccurrence();
-	// if (occurrence != null)
-	// {
-	// int occurType = occurrence.intValue();
-	// if (occurType != DTDOccurrenceType.ONE)
-	// {
-	// if (repeatContent instanceof DTDEntityReferenceContent)
-	// {
-	// sb.append("(");
-	// trailingChars = ")";
-	// }
-	// trailingChars += (char) occurType;
-	// }
-	// } // end of if ()
-	// } // end of if ()
-	//    
-	// if (content instanceof DTDGroupContent)
-	// {
-	// super.visitDTDElementContent(content);
-	// } // end of if ()
-	// else if (content instanceof DTDElementReferenceContent ||
-	// content instanceof DTDEntityReferenceContent)
-	// {
-	// sb.append(((DTDRepeatableContent)content).unparseRepeatableContent());
-	// } // end of if ()
-	// else
-	// {
-	// // handle DTDPCDataContent, DTDAnyContent and DTDEmptyContent here
-	// sb.append(content.getContentName());
-	// } // end of else
-	// sb.append(trailingChars);
-	// updateEndOffset(content, sb.length());
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void visitDTDGroupContentGen(DTDGroupContent group) {
-	//
-	// sb.append("(");
-	//    
-	// Integer groupKind = group.getGroupKind();
-	// if (groupKind == null)
-	// {
-	// group.setGroupKind(DTDGroupKind.SEQUENCE);
-	// } // end of if ()
-	//    
-	// String con = group.getGroupKind().intValue() == DTDGroupKind.CHOICE ? "
-	// | " : ", ";
-	//
-	//
-	// // Loop thru the children of the current group
-	// Collection content = group.getContent();
-	// if (content != null)
-	// {
-	// boolean firstContent = true;
-	// for (Iterator i = content.iterator(); i.hasNext(); )
-	// {
-	// if (!firstContent)
-	// {
-	// sb.append(con);
-	// } // end of if ()
-	// else
-	// {
-	// firstContent = false;
-	// } // end of else
-	// visitDTDElementContent((DTDElementContent) i.next());
-	// }
-	// }
-	//
-	//
-	// sb.append(")");
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void visitAttributesGen(DTDElement elem) {
-	//
-	// Collection attrs = elem.getDTDAttribute();
-	// Iterator i = attrs.iterator();
-	// if (attrs != null && i.hasNext())
-	// {
-	// DTDAttribute attrib = (DTDAttribute) i.next();
-	// String comment = attrib.getComment();
-	// if (comment!=null && comment.length()>0)
-	// sb.append("<!--\n ").append(comment).append("\n-->\n");
-	// sb.append("<!ATTLIST " + elem.getName() + "\n");
-	// sb.append(" ");
-	// updateStartOffset(attrib, sb.length());
-	// sb.append(attrib.unparse());
-	// updateEndOffset(attrib, sb.length());
-	// sb.append("\n");
-	// for (; i.hasNext(); )
-	// {
-	// attrib = (DTDAttribute) i.next();
-	// comment = attrib.getComment();
-	// if (comment!=null && comment.length()>0)
-	// {
-	// sb.append(">\n");
-	// if (comment!=null && comment.length()>0)
-	// sb.append("<!--\n ").append(comment).append("\n-->\n");
-	// sb.append("<!ATTLIST " + elem.getName() + "\n");
-	// }
-	// sb.append(" ");
-	// updateStartOffset(attrib, sb.length());
-	// sb.append(attrib.unparse());
-	// updateEndOffset(attrib, sb.length());
-	// sb.append("\n");
-	// }
-	// sb.append(">\n");
-	// }
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void endTagGen() {
-	//
-	// sb.append(">\n");
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void updateStartOffsetGen(DTDSourceOffset o, int offset) {
-	//
-	// if (updateOffset)
-	// {
-	// o.setStartOffset(offset);
-	// } // end of if ()
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void updateEndOffsetGen(DTDSourceOffset o, int offset) {
-	//
-	// if (updateOffset)
-	// {
-	// o.setEndOffset(offset);
-	// } // end of if ()
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void generateCommentGen(DTDObject dtdObject) {
-	//
-	// String commentString = null;
-	//
-	//
-	// if (dtdObject instanceof DTDElement)
-	// commentString = ((DTDElement)dtdObject).getComment();
-	// else if (dtdObject instanceof DTDEntity)
-	// commentString = ((DTDEntity)dtdObject).getComment();
-	// else if (dtdObject instanceof DTDNotation)
-	// commentString = ((DTDNotation)dtdObject).getComment();
-	//
-	//
-	// if ( commentString!=null && commentString.length()>0)
-	// {
-	// sb.append("<!--").append(commentString).append("-->\n");
-	// }
-	// }
-}// DTDPrinter
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDResourceFactoryImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDResourceFactoryImpl.java
deleted file mode 100644
index 21e2aa7..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDResourceFactoryImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-
-public class DTDResourceFactoryImpl extends ResourceFactoryImpl {
-	public DTDResourceFactoryImpl() {
-		super();
-	}
-
-	public Resource createResource(String filename) {
-		return new DTDResourceImpl(filename);
-	}
-
-	public Resource createResource(URI uri) {
-		return new DTDResourceImpl(uri);
-	}
-
-	public Resource createResource(ResourceSet resources, URI uri) {
-		Resource resource = new DTDResourceImpl(uri);
-		resources.getResources().add(resource);
-		return resource;
-	}
-
-	public Resource createResource(ResourceSet resources, String uri) {
-		Resource resource = new DTDResourceImpl(uri);
-		resources.getResources().add(resource);
-		return resource;
-	}
-
-	public Resource load(String uri) throws Exception {
-		Resource resource = createResource(uri);
-		resource.load(new HashMap());
-		return resource;
-	}
-
-	public Resource load(URI uri) throws Exception {
-		Resource resource = createResource(uri);
-		resource.load(new HashMap());
-		return resource;
-	}
-
-	public Resource load(ResourceSet resources, String uri) throws Exception {
-		return load(resources, uri, new HashMap());
-	}
-
-	public Resource load(ResourceSet resources, URI uri) throws Exception {
-		return load(resources, uri, new HashMap());
-	}
-
-	public Resource load(ResourceSet resources, String uri, Map options) throws Exception {
-		Resource resource = createResource(resources, uri);
-		resource.load(options);
-		return resource;
-	}
-
-	public Resource load(ResourceSet resources, URI uri, Map options) throws Exception {
-		Resource resource = createResource(resources, uri);
-		resource.load(options);
-		return resource;
-	}
-} // DTDResourceFactoryImpl
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDResourceImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDResourceImpl.java
deleted file mode 100644
index 879da44..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDResourceImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.util;
-
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
-import org.eclipse.wst.dtd.core.internal.DTDCoreMessages;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
-
-
-public class DTDResourceImpl extends ResourceImpl {
-
-	public DTDResourceImpl() {
-		super();
-	}
-
-	public DTDResourceImpl(String filename) {
-		super(URI.createURI(filename));
-		// System.out.println(">>>> DTDResourceImpl ctor 1");
-	}
-
-	public DTDResourceImpl(URI uri) {
-		super(uri);
-		// System.out.println(">>>> DTDResourceImpl ctor 2");
-	}
-
-	/**
-	 * Returns the resolved object for the given URI
-	 * {@link URI#fragment fragment}.
-	 * <p>
-	 * The fragment encoding will typically be that produced by
-	 * {@link #getURIFragment getURIFragment}.
-	 * </p>
-	 * 
-	 * @param uriFragment
-	 *            the fragment to resolve.
-	 * @return the resolved object for the given fragment.
-	 * @see #getURIFragment(EObject)
-	 * @see org.eclipse.emf.ecore.resource.ResourceSet#getEObject(URI, boolean)
-	 * @see org.eclipse.emf.ecore.util.EcoreUtil#resolve(EObject, org.eclipse.emf.ecore.resource.ResourceSet)
-	 * @see org.eclipse.emf.ecore.InternalEObject#eObjectForURIFragmentSegment(String)
-	 * @throws org.eclipse.emf.common.util.WrappedException
-	 *             if a problem occurs navigating the fragment.
-	 */
-	public EObject getEObject(java.lang.String uriFragment) {
-		EList contents = getContents();
-		if (contents != null) {
-			Iterator i = contents.iterator();
-			while (i.hasNext()) {
-				Object obj = i.next();
-				if (obj instanceof DTDFile) {
-					// there should only be one DTDFile in a DTD extent
-					EObject result = ((DTDFile) obj).findObject(uriFragment);
-					return result;
-				}
-			}
-		}
-		System.out.println(">>> DTDKey Error: cannot find object " + uriFragment); //$NON-NLS-1$
-		return super.getEObject(uriFragment);
-	}
-
-	/**
-	 * Returns the URI {@link URI#fragment fragment} that, when passed to
-	 * {@link #getEObject getEObject} will return the given object.
-	 * <p>
-	 * In other words, the following is <code>true</code> for any object
-	 * contained by a resource:
-	 * 
-	 * <pre>
-	 * 
-	 *    Resource resource = eObject.eResource();
-	 *    eObject == resource.getEObject(resource.getURIFragment(eObject))
-	 * 
-	 * </pre>
-	 * 
-	 * An implementation may choose to use IDs or to use structured URI
-	 * fragments, as supported by
-	 * {@link org.eclipse.emf.ecore.InternalEObject#eURIFragmentSegment eURIFragmentSegment}.
-	 * </p>
-	 * 
-	 * @param eObject
-	 *            the object to identify.
-	 * @return the URI {@link URI#fragment fragment} for the object.
-	 * @see #getEObject(String)
-	 * @see org.eclipse.emf.ecore.InternalEObject#eURIFragmentSegment(org.eclipse.emf.core.EStructuralFeature,
-	 *      EObject)
-	 */
-	public java.lang.String getURIFragment(EObject eObject) {
-		if (eObject instanceof DTDObject) {
-			return ((DTDObject) eObject).getPathname();
-		}
-		return super.getURIFragment(eObject);
-	}
-
-	private DTDUtil dtdUtil;
-
-	public DTDUtil getDTDUtil() {
-		return dtdUtil;
-	}
-
-	public void setDTDUtil(DTDUtil dtdUtil) {
-		this.dtdUtil = dtdUtil;
-	}
-
-	public void load(Map options) {
-
-		String uriString = getURI().toString();
-		try {
-			DTDUtil dtdUtil = new DTDUtil();
-			dtdUtil.parse(getResourceSet(), uriString);
-			dtdUtil.setResource(this);
-			setDTDUtil(dtdUtil);
-			getContents().add(dtdUtil.getDTDFile());
-
-			// Reset the dirty flag after the resource is loaded
-			setModified(false);
-		}
-		catch (Exception exc) {
-			exc.printStackTrace();
-		}
-	}
-
-	public void save(OutputStream os, Object options) throws Exception {
-		if (contents != null) {
-			Iterator i = contents.iterator();
-			while (i.hasNext()) {
-				Object obj = i.next();
-				if (obj instanceof DTDFile) {
-					try {
-						DTDPrinter printer = new DTDPrinter(true);
-						printer.visitDTDFile((DTDFile) obj);
-
-						String s = printer.getBuffer().toString();
-						os.write(s.getBytes());
-						// Reset the dirty flag after the resource is saved
-						setModified(false);
-					}
-					catch (Exception e) {
-					}
-					break;
-				}
-			}
-		}
-	}
-
-	public void save(ZipOutputStream zos, String entry, String metaModelName) throws Exception {
-		throw new Exception(DTDCoreMessages._EXC_OPERATION_NOT_SUPPORTED); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDSwitch.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDSwitch.java
deleted file mode 100644
index e77b125..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDSwitch.java
+++ /dev/null
@@ -1,489 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.util;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAnyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute;
-import org.eclipse.wst.dtd.core.internal.emf.DTDBasicType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEmptyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType;
-import org.eclipse.wst.dtd.core.internal.emf.DTDExternalEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDInternalEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDNotation;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPCDataContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPackage;
-import org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference;
-import org.eclipse.wst.dtd.core.internal.emf.DTDRepeatableContent;
-
-
-
-public class DTDSwitch {
-	/**
-	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected static DTDPackage modelPackage;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public DTDSwitch() {
-		if (modelPackage == null) {
-			modelPackage = DTDPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object doSwitch(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case DTDPackage.DTD_GROUP_CONTENT : {
-					DTDGroupContent dtdGroupContent = (DTDGroupContent) theEObject;
-					Object result = caseDTDGroupContent(dtdGroupContent);
-					if (result == null)
-						result = caseDTDRepeatableContent(dtdGroupContent);
-					if (result == null)
-						result = caseDTDElementContent(dtdGroupContent);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case DTDPackage.DTD_ATTRIBUTE : {
-					DTDAttribute dtdAttribute = (DTDAttribute) theEObject;
-					Object result = caseDTDAttribute(dtdAttribute);
-					if (result == null)
-						result = caseEAttribute(dtdAttribute);
-					if (result == null)
-						result = caseEStructuralFeature(dtdAttribute);
-					if (result == null)
-						result = caseETypedElement(dtdAttribute);
-					if (result == null)
-						result = caseENamedElement(dtdAttribute);
-					if (result == null)
-						result = caseEModelElement(dtdAttribute);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case DTDPackage.DTD_ELEMENT : {
-					DTDElement dtdElement = (DTDElement) theEObject;
-					Object result = caseDTDElement(dtdElement);
-					if (result == null)
-						result = caseEClass(dtdElement);
-					if (result == null)
-						result = caseDTDContent(dtdElement);
-					if (result == null)
-						result = caseEClassifier(dtdElement);
-					if (result == null)
-						result = caseENamedElement(dtdElement);
-					if (result == null)
-						result = caseEModelElement(dtdElement);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case DTDPackage.DTD_EMPTY_CONTENT : {
-					DTDEmptyContent dtdEmptyContent = (DTDEmptyContent) theEObject;
-					Object result = caseDTDEmptyContent(dtdEmptyContent);
-					if (result == null)
-						result = caseDTDElementContent(dtdEmptyContent);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case DTDPackage.DTD_ANY_CONTENT : {
-					DTDAnyContent dtdAnyContent = (DTDAnyContent) theEObject;
-					Object result = caseDTDAnyContent(dtdAnyContent);
-					if (result == null)
-						result = caseDTDElementContent(dtdAnyContent);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case DTDPackage.DTD_PC_DATA_CONTENT : {
-					DTDPCDataContent dtdpcDataContent = (DTDPCDataContent) theEObject;
-					Object result = caseDTDPCDataContent(dtdpcDataContent);
-					if (result == null)
-						result = caseDTDElementContent(dtdpcDataContent);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case DTDPackage.DTD_ELEMENT_REFERENCE_CONTENT : {
-					DTDElementReferenceContent dtdElementReferenceContent = (DTDElementReferenceContent) theEObject;
-					Object result = caseDTDElementReferenceContent(dtdElementReferenceContent);
-					if (result == null)
-						result = caseDTDRepeatableContent(dtdElementReferenceContent);
-					if (result == null)
-						result = caseDTDElementContent(dtdElementReferenceContent);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case DTDPackage.DTD_FILE : {
-					DTDFile dtdFile = (DTDFile) theEObject;
-					Object result = caseDTDFile(dtdFile);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case DTDPackage.DTD_BASIC_TYPE : {
-					DTDBasicType dtdBasicType = (DTDBasicType) theEObject;
-					Object result = caseDTDBasicType(dtdBasicType);
-					if (result == null)
-						result = caseEClass(dtdBasicType);
-					if (result == null)
-						result = caseEClassifier(dtdBasicType);
-					if (result == null)
-						result = caseENamedElement(dtdBasicType);
-					if (result == null)
-						result = caseEModelElement(dtdBasicType);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case DTDPackage.DTD_ENUMERATION_TYPE : {
-					DTDEnumerationType dtdEnumerationType = (DTDEnumerationType) theEObject;
-					Object result = caseDTDEnumerationType(dtdEnumerationType);
-					if (result == null)
-						result = caseEEnum(dtdEnumerationType);
-					if (result == null)
-						result = caseEDataType(dtdEnumerationType);
-					if (result == null)
-						result = caseEClassifier(dtdEnumerationType);
-					if (result == null)
-						result = caseENamedElement(dtdEnumerationType);
-					if (result == null)
-						result = caseEModelElement(dtdEnumerationType);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case DTDPackage.DTD_NOTATION : {
-					DTDNotation dtdNotation = (DTDNotation) theEObject;
-					Object result = caseDTDNotation(dtdNotation);
-					if (result == null)
-						result = caseDTDContent(dtdNotation);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case DTDPackage.DTD_ENTITY : {
-					DTDEntity dtdEntity = (DTDEntity) theEObject;
-					Object result = caseDTDEntity(dtdEntity);
-					if (result == null)
-						result = caseDTDContent(dtdEntity);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case DTDPackage.DTD_EXTERNAL_ENTITY : {
-					DTDExternalEntity dtdExternalEntity = (DTDExternalEntity) theEObject;
-					Object result = caseDTDExternalEntity(dtdExternalEntity);
-					if (result == null)
-						result = caseDTDEntityContent(dtdExternalEntity);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case DTDPackage.DTD_INTERNAL_ENTITY : {
-					DTDInternalEntity dtdInternalEntity = (DTDInternalEntity) theEObject;
-					Object result = caseDTDInternalEntity(dtdInternalEntity);
-					if (result == null)
-						result = caseDTDEntityContent(dtdInternalEntity);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case DTDPackage.DTD_PARAMETER_ENTITY_REFERENCE : {
-					DTDParameterEntityReference dtdParameterEntityReference = (DTDParameterEntityReference) theEObject;
-					Object result = caseDTDParameterEntityReference(dtdParameterEntityReference);
-					if (result == null)
-						result = caseDTDContent(dtdParameterEntityReference);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case DTDPackage.DTD_ENTITY_REFERENCE_CONTENT : {
-					DTDEntityReferenceContent dtdEntityReferenceContent = (DTDEntityReferenceContent) theEObject;
-					Object result = caseDTDEntityReferenceContent(dtdEntityReferenceContent);
-					if (result == null)
-						result = caseDTDRepeatableContent(dtdEntityReferenceContent);
-					if (result == null)
-						result = caseDTDElementContent(dtdEntityReferenceContent);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				default :
-					return defaultCase(theEObject);
-			}
-		}
-		return defaultCase(theEObject);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDFile(DTDFile object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDNotation(DTDNotation object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDContent(DTDContent object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDEntity(DTDEntity object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDEntityContent(DTDEntityContent object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDExternalEntity(DTDExternalEntity object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDInternalEntity(DTDInternalEntity object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDParameterEntityReference(DTDParameterEntityReference object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDEntityReferenceContent(DTDEntityReferenceContent object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDRepeatableContent(DTDRepeatableContent object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDElementReferenceContent(DTDElementReferenceContent object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDElement(DTDElement object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDElementContent(DTDElementContent object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDEmptyContent(DTDEmptyContent object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDAnyContent(DTDAnyContent object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDPCDataContent(DTDPCDataContent object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDGroupContent(DTDGroupContent object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDAttribute(DTDAttribute object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDEnumerationType(DTDEnumerationType object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseDTDBasicType(DTDBasicType object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	// +++++++++++++++++++GENERICRULES.JSED+++++++++++++++++++
-	//
-	// +++++++++++++++++++GENERICRULES.JSED+++++++++++++++++++
-	// // public Object caseENamespace(ENamespace object) {
-	// -------------------GENERICRULES.JSED-------------------
-	// return null;
-	// }
-	// -------------------GENERICRULES.JSED-------------------
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseEClass(EClass object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseEAttribute(EAttribute object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseEEnum(EEnum object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseEModelElement(EModelElement object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseENamedElement(ENamedElement object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseEStructuralFeature(EStructuralFeature object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseEDataType(EDataType object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseETypedElement(ETypedElement object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseEClassifier(EClassifier object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	// +++++++++++++++++++GENERICRULES.JSED+++++++++++++++++++
-	//
-	// +++++++++++++++++++GENERICRULES.JSED+++++++++++++++++++
-	// // public Object caseInternalEClassifier(InternalEClassifier object) {
-	// -------------------GENERICRULES.JSED-------------------
-	// return null;
-	// }
-	// -------------------GENERICRULES.JSED-------------------
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} // DTDSwitch
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDUniqueNameHelper.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDUniqueNameHelper.java
deleted file mode 100644
index e12f6b3..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDUniqueNameHelper.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDNotation;
-
-
-
-public class DTDUniqueNameHelper {
-	public DTDUniqueNameHelper() {
-
-	}
-
-	static public String getUniqueElementName(DTDFile dtdFile) {
-		List elements = dtdFile.listDTDElement();
-		return getUniqueName(elements, "NewElement"); //$NON-NLS-1$
-	}
-
-	static public String getUniqueEntityName(DTDFile dtdFile) {
-		List entities = dtdFile.listDTDEntity();
-		return getUniqueName(entities, "NewEntity"); //$NON-NLS-1$
-	}
-
-	static public String getUniqueNotationName(DTDFile dtdFile) {
-		List notations = dtdFile.listDTDNotation();
-		return getUniqueName(notations, "NewNotation"); //$NON-NLS-1$
-	}
-
-	static public String getUniqueAttributeName(DTDElement element) {
-		List attrs = element.getDTDAttribute();
-		return getUniqueName(attrs, "NewAttribute"); //$NON-NLS-1$
-	}
-
-	static public String getUniqueName(List objs, String token) {
-		int counter = 1;
-
-		boolean uniqueName = false;
-		while (!uniqueName) {
-			String newName = token + new Integer(counter++);
-			uniqueName = true;
-			Iterator iter = objs.iterator();
-			while (iter.hasNext()) {
-				Object obj = iter.next();
-				String objName = getName(obj);
-				if (objName.equals(newName)) {
-					uniqueName = false;
-					break;
-				}
-			}
-			if (uniqueName) {
-				return newName;
-			}
-		}
-		// we shouldn't get here
-		return "No Name found"; //$NON-NLS-1$
-	}
-
-	static public String getName(Object obj) {
-		if (obj instanceof DTDElement) {
-			return ((DTDElement) obj).getName();
-		}
-		else if (obj instanceof DTDEntity) {
-			return ((DTDEntity) obj).getName();
-		}
-		else if (obj instanceof DTDNotation) {
-			return ((DTDNotation) obj).getName();
-		}
-		else if (obj instanceof DTDAttribute) {
-			return ((DTDAttribute) obj).getName();
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-
-	/**
-	 * @generated
-	 */
-	protected static String getUniqueElementNameGen(DTDFile dtdFile) {
-
-		List elements = dtdFile.listDTDElement();
-		return getUniqueName(elements, "NewElement"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected static String getUniqueEntityNameGen(DTDFile dtdFile) {
-
-		List entities = dtdFile.listDTDEntity();
-		return getUniqueName(entities, "NewEntity"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected static String getUniqueNotationNameGen(DTDFile dtdFile) {
-
-		List notations = dtdFile.listDTDNotation();
-		return getUniqueName(notations, "NewNotation"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected static String getUniqueAttributeNameGen(DTDElement element) {
-
-		List attrs = element.getDTDAttribute();
-		return getUniqueName(attrs, "NewAttribute"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected static String getUniqueNameGen(List objs, String token) {
-
-		int counter = 1;
-
-		boolean uniqueName = false;
-		while (!uniqueName) {
-			String newName = token + new Integer(counter++);
-			uniqueName = true;
-			Iterator iter = objs.iterator();
-			while (iter.hasNext()) {
-				Object obj = iter.next();
-				String objName = getName(obj);
-				if (objName.equals(newName)) {
-					uniqueName = false;
-					break;
-				}
-			}
-			if (uniqueName) {
-				return newName;
-			}
-		}
-		// we shouldn't get here
-		return "No Name found"; //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected static String getNameGen(Object obj) {
-
-		if (obj instanceof DTDElement) {
-			return ((DTDElement) obj).getName();
-		}
-		else if (obj instanceof DTDEntity) {
-			return ((DTDEntity) obj).getName();
-		}
-		else if (obj instanceof DTDNotation) {
-			return ((DTDNotation) obj).getName();
-		}
-		else if (obj instanceof DTDAttribute) {
-			return ((DTDAttribute) obj).getName();
-		}
-		return ""; //$NON-NLS-1$
-	}
-}// DTDUniqueNameHelper
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDUtil.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDUtil.java
deleted file mode 100644
index cc0ab38..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDUtil.java
+++ /dev/null
@@ -1,1217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.util;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.wst.dtd.core.internal.emf.DTDConstants;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFactory;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
-import org.eclipse.wst.dtd.core.internal.emf.impl.DTDFactoryImpl;
-import org.eclipse.wst.dtd.core.internal.saxparser.DTD;
-import org.eclipse.wst.dtd.core.internal.saxparser.DTDParser;
-import org.eclipse.wst.dtd.core.internal.saxparser.ErrorMessage;
-
-/**
- * Create MOF objects from the parsed DTD If no DTD file is specifed, create
- * the root MOF object
- */
-public class DTDUtil {
-	DTDFactory factory;
-	EList extent;
-	Resource resource;
-	DTDFile dtdFile;
-	String dtdModelFile;
-	boolean expandEntityReferences;
-
-	private Hashtable externalDTDModels = new Hashtable();
-	private Hashtable pePool = new Hashtable();
-	private Hashtable elementPool = new Hashtable();
-
-	private DTDParser parser;
-
-	private Vector errorMsgs = new Vector();
-
-	private static Hashtable utilCache = new Hashtable();
-
-	static public DTDUtil getDTDUtilFor(String filename) {
-		DTDUtil util = (DTDUtil) utilCache.get(filename);
-		if (util == null) {
-			util = new DTDUtil();
-			utilCache.put(filename, util);
-		}
-
-		return util;
-	}
-
-
-	public void parse(String uri) {
-		parse(new ResourceSetImpl(), uri);
-	}
-
-	/**
-	 * Invoke parse to parse a .dtd file into a MOF object model This is
-	 * invoked by the RegisteredDTDParser that registers this parser for MOF
-	 * to use against the .dtd type
-	 * 
-	 * @param filename -
-	 *            the fully qualifed name of a .dtd file
-	 */
-	public void parse(ResourceSet resources, String filename) {
-		// Get the dtd name from the file name
-		Path path = new Path(filename);
-		IPath iPath = path.removeFileExtension();
-		String dtdName = iPath.toFile().getName();
-
-		try {
-			parser = new DTDParser(false);
-			if (expandEntityReferences) {
-				parser.setExpandEntityReferences(expandEntityReferences);
-			}
-			parser.parse(filename);
-		}
-		catch (IOException ex) {
-			ex.printStackTrace(System.err);
-		}
-
-		dtdModelFile = filename;
-
-		factory = DTDFactoryImpl.instance();
-
-		extent = new BasicEList();
-
-		dtdFile = factory.createDTDFile();
-		extent.add(dtdFile);
-
-		dtdFile.setName(dtdName);
-
-		populateDTD(resources, expandEntityReferences);
-	}
-
-	public DTDFactory getFactory() {
-		return factory;
-	}
-
-	public DTDFile getDTDFile() {
-		return dtdFile;
-	}
-
-	public Hashtable getPEPool() {
-		return pePool;
-	}
-
-	public Hashtable getElementPool() {
-		return elementPool;
-	}
-
-	public EList getContents() {
-		return extent;
-	}
-
-	public void setResource(Resource resource) {
-		this.resource = resource;
-	}
-
-	public Resource getResource(Resource resource) {
-		return resource;
-	}
-
-	public void setexpandEntityReferences(boolean expandEntityReferences) {
-		this.expandEntityReferences = expandEntityReferences;
-	}
-
-	public boolean getExpandEntityReferences() {
-		return expandEntityReferences;
-	}
-
-	/**
-	 * Return true if the model has been modified
-	 */
-	public boolean isModelDirty() {
-		if (resource != null) {
-			return resource.isModified();
-		}
-		return false;
-	}
-
-	/**
-	 * Save the .dtd file
-	 */
-	public boolean save() {
-		try {
-			Map options = new HashMap();
-			resource.save(options);
-			return true;
-		}
-		catch (Exception ex) {
-			System.out.println("Save model exception " + ex); //$NON-NLS-1$
-			ex.printStackTrace();
-			return false;
-		}
-	}
-
-	public boolean saveAs(String newFilename) {
-		resource.setURI(URI.createURI(newFilename));
-		boolean ok = save();
-
-		if (ok) {
-			Path path = new Path(newFilename);
-			IPath iPath = path.removeFileExtension();
-			String dtdName = iPath.toFile().getName();
-
-			dtdFile.setName(dtdName);
-		}
-		return ok;
-	}
-
-	public boolean saveDTDFile(String filename) {
-		boolean result = true;
-		try {
-			PrintWriter pw = new PrintWriter(new FileWriter(filename), true);
-			DTDPrinter printer = new DTDPrinter(true);
-			printer.visitDTDFile(dtdFile);
-
-			String s = printer.getBuffer().toString();
-			pw.println(s);
-			pw.close();
-		}
-
-		catch (Exception e) {
-			result = false;
-		}
-		return result;
-	}
-
-	public String getDTDSource(boolean includeError) {
-		return dtdFile.unparse(includeError); // true = include error lines
-	}
-
-	/**
-	 * Create MOF objects from DTD
-	 */
-	private void populateDTD(ResourceSet resources, boolean expandEntityReferences) {
-		Vector dtdList = parser.getDTDList();
-
-		// create XMIModel for the included DTDs
-		if (dtdList.size() > 0) {
-			if (!expandEntityReferences) {
-				for (int i = dtdList.size() - 1; i > 0; i--) {
-					DTD dtd = (DTD) dtdList.elementAt(i);
-					loadIncludedDTD(resources, dtd);
-				}
-
-				DTD dtd = (DTD) dtdList.elementAt(0);
-				populateDTD(resources, dtd, dtdFile); // populate the main
-														// DTD
-				// validateWithModel(dtd);
-			}
-			else {
-				for (int i = dtdList.size() - 1; i >= 0; i--) {
-					DTD dtd = (DTD) dtdList.elementAt(i);
-					populateDTD(resources, dtd, dtdFile);
-					// validateWithModel(dtd);
-				}
-			}
-		}
-	}
-
-	// return the instance unique to this DTDUtil file that represents an
-	// externally loaded dtd (will create if one doesn't exist yet)
-	public ExternalDTDModel getExternalDTDModel(ResourceSet resources, String uri) {
-		if (expandEntityReferences) {
-			return null;
-		}
-
-		// DefaultMsgLogger.write("External DTD name: " + uri);
-
-		if (externalDTDModels.containsKey(uri)) {
-			return (ExternalDTDModel) externalDTDModels.get(uri);
-		}
-		else {
-			ExternalDTDModel extModel = new ExternalDTDModel();
-			if (extModel.loadModel(resources, uri)) {
-				externalDTDModels.put(uri, extModel);
-				return extModel;
-			}
-		}
-		return null;
-	}
-
-	// load xmiModels for included DTDs
-	private void loadIncludedDTD(ResourceSet resources, DTD dtd) {
-		ExternalDTDModel extModel = getExternalDTDModel(resources, dtd.getName());
-		if (extModel != null) {
-			// now fill our hash tables for elements and parameter entities
-			// so that we know what can be referenced by our main dtd
-			DTDFile file = extModel.getExternalDTDFile();
-			Collection elementList = file.listDTDElement();
-			Collection entityList = file.listDTDEntity();
-
-			Iterator i = elementList.iterator();
-			while (i.hasNext()) {
-				DTDObject object = (DTDObject) i.next();
-				elementPool.put(getBaseName(object), object);
-			}
-
-			i = entityList.iterator();
-			while (i.hasNext()) {
-				DTDEntity entity = (DTDEntity) i.next();
-				if (entity.isParameterEntity()) {
-					pePool.put(getBaseName(entity), entity);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Create MOF objects from DTD
-	 * 
-	 * 1) will create the corresponding DTD Mof object for EntityDecl,
-	 * NotationDecl and ElementDecl declarations during the 1st pass 2) During
-	 * the 2nd pass, it will add the contentModel and Attlist to all
-	 * ElementDecl.
-	 * 
-	 */
-	private void populateDTD(ResourceSet resources, DTD dtd, DTDFile dFile) {
-		DTDModelBuilder modelBuilder = new DTDModelBuilder(resources, this, dtd, dFile);
-
-		modelBuilder.visitDTD(dtd);
-	}
-
-
-	public void emptyErrorMessages() {
-		errorMsgs.removeAllElements();
-	}
-
-	public void addErrorMessage(ErrorMessage error) {
-		int vectorSize = errorMsgs.size();
-		boolean add = true;
-
-		if (vectorSize != 0) {
-			int index = 0;
-
-			while (add == true && index < vectorSize) {
-				if (((ErrorMessage) errorMsgs.elementAt(index)).equals(error)) {
-					add = false;
-				}
-				else {
-					index++;
-				}
-			}
-		}
-
-		if (add) {
-			errorMsgs.addElement(error);
-		}
-	}
-
-	public Vector getErrors() {
-		return errorMsgs;
-	}
-
-	// This gets the name without any pseudo namespace prefix
-	public static String getBaseName(DTDObject obj) {
-		return getName(obj, null);
-	}
-
-	// This gets the name with pseudo namespace prefixes if dtdFile is not
-	// null
-	public static String getName(DTDObject obj, DTDFile dtdFile) {
-		String name = ""; //$NON-NLS-1$
-		if (obj instanceof DTDEntity) {
-			DTDEntity entity = (DTDEntity) obj;
-			if (dtdFile != null && !entity.getDTDFile().equals(dtdFile)) {
-				name = new Path(entity.getDTDFile().getName()).lastSegment() + ": "; //$NON-NLS-1$
-			}
-			name += "%" + ((DTDEntity) obj).getName() + ";"; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		else if (obj instanceof DTDElement) {
-			DTDElement element = (DTDElement) obj;
-			if (dtdFile != null && !element.getDTDFile().equals(dtdFile)) {
-				name = new Path(element.getDTDFile().getName()).lastSegment() + ": "; //$NON-NLS-1$
-			}
-			name += ((DTDElement) obj).getName();
-		}
-		else if (obj instanceof DTDElementContent) {
-			return ((DTDElementContent) obj).getContentName();
-		}
-		return name;
-	}
-
-	public static String getGroupType(int groupKind, int occurrence) {
-		String type = null;
-
-		switch (groupKind) {
-			case DTDGroupKind.SEQUENCE :
-				type = "DTDSequence"; //$NON-NLS-1$
-				break;
-			case DTDGroupKind.CHOICE :
-				type = "DTDChoice"; //$NON-NLS-1$
-				break;
-		}
-
-		type += getRepeatableTypeSuffix(occurrence);
-		return type;
-	}
-
-	public static String getReferenceType(int occurrence) {
-		String type = "DTDReference"; //$NON-NLS-1$
-		type += getRepeatableTypeSuffix(occurrence);
-		return type;
-	}
-
-	private static String getRepeatableTypeSuffix(int occurrence) {
-		return "(" + (char) occurrence + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public static void main(String args[]) {
-		System.out.println("\nStarting ..."); //$NON-NLS-1$
-
-		if (args.length != 1)
-			System.out.println("usage: DtdUtil inputfile.dtd"); //$NON-NLS-1$
-
-		java.io.File inputFile = new File(args[0]);
-
-		String dtdFileName = ""; //$NON-NLS-1$
-		try {
-			dtdFileName = inputFile.getCanonicalPath();
-		}
-		catch (IOException ex) {
-		}
-
-		String dtdModelName = dtdFileName;
-
-		if (DTDConstants.DTD_EXTENSION.equals(new Path(dtdFileName).getFileExtension())) {
-			dtdModelName = new Path(dtdFileName).removeFileExtension().lastSegment();
-		}
-		DTDUtil d2m = new DTDUtil();
-		// TODO: fix port
-		// d2m.parse(dtdFileName);
-		try {
-			d2m.saveAs(dtdModelName + "." + DTDConstants.DTD_XMI_EXTENSION); //$NON-NLS-1$
-		}
-		catch (Exception e) {
-			System.out.println("Exception thrown during model save: " + e); //$NON-NLS-1$
-		}
-		System.out.println("Done."); //$NON-NLS-1$
-	}
-
-	public org.eclipse.core.runtime.IPath getPath() {
-		Path currentDTDPath = new Path(dtdModelFile);
-		if (currentDTDPath.segmentCount() > 1) {
-			return currentDTDPath.removeLastSegments(1).addTrailingSeparator();
-		}
-
-		return new Path(""); //$NON-NLS-1$
-	}
-
-	// /**
-	// * @generated
-	// */
-	// protected static DTDUtil getDTDUtilForGen(String filename) {
-	//
-	// DTDUtil util = (DTDUtil) utilCache.get(filename);
-	// if (util == null)
-	// {
-	// util = new DTDUtil();
-	// utilCache.put(filename, util);
-	// }
-	//    
-	// return util;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void parseGen(String uri) {
-	//                           
-	// parse(new ResourceSetImpl(), uri);
-	// }
-	// /**
-	// * Invoke parse to parse a .dtd file into a MOF object model
-	// * This is invoked by the RegisteredDTDParser that registers this parser
-	// for MOF to use
-	// * against the .dtd type
-	// * @param filename - the fully qualifed name of a .dtd file
-	// */
-	// protected void parseGen(ResourceSet resources, String filename) {
-	//
-	// // Get the dtd name from the file name
-	// Path path = new Path(filename);
-	// IPath iPath = path.removeFileExtension();
-	// String dtdName = iPath.toFile().getName();
-	//
-	//
-	// try
-	// {
-	// parser = new DTDParser(false);
-	// if (expandEntityReferences)
-	// {
-	// parser.setExpandEntityReferences(expandEntityReferences);
-	// }
-	// parser.parse(filename);
-	// }
-	// catch(IOException ex)
-	// {
-	// ex.printStackTrace(System.err);
-	// }
-	//
-	//
-	// dtdModelFile = filename;
-	//
-	//
-	// factory = DTDFactoryImpl.instance();
-	//
-	//
-	// extent = new BasicEList();
-	//
-	//
-	// dtdFile = factory.createDTDFile();
-	// extent.add(dtdFile);
-	//
-	//
-	// dtdFile.setName(dtdName);
-	//
-	//
-	// populateDTD(resources, expandEntityReferences);
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected DTDFactory getFactoryGen() {
-	//
-	// return factory;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected DTDFile getDTDFileGen() {
-	//
-	// return dtdFile;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected Hashtable getPEPoolGen() {
-	//
-	// return pePool;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected Hashtable getElementPoolGen() {
-	//
-	// return elementPool;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected EList getExtentGen() {
-	//
-	// return extent;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void setResourceGen(Resource resource) {
-	//
-	// this.resource = resource;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected Resource getResourceGen(Resource resource) {
-	//
-	// return resource;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void setexpandEntityReferencesGen(boolean
-	// expandEntityReferences) {
-	//
-	// this.expandEntityReferences = expandEntityReferences;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected boolean getExpandEntityReferencesGen() {
-	//
-	// return expandEntityReferences;
-	// }
-	// /**
-	// * Return true if the model has been modified
-	// */
-	// protected boolean isModelDirtyGen() {
-	//
-	// if (resource != null)
-	// {
-	// return resource.isModified();
-	// }
-	// return false;
-	// }
-	// /**
-	// * Save the .dtd file
-	// */
-	// protected boolean saveGen() {
-	//
-	// try
-	// {
-	// resource.save();
-	// return true;
-	// }
-	// catch (Exception ex)
-	// {
-	// System.out.println("Save model exception " + ex);
-	// ex.printStackTrace();
-	// return false;
-	// }
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected boolean saveAsGen(String newFilename) {
-	//
-	// resource.setURI(newFilename);
-	// boolean ok = save();
-	//
-	//
-	// if (ok)
-	// {
-	// Path path = new Path(newFilename);
-	// IPath iPath = path.removeFileExtension();
-	// String dtdName = iPath.toFile().getName();
-	//
-	//
-	// dtdFile.setName(dtdName);
-	// }
-	// return ok;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected boolean saveDTDFileGen(String filename) {
-	//
-	// boolean result=true;
-	// try
-	// {
-	// PrintWriter pw = new PrintWriter(new FileWriter(filename),true);
-	// DTDPrinter printer = new DTDPrinter(true);
-	// printer.visitDTDFile(dtdFile);
-	//
-	//
-	// String s = printer.getBuffer().getName().toString();
-	// pw.println(s);
-	// pw.close();
-	// }
-	//
-	//
-	// catch (Exception e)
-	// {
-	// result = false;
-	// }
-	// return result;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected String getDTDSourceGen(boolean includeError) {
-	//
-	// return dtdFile.unparse(includeError); // true = include error lines
-	// }
-	// /**
-	// * Create MOF objects from DTD
-	// */
-	// protected void populateDTDGen(ResourceSet resources, boolean
-	// expandEntityReferences) {
-	//
-	// Vector dtdList = parser.getDTDList();
-	//
-	//
-	// // create XMIModel for the included DTDs
-	// if ( dtdList.size() > 0)
-	// {
-	// if (!expandEntityReferences)
-	// {
-	// for (int i=dtdList.size() - 1; i > 0; i--)
-	// {
-	// DTD dtd = (DTD) dtdList.elementAt(i);
-	// loadIncludedDTD(resources, dtd);
-	// }
-	//
-	//
-	// DTD dtd = (DTD) dtdList.elementAt(0);
-	// populateDTD(resources, dtd, dtdFile); // populate the main DTD
-	// // validateWithModel(dtd);
-	// }
-	// else
-	// {
-	// for (int i = dtdList.size() - 1; i >= 0; i--)
-	// {
-	// DTD dtd = (DTD) dtdList.elementAt(i);
-	// populateDTD(resources, dtd, dtdFile);
-	// // validateWithModel(dtd);
-	// }
-	// }
-	// }
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected ExternalDTDModel getExternalDTDModelGen(ResourceSet
-	// resources, String uri) {
-	//
-	// if (expandEntityReferences)
-	// {
-	// return null;
-	// }
-	//       
-	// DefaultMsgLogger.write("External DTD name: " + uri);
-	//
-	//
-	// if (externalDTDModels.containsKey(uri))
-	// {
-	// return (ExternalDTDModel) externalDTDModels.get(uri);
-	// }
-	// else
-	// {
-	// ExternalDTDModel extModel = new ExternalDTDModel();
-	// if (extModel.loadModel(resources, uri))
-	// {
-	// externalDTDModels.put(uri, extModel);
-	// return extModel;
-	// }
-	// }
-	// return null;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void loadIncludedDTDGen(ResourceSet resources, DTD dtd) {
-	//
-	// ExternalDTDModel extModel = getExternalDTDModel(resources,
-	// dtd.getName());
-	// if (extModel != null)
-	// {
-	// // now fill our hash tables for elements and parameter entities
-	// // so that we know what can be referenced by our main dtd
-	// DTDFile file = extModel.getExternalDTDFile();
-	// Collection elementList = file.listDTDElement();
-	// Collection entityList = file.listDTDEntity();
-	//
-	//
-	// Iterator i = elementList.iterator();
-	// while (i.hasNext())
-	// {
-	// DTDObject object = (DTDObject) i.next();
-	// elementPool.put(getBaseName(object), object);
-	// }
-	//      
-	// i = entityList.iterator();
-	// while (i.hasNext())
-	// {
-	// DTDEntity entity = (DTDEntity) i.next();
-	// if (entity.isParameterEntity())
-	// {
-	// pePool.put(getBaseName(entity), entity);
-	// }
-	// }
-	// }
-	// }
-	// /**
-	// * Create MOF objects from DTD
-	// *
-	// * 1) will create the corresponding DTD Mof object for EntityDecl,
-	// NotationDecl
-	// * and ElementDecl declarations during the 1st pass
-	// * 2) During the 2nd pass, it will add the contentModel and Attlist to
-	// all
-	// * ElementDecl.
-	// *
-	// */
-	// protected void populateDTDGen(ResourceSet resources, DTD dtd, DTDFile
-	// dFile) {
-	//
-	// DTDModelBuilder modelBuilder = new DTDModelBuilder(resources, this,
-	// dtd, dFile);
-	//
-	//
-	// modelBuilder.visitDTD(dtd);
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void emptyErrorMessagesGen() {
-	//
-	// errorMsgs.removeAllElements();
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void addErrorMessageGen(ErrorMessage error) {
-	//
-	// int vectorSize = errorMsgs.size();
-	// boolean add = true;
-	//
-	//
-	// if (vectorSize != 0)
-	// {
-	// int index = 0;
-	//
-	//
-	// while (add == true && index < vectorSize)
-	// {
-	// if (((ErrorMessage) errorMsgs.elementAt(index)).equals(error))
-	// {
-	// add =false;
-	// }
-	// else
-	// {
-	// index++;
-	// }
-	// }
-	// }
-	//
-	//
-	// if (add)
-	// {
-	// errorMsgs.addElement(error);
-	// }
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected Vector getErrorsGen() {
-	//
-	// return errorMsgs;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected boolean validateDTDGen() {
-	//
-	// String tempDTDFile=getPath().toOSString()+"tempValidatingFileName.dtd";
-	// try
-	// {
-	// saveDTDFile(tempDTDFile);
-	//
-	//
-	// parser = new DTDParser(false);
-	// if (FileUtility.fileExists(tempDTDFile))
-	// {
-	// parser.parse(tempDTDFile);
-	// }
-	// Vector dtdList = parser.getDTDList();
-	// if ( dtdList.size() > 0)
-	// {
-	// // reset the errors and update what we have in the element pool
-	// emptyErrorMessages();
-	// updateElementHashtable();
-	//
-	//
-	// // TODO: do we just validate the current one?
-	// validateWithModel((DTD)dtdList.elementAt(0));
-	// }
-	// }
-	// catch(IOException ex)
-	// {
-	// ex.printStackTrace(System.err);
-	// FileUtility.delete(tempDTDFile);
-	// }
-	// FileUtility.delete(tempDTDFile);
-	//
-	//
-	// return dtdFile.isParseError();
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void validateWithModelGen(DTD dtd) {
-	//
-	// Enumeration en = dtd.externalElements();
-	// while (en.hasMoreElements())
-	// {
-	// Object e = en.nextElement();
-	//
-	//
-	// if ( e instanceof EntityDecl )
-	// {
-	// EntityDecl entity = (EntityDecl) e;
-	// ErrorMessage errMsg = entity.getErrorMessage();
-	// if ( errMsg!= null)
-	// {
-	// addErrorMessage(errMsg);
-	// // dtdFile.setParseError(true);
-	// }
-	// }
-	// else if ( e instanceof ElementDecl )
-	// {
-	// ElementDecl elem = (ElementDecl) e;
-	// ErrorMessage errMsg = elem.getErrorMessage();
-	// DTDElement dtdelement = (DTDElement)
-	// getElementPool().get(elem.getNodeName());
-	//
-	//
-	// if ( errMsg!= null)
-	// {
-	// addErrorMessage(errMsg);
-	// }
-	// checkForMissingElementReferences(dtdelement);
-	// }
-	// else if ( e instanceof NotationDecl )
-	// {
-	// NotationDecl notation = (NotationDecl) e;
-	// ErrorMessage errMsg = notation.getErrorMessage();
-	// if ( errMsg!= null)
-	// {
-	// addErrorMessage(errMsg);
-	// }
-	// }
-	// else if ( e instanceof Attlist )
-	// {
-	// Attlist attList = (Attlist) e;
-	// ErrorMessage errMsg = attList.getErrorMessage();
-	// if ( errMsg!= null)
-	// {
-	// addErrorMessage(errMsg);
-	// }
-	// }
-	// }
-	//
-	//
-	// checkForDuplicateIDAttribute();
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void updateElementHashtableGen() {
-	//
-	// elementPool.clear();
-	// CreateListItems itemsHelper = new CreateListItems(dtdFile);
-	//
-	//
-	// Vector allElements = itemsHelper.getElements();
-	// // go through all the dtdFiles and list the elements
-	// int numElements = allElements.size();
-	//
-	//
-	// for (int i = 0; i < numElements; i++)
-	// {
-	// DTDElement element = (DTDElement) allElements.elementAt(i);
-	// elementPool.put(getBaseName(element), element);
-	// }
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void updateEntityHashtableGen() {
-	//
-	// updateHashTable(pePool, dtdFile.listDTDEntity());
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void updateHashTableGen(Hashtable h, Collection dtdObjects) {
-	//
-	// h.clear();
-	// Iterator i = dtdObjects.iterator();
-	// while (i.hasNext())
-	// {
-	// String name = "";
-	// DTDObject o = (DTDObject) i.next();
-	// name = getBaseName(o);
-	// h.put(name,o);
-	// }
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected static String getBaseNameGen(DTDObject obj) {
-	//
-	// return getName(obj, null);
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected static String getNameGen(DTDObject obj, DTDFile dtdFile) {
-	//
-	// String name = "";
-	// if (obj instanceof DTDEntity)
-	// {
-	// DTDEntity entity = (DTDEntity) obj;
-	// if (dtdFile != null &&
-	// !entity.getDTDFile().equals(dtdFile))
-	// {
-	// name = new Path(entity.getDTDFile().getName()).lastSegment() + ": ";
-	// }
-	// name += "%" + ((DTDEntity)obj).getName() + ";";
-	// }
-	// else if (obj instanceof DTDElement)
-	// {
-	// DTDElement element = (DTDElement) obj;
-	// if (dtdFile != null &&
-	// !element.getDTDFile().equals(dtdFile))
-	// {
-	// name = new Path(element.getDTDFile().getName()).lastSegment() + ": ";
-	// }
-	// name += ((DTDElement)obj).getName();
-	// }
-	// else if (obj instanceof DTDElementContent)
-	// {
-	// return ((DTDElementContent) obj).getContentName();
-	// }
-	// return name;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void checkForMissingElementReferencesGen(DTDElement element)
-	// {
-	//
-	// String dtdString = null;
-	// if ( element == null )
-	// return;
-	//
-	//
-	// Vector elementRefs = new Vector();
-	// findElementReferences(element.getContent(),elementRefs);
-	//
-	//
-	// Enumeration en = elementRefs.elements();
-	// while (en.hasMoreElements())
-	// {
-	// String elementRefName = "";
-	// DTDObject dtdObject = (DTDObject) en.nextElement();
-	//
-	//
-	// if ( dtdObject instanceof DTDElement)
-	// {
-	// elementRefName = ((DTDElement)dtdObject).getName();
-	// if ( getElementPool().get(elementRefName) == null)
-	// {
-	// if (dtdString == null)
-	// {
-	// dtdString = getDTDSource(false);
-	// }
-	// String errorMsg = "Element \"" + element.getName() + "\", refers to
-	// undeclared element "
-	// + "\"" + elementRefName + "\", in content model.\n";
-	// ErrorMessage dtdError = new ErrorMessage();
-	// dtdError.setErrorMessage(errorMsg);
-	// SourceLocationHelper.LineColumn lineColumn =
-	// SourceLocationHelper.offsetToLineColumn(dtdString,
-	// element.getStartOffset());
-	// dtdError.setErrorLine(lineColumn.getLine());
-	// dtdError.setErrorColumn(lineColumn.getColumn());
-	// addErrorMessage(dtdError);
-	// }
-	// }
-	// }
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void findElementReferencesGen(DTDElementContent content,
-	// Vector result) {
-	//
-	//
-	// if (content instanceof DTDElementReferenceContent)
-	// {
-	// result.addElement(((DTDElementReferenceContent)content).getReferencedElement());
-	// }
-	// else if (content instanceof DTDEntityReferenceContent)
-	// {
-	// result.addElement(((DTDEntityReferenceContent)content).getElementReferencedEntity());
-	// }
-	// else if (content instanceof DTDGroupContent)
-	// {
-	// DTDGroupContent group = (DTDGroupContent)content;
-	// EList contents = group.getContent();
-	// Iterator i = contents.iterator();
-	// while (i.hasNext())
-	// {
-	// findElementReferences((DTDElementContent) i.next(), result);
-	// }
-	// }
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected void checkForDuplicateIDAttributeGen() {
-	//
-	// String dtdString = null;
-	// Collection elements = dtdFile.listDTDElement();
-	// Iterator i = elements.iterator();
-	// while (i.hasNext())
-	// {
-	// DTDElement element = (DTDElement) i.next();
-	// Iterator k = element.getDTDAttribute().iterator();
-	// boolean saw1stID = false;
-	// while (k.hasNext())
-	// {
-	// DTDAttribute attr = (DTDAttribute) k.next();
-	// DTDType dType = attr.getDTDType();
-	// if (dType instanceof DTDBasicType)
-	// {
-	// if ( ((DTDBasicType)dType).getKind().intValue() == DTDBasicTypeKind.ID)
-	// {
-	// if (saw1stID)
-	// {
-	// if (dtdString == null)
-	// {
-	// dtdString = getDTDSource(false);
-	// }
-	// String errMsg = DTDPlugin.getDTDString("_ERROR_DUP_ID_ATTRIBUTE_1");
-	// errMsg += attr.getName() +
-	// DTDPlugin.getDTDString("_UI_ERRORPART_DUP_ID_ATTRIBUTE_2");
-	//              
-	// ErrorMessage dtdError = new ErrorMessage();
-	// dtdError.setErrorMessage(errMsg);
-	// SourceLocationHelper.LineColumn lineColumn =
-	// SourceLocationHelper.offsetToLineColumn(dtdString,
-	// attr.getStartOffset());
-	// dtdError.setErrorLine(lineColumn.getLine());
-	// dtdError.setErrorColumn(lineColumn.getColumn());
-	// dtdError.setObject(attr);
-	// addErrorMessage(dtdError);
-	// // dtdFile.setParseError(true);
-	// break;
-	// }
-	// else
-	// {
-	// saw1stID = true;
-	// }
-	// }
-	// }
-	// }
-	// }
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected static String getGroupTypeGen(int groupKind, int occurrence)
-	// {
-	//
-	// String type = null;
-	//
-	//
-	// switch (groupKind)
-	// {
-	// case DTDGroupKind.SEQUENCE:
-	// type = "DTDSequence";
-	// break;
-	// case DTDGroupKind.CHOICE:
-	// type = "DTDChoice";
-	// break;
-	// }
-	//
-	//
-	// type += getRepeatableTypeSuffix(occurrence);
-	// return type;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected static String getReferenceTypeGen(int occurrence) {
-	//
-	// String type = "DTDReference";
-	// type += getRepeatableTypeSuffix(occurrence);
-	// return type;
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected static String getRepeatableTypeSuffixGen(int occurrence) {
-	//
-	// return "(" + (char)occurrence + ")";
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected static void mainGen(String[] args) {
-	//
-	// System.out.println("\nStarting ...");
-	//
-	//
-	// if (args.length != 1)
-	// System.out.println("usage: DtdUtil inputfile.dtd");
-	//
-	//
-	// java.io.File inputFile = new File(args[0]);
-	//
-	//
-	// String dtdFileName = "";
-	// try
-	// {
-	// dtdFileName = inputFile.getCanonicalPath();
-	// }
-	// catch(IOException ex)
-	// {}
-	//
-	//
-	// String dtdModelName = dtdFileName;
-	//
-	//
-	// if (DTDConstants.DTD_EXTENSION.equals(new
-	// Path(dtdFileName).getFileExtension()))
-	// {
-	// dtdModelName= new
-	// Path(dtdFileName).removeFileExtension().lastSegment();
-	// }
-	// DTDUtil d2m = new DTDUtil();
-	// // TODO: fix port
-	// // d2m.parse(dtdFileName);
-	// try
-	// {
-	// d2m.saveAs(dtdModelName + "." + DTDConstants.DTD_XMI_EXTENSION);
-	// }
-	// catch (Exception e)
-	// {
-	// System.out.println("Exception thrown during model save: " + e);
-	// }
-	// System.out.println("Done.");
-	// }
-	// /**
-	// * @generated
-	// */
-	// protected org.eclipse.core.runtime.IPath getPathGen() {
-	//
-	// Path currentDTDPath = new Path(dtdModelFile);
-	// if (currentDTDPath.segmentCount() > 1)
-	// {
-	// return currentDTDPath.removeLastSegments(1).addTrailingSeparator();
-	// }
-	//    
-	// return new Path("");
-	// }
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDVisitor.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDVisitor.java
deleted file mode 100644
index f65a422..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDVisitor.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.util;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.dtd.core.internal.emf.DTDAnyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElementReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEmptyContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntity;
-import org.eclipse.wst.dtd.core.internal.emf.DTDEntityReferenceContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDGroupKind;
-import org.eclipse.wst.dtd.core.internal.emf.DTDNotation;
-import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
-import org.eclipse.wst.dtd.core.internal.emf.DTDPCDataContent;
-import org.eclipse.wst.dtd.core.internal.emf.DTDParameterEntityReference;
-import org.eclipse.wst.dtd.core.internal.emf.DTDRepeatableContent;
-
-
-
-public class DTDVisitor {
-
-	public DTDVisitor() {
-	}
-
-	public void visitDTDFile(DTDFile file) {
-		Collection notations = file.listDTDNotation();
-		for (Iterator i = notations.iterator(); i.hasNext();) {
-			visitDTDNotation((DTDNotation) i.next());
-		}
-
-		Collection entities = file.listDTDEntity();
-		for (Iterator i = entities.iterator(); i.hasNext();) {
-			visitDTDEntity((DTDEntity) i.next());
-		}
-
-		Collection objects = file.listDTDElementAndDTDParameterEntityReference();
-		for (Iterator i = objects.iterator(); i.hasNext();) {
-			DTDObject object = (DTDObject) i.next();
-			if (object instanceof DTDElement) {
-				visitDTDElement((DTDElement) object);
-			} // end of if ()
-			else {
-				visitDTDParameterEntityReference((DTDParameterEntityReference) object);
-			} // end of if ()
-		}
-
-	}
-
-	public void visitDTDNotation(DTDNotation notation) {
-	}
-
-	public void visitDTDEntity(DTDEntity entity) {
-	}
-
-	public void visitDTDElement(DTDElement element) {
-		visitDTDElementContent(element.getContent());
-		visitDTDAttributeList(element.getDTDAttribute());
-	}
-
-	public void visitDTDParameterEntityReference(DTDParameterEntityReference parmEntity) {
-
-	}
-
-	public void visitDTDElementContent(DTDElementContent content) {
-		// System.out.println("visitDTDElementContent : " + content);
-		if (content instanceof DTDEmptyContent) {
-			visitDTDEmptyContent((DTDEmptyContent) content);
-		}
-		else if (content instanceof DTDAnyContent) {
-			visitDTDAnyContent((DTDAnyContent) content);
-		}
-		else if (content instanceof DTDPCDataContent) {
-			visitDTDPCDataContent((DTDPCDataContent) content);
-		}
-		if (content instanceof DTDRepeatableContent) {
-			if (content instanceof DTDGroupContent) {
-				visitDTDGroupContent((DTDGroupContent) content);
-			}
-			else if (content instanceof DTDElementReferenceContent) {
-				visitDTDElementReferenceContent((DTDElementReferenceContent) content);
-			}
-			else {
-				visitDTDEntityReferenceContent((DTDEntityReferenceContent) content);
-			} // end of else
-
-			// System.out.println("occurrence: " +
-			// (char)((DTDRepeatableContent)content).getOccurrence());
-		}
-	}
-
-	public void visitDTDEmptyContent(DTDEmptyContent dtdEmptyContent) {
-		// System.out.println("content: EMPTY");
-	}
-
-	public void visitDTDAnyContent(DTDAnyContent dtdAnyContent) {
-		// System.out.println("content: ANY");
-	}
-
-	public void visitDTDPCDataContent(DTDPCDataContent pcDataContent) {
-		// System.out.println("content: PCDATA");
-	}
-
-	public void visitDTDGroupContent(DTDGroupContent groupContent) {
-		if (groupContent.getGroupKind().getValue() == DTDGroupKind.SEQUENCE) {
-			// System.out.println("content: Sequence");
-		}
-		else // if (contentgetGroupKind() == DTDGroupKind.CHOICE)
-		{
-			// System.out.println("content: Choice");
-		}
-
-		Collection groupContents = groupContent.getContent();
-		for (Iterator i = groupContents.iterator(); i.hasNext();) {
-			visitDTDElementContent((DTDElementContent) i.next());
-		}
-	}
-
-	public void visitDTDElementReferenceContent(DTDElementReferenceContent elementReferenceContent) {
-	}
-
-	public void visitDTDEntityReferenceContent(DTDEntityReferenceContent entityReferenceContent) {
-	}
-
-	public void visitDTDAttributeList(List attrs) {
-		Iterator iter = attrs.iterator();
-
-		while (iter.hasNext()) {
-			visitDTDAttribute((DTDAttribute) iter.next());
-		} // end of while ()
-	}
-
-	public void visitDTDAttribute(DTDAttribute attribute) {
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDFileGen(DTDFile file) {
-
-		Collection notations = file.listDTDNotation();
-		for (Iterator i = notations.iterator(); i.hasNext();) {
-			visitDTDNotation((DTDNotation) i.next());
-		}
-
-		Collection entities = file.listDTDEntity();
-		for (Iterator i = entities.iterator(); i.hasNext();) {
-			visitDTDEntity((DTDEntity) i.next());
-		}
-
-		Collection objects = file.listDTDElementAndDTDParameterEntityReference();
-		for (Iterator i = objects.iterator(); i.hasNext();) {
-			DTDObject object = (DTDObject) i.next();
-			if (object instanceof DTDElement) {
-				visitDTDElement((DTDElement) object);
-			} // end of if ()
-			else {
-				visitDTDParameterEntityReference((DTDParameterEntityReference) object);
-			} // end of if ()
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDNotationGen(DTDNotation notation) {
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDEntityGen(DTDEntity entity) {
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDElementGen(DTDElement element) {
-
-		visitDTDElementContent(element.getContent());
-		visitDTDAttributeList(element.getDTDAttribute());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDParameterEntityReferenceGen(DTDParameterEntityReference parmEntity) {
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDElementContentGen(DTDElementContent content) {
-
-		// System.out.println("visitDTDElementContent : " + content);
-		if (content instanceof DTDEmptyContent) {
-			visitDTDEmptyContent((DTDEmptyContent) content);
-		}
-		else if (content instanceof DTDAnyContent) {
-			visitDTDAnyContent((DTDAnyContent) content);
-		}
-		else if (content instanceof DTDPCDataContent) {
-			visitDTDPCDataContent((DTDPCDataContent) content);
-		}
-		if (content instanceof DTDRepeatableContent) {
-			if (content instanceof DTDGroupContent) {
-				visitDTDGroupContent((DTDGroupContent) content);
-			}
-			else if (content instanceof DTDElementReferenceContent) {
-				visitDTDElementReferenceContent((DTDElementReferenceContent) content);
-			}
-			else {
-				visitDTDEntityReferenceContent((DTDEntityReferenceContent) content);
-			} // end of else
-
-			// System.out.println("occurrence: " +
-			// (char)((DTDRepeatableContent)content).getOccurrence());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDEmptyContentGen(DTDEmptyContent dtdEmptyContent) {
-
-		// System.out.println("content: EMPTY");
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDAnyContentGen(DTDAnyContent dtdAnyContent) {
-
-		// System.out.println("content: ANY");
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDPCDataContentGen(DTDPCDataContent pcDataContent) {
-
-		// System.out.println("content: PCDATA");
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDGroupContentGen(DTDGroupContent groupContent) {
-
-		if (groupContent.getGroupKind().getValue() == DTDGroupKind.SEQUENCE) {
-			// System.out.println("content: Sequence");
-		}
-		else // if (contentgetGroupKind() == DTDGroupKind.CHOICE)
-		{
-			// System.out.println("content: Choice");
-		}
-
-		Collection groupContents = groupContent.getContent();
-		for (Iterator i = groupContents.iterator(); i.hasNext();) {
-			visitDTDElementContent((DTDElementContent) i.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDElementReferenceContentGen(DTDElementReferenceContent elementReferenceContent) {
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDEntityReferenceContentGen(DTDEntityReferenceContent entityReferenceContent) {
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDAttributeListGen(List attrs) {
-
-		Iterator iter = attrs.iterator();
-
-		while (iter.hasNext()) {
-			visitDTDAttribute((DTDAttribute) iter.next());
-		} // end of while ()
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void visitDTDAttributeGen(DTDAttribute attribute) {
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/ExternalDTDModel.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/ExternalDTDModel.java
deleted file mode 100644
index 2476535..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/ExternalDTDModel.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.emf.util;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-
-
-/**
- * Load another DTD model - use when there is external entity references from
- * another model
- */
-public class ExternalDTDModel {
-	DTDFile dtdFile = null;
-
-	public ExternalDTDModel() {
-	}
-
-	public DTDFile getExternalDTDFile() {
-		return dtdFile;
-	}
-
-	/**
-	 * Load the DTD model specified by the uri e.g.
-	 * file:C:/eclipse/examples/purchaseorder.dtd
-	 */
-	public boolean loadModel(ResourceSet resources, String uri) {
-		boolean rc = true;
-
-		if (uri == null || uri.equals("")) { //$NON-NLS-1$
-			return false;
-		}
-
-		try {
-			// todo... Investigate why we can not create a new DTDUtil to load
-			// the external
-			// without breaking the bvt test bucket on the oagis cases.
-			// Are depending on mof's built in caching via
-			// resources.load(uri)?
-			//
-			URI uriObj = URI.createURI(uri);
-			Resource r = resources.createResource(uriObj);
-			Map options = new HashMap();
-			r.load(options);
-
-			for (Iterator i = resources.getResources().iterator(); i.hasNext();) {
-				DTDFile currentFile = (DTDFile) ((Resource) i.next()).getContents().get(0);
-				String currentURI = currentFile.eResource().getURI().toString();
-				// note : mof stores a slightly different uri than the one we
-				// passed in to resources.load(uri)
-				// In the 'file:' protocol case, the call
-				// resource.load("file:D:\x.dtd") will store a resource with
-				// uri "D:\x.dtd".
-				// This is why we use 'endswith()' instead of 'equals()' to
-				// compare.
-				if (uri.endsWith(currentURI)) {
-					dtdFile = currentFile;
-					break;
-				}
-			}
-			if (dtdFile == null) {
-				rc = false;
-			}
-		}
-		catch (Exception ex) {
-			rc = false;
-		}
-		return rc;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/rose/DTD.cat b/bundles/org.eclipse.wst.dtd.core/emfmodel/rose/DTD.cat
deleted file mode 100644
index 4097274..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/rose/DTD.cat
+++ /dev/null
@@ -1,3812 +0,0 @@
-

-(object Petal

-    version    	45

-    _written   	"Rose 7.5.0103.1920"

-    charSet    	0)

-

-(object Class_Category "dtd"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"IDL"

-	    name       	"uuid"

-	    value      	(value Text "DCE:935d5730-850b-11e1-0000-005cf4691c4c:1"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"packageName"

-	    value      	(value Text "dtd"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

-	    value      	(value Text "org.eclipse.wst.dtd"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "DTD")))

-    quid       	"3857B1C00293"

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "DTDElementContent"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:935d5730-850b-11e1-0001-005cf4691c4c:1")))

-	    quid       	"37CBEACF0213"

-	    abstract   	TRUE)

-	(object Class "DTDGroupContent"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:935eddd0-850b-11e1-0000-005cf4691c4c:1")))

-	    quid       	"37CBEAEF0232"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-0001-005cf4691c4c:1")))

-		    quid       	"37D9AD920363"

-		    supplier   	"Logical View::dtd::DTDRepeatableContent"

-		    quidu      	"37D9AD4C01D1"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "groupKind"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-0002-005cf4691c4c:1")))

-		    quid       	"37EFC9EC0189"

-		    type       	"DTDGroupKind"

-		    quidu      	"37EFCA550216"

-		    exportControl 	"Public")))

-	(object Class "DTDAttribute"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:935eddd0-850b-11e1-0003-005cf4691c4c:1")))

-	    quid       	"37CC187900EA"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-0004-005cf4691c4c:1")))

-		    quid       	"39B7F15901DA"

-		    supplier   	"Logical View::ecore::EAttribute"

-		    quidu      	"39238472039D"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "comment"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-0005-005cf4691c4c:1")))

-		    quid       	"3839DC9A013B"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "defaultKind"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-0006-005cf4691c4c:1")))

-		    quid       	"37E144BF0261"

-		    type       	"DTDDefaultKind"

-		    quidu      	"37E144DC03AD"

-		    exportControl 	"Public")

-		(object ClassAttribute "defaultValueString"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-0007-005cf4691c4c:1")))

-		    quid       	"396B9BBF006B"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "DTDOccurrenceType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:935eddd0-850b-11e1-0008-005cf4691c4c:1")))

-	    quid       	"37CC19AF007D"

-	    documentation 	

-|ONE=49 

-|OPTIONAL=63 ONE_OR_MORE=43 ZERO_OR_MORE=42

-	    

-	    stereotype 	"enumeration")

-	(object Class "DTDElement"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:935eddd0-850b-11e1-0009-005cf4691c4c:1")))

-	    quid       	"37D9AAF70071"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-000a-005cf4691c4c:1")))

-		    quid       	"39B7F0AF02A8"

-		    supplier   	"Logical View::ecore::EClass"

-		    quidu      	"3903D5BF000A")

-		(object Inheritance_Relationship

-		    quid       	"39FE2B83029B"

-		    supplier   	"Logical View::dtd::DTDContent"

-		    quidu      	"39FE2B5E02DE"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "comment"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-000b-005cf4691c4c:1")))

-		    quid       	"3839DC810062"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "DTDEmptyContent"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:935eddd0-850b-11e1-000c-005cf4691c4c:1")))

-	    quid       	"37D9AB47037A"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-000d-005cf4691c4c:1")))

-		    quid       	"37D9ABF30327"

-		    supplier   	"Logical View::dtd::DTDElementContent"

-		    quidu      	"37CBEACF0213")))

-	(object Class "DTDAnyContent"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:935eddd0-850b-11e1-000e-005cf4691c4c:1")))

-	    quid       	"37D9AB500304"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-000f-005cf4691c4c:1")))

-		    quid       	"37D9ABEE0207"

-		    supplier   	"Logical View::dtd::DTDElementContent"

-		    quidu      	"37CBEACF0213")))

-	(object Class "DTDPCDataContent"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:935eddd0-850b-11e1-0010-005cf4691c4c:1")))

-	    quid       	"37D9AB5C0135"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-0011-005cf4691c4c:1")))

-		    quid       	"37D9ABE90278"

-		    supplier   	"Logical View::dtd::DTDElementContent"

-		    quidu      	"37CBEACF0213")))

-	(object Class "DTDElementReferenceContent"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:935eddd0-850b-11e1-0012-005cf4691c4c:1")))

-	    quid       	"37D9AB7D0010"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-0013-005cf4691c4c:1")))

-		    quid       	"37D9AD8C03AA"

-		    supplier   	"Logical View::dtd::DTDRepeatableContent"

-		    quidu      	"37D9AD4C01D1")))

-	(object Class "DTDRepeatableContent"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:935eddd0-850b-11e1-0014-005cf4691c4c:1")))

-	    quid       	"37D9AD4C01D1"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-0015-005cf4691c4c:1")))

-		    quid       	"37D9ADB703C0"

-		    supplier   	"Logical View::dtd::DTDElementContent"

-		    quidu      	"37CBEACF0213"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "occurrence"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-0016-005cf4691c4c:1")))

-		    quid       	"37CC18A90148"

-		    documentation 	"JUST_ONE= -1  ONE_OR_MORE=43 OPTIONAL=63 ZERO_OR_MORE=42"

-		    type       	"DTDOccurrenceType"

-		    quidu      	"37CC19AF007D"

-		    exportControl 	"Public"))

-	    abstract   	TRUE)

-	(object Class "DTDFile"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:935eddd0-850b-11e1-0017-005cf4691c4c:1")))

-	    quid       	"37D9B08E018F"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-0018-005cf4691c4c:1")))

-		    quid       	"39B7F07F0118"

-		    supplier   	"Logical View::ecore::eNamedElement"

-		    quidu      	"3903D4EE0014"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "comment"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-0019-005cf4691c4c:1")))

-		    quid       	"3839DBEF012B"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "parseError"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:935eddd0-850b-11e1-001a-005cf4691c4c:1")))

-		    quid       	"388C995F025B"

-		    type       	"boolean"

-		    exportControl 	"Public")))

-	(object Class "DTDDefaultKind"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:9361eb10-850b-11e1-0000-005cf4691c4c:1")))

-	    quid       	"37E144DC03AD"

-	    documentation 	"IMPLIED=1 REQUIRED=2 FIXED=3 NOFIXED=4"

-	    stereotype 	"enumeration")

-	(object Class "DTDBasicType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:9361eb10-850b-11e1-0001-005cf4691c4c:1")))

-	    quid       	"37E1464F00DA"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:9361eb10-850b-11e1-0002-005cf4691c4c:1")))

-		    quid       	"39B7F2800315"

-		    supplier   	"Logical View::ecore::EClass"

-		    quidu      	"3903D5BF000A"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "kind"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:9361eb10-850b-11e1-0003-005cf4691c4c:1")))

-		    quid       	"37E1468A0016"

-		    type       	"DTDBasicTypeKind"

-		    quidu      	"37E14905022C"

-		    exportControl 	"Public")))

-	(object Class "DTDEnumerationType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:9361eb10-850b-11e1-0004-005cf4691c4c:1")))

-	    quid       	"37E146680306"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:9361eb10-850b-11e1-0005-005cf4691c4c:1")))

-		    quid       	"39B7F2810302"

-		    supplier   	"Logical View::ecore::EEnum"

-		    quidu      	"39A473E901D4"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "kind"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:9361eb10-850b-11e1-0006-005cf4691c4c:1")))

-		    quid       	"37E146AC03B8"

-		    type       	"DTDEnumGroupKind"

-		    quidu      	"37E149B201AD"

-		    exportControl 	"Public")))

-	(object Class "DTDBasicTypeKind"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:9361eb10-850b-11e1-0007-005cf4691c4c:1")))

-	    quid       	"37E14905022C"

-	    documentation 	"NONE=0 CDATA=1 ID=2 IDREF=3 IDREFS=4 ENTITY=5 ENTITIES=6 NMTOKEN=7 NMTOKENS=8"

-	    stereotype 	"enumeration")

-	(object Class "DTDEnumGroupKind"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:9361eb10-850b-11e1-0008-005cf4691c4c:1")))

-	    quid       	"37E149B201AD"

-	    documentation 	"NAME_TOKEN_GROUP=1 NOTATION_GROUP=2"

-	    stereotype 	"enumeration")

-	(object Class "DTDGroupKind"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:9361eb10-850b-11e1-0009-005cf4691c4c:1")))

-	    quid       	"37EFCA550216"

-	    documentation 	"SEQUENCE=1 CHOICE=2"

-	    stereotype 	"enumeration")

-	(object Class "DTDNotation"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:9361eb10-850b-11e1-000a-005cf4691c4c:1")))

-	    quid       	"37EFD0EF00C9"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:9361eb10-850b-11e1-000b-005cf4691c4c:1")))

-		    quid       	"39B7F0E30234"

-		    supplier   	"Logical View::ecore::eNamedElement"

-		    quidu      	"3903D4EE0014")

-		(object Inheritance_Relationship

-		    quid       	"39FE2B850118"

-		    supplier   	"Logical View::dtd::DTDContent"

-		    quidu      	"39FE2B5E02DE"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "comment"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:9361eb10-850b-11e1-000c-005cf4691c4c:1")))

-		    quid       	"3839DC0A024C"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "systemID"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:9361eb10-850b-11e1-000d-005cf4691c4c:1")))

-		    quid       	"37EFD1020397"

-		    type       	"string"

-		    exportControl 	"Public")

-		(object ClassAttribute "publicID"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:9361eb10-850b-11e1-000e-005cf4691c4c:1")))

-		    quid       	"37EFD10E018C"

-		    type       	"string"

-		    exportControl 	"Public")))

-	(object Class "DTDEntity"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:9361eb10-850b-11e1-000f-005cf4691c4c:1")))

-	    quid       	"37EFD12B03C8"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:9361eb10-850b-11e1-0010-005cf4691c4c:1")))

-		    quid       	"39B7F0E701EA"

-		    supplier   	"Logical View::ecore::eNamedElement"

-		    quidu      	"3903D4EE0014")

-		(object Inheritance_Relationship

-		    quid       	"39FE2B860304"

-		    supplier   	"Logical View::dtd::DTDContent"

-		    quidu      	"39FE2B5E02DE"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "comment"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:9361eb10-850b-11e1-0011-005cf4691c4c:1")))

-		    quid       	"3839DC37008E"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "parameterEntity"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:9361eb10-850b-11e1-0012-005cf4691c4c:1")))

-		    quid       	"37EFD13C017E"

-		    type       	"boolean"

-		    exportControl 	"Public")))

-	(object Class "DTDEntityContent"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:9361eb10-850b-11e1-0013-005cf4691c4c:1")))

-	    quid       	"37EFD19D0083"

-	    abstract   	TRUE)

-	(object Class "DTDExternalEntity"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:9361eb10-850b-11e1-0014-005cf4691c4c:1")))

-	    quid       	"37EFD1F803E1"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:9361eb10-850b-11e1-0015-005cf4691c4c:1")))

-		    quid       	"37EFD32400F3"

-		    supplier   	"Logical View::dtd::DTDEntityContent"

-		    quidu      	"37EFD19D0083"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "systemID"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0000-005cf4691c4c:1")))

-		    quid       	"37EFD2E50161"

-		    type       	"string"

-		    exportControl 	"Public")

-		(object ClassAttribute "publicID"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0001-005cf4691c4c:1")))

-		    quid       	"37EFD2EC01F7"

-		    type       	"string"

-		    exportControl 	"Public")))

-	(object Class "DTDInternalEntity"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:936371b0-850b-11e1-0002-005cf4691c4c:1")))

-	    quid       	"37EFD2BA026E"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0003-005cf4691c4c:1")))

-		    quid       	"37EFD32B032E"

-		    supplier   	"Logical View::dtd::DTDEntityContent"

-		    quidu      	"37EFD19D0083"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "value"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0004-005cf4691c4c:1")))

-		    quid       	"37EFD2CB0268"

-		    type       	"string"

-		    exportControl 	"Public")))

-	(object Class "DTDParameterEntityReference"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:936371b0-850b-11e1-0005-005cf4691c4c:1")))

-	    quid       	"385287CA0163"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0006-005cf4691c4c:1")))

-		    quid       	"39B7F0D10076"

-		    supplier   	"Logical View::ecore::eNamedElement"

-		    quidu      	"3903D4EE0014")

-		(object Inheritance_Relationship

-		    quid       	"39FE2B8A0287"

-		    supplier   	"Logical View::dtd::DTDContent"

-		    quidu      	"39FE2B5E02DE")))

-	(object Class "DTDEntityReferenceContent"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:936371b0-850b-11e1-0007-005cf4691c4c:1")))

-	    quid       	"3852900E0127"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0008-005cf4691c4c:1")))

-		    quid       	"38529044011B"

-		    supplier   	"Logical View::dtd::DTDRepeatableContent"

-		    quidu      	"37D9AD4C01D1")))

-	(object Class "XMLSchemaDefinedType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:936371b0-850b-11e1-0009-005cf4691c4c:1")))

-	    quid       	"389F0C6D010E"

-	    documentation 	

-|NONE=-1

-|STRING=1

-|BOOLEAN=2

-|FLOAT=3

-|DOUBLE=4

-|DECIMAL=5

-|TIMEINSTANT=6

-|TIMEDURATION=7

-|RECURRINGINSTANT=8

-|BINARY=9

-|URI=10

-|INTEGER=11

-|DATE=12

-|TIME=13

-	    

-	    stereotype 	"enumeration")

-	(object Class "DTDContent"

-	    quid       	"39FE2B5E02DE"

-	    abstract   	TRUE)

-	(object Association "$UNNAMED$0"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:936371b0-850b-11e1-000a-005cf4691c4c:1")))

-	    quid       	"37CBEB6F005D"

-	    roles      	(list role_list

-		(object Role "content"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-000b-005cf4691c4c:1")))

-		    quid       	"37CBEB70006D"

-		    label      	"content"

-		    supplier   	"Logical View::dtd::DTDElementContent"

-		    quidu      	"37CBEACF0213"

-		    client_cardinality 	(value cardinality "1..n")

-		    Constraints 	"ordered"

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "group"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-000c-005cf4691c4c:1")))

-		    quid       	"37CBEB7000AB"

-		    label      	"group"

-		    supplier   	"Logical View::dtd::DTDGroupContent"

-		    quidu      	"37CBEAEF0232"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$1"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:936371b0-850b-11e1-000d-005cf4691c4c:1")))

-	    quid       	"37D9AC0E00CD"

-	    roles      	(list role_list

-		(object Role "element"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-000e-005cf4691c4c:1")))

-		    quid       	"37D9AC0F039F"

-		    label      	"element"

-		    supplier   	"Logical View::dtd::DTDElement"

-		    quidu      	"37D9AAF70071"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "content"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-000f-005cf4691c4c:1")))

-		    quid       	"37D9AC0F03A9"

-		    label      	"content"

-		    supplier   	"Logical View::dtd::DTDElementContent"

-		    quidu      	"37CBEACF0213"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:936371b0-850b-11e1-0010-005cf4691c4c:1")))

-	    quid       	"37D9AF11001A"

-	    roles      	(list role_list

-		(object Role "elementReference"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0011-005cf4691c4c:1")))

-		    quid       	"37D9AF1B0209"

-		    label      	"elementReference"

-		    supplier   	"Logical View::dtd::DTDElementReferenceContent"

-		    quidu      	"37D9AB7D0010"

-		    client_cardinality 	(value cardinality "0..n"))

-		(object Role "referencedElement"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0012-005cf4691c4c:1")))

-		    quid       	"37D9AF1B020A"

-		    label      	"referencedElement"

-		    supplier   	"Logical View::dtd::DTDElement"

-		    quidu      	"37D9AAF70071"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$3"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:936371b0-850b-11e1-0013-005cf4691c4c:1")))

-	    quid       	"37EFD1C902DF"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$4"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0014-005cf4691c4c:1")))

-		    quid       	"37EFD1CA031D"

-		    supplier   	"Logical View::dtd::DTDEntity"

-		    quidu      	"37EFD12B03C8"

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "content"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0015-005cf4691c4c:1")))

-		    quid       	"37EFD1CA0327"

-		    label      	"content"

-		    supplier   	"Logical View::dtd::DTDEntityContent"

-		    quidu      	"37EFD19D0083"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$5"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:936371b0-850b-11e1-0016-005cf4691c4c:1")))

-	    quid       	"37EFD34400E5"

-	    roles      	(list role_list

-		(object Role "notation"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0017-005cf4691c4c:1"))

-			(object Attribute

-			    tool       	"eCore"

-			    name       	"isTransient"

-			    value      	TRUE)

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isTransient"

-			    value      	TRUE))

-		    quid       	"37EFD3450209"

-		    label      	"notation"

-		    supplier   	"Logical View::dtd::DTDNotation"

-		    quidu      	"37EFD0EF00C9"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE)

-		(object Role "entity"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0018-005cf4691c4c:1")))

-		    quid       	"37EFD3450213"

-		    label      	"entity"

-		    supplier   	"Logical View::dtd::DTDExternalEntity"

-		    quidu      	"37EFD1F803E1"

-		    client_cardinality 	(value cardinality "0..n")

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:936371b0-850b-11e1-0019-005cf4691c4c:1")))

-	    quid       	"38528979005F"

-	    roles      	(list role_list

-		(object Role "parmEntityRef"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-001a-005cf4691c4c:1")))

-		    quid       	"3852897C0352"

-		    label      	"parmEntityRef"

-		    supplier   	"Logical View::dtd::DTDParameterEntityReference"

-		    quidu      	"385287CA0163"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "entity"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-001b-005cf4691c4c:1")))

-		    quid       	"3852897C0353"

-		    label      	"entity"

-		    supplier   	"Logical View::dtd::DTDEntity"

-		    quidu      	"37EFD12B03C8"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$7"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:936371b0-850b-11e1-001c-005cf4691c4c:1")))

-	    quid       	"385294EB0243"

-	    roles      	(list role_list

-		(object Role "entityReference"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-001d-005cf4691c4c:1"))

-			(object Attribute

-			    tool       	"eCore"

-			    name       	"isTransient"

-			    value      	TRUE))

-		    quid       	"385294EF03BB"

-		    label      	"entityReference"

-		    supplier   	"Logical View::dtd::DTDEntityReferenceContent"

-		    quidu      	"3852900E0127"

-		    client_cardinality 	(value cardinality "0..n")

-		    is_navigable 	TRUE)

-		(object Role "elementReferencedEntity"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-001e-005cf4691c4c:1")))

-		    quid       	"385294EF03BC"

-		    label      	"elementReferencedEntity"

-		    supplier   	"Logical View::dtd::DTDEntity"

-		    quidu      	"37EFD12B03C8"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:936371b0-850b-11e1-001f-005cf4691c4c:1")))

-	    quid       	"3852972D02CB"

-	    roles      	(list role_list

-		(object Role "attributeNameReference"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0020-005cf4691c4c:1"))

-			(object Attribute

-			    tool       	"eCore"

-			    name       	"isTransient"

-			    value      	TRUE))

-		    quid       	"385297360291"

-		    label      	"attributeNameReference"

-		    supplier   	"Logical View::dtd::DTDAttribute"

-		    quidu      	"37CC187900EA"

-		    client_cardinality 	(value cardinality "0..n")

-		    is_navigable 	TRUE)

-		(object Role "attributeNameReferencedEntity"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0021-005cf4691c4c:1")))

-		    quid       	"38529736029B"

-		    label      	"attributeNameReferencedEntity"

-		    supplier   	"Logical View::dtd::DTDEntity"

-		    quidu      	"37EFD12B03C8"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$9"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:936371b0-850b-11e1-0022-005cf4691c4c:1")))

-	    quid       	"38B68A7302B8"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$10"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0023-005cf4691c4c:1")))

-		    quid       	"38B68A780084"

-		    supplier   	"Logical View::dtd::DTDExternalEntity"

-		    quidu      	"37EFD1F803E1")

-		(object Role "entityReferencedFromAnotherFile"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0024-005cf4691c4c:1")))

-		    quid       	"38B68A78008E"

-		    label      	"entityReferencedFromAnotherFile"

-		    supplier   	"Logical View::dtd::DTDFile"

-		    quidu      	"37D9B08E018F"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$11"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:936371b0-850b-11e1-0025-005cf4691c4c:1")))

-	    quid       	"38BD4908013D"

-	    roles      	(list role_list

-		(object Role "attributeTypeReference"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0026-005cf4691c4c:1"))

-			(object Attribute

-			    tool       	"eCore"

-			    name       	"isTransient"

-			    value      	TRUE))

-		    quid       	"38BD49140130"

-		    label      	"attributeTypeReference"

-		    supplier   	"Logical View::dtd::DTDAttribute"

-		    quidu      	"37CC187900EA"

-		    client_cardinality 	(value cardinality "0..n")

-		    is_navigable 	TRUE)

-		(object Role "attributeTypeReferencedEntity"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:936371b0-850b-11e1-0027-005cf4691c4c:1")))

-		    quid       	"38BD4914014E"

-		    label      	"attributeTypeReferencedEntity"

-		    supplier   	"Logical View::dtd::DTDEntity"

-		    quidu      	"37EFD12B03C8"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$12"

-	    quid       	"39FE2A9500CC"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$13"

-		    quid       	"39FE2A950311"

-		    supplier   	"Logical View::dtd::DTDElement"

-		    quidu      	"37D9AAF70071"

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "$UNNAMED$14"

-		    quid       	"39FE2A95031B"

-		    supplier   	"Logical View::dtd::DTDAttribute"

-		    quidu      	"37CC187900EA"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$15"

-	    quid       	"39FE2BBE02DC"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$16"

-		    quid       	"39FE2BBF01B1"

-		    supplier   	"Logical View::dtd::DTDFile"

-		    quidu      	"37D9B08E018F"

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "$UNNAMED$17"

-		    quid       	"39FE2BBF01BB"

-		    supplier   	"Logical View::dtd::DTDContent"

-		    quidu      	"39FE2B5E02DE"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$18"

-	    quid       	"39FE30D8033E"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$19"

-		    quid       	"39FE30D90105"

-		    supplier   	"Logical View::dtd::DTDFile"

-		    quidu      	"37D9B08E018F"

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "$UNNAMED$20"

-		    quid       	"39FE30D90137"

-		    supplier   	"Logical View::dtd::DTDEnumerationType"

-		    quidu      	"37E146680306"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "Main"

-	    quid       	"37CAB0E60177"

-	    title      	"Main"

-	    zoom       	98

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object NoteView @1

-		    location   	(3264, 240)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(2910, 65)

-			fill_color 	13434879

-			nlines     	7

-			max_width  	673

-			label      	

-|DTDElement's, 

-|DTDParameterEntityReference's, DTDEntity's, and DTDNotation's are added to DTDFile's using the

-|ownedElement relationship

-|between MOFNamespace

-|and MOFObject

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	733

-		    height     	363)

-		(object ClassView "Class" "Logical View::dtd::DTDInternalEntity" @2

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1824, 1872)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(1647, 1817)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	354

-			justify    	0

-			label      	"DTDInternalEntity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37EFD2BA026E"

-		    width      	372

-		    height     	134

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::dtd::DTDElement" @3

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(592, 1200)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(417, 1145)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	350

-			justify    	0

-			label      	"DTDElement")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37D9AAF70071"

-		    compartment 	(object Compartment

-			Parent_View 	@3

-			location   	(417, 1204)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	1

-			max_width  	371)

-		    width      	368

-		    height     	134

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::dtd::DTDEntityContent" @4

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1520, 1488)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@4

-			location   	(1341, 1438)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	358

-			justify    	0

-			label      	"DTDEntityContent")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37EFD19D0083"

-		    width      	376

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @5

-		    location   	(1520, 1640)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@4

-		    vertices   	(list Points

-			(1520, 1640)

-			(1520, 1550)))

-		(object ClassView "Class" "Logical View::dtd::DTDParameterEntityReference" @6

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2480, 1216)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@6

-			location   	(2186, 1166)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	588

-			justify    	0

-			label      	"DTDParameterEntityReference")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"385287CA0163"

-		    width      	606

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::dtd::DTDEntity" @7

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1520, 1216)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@7

-			location   	(1270, 1137)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	500

-			justify    	0

-			label      	"DTDEntity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37EFD12B03C8"

-		    compartment 	(object Compartment

-			Parent_View 	@7

-			location   	(1270, 1196)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	525)

-		    width      	518

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$3" @8

-		    location   	(1546, 1366)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"37EFD1C902DF"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$4" @9

-			    Parent_View 	@8

-			    location   	(-54, 246)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"37EFD1CA031D"

-			    client     	@8

-			    supplier   	@7

-			    line_style 	3

-			    origin_attachment 	(1546, 1366)

-			    terminal_attachment 	(1546, 1307))

-			(object RoleView "content" @10

-			    Parent_View 	@8

-			    location   	(-54, 246)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @11

-				Parent_View 	@10

-				location   	(1443, 1407)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	191

-				justify    	0

-				label      	"+content"

-				pctDist    	0.699248

-				height     	104

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"37EFD1CA0327"

-			    client     	@8

-			    supplier   	@4

-			    line_style 	3

-			    origin_attachment 	(1546, 1366)

-			    terminal_attachment 	(1546, 1426)

-			    label      	(object SegLabel @12

-				Parent_View 	@10

-				location   	(1568, 1408)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.721804

-				height     	22

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$6" @13

-		    location   	(1978, 1256)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38528979005F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "parmEntityRef" @14

-			    Parent_View 	@13

-			    location   	(602, 488)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @15

-				Parent_View 	@14

-				location   	(2038, 1299)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	328

-				justify    	0

-				label      	"+parmEntityRef"

-				pctDist    	0.305419

-				height     	43

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3852897C0352"

-			    client     	@13

-			    supplier   	@6

-			    line_style 	3

-			    origin_attachment 	(1978, 1256)

-			    terminal_attachment 	(2177, 1256)

-			    label      	(object SegLabel @16

-				Parent_View 	@14

-				location   	(2141, 1228)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.826484

-				height     	29

-				orientation 	0))

-			(object RoleView "entity" @17

-			    Parent_View 	@13

-			    location   	(602, 488)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @18

-				Parent_View 	@17

-				location   	(1862, 1217)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	150

-				justify    	0

-				label      	"+entity"

-				pctDist    	0.589109

-				height     	40

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3852897C0353"

-			    client     	@13

-			    supplier   	@7

-			    line_style 	3

-			    origin_attachment 	(1978, 1256)

-			    terminal_attachment 	(1779, 1256)

-			    label      	(object SegLabel @19

-				Parent_View 	@17

-				location   	(1823, 1309)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.776923

-				height     	53

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::ecore::eNamedElement" @20

-		    ShowCompartmentStereotypes 	TRUE

-		    location   	(1488, 176)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@20

-			location   	(1352, 131)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	272

-			justify    	0

-			label      	"eNamedElement")

-		    icon_style 	"Icon"

-		    line_color 	12615680

-		    fill_color 	16777175

-		    quidu      	"3903D4EE0014"

-		    width      	290

-		    height     	115

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ecore::EClass" @21

-		    ShowCompartmentStereotypes 	TRUE

-		    location   	(576, 960)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@21

-			location   	(492, 863)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	168

-			justify    	0

-			label      	"EClass")

-		    icon_style 	"Icon"

-		    line_color 	12615680

-		    fill_color 	16777175

-		    quidu      	"3903D5BF000A"

-		    width      	186

-		    height     	218

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @22

-		    stereotype 	TRUE

-		    line_color 	12615680

-		    quidu      	"39B7F0AF02A8"

-		    client     	@3

-		    supplier   	@21

-		    line_style 	3

-		    origin_attachment 	(571, 1132)

-		    terminal_attachment 	(571, 1069))

-		(object ClassView "Class" "Logical View::ecore::eNamedElement" @23

-		    ShowCompartmentStereotypes 	TRUE

-		    location   	(2560, 864)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@23

-			location   	(2424, 819)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	272

-			justify    	0

-			label      	"eNamedElement")

-		    icon_style 	"Icon"

-		    line_color 	12615680

-		    fill_color 	16777175

-		    quidu      	"3903D4EE0014"

-		    width      	290

-		    height     	115

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @24

-		    location   	(2560, 1036)

-		    line_color 	12615680

-		    fill_color 	13434879

-		    supplier   	@23

-		    vertices   	(list Points

-			(2560, 1036)

-			(2560, 921)))

-		(object InheritView "" @25

-		    stereotype 	TRUE

-		    line_color 	12615680

-		    quidu      	"39B7F0E701EA"

-		    client     	@7

-		    supplier   	@23

-		    line_style 	3

-		    origin_attachment 	(1669, 1125)

-		    terminal_attachment 	(1669, 1036)

-		    drawSupplier 	@24)

-		(object InheritView "" @26

-		    stereotype 	TRUE

-		    line_color 	12615680

-		    quidu      	"39B7F0D10076"

-		    client     	@6

-		    supplier   	@23

-		    line_style 	3

-		    origin_attachment 	(2618, 1153)

-		    terminal_attachment 	(2618, 1036)

-		    drawSupplier 	@24)

-		(object ClassView "Class" "Logical View::dtd::DTDNotation" @27

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(992, 1232)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@27

-			location   	(817, 1129)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	350

-			justify    	0

-			label      	"DTDNotation")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37EFD0EF00C9"

-		    compartment 	(object Compartment

-			Parent_View 	@27

-			location   	(817, 1188)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	371)

-		    width      	368

-		    height     	230

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::dtd::DTDExternalEntity" @28

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1344, 1872)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@28

-			location   	(1158, 1793)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	372

-			justify    	0

-			label      	"DTDExternalEntity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37EFD1F803E1"

-		    width      	390

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$5" @29

-		    location   	(969, 1677)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"37EFD34400E5"

-		    roleview_list 	(list RoleViews

-			(object RoleView "notation" @30

-			    Parent_View 	@29

-			    location   	(-247, 205)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @31

-				Parent_View 	@30

-				location   	(834, 1390)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	203

-				justify    	0

-				label      	"+notation"

-				pctDist    	0.870734

-				height     	136

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"37EFD3450209"

-			    client     	@29

-			    supplier   	@27

-			    line_style 	3

-			    origin_attachment 	(969, 1677)

-			    terminal_attachment 	(969, 1347)

-			    label      	(object SegLabel @32

-				Parent_View 	@30

-				location   	(1040, 1388)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	72

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.877934

-				height     	71

-				orientation 	1))

-			(object RoleView "entity" @33

-			    Parent_View 	@29

-			    location   	(-247, 205)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @34

-				Parent_View 	@33

-				location   	(1082, 1786)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	150

-				justify    	0

-				label      	"+entity"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"37EFD3450213"

-			    client     	@29

-			    supplier   	@28

-			    vertices   	(list Points

-				(969, 1677)

-				(969, 1827)

-				(1149, 1827))

-			    line_style 	3

-			    origin_attachment 	(969, 1677)

-			    terminal_attachment 	(1149, 1827)

-			    label      	(object SegLabel @35

-				Parent_View 	@33

-				location   	(1104, 1853)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.863501

-				height     	26

-				orientation 	1))))

-		(object InheritView "" @36

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"37EFD32400F3"

-		    client     	@28

-		    supplier   	@4

-		    line_style 	3

-		    origin_attachment 	(1274, 1781)

-		    terminal_attachment 	(1274, 1640)

-		    drawSupplier 	@5)

-		(object ClassView "Class" "Logical View::dtd::DTDContent" @37

-		    ShowCompartmentStereotypes 	TRUE

-		    location   	(1472, 800)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@37

-			location   	(1344, 750)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"DTDContent")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39FE2B5E02DE"

-		    width      	274

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @38

-		    location   	(1472, 990)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@37

-		    vertices   	(list Points

-			(1472, 990)

-			(1472, 862)))

-		(object InheritView "" @39

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39FE2B83029B"

-		    client     	@3

-		    supplier   	@37

-		    line_style 	3

-		    origin_attachment 	(719, 1132)

-		    terminal_attachment 	(719, 990)

-		    drawSupplier 	@38)

-		(object InheritView "" @40

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39FE2B860304"

-		    client     	@7

-		    supplier   	@37

-		    line_style 	3

-		    origin_attachment 	(1452, 1124)

-		    terminal_attachment 	(1452, 990)

-		    drawSupplier 	@38)

-		(object InheritView "" @41

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39FE2B8A0287"

-		    client     	@6

-		    supplier   	@37

-		    line_style 	3

-		    origin_attachment 	(2347, 1154)

-		    terminal_attachment 	(2347, 990)

-		    drawSupplier 	@38)

-		(object ClassView "Class" "Logical View::dtd::DTDFile" @42

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1488, 448)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@42

-			location   	(1281, 369)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	414

-			justify    	0

-			label      	"DTDFile")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37D9B08E018F"

-		    compartment 	(object Compartment

-			Parent_View 	@42

-			location   	(1281, 428)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	425)

-		    width      	432

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$9" @43

-		    location   	(354, 1049)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38B68A7302B8"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$10" @44

-			    Parent_View 	@43

-			    location   	(-109, 207)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38B68A780084"

-			    client     	@43

-			    supplier   	@28

-			    vertices   	(list Points

-				(354, 1049)

-				(354, 1781)

-				(1149, 1781))

-			    line_style 	3

-			    origin_attachment 	(354, 1049)

-			    terminal_attachment 	(1149, 1781))

-			(object RoleView "entityReferencedFromAnotherFile" @45

-			    Parent_View 	@43

-			    location   	(-109, 207)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @46

-				Parent_View 	@45

-				location   	(296, 4537)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	732

-				justify    	0

-				label      	"+entityReferencedFromAnotherFile"

-				pctDist    	-2.283333

-				height     	59

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38B68A78008E"

-			    client     	@43

-			    supplier   	@42

-			    vertices   	(list Points

-				(354, 1049)

-				(354, 439)

-				(1272, 439))

-			    line_style 	3

-			    origin_attachment 	(354, 1049)

-			    terminal_attachment 	(1272, 439)

-			    label      	(object SegLabel @47

-				Parent_View 	@45

-				location   	(1206, 500)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.957129

-				height     	61

-				orientation 	1))))

-		(object InheritView "" @48

-		    stereotype 	TRUE

-		    line_color 	12615680

-		    quidu      	"39B7F07F0118"

-		    client     	@42

-		    supplier   	@20

-		    line_style 	3

-		    origin_attachment 	(1488, 357)

-		    terminal_attachment 	(1488, 233))

-		(object AssociationViewNew "$UNNAMED$15" @49

-		    location   	(1472, 638)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39FE2BBE02DC"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$16" @50

-			    Parent_View 	@49

-			    location   	(0, -162)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39FE2BBF01B1"

-			    client     	@49

-			    supplier   	@42

-			    line_style 	3

-			    origin_attachment 	(1472, 638)

-			    terminal_attachment 	(1472, 539))

-			(object RoleView "$UNNAMED$17" @51

-			    Parent_View 	@49

-			    location   	(0, -162)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39FE2BBF01BB"

-			    client     	@49

-			    supplier   	@37

-			    line_style 	3

-			    origin_attachment 	(1472, 638)

-			    terminal_attachment 	(1472, 738)

-			    label      	(object SegLabel @52

-				Parent_View 	@51

-				location   	(1526, 712)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.736248

-				height     	54

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::dtd::DTDEnumerationType" @53

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    location   	(2448, 464)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@53

-			location   	(2184, 385)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	528

-			justify    	0

-			label      	"DTDEnumerationType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37E146680306"

-		    compartment 	(object Compartment

-			Parent_View 	@53

-			location   	(2184, 444)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	546)

-		    width      	546

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$18" @54

-		    location   	(1939, 449)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39FE30D8033E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$19" @55

-			    Parent_View 	@54

-			    location   	(-461, -31)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39FE30D90105"

-			    client     	@54

-			    supplier   	@42

-			    line_style 	3

-			    origin_attachment 	(1939, 449)

-			    terminal_attachment 	(1704, 449))

-			(object RoleView "$UNNAMED$20" @56

-			    Parent_View 	@54

-			    location   	(-461, -31)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39FE30D90137"

-			    client     	@54

-			    supplier   	@53

-			    line_style 	3

-			    origin_attachment 	(1939, 449)

-			    terminal_attachment 	(2175, 449)

-			    label      	(object SegLabel @57

-				Parent_View 	@56

-				location   	(2120, 486)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.767837

-				height     	37

-				orientation 	1))))

-		(object InheritView "" @58

-		    stereotype 	TRUE

-		    line_color 	12615680

-		    quidu      	"39B7F0E30234"

-		    client     	@27

-		    supplier   	@23

-		    line_style 	3

-		    origin_attachment 	(1064, 1116)

-		    terminal_attachment 	(1064, 1036)

-		    drawSupplier 	@24)

-		(object InheritView "" @59

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39FE2B850118"

-		    client     	@27

-		    supplier   	@37

-		    line_style 	3

-		    origin_attachment 	(941, 1117)

-		    terminal_attachment 	(941, 990)

-		    drawSupplier 	@38)

-		(object InheritView "" @60

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"37EFD32B032E"

-		    client     	@2

-		    supplier   	@4

-		    line_style 	3

-		    origin_attachment 	(1782, 1805)

-		    terminal_attachment 	(1782, 1640)

-		    drawSupplier 	@5)))

-	(object ClassDiagram "ElementDefinition"

-	    quid       	"37E14330032F"

-	    title      	"ElementDefinition"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	426

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::dtd::DTDEmptyContent" @61

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(467, 1448)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@61

-			location   	(281, 1403)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	372

-			justify    	0

-			label      	"DTDEmptyContent")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37D9AB47037A"

-		    width      	390

-		    height     	114

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::dtd::DTDAnyContent" @62

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(886, 1445)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@62

-			location   	(728, 1400)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	316

-			justify    	0

-			label      	"DTDAnyContent")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37D9AB500304"

-		    width      	334

-		    height     	114

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::dtd::DTDPCDataContent" @63

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1298, 1451)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@63

-			location   	(1099, 1406)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	398

-			justify    	0

-			label      	"DTDPCDataContent")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37D9AB5C0135"

-		    width      	416

-		    height     	114

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::dtd::DTDRepeatableContent" @64

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1888, 1456)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@64

-			location   	(1572, 1404)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	632

-			justify    	0

-			label      	"DTDRepeatableContent")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37D9AD4C01D1"

-		    width      	650

-		    height     	128

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @65

-		    location   	(1878, 1618)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@64

-		    vertices   	(list Points

-			(1878, 1618)

-			(1878, 1520)))

-		(object ClassView "Class" "Logical View::ecore::EAttribute" @66

-		    ShowCompartmentStereotypes 	TRUE

-		    location   	(1936, 400)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@66

-			location   	(1855, 325)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	162

-			justify    	0

-			label      	"EAttribute")

-		    icon_style 	"Icon"

-		    line_color 	12615680

-		    fill_color 	16777175

-		    quidu      	"39238472039D"

-		    height     	174

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ecore::EClass" @67

-		    ShowCompartmentStereotypes 	TRUE

-		    location   	(928, 384)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@67

-			location   	(847, 309)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	162

-			justify    	0

-			label      	"EClass")

-		    icon_style 	"Icon"

-		    line_color 	12615680

-		    fill_color 	16777175

-		    quidu      	"3903D5BF000A"

-		    height     	174

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::dtd::DTDGroupContent" @68

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2192, 1776)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@68

-			location   	(1931, 1727)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	522

-			justify    	0

-			label      	"DTDGroupContent")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37CBEAEF0232"

-		    width      	540

-		    height     	122

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @69

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"37D9AD920363"

-		    client     	@68

-		    supplier   	@64

-		    line_style 	3

-		    origin_attachment 	(2221, 1714)

-		    terminal_attachment 	(2221, 1618)

-		    drawSupplier 	@65)

-		(object ClassView "Class" "Logical View::dtd::DTDEntityReferenceContent" @70

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1488, 1760)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@70

-			location   	(1223, 1715)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	530

-			justify    	0

-			label      	"DTDEntityReferenceContent")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3852900E0127"

-		    width      	548

-		    height     	114

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @71

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38529044011B"

-		    client     	@70

-		    supplier   	@64

-		    line_style 	3

-		    origin_attachment 	(1474, 1702)

-		    terminal_attachment 	(1474, 1618)

-		    drawSupplier 	@65)

-		(object ClassView "Class" "Logical View::dtd::DTDElementContent" @72

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(912, 1056)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@72

-			location   	(704, 1008)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	416

-			justify    	0

-			label      	"DTDElementContent")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37CBEACF0213"

-		    width      	434

-		    height     	120

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$0" @73

-		    location   	(2289, 1048)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"37CBEB6F005D"

-		    roleview_list 	(list RoleViews

-			(object RoleView "content" @74

-			    Parent_View 	@73

-			    location   	(1025, 8)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @75

-				Parent_View 	@74

-				location   	(1223, 1001)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	168

-				justify    	0

-				label      	"+content"

-				pctDist    	0.919424

-				height     	48

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"37CBEB70006D"

-			    client     	@73

-			    supplier   	@72

-			    line_style 	3

-			    origin_attachment 	(2289, 1048)

-			    terminal_attachment 	(1129, 1048)

-			    label      	(object SegLabel @76

-				Parent_View 	@74

-				location   	(1186, 1083)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	72

-				justify    	0

-				label      	"1..*"

-				pctDist    	0.951381

-				height     	35

-				orientation 	0)

-			    label      	(object SegLabel @77

-				Parent_View 	@74

-				location   	(1246, 941)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	3

-				anchor_loc 	1

-				nlines     	1

-				max_width  	159

-				justify    	0

-				label      	"{ordered}"

-				pctDist    	0.900000

-				height     	108

-				orientation 	1))

-			(object RoleView "group" @78

-			    Parent_View 	@73

-			    location   	(1025, 8)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @79

-				Parent_View 	@78

-				location   	(2535, 1745)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	144

-				justify    	0

-				label      	"+group"

-				pctDist    	0.937744

-				height     	41

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"37CBEB7000AB"

-			    client     	@73

-			    supplier   	@68

-			    vertices   	(list Points

-				(2289, 1048)

-				(2587, 1048)

-				(2587, 1785)

-				(2462, 1785))

-			    line_style 	3

-			    origin_attachment 	(2289, 1048)

-			    terminal_attachment 	(2462, 1785)

-			    label      	(object SegLabel @80

-				Parent_View 	@78

-				location   	(2526, 1827)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.945085

-				height     	42

-				orientation 	0))))

-		(object InheritTreeView "" @81

-		    location   	(910, 1291)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@72

-		    vertices   	(list Points

-			(910, 1291)

-			(910, 1116)))

-		(object InheritView "" @82

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"37D9ABE90278"

-		    client     	@63

-		    supplier   	@72

-		    line_style 	3

-		    origin_attachment 	(1297, 1394)

-		    terminal_attachment 	(1297, 1291)

-		    drawSupplier 	@81)

-		(object InheritView "" @83

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"37D9ABF30327"

-		    client     	@61

-		    supplier   	@72

-		    line_style 	3

-		    origin_attachment 	(466, 1391)

-		    terminal_attachment 	(466, 1291)

-		    drawSupplier 	@81)

-		(object InheritView "" @84

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"37D9ABEE0207"

-		    client     	@62

-		    supplier   	@72

-		    line_style 	3

-		    origin_attachment 	(881, 1388)

-		    terminal_attachment 	(881, 1291)

-		    drawSupplier 	@81)

-		(object InheritView "" @85

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"37D9ADB703C0"

-		    client     	@64

-		    supplier   	@72

-		    line_style 	3

-		    origin_attachment 	(1903, 1392)

-		    terminal_attachment 	(1903, 1291)

-		    drawSupplier 	@81)

-		(object ClassView "Class" "Logical View::dtd::DTDElementReferenceContent" @86

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(784, 1760)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@86

-			location   	(492, 1715)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	584

-			justify    	0

-			label      	"DTDElementReferenceContent")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37D9AB7D0010"

-		    width      	602

-		    height     	114

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @87

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"37D9AD8C03AA"

-		    client     	@86

-		    supplier   	@64

-		    line_style 	3

-		    origin_attachment 	(650, 1703)

-		    terminal_attachment 	(650, 1618)

-		    drawSupplier 	@65)

-		(object ClassView "Class" "Logical View::dtd::DTDEntity" @88

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1488, 2064)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@88

-			location   	(1244, 1992)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	488

-			justify    	0

-			label      	"DTDEntity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37EFD12B03C8"

-		    width      	506

-		    height     	168

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$7" @89

-		    location   	(1480, 1898)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"385294EB0243"

-		    roleview_list 	(list RoleViews

-			(object RoleView "entityReference" @90

-			    Parent_View 	@89

-			    location   	(312, -70)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @91

-				Parent_View 	@90

-				location   	(1280, 1842)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	312

-				justify    	0

-				label      	"+entityReference"

-				pctDist    	0.693750

-				height     	201

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"385294EF03BB"

-			    client     	@89

-			    supplier   	@70

-			    line_style 	3

-			    origin_attachment 	(1480, 1898)

-			    terminal_attachment 	(1480, 1817)

-			    label      	(object SegLabel @92

-				Parent_View 	@90

-				location   	(1534, 1842)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..*"

-				pctDist    	0.693750

-				height     	54

-				orientation 	1))

-			(object RoleView "elementReferencedEntity" @93

-			    Parent_View 	@89

-			    location   	(312, -70)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @94

-				Parent_View 	@93

-				location   	(1220, 1954)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	480

-				justify    	0

-				label      	"+elementReferencedEntity"

-				pctDist    	0.685315

-				height     	261

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"385294EF03BC"

-			    client     	@89

-			    supplier   	@88

-			    line_style 	3

-			    origin_attachment 	(1480, 1898)

-			    terminal_attachment 	(1480, 1980)

-			    label      	(object SegLabel @95

-				Parent_View 	@93

-				location   	(1524, 1958)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.734234

-				height     	44

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::dtd::DTDElement" @96

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(912, 752)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@96

-			location   	(744, 702)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	336

-			justify    	0

-			label      	"DTDElement")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37D9AAF70071"

-		    width      	354

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$1" @97

-		    location   	(912, 904)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"37D9AC0E00CD"

-		    roleview_list 	(list RoleViews

-			(object RoleView "element" @98

-			    Parent_View 	@97

-			    location   	(-25, 96)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @99

-				Parent_View 	@98

-				location   	(1014, 865)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	168

-				justify    	0

-				label      	"+element"

-				pctDist    	0.428571

-				height     	102

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"37D9AC0F039F"

-			    client     	@97

-			    supplier   	@96

-			    line_style 	0

-			    label      	(object SegLabel @100

-				Parent_View 	@98

-				location   	(857, 850)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.598214

-				height     	56

-				orientation 	0))

-			(object RoleView "content" @101

-			    Parent_View 	@97

-			    location   	(-25, 96)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @102

-				Parent_View 	@101

-				location   	(1014, 964)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	168

-				justify    	0

-				label      	"+content"

-				pctDist    	0.664063

-				height     	102

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"37D9AC0F03A9"

-			    client     	@97

-			    supplier   	@72

-			    line_style 	0

-			    label      	(object SegLabel @103

-				Parent_View 	@101

-				location   	(871, 962)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.640625

-				height     	42

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$2" @104

-		    location   	(123, 1122)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"37D9AF11001A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "elementReference" @105

-			    Parent_View 	@104

-			    location   	(-981, 642)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @106

-				Parent_View 	@105

-				location   	(321, 1825)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	348

-				justify    	0

-				label      	"+elementReference"

-				pctDist    	0.840035

-				height     	56

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"37D9AF1B0209"

-			    client     	@104

-			    supplier   	@86

-			    vertices   	(list Points

-				(123, 1122)

-				(123, 1769)

-				(483, 1769))

-			    line_style 	3

-			    origin_attachment 	(123, 1122)

-			    terminal_attachment 	(483, 1769)

-			    label      	(object SegLabel @107

-				Parent_View 	@105

-				location   	(422, 1726)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..*"

-				pctDist    	0.940559

-				height     	44

-				orientation 	0))

-			(object RoleView "referencedElement" @108

-			    Parent_View 	@104

-			    location   	(-981, 642)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @109

-				Parent_View 	@108

-				location   	(532, 686)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	360

-				justify    	0

-				label      	"+referencedElement"

-				pctDist    	0.799650

-				height     	43

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"37D9AF1B020A"

-			    client     	@104

-			    supplier   	@96

-			    vertices   	(list Points

-				(123, 1122)

-				(123, 728)

-				(735, 728))

-			    line_style 	3

-			    origin_attachment 	(123, 1122)

-			    terminal_attachment 	(735, 728)

-			    label      	(object SegLabel @110

-				Parent_View 	@108

-				location   	(701, 773)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.966965

-				height     	45

-				orientation 	1))))

-		(object InheritView "" @111

-		    stereotype 	TRUE

-		    line_color 	12615680

-		    quidu      	"39B7F0AF02A8"

-		    client     	@96

-		    supplier   	@67

-		    line_style 	3

-		    origin_attachment 	(923, 690)

-		    terminal_attachment 	(923, 470))

-		(object ClassView "Class" "Logical View::dtd::DTDAttribute" @112

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1888, 752)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@112

-			location   	(1612, 657)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	552

-			justify    	0

-			label      	"DTDAttribute")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37CC187900EA"

-		    width      	570

-		    height     	214

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$8" @113

-		    location   	(2775, 1628)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3852972D02CB"

-		    roleview_list 	(list RoleViews

-			(object RoleView "attributeNameReference" @114

-			    Parent_View 	@113

-			    location   	(1591, -564)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @115

-				Parent_View 	@114

-				location   	(2422, 808)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	468

-				justify    	0

-				label      	"+attributeNameReference"

-				pctDist    	0.829630

-				height     	39

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"385297360291"

-			    client     	@113

-			    supplier   	@112

-			    vertices   	(list Points

-				(2775, 1628)

-				(2775, 768)

-				(2173, 768))

-			    line_style 	3

-			    origin_attachment 	(2775, 1628)

-			    terminal_attachment 	(2173, 768)

-			    label      	(object SegLabel @116

-				Parent_View 	@114

-				location   	(2222, 871)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..*"

-				pctDist    	0.966649

-				height     	102

-				orientation 	0))

-			(object RoleView "attributeNameReferencedEntity" @117

-			    Parent_View 	@113

-			    location   	(1591, -564)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @118

-				Parent_View 	@117

-				location   	(2076, 2090)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	588

-				justify    	0

-				label      	"+attributeNameReferencedEntity"

-				pctDist    	0.771469

-				height     	35

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38529736029B"

-			    client     	@113

-			    supplier   	@88

-			    vertices   	(list Points

-				(2775, 1628)

-				(2775, 2055)

-				(1741, 2055))

-			    line_style 	3

-			    origin_attachment 	(2775, 1628)

-			    terminal_attachment 	(1741, 2055)

-			    label      	(object SegLabel @119

-				Parent_View 	@117

-				location   	(1813, 2018)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.951442

-				height     	38

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$11" @120

-		    location   	(2945, 1891)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38BD4908013D"

-		    roleview_list 	(list RoleViews

-			(object RoleView "attributeTypeReference" @121

-			    Parent_View 	@120

-			    location   	(1489, -676)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @122

-				Parent_View 	@121

-				location   	(2435, 656)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	444

-				justify    	0

-				label      	"+attributeTypeReference"

-				pctDist    	0.866026

-				height     	54

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38BD49140130"

-			    client     	@120

-			    supplier   	@112

-			    vertices   	(list Points

-				(2945, 1891)

-				(2945, 708)

-				(2173, 708))

-			    line_style 	3

-			    origin_attachment 	(2945, 1891)

-			    terminal_attachment 	(2173, 708)

-			    label      	(object SegLabel @123

-				Parent_View 	@121

-				location   	(2345, 603)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..*"

-				pctDist    	0.912538

-				height     	107

-				orientation 	1))

-			(object RoleView "attributeTypeReferencedEntity" @124

-			    Parent_View 	@120

-			    location   	(1489, -676)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @125

-				Parent_View 	@124

-				location   	(1679, 2299)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	576

-				justify    	0

-				label      	"+attributeTypeReferencedEntity"

-				pctDist    	0.828601

-				height     	56

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38BD4914014E"

-			    client     	@120

-			    supplier   	@88

-			    vertices   	(list Points

-				(2945, 1891)

-				(2945, 2243)

-				(1438, 2243)

-				(1438, 2148))

-			    line_style 	3

-			    origin_attachment 	(2945, 1891)

-			    terminal_attachment 	(1438, 2148)

-			    label      	(object SegLabel @126

-				Parent_View 	@124

-				location   	(1365, 2178)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.984774

-				height     	74

-				orientation 	0))))

-		(object InheritView "" @127

-		    stereotype 	TRUE

-		    line_color 	12615680

-		    quidu      	"39B7F15901DA"

-		    client     	@112

-		    supplier   	@66

-		    line_style 	3

-		    origin_attachment 	(1950, 645)

-		    terminal_attachment 	(1950, 486))

-		(object AssociationViewNew "$UNNAMED$12" @128

-		    location   	(1346, 752)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39FE2A9500CC"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$13" @129

-			    Parent_View 	@128

-			    location   	(-542, -16)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39FE2A950311"

-			    client     	@128

-			    supplier   	@96

-			    line_style 	3

-			    origin_attachment 	(1346, 752)

-			    terminal_attachment 	(1089, 752))

-			(object RoleView "$UNNAMED$14" @130

-			    Parent_View 	@128

-			    location   	(-542, -16)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39FE2A95031B"

-			    client     	@128

-			    supplier   	@112

-			    line_style 	3

-			    origin_attachment 	(1346, 752)

-			    terminal_attachment 	(1603, 752)

-			    label      	(object SegLabel @131

-				Parent_View 	@130

-				location   	(1544, 791)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..*"

-				pctDist    	0.773390

-				height     	39

-				orientation 	1))))))

-	(object ClassDiagram "AttributeDefinition"

-	    quid       	"37E144570257"

-	    title      	"AttributeDefinition"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::dtd::DTDAttribute" @132

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(512, 656)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@132

-			location   	(236, 539)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	552

-			justify    	0

-			label      	"DTDAttribute")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37CC187900EA"

-		    width      	570

-		    height     	258

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::dtd::DTDBasicType" @133

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1264, 656)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@133

-			location   	(1017, 584)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	494

-			justify    	0

-			label      	"DTDBasicType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37E1464F00DA"

-		    width      	512

-		    height     	168

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::dtd::DTDEnumerationType" @134

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1904, 656)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@134

-			location   	(1646, 584)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	516

-			justify    	0

-			label      	"DTDEnumerationType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37E146680306"

-		    width      	534

-		    height     	168

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @135

-		    location   	(912, 1120)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@135

-			location   	(492, 926)

-			nlines     	9

-			max_width  	805

-			label      	

-|A DTD attribute's type and initial

-|value are represented using the eType and default value stored in eAttribute. The eType will always be either DTDBasicType (subclass of eClass) or DTDEnumerationType (subclass of eEnum).

-			)

-		    fill_color 	16777215

-		    width      	865

-		    height     	400)

-		(object AttachView "" @136

-		    stereotype 	TRUE

-		    client     	@132

-		    supplier   	@135

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::ecore::EClass" @137

-		    ShowCompartmentStereotypes 	TRUE

-		    location   	(1264, 272)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@137

-			location   	(1183, 197)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	162

-			justify    	0

-			label      	"EClass")

-		    icon_style 	"Icon"

-		    line_color 	12615680

-		    fill_color 	16777175

-		    quidu      	"3903D5BF000A"

-		    height     	174

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ecore::EEnum" @138

-		    ShowCompartmentStereotypes 	TRUE

-		    location   	(1904, 272)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@138

-			location   	(1823, 197)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	162

-			justify    	0

-			label      	"EEnum")

-		    icon_style 	"Icon"

-		    line_color 	12615680

-		    fill_color 	16777175

-		    quidu      	"39A473E901D4"

-		    height     	174

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @139

-		    stereotype 	TRUE

-		    line_color 	12615680

-		    quidu      	"39B7F2800315"

-		    client     	@133

-		    supplier   	@137

-		    line_style 	3

-		    origin_attachment 	(1260, 572)

-		    terminal_attachment 	(1260, 359))

-		(object InheritView "" @140

-		    stereotype 	TRUE

-		    line_color 	12615680

-		    quidu      	"39B7F2810302"

-		    client     	@134

-		    supplier   	@138

-		    line_style 	3

-		    origin_attachment 	(1903, 572)

-		    terminal_attachment 	(1903, 359))

-		(object ClassView "Class" "Logical View::ecore::EAttribute" @141

-		    ShowCompartmentStereotypes 	TRUE

-		    location   	(528, 272)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@141

-			location   	(447, 197)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	162

-			justify    	0

-			label      	"EAttribute")

-		    icon_style 	"Icon"

-		    line_color 	12615680

-		    fill_color 	16777175

-		    quidu      	"39238472039D"

-		    height     	174

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @142

-		    stereotype 	TRUE

-		    line_color 	12615680

-		    quidu      	"39B7F15901DA"

-		    client     	@132

-		    supplier   	@141

-		    line_style 	3

-		    origin_attachment 	(520, 527)

-		    terminal_attachment 	(520, 359))))))

diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/rose/dtdmodel.mdl b/bundles/org.eclipse.wst.dtd.core/emfmodel/rose/dtdmodel.mdl
deleted file mode 100644
index ce5627a..0000000
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/rose/dtdmodel.mdl
+++ /dev/null
@@ -1,7526 +0,0 @@
-

-(object Petal

-    version    	45

-    _written   	"Rose 7.5.0103.1920"

-    charSet    	0)

-

-(object Design "Logical View"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Java"

-	    name       	"IDE"

-	    value      	"Internal Editor"))

-    quid       	"3E36BEB60133"

-    defaults   	(object defaults

-	rightMargin 	0.250000

-	leftMargin 	0.250000

-	topMargin  	0.250000

-	bottomMargin 	0.500000

-	pageOverlap 	0.250000

-	clipIconLabels 	TRUE

-	autoResize 	TRUE

-	snapToGrid 	TRUE

-	gridX      	16

-	gridY      	16

-	defaultFont 	(object Font

-	    size       	10

-	    face       	"Arial"

-	    bold       	FALSE

-	    italics    	FALSE

-	    underline  	FALSE

-	    strike     	FALSE

-	    color      	0

-	    default_color 	TRUE)

-	showMessageNum 	1

-	showClassOfObject 	TRUE

-	notation   	"Unified")

-    root_usecase_package 	(object Class_Category "Use Case View"

-	quid       	"3A0C75F401F7"

-	exportControl 	"Public"

-	global     	TRUE

-	logical_models 	(list unit_reference_list)

-	logical_presentations 	(list unit_reference_list

-	    (object UseCaseDiagram "Main"

-		quid       	"3A0C75F4020B"

-		title      	"Main"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	0

-		origin_y   	0

-		items      	(list diagram_item_list))))

-    root_category 	(object Class_Category "Logical View"

-	quid       	"3A0C75F401F6"

-	exportControl 	"Public"

-	global     	TRUE

-	subsystem  	"Component View"

-	quidu      	"3A0C75F401F8"

-	logical_models 	(list unit_reference_list

-	    (object Class_Category "ecore"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$VABASE_PLUGINS_PATH\\org.eclipse.emf.ecore\\src\\model\\org.eclipse.emf.ECore.cat"

-		quid       	"39A5ED04004E")

-	    (object Class_Category "dtd"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$VABASE_PLUGINS_PATH\\org.eclipse.wst.dtd\\src\\rose\\DTD.cat"

-		quid       	"3857B1C00293"))

-	logical_presentations 	(list unit_reference_list

-	    (object ClassDiagram "Main"

-		quid       	"3A0C75F401FF"

-		title      	"Main"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	0

-		origin_y   	0

-		items      	(list diagram_item_list

-		    (object CategoryView "Logical View::ecore" @1

-			location   	(960, 304)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@1

-			    location   	(816, 220)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"ecore")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"39A5ED04004E"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::dtd" @2

-			location   	(368, 256)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@2

-			    location   	(224, 172)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"dtd")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"3857B1C00293"

-			width      	300

-			height     	180)))))

-    root_subsystem 	(object SubSystem "Component View"

-	quid       	"3A0C75F401F8"

-	physical_models 	(list unit_reference_list)

-	physical_presentations 	(list unit_reference_list

-	    (object Module_Diagram "Main"

-		quid       	"3A0C75F4020A"

-		title      	"Main"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	0

-		origin_y   	0

-		items      	(list diagram_item_list))))

-    process_structure 	(object Processes

-	quid       	"3A0C75F401F9"

-	ProcsNDevs 	(list

-	    (object Process_Diagram "Deployment View"

-		quid       	"3A0C75F401FB"

-		title      	"Deployment View"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	0

-		origin_y   	0

-		items      	(list diagram_item_list))))

-    properties 	(object Properties

-	attributes 	(list Attribute_Set

-	    (object Attribute

-		tool       	"DDL"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"DDL"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"DDL"

-			name       	"Directory"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"DDL"

-			name       	"DataBase"

-			value      	("DataBaseSet" 800))

-		    (object Attribute

-			tool       	"DDL"

-			name       	"DataBaseSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"DDL"

-				name       	"ANSI"

-				value      	800)

-			    (object Attribute

-				tool       	"DDL"

-				name       	"Oracle"

-				value      	801)

-			    (object Attribute

-				tool       	"DDL"

-				name       	"SQLServer"

-				value      	802)

-			    (object Attribute

-				tool       	"DDL"

-				name       	"Sybase"

-				value      	803)

-			    (object Attribute

-				tool       	"DDL"

-				name       	"Watcom"

-				value      	804)))

-		    (object Attribute

-			tool       	"DDL"

-			name       	"PrimaryKeyColumnName"

-			value      	"Id")

-		    (object Attribute

-			tool       	"DDL"

-			name       	"PrimaryKeyColumnType"

-			value      	"NUMBER(5)")

-		    (object Attribute

-			tool       	"DDL"

-			name       	"ViewName"

-			value      	"V_")

-		    (object Attribute

-			tool       	"DDL"

-			name       	"TableName"

-			value      	"T_")

-		    (object Attribute

-			tool       	"DDL"

-			name       	"InheritSuffix"

-			value      	"_V")

-		    (object Attribute

-			tool       	"DDL"

-			name       	"DropClause"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"DDL"

-			name       	"BaseViews"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"DDL"

-			name       	"DDLScriptFilename"

-			value      	"DDL1.SQL")))

-	    (object Attribute

-		tool       	"DDL"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"DDL"

-			name       	"ColumnType"

-			value      	"VARCHAR")

-		    (object Attribute

-			tool       	"DDL"

-			name       	"Length"

-			value      	"")

-		    (object Attribute

-			tool       	"DDL"

-			name       	"NullsOK"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"DDL"

-			name       	"PrimaryKey"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"DDL"

-			name       	"Unique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"DDL"

-			name       	"CompositeUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"DDL"

-			name       	"CheckConstraint"

-			value      	"")))

-	    (object Attribute

-		tool       	"DDL"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"IDL"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"IDL"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"IDL"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"StopOnError"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"Directory"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"IDL"

-			name       	"GeneratePreserveRegions"

-			value      	TRUE)))

-	    (object Attribute

-		tool       	"IDL"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"IDL"

-			name       	"ImplementationType"

-			value      	"")

-		    (object Attribute

-			tool       	"IDL"

-			name       	"ConstValue"

-			value      	"")

-		    (object Attribute

-			tool       	"IDL"

-			name       	"GenerateDefaultSpecifier"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"DefaultSpecifier"

-			value      	"")

-		    (object Attribute

-			tool       	"IDL"

-			name       	"IDLElement"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"IDLSpecificationType"

-			value      	("IDLSpecSet" 22))

-		    (object Attribute

-			tool       	"IDL"

-			name       	"IDLSpecSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"IDL"

-				name       	"Interface"

-				value      	22)

-			    (object Attribute

-				tool       	"IDL"

-				name       	"Typedef"

-				value      	54)

-			    (object Attribute

-				tool       	"IDL"

-				name       	"Enumeration"

-				value      	8)

-			    (object Attribute

-				tool       	"IDL"

-				name       	"Const"

-				value      	71)

-			    (object Attribute

-				tool       	"IDL"

-				name       	"Exception"

-				value      	61)

-			    (object Attribute

-				tool       	"IDL"

-				name       	"Struct"

-				value      	51)

-			    (object Attribute

-				tool       	"IDL"

-				name       	"Union"

-				value      	81)))))

-	    (object Attribute

-		tool       	"IDL"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"IDL"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"CmIdentification"

-			value      	(value Text "  %X%  @(#) plugins/org.eclipse.wst.dtd/src/rose/dtdmodel.mdl, org.eclipse.wst.dtd, wtpM1, 20041122"))

-		    (object Attribute

-			tool       	"IDL"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"IDL"

-			name       	"FileName"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"IDL"

-			name       	"GenerateIDLModule"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"InclusionProtectionSymbol"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"IDL"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"IDL"

-			name       	"IncludeBySimpleName"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"IDL"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"IDL"

-			name       	"CmIdentification"

-			value      	(value Text "  %X%  @(#) plugins/org.eclipse.wst.dtd/src/rose/dtdmodel.mdl, org.eclipse.wst.dtd, wtpM1, 20041122"))

-		    (object Attribute

-			tool       	"IDL"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"IDL"

-			name       	"FileName"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"IDL"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"IDL"

-			name       	"IncludeBySimpleName"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"IDL"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"IDL"

-			name       	"OperationIsOneWay"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"Context"

-			value      	"")

-		    (object Attribute

-			tool       	"IDL"

-			name       	"Raises"

-			value      	"")))

-	    (object Attribute

-		tool       	"IDL"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"IDL"

-			name       	"CaseSpecifier"

-			value      	"")

-		    (object Attribute

-			tool       	"IDL"

-			name       	"GenerateDataMember"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"DataMemberName"

-			value      	"$relationship")

-		    (object Attribute

-			tool       	"IDL"

-			name       	"IsReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"IsConst"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"ConstValue"

-			value      	"")))

-	    (object Attribute

-		tool       	"IDL"

-		name       	"default__Has"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"IDL"

-			name       	"NameIfUnlabeled"

-			value      	"the_$supplier")

-		    (object Attribute

-			tool       	"IDL"

-			name       	"GenerateDataMember"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"DataMemberName"

-			value      	"$relationship")

-		    (object Attribute

-			tool       	"IDL"

-			name       	"GenerateForwardReference"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"IsReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"BoundedHasRelType"

-			value      	("HasRelTypeSet" 47))

-		    (object Attribute

-			tool       	"IDL"

-			name       	"HasRelTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"IDL"

-				name       	"Array"

-				value      	24)

-			    (object Attribute

-				tool       	"IDL"

-				name       	"Sequence"

-				value      	47)))))

-	    (object Attribute

-		tool       	"IDL"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"IDL"

-			name       	"NameIfUnlabeled"

-			value      	"the_$supplier")

-		    (object Attribute

-			tool       	"IDL"

-			name       	"GenerateDataMember"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"DataMemberName"

-			value      	"$relationship")

-		    (object Attribute

-			tool       	"IDL"

-			name       	"GenerateForwardReference"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"IsReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"IDL"

-			name       	"BoundedRoleType"

-			value      	("AssocTypeSet" 47))

-		    (object Attribute

-			tool       	"IDL"

-			name       	"AssocTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"IDL"

-				name       	"Array"

-				value      	24)

-			    (object Attribute

-				tool       	"IDL"

-				name       	"Sequence"

-				value      	47)))))

-	    (object Attribute

-		tool       	"IDL"

-		name       	"default__Uses"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"IDL"

-			name       	"GenerateForwardReference"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"IDL"

-		name       	"default__Subsystem"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"IDL"

-			name       	"Directory"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"IDL"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"SCC"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"eCore"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"eCore"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"eCore"

-			name       	"Codegen Name"

-			value      	"")))

-	    (object Attribute

-		tool       	"eCore"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"eCore"

-			name       	"isTransient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"eCore"

-			name       	"isVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"eCore"

-			name       	"isChangeable"

-			value      	TRUE)))

-	    (object Attribute

-		tool       	"eCore"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"eCore"

-			name       	"isTransient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"eCore"

-			name       	"isVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"eCore"

-			name       	"isChangeable"

-			value      	TRUE)))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Const"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialValue"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Inherit"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Copyright"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"RootPackage"

-			value      	"C++ Reverse Engineered")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialHeaderIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialBodyIncludes"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialCodeBody"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Inline"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ImplementationType"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"HeaderSourceFile"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"BodySourceFile"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"IsNamespace"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"ANSI C++ Event Watcher"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"ANSIConvert"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"propertyId"

-		value      	"838326200")

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SpecFileExtension"

-			value      	"1.ada")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SpecFileBackupExtension"

-			value      	"1.ad~")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SpecFileTemporaryExtension"

-			value      	"1.ad#")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"BodyFileExtension"

-			value      	"2.ada")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"BodyFileBackupExtension"

-			value      	"2.ad~")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"BodyFileTemporaryExtension"

-			value      	"2.ad#")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateBodies"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DefaultCodeBody"

-			value      	"[statement]")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CommentWidth"

-			value      	60)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"UseFileName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Directory"

-			value      	"$ROSEADA83_SOURCE")))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassName"

-			value      	"Object")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassAccess"

-			value      	("ImplementationSet" 43))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplementationType"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsSubtype"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"PolymorphicUnit"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"HandleName"

-			value      	"Handle")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"HandleAccess"

-			value      	("ImplementationSet" 45))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Discriminant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Variant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"EnumerationLiteralPrefix"

-			value      	"A_")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"RecordFieldPrefix"

-			value      	"The_")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassParameterName"

-			value      	"This")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DefaultConstructorKind"

-			value      	("ConstructorKindSet" 199))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DefaultConstructorName"

-			value      	"Create")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineDefaultConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyConstructorKind"

-			value      	("ConstructorKindSet" 199))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyConstructorName"

-			value      	"Copy")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineCopyConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DestructorName"

-			value      	"Free")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineDestructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassEqualityOperation"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"HandleEqualityOperation"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineEquality"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsTask"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"LimitedPrivate"

-				value      	200)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ConstructorKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenericFormalParameters"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsSubunit"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SubprogramImplementation"

-			value      	("SubprogramImplementationSet" 2))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Renames"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassParameterMode"

-			value      	("ParameterModeSet" 203))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Inline"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"EntryCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ExitCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InitialCodeBody"

-			value      	"${default}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SubprogramImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Spec"

-				value      	224)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Body"

-				value      	2)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Renaming"

-				value      	222)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Separate"

-				value      	223)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ParameterModeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"In"

-				value      	204)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Out"

-				value      	205)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"InOut"

-				value      	203)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"FunctionReturn"

-				value      	206)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Has"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"NameIfUnlabeled"

-			value      	"The_${supplier}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DataMemberName"

-			value      	"${relationship}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${relationship}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${relationship}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Variant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorType"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DataMemberName"

-			value      	"${attribute}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${attribute}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${attribute}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Variant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Representation"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Association"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${association}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${association}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateAssociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AssociateName"

-			value      	"Associate")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineAssociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateDissociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DissociateName"

-			value      	"Dissociate")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineDissociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DataMemberName"

-			value      	"${target}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${target}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${target}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Subsystem"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Directory"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"propertyId"

-		value      	"838326200")

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SpecFileExtension"

-			value      	"1.ada")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SpecFileBackupExtension"

-			value      	"1.ad~")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SpecFileTemporaryExtension"

-			value      	"1.ad#")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"BodyFileExtension"

-			value      	"2.ada")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"BodyFileBackupExtension"

-			value      	"2.ad~")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"BodyFileTemporaryExtension"

-			value      	"2.ad#")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"UseColonNotation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateBodies"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DefaultCodeBody"

-			value      	"[statement]")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CommentWidth"

-			value      	60)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"UseFileName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Directory"

-			value      	"$ROSEADA95_SOURCE")))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeName"

-			value      	"Object")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeVisibility"

-			value      	("TypeVisibilitySet" 43))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeImplementation"

-			value      	("TypeImplementationSet" 208))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeControl"

-			value      	("TypeControlSet" 225))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeControlName"

-			value      	"Controlled_${type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeDefinition"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordImplementation"

-			value      	("RecordImplementationSet" 209))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordKindPackageName"

-			value      	"${class}_Record_Kinds")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsLimited"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsSubtype"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessType"

-			value      	("GenerateAccessTypeSet" 230))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessTypeName"

-			value      	"Handle")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessTypeVisibility"

-			value      	("TypeVisibilitySet" 45))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessTypeDefinition"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessClassWide"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"MaybeAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParameterizedImplementation"

-			value      	("ParameterizedImplementationSet" 11))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParentClassName"

-			value      	"Superclass")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"EnumerationLiteralPrefix"

-			value      	"A_")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldPrefix"

-			value      	"The_")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ArrayOfTypeName"

-			value      	"Array_Of_${type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessArrayOfTypeName"

-			value      	"Access_Array_Of_${type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ArrayOfAccessTypeName"

-			value      	"Array_Of_${access_type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessArrayOfAccessTypeName"

-			value      	"Access_Array_Of_${access_type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ArrayIndexDefinition"

-			value      	"Positive range <>")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameterName"

-			value      	"This")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateDefaultConstructor"

-			value      	("SubprogramKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DefaultConstructorName"

-			value      	"Create")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineDefaultConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateCopyConstructor"

-			value      	("SubprogramKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CopyConstructorName"

-			value      	"Copy")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineCopyConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateDestructor"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DestructorName"

-			value      	"Free")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineDestructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateTypeEquality"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeEqualityName"

-			value      	"${quote}=${quote}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineEquality"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Tagged"

-				value      	208)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Record"

-				value      	210)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Mixin"

-				value      	211)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Task"

-				value      	212)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"SingleType"

-				value      	209)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"MultipleTypes"

-				value      	213)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParameterizedImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Generic"

-				value      	11)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Unconstrained"

-				value      	214)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Private"

-				value      	43)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SubprogramKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeControlSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"None"

-				value      	225)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"InitializationOnly"

-				value      	226)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AssignmentFinalizationOnly"

-				value      	227)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"All"

-				value      	228)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Always"

-				value      	229)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Auto"

-				value      	230)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenericFormalParameters"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsPrivate"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsSubunit"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SubprogramImplementation"

-			value      	("SubprogramImplementationSet" 2))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Renames"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateOverriding"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameterMode"

-			value      	("ParameterModeSet" 203))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameterClassWide"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Inline"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"EntryCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ExitCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InitialCodeBody"

-			value      	"${default}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"EntryBarrierCondition"

-			value      	"True")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SubprogramImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Spec"

-				value      	224)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Body"

-				value      	2)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Abstract"

-				value      	221)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Renaming"

-				value      	222)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"RenamingAsBody"

-				value      	231)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Separate"

-				value      	223)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParameterModeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"In"

-				value      	204)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Out"

-				value      	205)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"InOut"

-				value      	203)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Access"

-				value      	220)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Has"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"NameIfUnlabeled"

-			value      	"The_${supplier}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementation"

-			value      	("RecordFieldImplementationSet" 216))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldName"

-			value      	"${relationship}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessGet"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${relationship}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessSet"

-			value      	("ProcedureKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${relationship}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementation"

-			value      	("ContainerImplementationSet" 217))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Component"

-				value      	216)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Discriminant"

-				value      	218)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AccessDiscriminant"

-				value      	219)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Array"

-				value      	217)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Generic"

-				value      	11)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementation"

-			value      	("RecordFieldImplementationSet" 216))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldName"

-			value      	"${attribute}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessGet"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${attribute}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessSet"

-			value      	("ProcedureKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${attribute}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Component"

-				value      	216)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Discriminant"

-				value      	218)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AccessDiscriminant"

-				value      	219)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Association"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${association}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${association}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAssociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AssociateName"

-			value      	"Associate")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineAssociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateDissociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DissociateName"

-			value      	"Dissociate")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineDissociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementation"

-			value      	("RecordFieldImplementationSet" 216))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldName"

-			value      	"${target}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessGet"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${target}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessSet"

-			value      	("ProcedureKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${target}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementation"

-			value      	("ContainerImplementationSet" 217))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Component"

-				value      	216)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Discriminant"

-				value      	218)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AccessDiscriminant"

-				value      	219)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Array"

-				value      	217)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Generic"

-				value      	11)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Subsystem"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Directory"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Editor"

-			value      	("EditorType" 100))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"IncludePath"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"StopOnError"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"EditorType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"BuiltIn"

-				value      	100)

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"WindowsShell"

-				value      	101)))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"PathSeparator"

-			value      	"")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ArrayDimensions"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ConstValue"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ImplementationType"

-			value      	"")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CmIdentification"

-			value      	(value Text "  %X%  @(#) plugins/org.eclipse.wst.dtd/src/rose/dtdmodel.mdl, org.eclipse.wst.dtd, wtpM1, 20041122"))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"InclusionProtectionSymbol"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CmIdentification"

-			value      	(value Text "  %X%  @(#) plugins/org.eclipse.wst.dtd/src/rose/dtdmodel.mdl, org.eclipse.wst.dtd, wtpM1, 20041122"))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"InclusionProtectionSymbol"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Context"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"OperationIsOneWay"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ArrayDimensions"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CaseSpecifier"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"IsReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Order"

-			value      	"")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ArrayDimensions"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CaseSpecifier"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"GenerateForwardReference"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"IsReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Order"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"BoundedRoleType"

-			value      	("AssocTypeSet" 47))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"AssocTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"Array"

-				value      	24)

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"Sequence"

-				value      	47)))))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Uses"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"GenerateForwardReference"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"project"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ViewCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DomainCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SPPackageCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TriggerCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IndexCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"StoreProcedureCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PrimaryKeyCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForeignKeyCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"JoinCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpaceCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"cONTAINERCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TablePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ViewPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DomainPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TriggerPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IndexPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"StoreProcedurePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PrimaryKeyPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForeignKeyPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpacePrefix"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDatabase"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TargetDatabase"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Location"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsTableSpace"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpaceType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDeault"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"BufferPool"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ExtentSize"

-			value      	1)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PrefetchSize"

-			value      	1)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PageSize"

-			value      	4)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ManagedBy"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ContainerList"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmSchema"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmDomainPackage"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsSchema"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDomainPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRootSchema"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRootDomainPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsSchemaPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DatabaseID"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DBMS"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsTable"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsView"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDomain"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsSPPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Synonymns"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpaceID"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceId"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"CorrelationName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SelectClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUpdateable"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"CheckOption"

-			value      	"None")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsSnapShot"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDistinct"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PersistToServer"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsPackage"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Ordinal"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsIdentity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"NullsAllowed"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Length"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Scale"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ColumnType"

-			value      	"Native")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForBitData"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValueType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceId"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"OID"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Association"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRelationship"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceId"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RIMethod"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentUpdateRule"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentUpdateRuleName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentDeleteRule"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentDeleteRuleName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildInsertRestrict"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildInsertRestrictName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildMultiplicity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildMultiplicityName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsConstraint"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsIndex"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsTrigger"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsStoredProcedure"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsCluster"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpace"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"FillFactor"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"KeyList"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"CheckPredicate"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DeferalMode"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"InitialCheckTime"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TriggerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsInsertEvent"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUpdateEvent"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDeleteEvent"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefOldTable"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefNewTable"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefOldRow"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefNewRow"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRow"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"WhenClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Language"

-			value      	"SQL")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ProcType"

-			value      	"Procedure")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDeterministic"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParameterStyle"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ReturnedNull"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ExternalName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Length"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Scale"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForBitData"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValueType"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Parameter"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsInParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsOutParameter"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Ordinal"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Length"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Scale"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForBitData"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValueType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"OperationID"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Data Modeler Communicator"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"framework"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Java"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"RootDir"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"UsePrefixes"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"AutoSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"NotShowRoseIDDlg"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ShowCodegenDlg"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateRoseID"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateDefaultReturnLine"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocDefaultAuthor"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocDefaultVersion"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocDefaultSince"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagName1"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagApply1"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagText1"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagName2"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagApply2"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagText2"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagName3"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagApply3"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagText3"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocNumAsterisks"

-			value      	0)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MaxNumChars"

-			value      	80)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Editor"

-			value      	("EditorType" 100))

-		    (object Attribute

-			tool       	"Java"

-			name       	"VM"

-			value      	("VMType" 200))

-		    (object Attribute

-			tool       	"Java"

-			name       	"ClassPath"

-			value      	".;C:\\IBM\\SQLLIB\\java\\db2java.zip;C:\\IBM\\SQLLIB\\java\\db2jcc.jar;C:\\IBM\\SQLLIB\\java\\sqlj.zip;C:\\IBM\\SQLLIB\\bin;C:\\IBM\\SQLLIB\\java\\common.jar")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ReferenceClasspath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EditorType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"BuiltIn"

-				value      	100)

-			    (object Attribute

-				tool       	"Java"

-				name       	"WindowsShell"

-				value      	101)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"VMType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Sun"

-				value      	200)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"VAJavaWorkingFolder"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"InstanceVariablePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ClassVariablePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DefaultAttributeDataType"

-			value      	"int")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DefaultOperationReturnType"

-			value      	"void")

-		    (object Attribute

-			tool       	"Java"

-			name       	"NoClassCustomDlg"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GlobalImports"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Java"

-			name       	"OpenBraceClassStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"OpenBraceMethodStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"UseTabs"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"UseSpaces"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"SpacingItems"

-			value      	3)

-		    (object Attribute

-			tool       	"Java"

-			name       	"RoseDefaultCommentStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"AsteriskCommentStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavaCommentStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocAuthor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocSince"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocVersion"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"BeanPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"BeanSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"RemotePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"RemoteSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"HomePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"HomeSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"PrimaryKeyPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"PrimaryKeySuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBDTDLocation"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletDTDLocation"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DefaultEJBVersion"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DefaultServletVersion"

-			value      	"")))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Static"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateDefaultConstructor"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ConstructorIs"

-			value      	("Ctor_Set" 62))

-		    (object Attribute

-			tool       	"Java"

-			name       	"Ctor_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"public"

-				value      	62)

-			    (object Attribute

-				tool       	"Java"

-				name       	"protected"

-				value      	63)

-			    (object Attribute

-				tool       	"Java"

-				name       	"private"

-				value      	64)

-			    (object Attribute

-				tool       	"Java"

-				name       	"package"

-				value      	65)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFinalizer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateStaticInitializer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateInstanceInitializer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"DisableAutoSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ReadOnly"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"Default_Servlet__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletName"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletContextRef"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"IsSingleThread"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletInitParameter"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletInitParameterNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletIsSecure"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestDispatcher"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestDispatcherPath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DispatcherInclude"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"DispatcherForward"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletSecurityRoles"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletgetInfo"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletXMLFilePath"

-			value      	"")))

-	    (object Attribute

-		tool       	"Java"

-		name       	"Http_Servlet__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestAttribute"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestAttributesNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForRequestAttributes"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestParameter"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestParameterNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForRequestParameters"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletHeader"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletHeaderNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForHeaders"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletIntHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletDateHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletCookie"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForCookie"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletContentType"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateHTML"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"Default_EJB__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Generate_XML_DD"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBCmpField"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBEnvironmentProperties"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBCnxFactory"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBReferences"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSecurityRoles"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBNameInJAR"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionType"

-			value      	("EJBSessionType_Set" 200))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	""

-				value      	200)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Stateless"

-				value      	201)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Stateful"

-				value      	202)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBTransactionType"

-			value      	("EJBTransactionType_Set" 211))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBTransactionType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Container"

-				value      	211)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bean"

-				value      	212)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBPersistenceType"

-			value      	("EJBPersistenceType_Set" 220))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBPersistenceType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	""

-				value      	220)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bean"

-				value      	221)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Container"

-				value      	222)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBReentrant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBVersion"

-			value      	("EJBVersion_Set" 230))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBVersion_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"2.0"

-				value      	230)

-			    (object Attribute

-				tool       	"Java"

-				name       	"1.x"

-				value      	231)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBXMLFilePath"

-			value      	"")))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"CmIdentification"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Java"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"CmIdentification"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Java"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Abstract"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Static"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Native"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Synchronized"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFullyQualifiedReturn"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ReplaceExistingCode"

-			value      	TRUE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Transient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Volatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"PropertyType"

-			value      	("BeanProperty_Set" 71))

-		    (object Attribute

-			tool       	"Java"

-			name       	"BeanProperty_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Not A Property"

-				value      	71)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Simple"

-				value      	72)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bound"

-				value      	73)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Constrained"

-				value      	74)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"IndividualChangeMgt"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write"

-			value      	("Read/Write_Set" 81))

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read & Write"

-				value      	81)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read Only"

-				value      	82)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Write Only"

-				value      	83)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFullyQualifiedTypes"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"ContainerClass"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Transient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Volatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"PropertyType"

-			value      	("BeanProperty_Set" 71))

-		    (object Attribute

-			tool       	"Java"

-			name       	"BeanProperty_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Not A Property"

-				value      	71)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Simple"

-				value      	72)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bound"

-				value      	73)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Constrained"

-				value      	74)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"IndividualChangeMgt"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write"

-			value      	("Read/Write_Set" 81))

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read & Write"

-				value      	81)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read Only"

-				value      	82)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Write Only"

-				value      	83)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFullyQualifiedTypes"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"IsNavigable"

-			value      	TRUE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"propertyId"

-		value      	"360000002")

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"DDLScriptFilename"

-			value      	"DDL1.SQL")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"DropClause"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"PrimaryKeyColumnName"

-			value      	"_ID")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"PrimaryKeyColumnType"

-			value      	"NUMBER(5,0)")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"SchemaNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"SchemaNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TableNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TableNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TypeNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TypeNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ViewNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ViewNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"VarrayNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"VarrayNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"NestedTableNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"NestedTableNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ObjectTableNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ObjectTableNameSuffix"

-			value      	"")))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsSchema"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OID"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"WhereClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CheckConstraint"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionTypeLength"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionTypePrecision"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionTypeScale"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionOfREFS"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"MethodKind"

-			value      	("MethodKindSet" 1903))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OverloadID"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OrderNumber"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsReadNoDataState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsReadNoProcessState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsWriteNoDataState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsWriteNoProcessState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsSelfish"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerType"

-			value      	("TriggerTypeSet" 1801))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerEvent"

-			value      	("TriggerEventSet" 1601))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerText"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerReferencingNames"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerForEach"

-			value      	("TriggerForEachSet" 1701))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerWhenClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"MethodKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"MapMethod"

-				value      	1901)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"OrderMethod"

-				value      	1902)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Function"

-				value      	1903)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Procedure"

-				value      	1904)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Operator"

-				value      	1905)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Constructor"

-				value      	1906)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Destructor"

-				value      	1907)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Trigger"

-				value      	1908)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Calculated"

-				value      	1909)))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"AFTER"

-				value      	1801)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"BEFORE"

-				value      	1802)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSTEAD OF"

-				value      	1803)))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerForEachSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"ROW"

-				value      	1701)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"STATEMENT"

-				value      	1702)))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerEventSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT"

-				value      	1601)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"UPDATE"

-				value      	1602)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"DELETE"

-				value      	1603)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT OR UPDATE"

-				value      	1604)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT OR DELETE"

-				value      	1605)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"UPDATE OR DELETE"

-				value      	1606)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT OR UPDATE OR DELETE"

-				value      	1607)))))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OrderNumber"

-			value      	"")))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OrderNumber"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"NullsAllowed"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"Length"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"Precision"

-			value      	"2")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"Scale"

-			value      	"6")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsIndex"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsPrimaryKey"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CompositeUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CheckConstraint"

-			value      	"")))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"ComponentTest"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"cg"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerAnnotations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerVersion"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"UseMSVC"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileExtension"

-			value      	"h")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileBackupExtension"

-			value      	"h~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileTemporaryExtension"

-			value      	"h#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileExtension"

-			value      	"cpp")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileBackupExtension"

-			value      	"cp~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileTemporaryExtension"

-			value      	"cp#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"cg"

-			name       	"Directory"

-			value      	"$ROSECPP_SOURCE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"PathSeparator"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FileNameFormat"

-			value      	"128vx_b")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BooleanType"

-			value      	"int")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowTemplates"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowExplicitInstantiations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowProtectedInheritance"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"CommentWidth"

-			value      	60)

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByValueContainer"

-			value      	"$targetClass")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByValueContainer"

-			value      	"OptionalByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByValueContainer"

-			value      	"BoundedListByValue<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByValueContainer"

-			value      	"BoundedSetByValue<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByReferenceContainer"

-			value      	"BoundedListByReference<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByReferenceContainer"

-			value      	"BoundedSetByReference<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByValueContainer"

-			value      	"UnboundedListByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByValueContainer"

-			value      	"UnboundedSetByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByReferenceContainer"

-			value      	"UnboundedListByReference<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByReferenceContainer"

-			value      	"UnboundedSetByReference<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByValueContainer"

-			value      	"AssociationByValue<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByValueContainer"

-			value      	"DictionaryByValue<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByReferenceContainer"

-			value      	"AssociationByReference<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByReferenceContainer"

-			value      	"DictionaryByReference<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AlwaysKeepOrphanedCode"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"compiler2.1__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerAnnotations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerVersion"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileExtension"

-			value      	"h")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileBackupExtension"

-			value      	"h~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileTemporaryExtension"

-			value      	"h#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileExtension"

-			value      	"cpp")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileBackupExtension"

-			value      	"cp~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileTemporaryExtension"

-			value      	"cp#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"cg"

-			name       	"Directory"

-			value      	"$ROSECPP_SOURCE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BooleanType"

-			value      	"int")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowTemplates"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowExplicitInstantiations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowProtectedInheritance"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByValueContainer"

-			value      	"$targetClass")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByValueContainer"

-			value      	"OptionalByValue(sizeof($targetClass))")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByValueContainer"

-			value      	"BoundedListByValue(sizeof($targetClass),$limit)")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByValueContainer"

-			value      	"BoundedSetByValue(sizeof($targetClass),$limit)")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByReferenceContainer"

-			value      	"BoundedListByReference($limit)")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByReferenceContainer"

-			value      	"BoundedSetByReference($limit)")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByValueContainer"

-			value      	"UnboundedListByValue(sizeof($targetClass))")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByValueContainer"

-			value      	"UnboundedSetByValue(sizeof($targetClass))")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByReferenceContainer"

-			value      	"UnboundedListByReference")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByReferenceContainer"

-			value      	"UnboundedSetByReference")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByValueContainer"

-			value      	"AssociationByValue(sizeof($qualtype), sizeof($qualcont))")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByValueContainer"

-			value      	"DictionaryByValue(sizeof($qualtype), sizeof($qualcont))")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByReferenceContainer"

-			value      	"AssociationByReference(sizeof($qualtype), sizeof($qualcont))")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByReferenceContainer"

-			value      	"DictionaryByReference(sizeof($qualtype), sizeof($qualcont))")

-		    (object Attribute

-			tool       	"cg"

-			name       	"PathSeparator"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FileNameFormat"

-			value      	"128vx_b")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AlwaysKeepOrphanedCode"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"compiler3.0__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerAnnotations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerVersion"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileExtension"

-			value      	"h")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileBackupExtension"

-			value      	"h~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileTemporaryExtension"

-			value      	"h#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileExtension"

-			value      	"cpp")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileBackupExtension"

-			value      	"cp~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileTemporaryExtension"

-			value      	"cp#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"cg"

-			name       	"Directory"

-			value      	"$ROSECPP_SOURCE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BooleanType"

-			value      	"int")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowTemplates"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowExplicitInstantiations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowProtectedInheritance"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByValueContainer"

-			value      	"$targetClass")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByValueContainer"

-			value      	"OptionalByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByValueContainer"

-			value      	"BoundedListByValue<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByValueContainer"

-			value      	"BoundedSetByValue<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByReferenceContainer"

-			value      	"BoundedListByReference<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByReferenceContainer"

-			value      	"BoundedSetByReference<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByValueContainer"

-			value      	"UnboundedListByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByValueContainer"

-			value      	"UnboundedSetByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByReferenceContainer"

-			value      	"UnboundedListByReference<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByReferenceContainer"

-			value      	"UnboundedSetByReference<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByValueContainer"

-			value      	"AssociationByValue<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByValueContainer"

-			value      	"DictionaryByValue<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByReferenceContainer"

-			value      	"AssociationByReference<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByReferenceContainer"

-			value      	"DictionaryByReference<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"PathSeparator"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FileNameFormat"

-			value      	"128vx_b")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AlwaysKeepOrphanedCode"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"ImplementationType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"ClassKey"

-			value      	"class")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegions"

-			value      	("GenerateEmptyRegionSet" 3))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegionSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Preserved"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unpreserved"

-				value      	2)

-			    (object Attribute

-				tool       	"cg"

-				name       	"All"

-				value      	3)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"PutBodiesInSpec"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDefaultConstructor"

-			value      	("GenerateSet" 199))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DefaultConstructorVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineDefaultConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ExplicitDefaultConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateCopyConstructor"

-			value      	("GenerateSet" 199))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CopyConstructorVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineCopyConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ExplicitCopyConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDestructor"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DestructorVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DestructorKind"

-			value      	("ThreeKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineDestructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateAssignmentOperation"

-			value      	("GenerateSet" 199))

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssignmentVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssignmentKind"

-			value      	("ThreeKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineAssignmentOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEqualityOperations"

-			value      	("GenerateSet" 199))

-		    (object Attribute

-			tool       	"cg"

-			name       	"EqualityVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"EqualityKind"

-			value      	("FriendKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineEqualityOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateRelationalOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"RelationalVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"RelationalKind"

-			value      	("FriendKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineRelationalOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateStorageMgmtOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"StorageMgmtVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineStorageMgmtOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateSubscriptOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"SubscriptVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"SubscriptKind"

-			value      	("ThreeKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"SubscriptResultType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineSubscriptOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDereferenceOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DereferenceVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DereferenceKind"

-			value      	("ThreeKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DereferenceResultType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineDereferenceOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateIndirectionOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IndirectionVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IndirectionKind"

-			value      	("ThreeKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IndirectionResultType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineIndirectionOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateStreamOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"StreamVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineStreamOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ThreeKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"KindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Static"

-				value      	203)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"FriendKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Friend"

-				value      	204)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"DeclareAndDefine"

-				value      	199)

-			    (object Attribute

-				tool       	"cg"

-				name       	"DeclareOnly"

-				value      	205)

-			    (object Attribute

-				tool       	"cg"

-				name       	"DoNotDeclare"

-				value      	206)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"VisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Implementation"

-				value      	14)))))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegions"

-			value      	("GenerateEmptyRegionSet" 3))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegionSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Preserved"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unpreserved"

-				value      	2)

-			    (object Attribute

-				tool       	"cg"

-				name       	"All"

-				value      	3)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CmIdentification"

-			value      	(value Text "  %X%  @(#) plugins/org.eclipse.wst.dtd/src/rose/dtdmodel.mdl, org.eclipse.wst.dtd, wtpM1, 20041122"))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"FileName"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowExtensionlessFileName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InclusionProtectionSymbol"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeFormat"

-			value      	(value Text 

-|// $package

-|#include "$file"

-|

-			))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeBySimpleName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludePrecompiledHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeOrder"

-			value      	"AMIR")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InliningStyle"

-			value      	("InliningStyleSet" 207))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InliningStyleSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"InClassDeclaration"

-				value      	208)

-			    (object Attribute

-				tool       	"cg"

-				name       	"FollowingClassDeclaration"

-				value      	207)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"TypesDefined"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeClosure"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegions"

-			value      	("GenerateEmptyRegionSet" 3))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegionSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Preserved"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unpreserved"

-				value      	2)

-			    (object Attribute

-				tool       	"cg"

-				name       	"All"

-				value      	3)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CmIdentification"

-			value      	(value Text "  %X%  @(#) plugins/org.eclipse.wst.dtd/src/rose/dtdmodel.mdl, org.eclipse.wst.dtd, wtpM1, 20041122"))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"FileName"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowExtensionlessFileName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeFormat"

-			value      	(value Text 

-|// $package

-|#include "$file"

-|

-			))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeBySimpleName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludePrecompiledHeader"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeOrder"

-			value      	"AMIR")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InliningStyle"

-			value      	("InliningStyleSet" 207))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InliningStyleSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"InClassDeclaration"

-				value      	208)

-			    (object Attribute

-				tool       	"cg"

-				name       	"FollowingClassDeclaration"

-				value      	207)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"TypesDefined"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeClosure"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OperationKind"

-			value      	("OperationKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"OperationKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Static"

-				value      	203)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Friend"

-				value      	204)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateAbstractBody"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateFriendBody"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateFriendDecl"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"SpecialDeclReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OperationIsConst"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"OperationIsExplicit"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"Inline"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"EntryCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"ExitCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CCRegion"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegions"

-			value      	("GenerateEmptyRegionSet" 3))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegionSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Preserved"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unpreserved"

-				value      	2)

-			    (object Attribute

-				tool       	"cg"

-				name       	"All"

-				value      	3)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"BodyAnnotations"

-			value      	"")))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Has"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"Ordered"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"NameIfUnlabeled"

-			value      	"the_$supplier")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDataMember"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberName"

-			value      	"$relationship")

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibility"

-			value      	("DataMemberVisibilitySet" 14))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Implementation"

-				value      	14)

-			    (object Attribute

-				tool       	"cg"

-				name       	"AtRelationshipVisibility"

-				value      	210)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutability"

-			value      	("DataMemberMutabilitySet" 0))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutabilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unrestricted"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Mutable"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Const"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberIsVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberFieldSize"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"InitialValue"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateGetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateSetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetName"

-			value      	"get_$relationship")

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetName"

-			value      	"set_$relationship")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKinds"

-			value      	("GetSetKindsSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKindsSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Static"

-				value      	203)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Friend"

-				value      	204)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"ContainerClass"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetIsConst"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConst"

-			value      	("GetResultIsConstSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConstSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"False"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"True"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Same_As_Function"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetByReference"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetReturnsValue"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ForwardReferenceOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"HasRelTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Array"

-				value      	24)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Sequence"

-				value      	47)))))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Association"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"NameIfUnlabeled"

-			value      	"the_$targetClass")))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Inherit"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"InstanceArguments"

-			value      	"")))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"ForwardReferenceOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"NameIfUnlabeled"

-			value      	"the_$targetClass")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDataMember"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberName"

-			value      	"$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibility"

-			value      	("DataMemberVisibilitySet" 14))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Implementation"

-				value      	14)

-			    (object Attribute

-				tool       	"cg"

-				name       	"AtRelationshipVisibility"

-				value      	210)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutability"

-			value      	("DataMemberMutabilitySet" 0))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutabilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unrestricted"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Mutable"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Const"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberIsVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberFieldSize"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"InitialValue"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"ContainerClass"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"ContainerGet"

-			value      	"$data.get($keys)")

-		    (object Attribute

-			tool       	"cg"

-			name       	"ContainerSet"

-			value      	"$data.set($keys,$value)")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedContainer"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassContainer"

-			value      	"$supplier *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassInitialValue"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKinds"

-			value      	("GetSetKindsSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKindsSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Static"

-				value      	203)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Friend"

-				value      	204)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetByReference"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateGetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetName"

-			value      	"get_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetIsConst"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConst"

-			value      	("GetResultIsConstSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConstSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"False"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"True"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Same_As_Function"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateSetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetName"

-			value      	"set_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetReturnsValue"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedGetSetByReference"

-			value      	("QualifiedGetSetByReferenceSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedGetSetByReferenceSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"False"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"True"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Same_As_GetSetByReference"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateQualifiedGetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedGetName"

-			value      	"get_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedGetIsConst"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedGetResultIsConst"

-			value      	("GetResultIsConstSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineQualifiedGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateQualifiedSetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedSetName"

-			value      	"set_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedSetReturnsValue"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineQualifiedSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateAssocClassDataMember"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassDataMemberName"

-			value      	"$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassDataMemberVisibility"

-			value      	("DataMemberVisibilitySet" 14))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Implementation"

-				value      	14)

-			    (object Attribute

-				tool       	"cg"

-				name       	"AtRelationshipVisibility"

-				value      	210)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassDataMemberMutability"

-			value      	("DataMemberMutabilitySet" 0))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutabilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unrestricted"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Mutable"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Const"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassDataMemberIsVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassGetSetKinds"

-			value      	("GetSetKindsSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateAssocClassGetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassGetName"

-			value      	"get_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassGetIsConst"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassGetResultIsConst"

-			value      	("GetResultIsConstSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineAssocClassGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateAssocClassSetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassSetName"

-			value      	"set_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassSetReturnsValue"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineAssocClassSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassForwardReferenceOnly"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Array"

-				value      	24)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Sequence"

-				value      	47)))))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDataMember"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberName"

-			value      	"$attribute")

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibility"

-			value      	("DataMemberVisibilitySet" 14))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Implementation"

-				value      	14)

-			    (object Attribute

-				tool       	"cg"

-				name       	"AtAttributeVisibility"

-				value      	211)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutability"

-			value      	("DataMemberMutabilitySet" 0))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutabilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unrestricted"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Mutable"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Const"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberIsVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberFieldSize"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateGetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateSetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetName"

-			value      	"get_$attribute")

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetName"

-			value      	"set_$attribute")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKinds"

-			value      	("GetSetKindsSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKindsSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Static"

-				value      	203)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Friend"

-				value      	204)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetIsConst"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConst"

-			value      	("GetResultIsConstSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConstSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"False"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"True"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Same_As_Function"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetByReference"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetReturnsValue"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"CCRegion"

-			value      	"")))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Uses"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"ForwardReferenceOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"BodyReferenceOnly"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Subsystem"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"Directory"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"DirectoryIsOnSearchList"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"PrecompiledHeader"

-			value      	"")))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"IsNamespace"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"Indent"

-			value      	2)

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegions"

-			value      	("GenerateEmptyRegionSet" 3))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegionSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Preserved"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unpreserved"

-				value      	2)

-			    (object Attribute

-				tool       	"cg"

-				name       	"All"

-				value      	3)))))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Version"

-			value      	"5.0")))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Type"

-			value      	("MSVCClassTypeSet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSVCClassTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Normal"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Interface_Part"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Connection_Part"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Class_Factory"

-				value      	3)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CObjectFunctionality"

-			value      	("CObjectFunctionalitySet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CObjectFunctionalitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dynamic"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dyncreate"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Serial"

-				value      	3)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateOverrideGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateDataGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DATA_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateFieldGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_FIELD_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateMessageGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateMessageMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_MSG_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MESSAGE_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLEFactory"

-			value      	("OLEFactorySet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLEFactorySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Built_in"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Simple"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Licensed"

-				value      	3)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLEName"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLEClassID"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateOLECtlType"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLECtlType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateOLETypeLib"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLETypeLibID"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLETypeLibMajor"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLETypeLibMinor"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GeneratePropPageIDs"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLEPropPageIDs"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateDispatchMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockProperties"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockFunctions"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DispatchDefValue"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateDispIdEnum"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISP_ID_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateInterfaceMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"INTERFACE_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"InitInterface"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateEventMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENT_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENT_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"EVENT_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockEvents"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateEventSinkMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENTSINK_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENTSINK_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"EVENTSINK_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"PropNotifySinks"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateConnectionMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CONNECTION_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"ConnectionPointIID"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"InheritanceType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DeclSpec"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLECommands"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MFCDeclares"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MFCImplements"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"ATL_Declares"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateCOMMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"COM_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateConnectionPointMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CONNECTION_POINT_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateMsgMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSG_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GeneratePropertyMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"PROPERTY_MAP_Entries"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Type"

-			value      	("MSVCOperationTypeSet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSVCOperationTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Normal"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Virtual_Override"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Message_Handler"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dispatch_Handler"

-				value      	3)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Event_Firing_Function"

-				value      	4)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Event_Sink_Handler"

-				value      	5)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Std_OLE_Method"

-				value      	6)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Command_Parser"

-				value      	7)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Property_Get_Function"

-				value      	8)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Property_Set_Function"

-				value      	9)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Property_Notify_Function"

-				value      	10)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Macro_Generated_Function"

-				value      	11)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_MSG_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MESSAGE_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENT_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"EVENT_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENTSINK_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"EVENTSINK_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CallType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DeclSpec"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"BodyImage"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Type"

-			value      	("MSVCAttributeTypeSet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSVCAttributeTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Normal"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Member_Property"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Get_Set_Property"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dialog_Data"

-				value      	3)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Field_Data"

-				value      	4)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Stock_Property"

-				value      	5)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DeclSpec"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"PointerBase"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CallType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockPropertyImplementation"

-			value      	"")))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Has"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Type"

-			value      	("MSVCAttributeTypeSet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSVCAttributeTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Normal"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Member_Property"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Get_Set_Property"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dialog_Data"

-				value      	3)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Field_Data"

-				value      	4)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Stock_Property"

-				value      	5)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DeclSpec"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"PointerBase"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CallType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockPropertyImplementation"

-			value      	"")))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Type"

-			value      	("MSVCAttributeTypeSet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSVCAttributeTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Normal"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Member_Property"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Get_Set_Property"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dialog_Data"

-				value      	3)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Field_Data"

-				value      	4)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Stock_Property"

-				value      	5)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DeclSpec"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"PointerBase"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CallType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockPropertyImplementation"

-			value      	"")))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateIncludesGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_INCLUDES_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateInsertLocation"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateIncludesGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_INCLUDES_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateInsertLocation"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Rose Model Integrator"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Rose Web Publisher"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"TopLink"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"COM"

-		name       	"propertyId"

-		value      	"783606378")

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"TypeKinds"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"COM"

-				name       	"enum"

-				value      	100)

-			    (object Attribute

-				tool       	"COM"

-				name       	"record"

-				value      	101)

-			    (object Attribute

-				tool       	"COM"

-				name       	"module"

-				value      	102)

-			    (object Attribute

-				tool       	"COM"

-				name       	"interface"

-				value      	103)

-			    (object Attribute

-				tool       	"COM"

-				name       	"dispinterface"

-				value      	104)

-			    (object Attribute

-				tool       	"COM"

-				name       	"coclass"

-				value      	105)

-			    (object Attribute

-				tool       	"COM"

-				name       	"alias"

-				value      	106)

-			    (object Attribute

-				tool       	"COM"

-				name       	"union"

-				value      	107)

-			    (object Attribute

-				tool       	"COM"

-				name       	"max"

-				value      	108)

-			    (object Attribute

-				tool       	"COM"

-				name       	"(none)"

-				value      	109)))

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"kind"

-			value      	("TypeKinds" 109))

-		    (object Attribute

-			tool       	"COM"

-			name       	"uuid"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"version"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpcontext"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"dllname"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"alias"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"id"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"id"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"filename"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"library"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"uuid"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"version"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpfile"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpcontext"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"lcid"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Version Control"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"propertyId"

-		value      	"783606378")

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateModel"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"InstancingSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"Private"

-				value      	221)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"PublicNotCreatable"

-				value      	213)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"SingleUse"

-				value      	214)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"GlobalSingleUse"

-				value      	215)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"MultiUse"

-				value      	219)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"GlobalMultiUse"

-				value      	220)))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"BaseSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"(none)"

-				value      	222)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"0"

-				value      	223)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"1"

-				value      	224)))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"OptionBase"

-			value      	("BaseSet" 222))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"OptionExplicit"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"OptionCompare"

-			value      	("CompareSet" 202))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Instancing"

-			value      	("InstancingSet" 219))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"CompareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"(none)"

-				value      	202)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"Binary"

-				value      	203)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"Text"

-				value      	204)))))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"LibraryName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"AliasName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"IsStatic"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProcedureID"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ReplaceExistingBody"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"DefaultBody"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"New"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"WithEvents"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProcedureID"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"PropertyName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Subscript"

-			value      	"")))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"New"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"WithEvents"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"FullName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProcedureID"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"PropertyName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Subscript"

-			value      	"")))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Inherit"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ImplementsDelegation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"FullName"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ByVal"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ByRef"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Optional"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ParamArray"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProjectFile"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateModel"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ImportReferences"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"QuickImport"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ImportBinary"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"VisualStudio"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Web Modeler"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Editor"

-			value      	("EditorType" 100))

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"StopOnError"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"EditorType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"XML_DTD"

-				name       	"BuiltIn"

-				value      	100)

-			    (object Attribute

-				tool       	"XML_DTD"

-				name       	"WindowsShell"

-				value      	101)))))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Entity_SystemID"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Entity_PublicID"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"NotationValue"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"InternalValue"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"ParameterEntity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"ExternalEntity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Notation_SystemID"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Notation_PublicID"

-			value      	"")))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"DefaultDeclType"

-			value      	"")))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Assign All"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"ComponentPath"

-			value      	"")))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"packageName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsURI"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"basePackage"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"prefix"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"classifierName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"operationName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"attributeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isTransient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isChangeable"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isUnsettable"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isUnique"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isID"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"referenceName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isTransient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isChangeable"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isUnsettable"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isResolveProxies"

-			value      	TRUE))))

-	quid       	"3A0C75F401FA"))

diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/DTDFile.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/DTDFile.gif
deleted file mode 100644
index 64ee536..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/DTDFile.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/any.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/any.gif
deleted file mode 100644
index 7017d91..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/any.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/attribute.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/attribute.gif
deleted file mode 100644
index 00bb7b4..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/attribute.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/attribute_list.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/attribute_list.gif
deleted file mode 100644
index 795eb5e..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/attribute_list.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/comment.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/comment.gif
deleted file mode 100644
index 28c2ccb..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/comment.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/element.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/element.gif
deleted file mode 100644
index 01f4889..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/element.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/element_ref.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/element_ref.gif
deleted file mode 100644
index 749acfc..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/element_ref.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/emptycontent.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/emptycontent.gif
deleted file mode 100644
index bc8e66c..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/emptycontent.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/entity.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/entity.gif
deleted file mode 100644
index 6a91888..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/entity.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/entity_reference.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/entity_reference.gif
deleted file mode 100644
index d30b26b..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/entity_reference.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/fldr_el.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/fldr_el.gif
deleted file mode 100644
index 801c133..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/fldr_el.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/fldr_ent.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/fldr_ent.gif
deleted file mode 100644
index 2fb2ca7..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/fldr_ent.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/fldr_not.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/fldr_not.gif
deleted file mode 100644
index 5909668..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/fldr_not.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/fldr_unrec.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/fldr_unrec.gif
deleted file mode 100644
index 6fd82e6..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/fldr_unrec.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/folder_attlist_obj.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/folder_attlist_obj.gif
deleted file mode 100644
index f849c75..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/folder_attlist_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/folder_comments_obj.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/folder_comments_obj.gif
deleted file mode 100644
index c9f0945..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/folder_comments_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/genhtmform_wiz.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/genhtmform_wiz.gif
deleted file mode 100644
index 5f54702..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/genhtmform_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/notation.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/notation.gif
deleted file mode 100644
index ce9df98..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/notation.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/one.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/one.gif
deleted file mode 100644
index 694c26f..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/one.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/onechoice.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/onechoice.gif
deleted file mode 100644
index d13ba2e..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/onechoice.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/oneormore.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/oneormore.gif
deleted file mode 100644
index 8b2b357..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/oneormore.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/oneormorechoice.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/oneormorechoice.gif
deleted file mode 100644
index 96398c0..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/oneormorechoice.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/oneormoresequence.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/oneormoresequence.gif
deleted file mode 100644
index 041db27..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/oneormoresequence.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/onesequence.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/onesequence.gif
deleted file mode 100644
index 5f9658e..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/onesequence.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/optional.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/optional.gif
deleted file mode 100644
index e7422d7..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/optional.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/optionalchoice.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/optionalchoice.gif
deleted file mode 100644
index fb4f9bd..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/optionalchoice.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/optionalsequence.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/optionalsequence.gif
deleted file mode 100644
index f8d5289..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/optionalsequence.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/txtext.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/txtext.gif
deleted file mode 100644
index efa7a38..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/txtext.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/unrecognized_content.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/unrecognized_content.gif
deleted file mode 100644
index 358997d..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/unrecognized_content.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/zeroormore.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/zeroormore.gif
deleted file mode 100644
index daf514d..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/zeroormore.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/zeroormorechoice.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/zeroormorechoice.gif
deleted file mode 100644
index a1ac131..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/zeroormorechoice.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/zeroormoresequence.gif b/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/zeroormoresequence.gif
deleted file mode 100644
index 8ed4cb7..0000000
--- a/bundles/org.eclipse.wst.dtd.core/icons/full/obj16/zeroormoresequence.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.core/plugin.properties b/bundles/org.eclipse.wst.dtd.core/plugin.properties
deleted file mode 100644
index 50405a6..0000000
--- a/bundles/org.eclipse.wst.dtd.core/plugin.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Jens Lukowski/Innoopract - initial renaming/restructuring
-#     
-###############################################################################
-
-providerName=Eclipse.org
-pluginName=Structured Source DTD Core
-nlFeatureName=Structured Source DTD Core NL Support
-#
-Structured_DTD_Document_Factory_Extension.name=Structured DTD Document Factory Extension
-DTD_Content_Type_Extension_Element.name=DTD
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.core/plugin.xml b/bundles/org.eclipse.wst.dtd.core/plugin.xml
deleted file mode 100644
index cc6c541..0000000
--- a/bundles/org.eclipse.wst.dtd.core/plugin.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension point="org.eclipse.wst.sse.core.modelHandler">
-		<modelHandler
-			class="org.eclipse.wst.dtd.core.internal.modelhandler.ModelHandlerForDTD"
-			associatedContentTypeId="org.eclipse.wst.dtd.core.dtdsource"
-			id="org.eclipse.wst.dtd.core.internal.modelhandler">
-		</modelHandler>
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.core.taskscanner">
-		<scanner
-			id="org.eclipse.wst.dtd.core.internal.tasks.DTDFileTaskScanner"
-			class="org.eclipse.wst.dtd.core.internal.tasks.DTDFileTaskScanner"
-			contentTypeIds="org.eclipse.wst.dtd.core.dtdsource" />
-	</extension>
-
-	<extension
-		point="org.eclipse.core.filebuffers.documentCreation"
-		id="org.eclipse.wst.dtd.core.documentfactories"
-		name="%Structured_DTD_Document_Factory_Extension.name">
-		<factory
-			contentTypeId="org.eclipse.wst.dtd.core.dtdsource"
-			class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory" />
-	</extension>
-
-	<extension point="org.eclipse.team.core.fileTypes">
-		<fileTypes
-			type="text"
-			extension="dtd" />
-		<fileTypes
-			type="text"
-			extension="mod" />
-		<fileTypes
-			type="text"
-			extension="ent" />
-	</extension>
-
-	<extension point="org.eclipse.core.runtime.contentTypes">
-		<content-type
-			file-extensions="dtd,mod,ent"
-			priority="normal"
-			name="%DTD_Content_Type_Extension_Element.name"
-			id="dtdsource"
-			base-type="org.eclipse.core.runtime.text"
-			default-charset="UTF-8">
-			<describer
-				class="org.eclipse.wst.dtd.core.internal.content.ContentDescriberForDTD" />
-		</content-type>
-	</extension>
-
-	<extension point="org.eclipse.emf.ecore.extension_parser">
-		<parser
-			type="dtd"
-			class="org.eclipse.wst.dtd.core.internal.emf.util.DTDResourceFactoryImpl">
-		</parser>
-	</extension>
-
-	<extension point="org.eclipse.emf.ecore.extension_parser">
-		<parser
-			type="ent"
-			class="org.eclipse.wst.dtd.core.internal.emf.util.DTDResourceFactoryImpl">
-		</parser>
-	</extension>
-
-	<extension point="org.eclipse.emf.ecore.generated_package">
-		<package
-			uri="DTD.xmi"
-			class="org.eclipse.wst.dtd.core.internal.emf.impl.DTDPackageImpl">
-		</package>
-	</extension>
-
-	<extension point="org.eclipse.wst.xml.core.documentFactories">
-		<factory
-			type="dtd, ent, mod, xml"
-			class="org.eclipse.wst.dtd.core.internal.contentmodel.CMDocumentFactoryDTD">
-		</factory>
-	</extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/AttNode.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/AttNode.java
deleted file mode 100644
index a86ddfb..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/AttNode.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-public final class AttNode {
-	//
-	// attType
-	//
-	public static final int CDATA = 0, ID = 1, IDREF = 2, IDREFS = 3, ENTITY = 4, ENTITIES = 5, NMTOKEN = 6, NMTOKENS = 7, NOTATION = 8, ENUMERATION = 9, PEREFERENCE = 10;
-
-	//
-	// Keep this array in-sync with the ATTTYPE definitions
-	//
-	private static final String[] fgAttTypeString = {"CDATA", // 0 //$NON-NLS-1$
-				"ID", // 1 //$NON-NLS-1$
-				"IDREF", // 2 //$NON-NLS-1$
-				"IDREFS", // 3 //$NON-NLS-1$
-				"ENTITY", // 4 //$NON-NLS-1$
-				"ENTITIES", // 5 //$NON-NLS-1$
-				"NMTOKEN", // 6 //$NON-NLS-1$
-				"NMTOKENS", // 7 //$NON-NLS-1$
-				"NOTATION", // 8 //$NON-NLS-1$
-				"ENUMERATION", // 9 (replaced with "NMTOKEN" by SAX //$NON-NLS-1$
-								// AttributeList handler)
-				"%ENTITYREFERENCE;"}; //$NON-NLS-1$
-
-	//
-	// attDefaultType
-	//
-	public static final int NOFIXED = 1, // AttValue
-				REQUIRED = 2, // #REQUIRED
-				IMPLIED = 3, // #IMPLIED
-				FIXED = 4; // #FIXED AttValue
-
-	public String name = null;
-	public String type = null;
-	public String defaultType = null;
-	public String defaultValue = null;
-	public Vector enumList = null; // list of Notations or Enum values
-
-	public int getDeclaredType() {
-		int t = -1;
-		if (type == null)
-			return t;
-
-		if (type.startsWith("%") && type.endsWith(";")) //$NON-NLS-1$ //$NON-NLS-2$
-			return PEREFERENCE;
-
-		for (int i = 0; i < fgAttTypeString.length; i++) {
-			if (type.equals(fgAttTypeString[i])) {
-				t = i;
-				break;
-			}
-		}
-		return t;
-	}
-
-	public Enumeration elements() {
-		if (enumList == null)
-			enumList = new Vector();
-		return enumList.elements();
-	}
-
-	public int getDefaultType() {
-		if (defaultType == null)
-			return -1;
-
-		if (defaultType.startsWith("%") && defaultType.endsWith(";")) //$NON-NLS-1$ //$NON-NLS-2$
-			return PEREFERENCE;
-		else if (defaultType.equals("#REQUIRED")) //$NON-NLS-1$
-			return REQUIRED;
-		else if (defaultType.equals("#IMPLIED")) //$NON-NLS-1$
-			return IMPLIED;
-		else if (defaultType.equals("#FIXED")) //$NON-NLS-1$
-			return FIXED;
-		else
-			return NOFIXED;
-	}
-
-	public String toString() {
-		return "Att Name: " + name + " Type: " + type + " defaultType: " + defaultType + " defaultValue: " + defaultValue; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/Attlist.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/Attlist.java
deleted file mode 100644
index e42e421..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/Attlist.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-public class Attlist extends BaseNode {
-	Vector attDefs = new Vector();
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param name
-	 *            This attribute list's name; this value is also known as the
-	 *            Element type.
-	 */
-	public Attlist(String name, String ownerDTD) {
-		this(name, ownerDTD, null, null);
-	}
-
-	public Attlist(String name, String ownerDTD, String comment, ErrorMessage errorMessage) {
-		super(name, ownerDTD, comment, errorMessage);
-	}
-
-
-	/**
-	 * Adds the specified attribute definition to the end of this attribute
-	 * list .
-	 * 
-	 * @param attDef
-	 *            Attribute definition to add to this atribute list.
-	 * @return =true if the attribute definition does not already exist in
-	 *         this attribute list; otherwise, =false.
-	 * @see #elementAt
-	 * @see #getAttDef
-	 * @see #contains
-	 * @see #size
-	 */
-	public boolean addElement(AttNode attDef) {
-		if (contains(attDef.name))
-			return false;
-		this.attDefs.addElement(attDef);
-		return true;
-	}
-
-	/**
-	 * Returns the attribute definition at the specified <var>index</var> in
-	 * this attribute list
-	 * 
-	 * @param index
-	 *            Index into this list of attribute definitions.
-	 * @return Attribute definition at the specified index, or <var>null</var>
-	 *         if an invalid index.
-	 * @see #addElement
-	 * @see #getAttDef
-	 * @see #contains
-	 * @see #size
-	 */
-	public AttNode elementAt(int index) {
-		return (AttNode) this.attDefs.elementAt(index);
-	}
-
-	/**
-	 * Returns the attribute definition that matches the specified attribute
-	 * definition name in this attribute list.
-	 * 
-	 * @param attDefName
-	 *            Attribute definition name to match in this attribute list.
-	 * @return The matching attribute definition, or <var>null</var> if the
-	 *         attribute is not currently defined.
-	 * @see #addElement
-	 * @see #elementAt
-	 * @see #contains
-	 * @see #size
-	 * @see #elements
-	 */
-	public AttNode getAttDef(String attDefName) {
-		for (int i = 0; i < size(); i++) {
-			AttNode ad = elementAt(i);
-			if (attDefName.equals(ad.name))
-				return ad;
-		}
-		return null;
-	}
-
-	/**
-	 * Returns whether the specified attribute definition name is currently
-	 * defined in this attribute list.
-	 * 
-	 * @param attDefName
-	 *            Attribute definition name to match in this attribute list.
-	 * @return =true if <var>attDefName</var> is defined; otherwise, =false.
-	 * @see #addElement
-	 * @see #elementAt
-	 * @see #getAttDef
-	 * @see #size
-	 * @see #elements
-	 */
-	public boolean contains(String attDefName) {
-		return null != getAttDef(attDefName);
-	}
-
-	/**
-	 * Returns the number of attribute definitions in this attribute list.
-	 * 
-	 * @return Number of attribute list definitions, or <var>null</var> if no
-	 *         definitions defined.
-	 * @see #addElement
-	 * @see #elementAt
-	 * @see #getAttDef
-	 * @see #contains
-	 */
-	public int size() {
-		return this.attDefs.size();
-	}
-
-	/**
-	 * Returns an enumeration of all attribute definitions in this attribute
-	 * list.
-	 * 
-	 * @return An enumeration of all attribute definitions, or <var>null</var>
-	 *         if none specified.
-	 * @see #addElement
-	 * @see #elementAt
-	 * @see #getAttDef
-	 * @see #contains
-	 * @see #size
-	 */
-	public Enumeration elements() {
-		return this.attDefs.elements();
-	}
-
-	void setAttDefs(Vector attrs) {
-		attDefs = attrs;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/BaseNode.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/BaseNode.java
deleted file mode 100644
index e944b30..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/BaseNode.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-
-public abstract class BaseNode {
-	protected String name = null;
-	protected ErrorMessage errorMessage = null;
-	// protected String errorMessage = null;
-	protected String comment = null;
-	protected String ownerDTD = null;
-
-	/** Default constructor. */
-	public BaseNode(String name, String ownerDTD) {
-		this(name, ownerDTD, null, null);
-	}
-
-	public BaseNode(String name, String ownerDTD, String comment, ErrorMessage errorMessage) {
-		this.name = name;
-		this.ownerDTD = ownerDTD;
-		this.comment = comment;
-		this.errorMessage = errorMessage;
-	}
-
-	public String getNodeName() {
-		return name;
-	}
-
-	public void setNodeName(String name) {
-		this.name = name;
-	}
-
-	public String getOwnerDTD() {
-		return ownerDTD;
-	}
-
-	public void setOwnerDTD(String owner) {
-		ownerDTD = owner;
-	}
-
-	public String getComment() {
-		return comment;
-	}
-
-	public void setComment(String comment) {
-		this.comment = comment;
-	}
-
-	public ErrorMessage getErrorMessage() {
-		return errorMessage;
-	}
-
-	public void setErrorMessage(ErrorMessage message) {
-		errorMessage = message;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMBasicNode.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMBasicNode.java
deleted file mode 100644
index d470ffb..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMBasicNode.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-public class CMBasicNode extends CMNode {
-	private int type = CMNodeType.EMPTY; // possible types :
-
-	// CMNodeType.EMPTY
-	// CMNodeType.ANY
-	// CMNodeType.PCDATA
-
-	/** Default constructor. */
-	public CMBasicNode(String refName) {
-		super(refName);
-	}
-
-	public CMBasicNode(String refName, int type) {
-		super(refName);
-		this.type = type;
-	}
-
-	public int getType() {
-		return type;
-	}
-
-	public void setType(int type) {
-		this.type = type;
-	}
-
-	public String toString() {
-		return " BasicNodeName: " + getName() + " Type: " + getType() + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMGroupNode.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMGroupNode.java
deleted file mode 100644
index 823b2cf..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMGroupNode.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-public class CMGroupNode extends CMRepeatableNode {
-	private int type = CMNodeType.GROUP;
-	private int groupKind = CMNodeType.GROUP_SEQUENCE;
-	private Vector children = new Vector();
-
-	public CMGroupNode() {
-		super("GROUP"); //$NON-NLS-1$
-	}
-
-	public int getType() {
-		return type;
-	}
-
-	// implement super class
-	public void setType(int type) {
-		// can't change - only one type allows
-	}
-
-	public int getGroupKind() {
-		return groupKind;
-	}
-
-	public void setGroupKind(int kind) {
-		groupKind = kind;
-	}
-
-	public Vector getChildren() {
-		return children;
-	}
-
-	public void addChild(CMNode child) {
-		children.addElement(child);
-	}
-
-	public String toString() {
-		String result = "Group ( - kind: " + getGroupKind() + " OccType: " + getOccurrence() + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-		Enumeration en = children.elements();
-		while (en.hasMoreElements()) {
-			result += " " + en.nextElement(); //$NON-NLS-1$
-		}
-
-		result += "Group )"; //$NON-NLS-1$
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMNode.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMNode.java
deleted file mode 100644
index 1682a27b..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMNode.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-public abstract class CMNode {
-	private String refName;
-
-	/** Default constructor. */
-	public CMNode(String refName) {
-		this.refName = refName;
-	}
-
-	public String getName() {
-		return refName;
-	}
-
-	public abstract int getType();
-
-	public abstract void setType(int type);
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMNodeType.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMNodeType.java
deleted file mode 100644
index 4e85db9..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMNodeType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-public interface CMNodeType {
-	static public int EMPTY = 1;
-	static public int ANY = 2;
-	static public int PCDATA = 3;
-	static public int ELEMENT_REFERENCE = 4;
-	static public int ENTITY_REFERENCE = 5;
-	static public int GROUP = 6;
-
-	static public int ONE = 7;
-	static public int OPTIONAL = 8;
-	static public int ONE_OR_MORE = 9;
-	static public int ZERO_OR_MORE = 10;
-
-	static public int GROUP_CHOICE = 11;
-	static public int GROUP_SEQUENCE = 12;
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMReferenceNode.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMReferenceNode.java
deleted file mode 100644
index ab59b4c..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMReferenceNode.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-public class CMReferenceNode extends CMRepeatableNode {
-	private int type = CMNodeType.ELEMENT_REFERENCE;
-
-	public CMReferenceNode(String refName) {
-		this(refName, CMNodeType.ELEMENT_REFERENCE);
-	}
-
-	public CMReferenceNode(String refName, int type) {
-		super(refName);
-		this.type = type;
-	}
-
-
-	public int getType() {
-		return type;
-	}
-
-	public void setType(int type) {
-		this.type = type;
-	}
-
-	public String toString() {
-		return " RefName: " + getName() + " Type: " + getType() + " OccType: " + getOccurrence() + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMRepeatableNode.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMRepeatableNode.java
deleted file mode 100644
index cf6e112..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMRepeatableNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-public abstract class CMRepeatableNode extends CMNode {
-	private int occType = CMNodeType.ONE;
-
-	public CMRepeatableNode(String refName) {
-		super(refName);
-	}
-
-	public CMRepeatableNode(String refName, int occType) {
-		super(refName);
-		this.occType = occType;
-	}
-
-	public int getOccurrence() {
-		return occType;
-	}
-
-	public void setOccurrence(int occType) {
-		this.occType = occType;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTD.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTD.java
deleted file mode 100644
index d86f9b1..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTD.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-public class DTD {
-	//
-	// Constants
-	//
-
-	Vector externalElements = new Vector();
-	String name = null;
-
-	boolean isExceptionDuringParse = false;
-
-	//
-	// Constructors
-	//
-
-	/**
-	 * Constructor.
-	 */
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param name
-	 *            The file name of this DTD.
-	 * @see #getName
-	 * @see #setName
-	 */
-	public DTD(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Returns this DTD's file name.
-	 * 
-	 * @return This DTD's file name, or <var>null</var> if no name.
-	 */
-	public String getName() {
-		return this.name;
-	}
-
-	/**
-	 * Sets this DTD's file name.
-	 * 
-	 * @param name
-	 *            This DTD's name.
-	 * @see #getName
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Returns an Enumeration instance of all external subset children of this
-	 * DTD.
-	 * 
-	 * @return An enumeration of all external subset children of this DTD.
-	 */
-	public Enumeration externalElements() {
-		return externalElements.elements();
-	}
-
-	public void addDecl(BaseNode decl) {
-		externalElements.addElement(decl);
-	}
-
-	public void setIsExceptionDuringParse(boolean on) {
-		isExceptionDuringParse = on;
-	}
-
-	public boolean getIsExceptionDuringParse() {
-		return isExceptionDuringParse;
-	}
-
-} // class DTD
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDParser.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDParser.java
deleted file mode 100644
index 5ba84bc..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDParser.java
+++ /dev/null
@@ -1,776 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Stack;
-import java.util.Vector;
-
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ext.DeclHandler;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class DTDParser extends DefaultHandler implements ContentHandler, DTDHandler, ErrorHandler, DeclHandler, LexicalHandler {
-	private String contentString = ""; //$NON-NLS-1$
-	private String declString = ""; //$NON-NLS-1$
-
-	/* Canonical output. */
-	protected boolean canonical;
-
-	protected XMLReader reader;
-	int entityDepth;
-
-	// dmw 11/15 private field never read locally
-	// private Vector declElements;
-	private String comment = null;
-	private ErrorMessage errorMessage = null;
-	private List errorMessages = new ArrayList();
-	private DeclNode previousDeclNode = null;
-	private DeclNode currentDeclNode = null;
-	private BaseNode lastBaseNode = null;
-
-	private boolean entityEnd = false;
-	private int lineNumber;
-
-	private DTD currentDTD = null;
-	private Vector dtdList = new Vector();
-
-	private Stack dtdStack = new Stack();
-	private Stack peRefStack = new Stack();
-	private Stack parsingPERefStack = new Stack();
-
-	private EntityPool entityPool = new EntityPool();
-	private String expandedEntityValue = null;
-	private Hashtable elementPool = new Hashtable();
-
-	boolean parsingExternalPEReference = false;
-	protected boolean expandEntityReferences = true;
-
-	private Locator locator = null;
-
-	private Locator getLocator() {
-		return locator;
-	}
-
-	public void setDocumentLocator(Locator locator) {
-		this.locator = locator;
-	}
-
-	public DTDParser(boolean canonical) throws UnsupportedEncodingException {
-		this(null, canonical);
-	}
-
-	protected DTDParser(String encoding, boolean canonical) throws UnsupportedEncodingException {
-
-		if (encoding == null)
-			encoding = "UTF-8"; //$NON-NLS-1$
-
-		this.canonical = canonical;
-		try {
-			SAXParser sparser = SAXParserFactory.newInstance().newSAXParser();
-			reader = sparser.getXMLReader();
-			reader.setProperty("http://xml.org/sax/properties/declaration-handler", this); //$NON-NLS-1$
-			reader.setProperty("http://xml.org/sax/properties/lexical-handler", this); //$NON-NLS-1$
-			reader.setContentHandler(this);
-			reader.setDTDHandler(this);
-			reader.setErrorHandler(this);
-			reader.setEntityResolver(this);
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	/* Prints the output from the SAX callbacks. */
-	public void parse(String uri) {
-		try {
-			boolean isReadable = URIHelper.isReadableURI(uri, true);
-			if (!isReadable) {
-				throw new Exception("DTD parse error. Can not read the specified URI : " + uri); //$NON-NLS-1$
-			}
-
-			String document = "<!DOCTYPE root SYSTEM \"" + uri + "\"><root/>"; //$NON-NLS-1$ //$NON-NLS-2$
-			entityDepth = 0;
-			currentDTD = new DTD(uri);
-			InputSource inputSource = new InputSource(new StringReader(document));
-			inputSource.setSystemId(uri + ".xml"); //$NON-NLS-1$
-			reader.parse(inputSource);
-		}
-		catch (SAXParseException se) {
-			if (currentDTD != null)
-				currentDTD.setIsExceptionDuringParse(true);
-		}
-		catch (Exception e) {
-			if (currentDTD != null)
-				currentDTD.setIsExceptionDuringParse(true);
-		}
-
-	}
-
-	/*
-	 * @deprecated Entity references are always expanded.
-	 */
-	public void setExpandEntityReferences(boolean expandEntityReferences) {
-		this.expandEntityReferences = true;
-	}
-
-	/*
-	 * @deprecated Entity references are always expanded.
-	 */
-	public boolean getExpandEntityReferences() {
-		return expandEntityReferences;
-	}
-
-	public Vector getDTDList() {
-		return dtdList;
-	}
-
-	public Hashtable getElementPool() {
-		return elementPool;
-	}
-
-	public EntityPool getEntityPool() {
-		return entityPool;
-	}
-
-	public List getErrorMessages() {
-		return errorMessages;
-	}
-
-	//
-	// DocumentHandler methods
-	//
-
-	public void startDocument() {
-	}
-
-	public void endDocument() {
-	}
-
-	public void processingInstruction(String target, String data) {
-	}
-
-	//
-	// DTDHandler methods
-	//
-
-	public void unparsedEntityDecl(String name, String publicId, String systemId, String notationName) throws SAXException {
-	}
-
-	public void notationDecl(String name, String publicId, String systemId) throws SAXException {
-		startDeclaration(DeclNode.NOTATION);
-		declString = "<!NOTATION"; //$NON-NLS-1$
-		if (entityDepth == 1 || parsingExternalPEReference) {
-			String xs = " "; //$NON-NLS-1$
-			xs += name;
-			if (publicId == null)
-				xs += " SYSTEM " + "\"" + systemId + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			else
-				xs += " PUBLIC " + "\"" + publicId + "\" " + "\"" + systemId + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-			contentString += xs;
-			parseCurrentDeclaration();
-		}
-	}
-
-	//
-	// DeclHandler methods
-	//
-
-	public void elementDecl(String name, String model) throws SAXException {
-		startDeclaration(DeclNode.ELEMENT);
-		declString = "<!ELEMENT"; //$NON-NLS-1$
-
-		// KB: With early versions of Xerces 2.x, startEntity("[dtd]") used to
-		// be called before this method
-		// so entityDepth was 1. Using JAXP changed that and startEntity() is
-		// not called back anymore.
-		// Because of this, we need to handle the case where entityDepth == 0
-		// as well.
-		if (entityDepth == 0 || entityDepth == 1 || parsingExternalPEReference)
-			parseCurrentDeclarationHelper(name + " " + model); //$NON-NLS-1$
-	}
-
-	protected String attributeString = ""; //$NON-NLS-1$
-
-	public void attributeDecl(String eName, String aName, String type, String valueDefault, String value) throws SAXException {
-		startDeclaration(DeclNode.ATTLIST);
-		declString = "<!ATTLIST"; //$NON-NLS-1$
-
-		attributeString += " " + aName; //$NON-NLS-1$
-		if (type != null)
-			attributeString += " " + type; //$NON-NLS-1$
-		if (valueDefault != null)
-			attributeString += " " + valueDefault; //$NON-NLS-1$
-		if (value != null)
-			attributeString += " '" + value + "'"; //$NON-NLS-1$ //$NON-NLS-2$
-
-		attributeString = eName + " " + attributeString + ">"; //$NON-NLS-1$ //$NON-NLS-2$
-		parseCurrentDeclarationHelper(attributeString);
-		attributeString = ""; //$NON-NLS-1$
-	}
-
-	public void internalEntityDecl(String name, String value) throws SAXException {
-		startDeclaration(DeclNode.INTERNAL_ENTITY);
-		declString = "<!ENTITY"; //$NON-NLS-1$
-
-		boolean isPEDecl = false;
-		String localName = name;
-		if (entityDepth == 1 || parsingExternalPEReference) {
-			// build up a string: e.g. " % STRDOM "(#PCDATA)">"
-			String xs = " "; //$NON-NLS-1$
-			if (name.startsWith("%")) { //$NON-NLS-1$
-				isPEDecl = true;
-				localName = name.substring(1);
-				xs += "% "; //$NON-NLS-1$
-				xs += name.substring(1);
-			}
-			else
-				xs += name;
-
-			xs += " \"" + value + "\">"; //$NON-NLS-1$ //$NON-NLS-2$
-
-			contentString += xs;
-			// save expanded entity value
-			expandedEntityValue = value;
-			parseCurrentDeclaration();
-
-		}
-	}
-
-	public void externalEntityDecl(String name, String publicId, String systemId) throws SAXException {
-		startDeclaration(DeclNode.EXTERNAL_ENTITY);
-		declString = "<!ENTITY"; //$NON-NLS-1$
-
-		if (entityDepth == 1 || parsingExternalPEReference) {
-			// build up a string:
-			// ex1) " % FIELD SYSTEM "oagis_fields.dtd">"
-			// ex2) " % FIELD PUBLIC "FOO">"
-			String xs = " "; //$NON-NLS-1$
-			if (name.startsWith("%")) { //$NON-NLS-1$
-				xs += "% "; //$NON-NLS-1$
-				xs += name.substring(1);
-			}
-			else
-				xs += name;
-
-			if (systemId != null)
-				xs += " SYSTEM \"" + systemId + "\">"; //$NON-NLS-1$ //$NON-NLS-2$
-			else if (publicId != null)
-				xs += " PUBLIC \"" + publicId + "\">"; //$NON-NLS-1$ //$NON-NLS-2$
-
-			contentString += xs;
-			parseCurrentDeclaration();
-		}
-	}
-
-	//
-	// LexicalHandler methods
-	//
-
-	public void startCDATA() throws SAXException {
-	}
-
-	public void endCDATA() throws SAXException {
-	}
-
-	public void startDTD(String name, String publicId, String systemId) throws SAXException {
-		dtdList.removeAllElements();
-		dtdList.addElement(currentDTD);
-	}
-
-	/**
-	 * Report the end of DTD declarations.
-	 * 
-	 * @exception SAXException
-	 *                The application may raise an exception.
-	 * @see #startDTD
-	 */
-	public void endDTD() throws SAXException {
-		startDeclaration(DeclNode.END_DTD);
-	}
-
-	/**
-	 * Report the beginning of an entity.
-	 * 
-	 * The start and end of the document entity are not reported. The start
-	 * and end of the external DTD subset are reported using the pseudo-name
-	 * "[dtd]". All other events must be properly nested within start/end
-	 * entity events.
-	 * 
-	 * @param name
-	 *            The name of the entity. If it is a parameter entity, the
-	 *            name will begin with '%'.
-	 * @exception SAXException
-	 *                The application may raise an exception.
-	 * @see #endEntity
-	 */
-
-	public void startEntity(String name) throws SAXException {
-		if (name.equals("[dtd]")) { //$NON-NLS-1$
-			startDeclaration(DeclNode.START_ENTITY_DTD);
-		}
-		else if (currentDeclNode == null) {
-			// PE reference in markupdecl section
-			if (name.startsWith("%")) { //$NON-NLS-1$
-				String peName = name.substring(1);
-				EntityDecl en = entityPool.referPara(peName);
-
-				peRefStack.push(name);
-				parsingPERefStack.push(new Boolean(parsingExternalPEReference));
-
-				String systemId = en.getSystemId();
-				String publicId = en.getPublicId();
-				if (systemId == null) {
-					parsingExternalPEReference = false;
-				}
-				else {
-					URIResolver idResolver = URIResolverPlugin.createResolver();
-					String uri = idResolver.resolve(currentDTD.getName(), publicId, systemId);
-					if (!isDTDLoaded(uri)) {
-						// not loaded
-						// out.println(" DTD not loaded .. create new DTD: "
-						// );
-						dtdStack.push(currentDTD);
-						DTD newDTD = new DTD(uri);
-						dtdList.addElement(newDTD);
-						currentDTD = newDTD;
-						parsingExternalPEReference = true;
-					}
-					else {
-						// out.println(" DTD already loaded .. " );
-						parsingExternalPEReference = false;
-					}
-				}
-			}
-		}
-		else if (entityDepth == 1 || parsingExternalPEReference) {
-			String xs = (String) reader.getProperty("http://xml.org/sax/properties/xml-string"); //$NON-NLS-1$
-			contentString += xs;
-		}
-		entityDepth++;
-	}
-
-	/**
-	 * Report the end of an entity.
-	 * 
-	 * @param name
-	 *            The name of the entity that is ending.
-	 * @exception SAXException
-	 *                The application may raise an exception.
-	 * @see #startEntity
-	 */
-	public void endEntity(String name) throws SAXException {
-		if (name.equals("[dtd]")) { //$NON-NLS-1$
-			startDeclaration(DeclNode.END_ENTITY_DTD);
-		}
-		else if (!peRefStack.empty()) {
-			parseExternalPEReference(name);
-		}
-		else if (entityDepth == 1 || parsingExternalPEReference) {
-			if (!contentString.endsWith(name + ";")) { //$NON-NLS-1$
-				String xs = (String) reader.getProperty("http://xml.org/sax/properties/xml-string"); //$NON-NLS-1$
-				contentString += xs;
-			}
-		}
-		entityDepth--;
-		entityEnd = true;
-	}
-
-	protected boolean parseExternalPEReference(String name) {
-		if (!peRefStack.empty()) {
-			if (((String) peRefStack.peek()).equals(name)) {
-				peRefStack.pop();
-				if (parsingExternalPEReference) {
-					currentDTD = (DTD) dtdStack.pop();
-					addPEReferenceNode(name);
-				}
-				parsingExternalPEReference = ((Boolean) parsingPERefStack.pop()).booleanValue();
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Report an XML comment anywhere in the document.
-	 * 
-	 * This callback will be used for comments inside or outside the document
-	 * element, including comments in the external DTD subset (if read).
-	 * 
-	 * @param ch
-	 *            An array holding the characters in the comment.
-	 * @param start
-	 *            The starting position in the array.
-	 * @param length
-	 *            The number of characters to use from the array.
-	 * @exception SAXException
-	 *                The application may raise an exception.
-	 */
-	public void comment(char ch[], int start, int length) throws SAXException {
-		startDeclaration(DeclNode.COMMENT);
-
-		if (comment == null)
-			comment = new String(ch);
-		else
-			comment += "\n" + new String(ch); // append all comments. //$NON-NLS-1$
-		// The comment will get reset after
-		// it has been attached to the following
-		// declaration.
-	}
-
-	//
-	// ErrorHandler methods
-	//
-
-	/* Warning. */
-	public void warning(SAXParseException ex) {
-		String error = "[Source Line] " + declString + contentString + "\n";  //$NON-NLS-1$//$NON-NLS-2$
-		error += "[Warning    ] " + getLocationString(ex) + ": " + ex.getMessage();  //$NON-NLS-1$//$NON-NLS-2$
-		setErrorInformation(ex, "warning"); //$NON-NLS-1$
-
-		parseCurrentDeclaration();
-	}
-
-	/* Error. */
-	public void error(SAXParseException ex) {
-		String error = "[Source Line] " + declString + contentString + "\n";  //$NON-NLS-1$//$NON-NLS-2$
-		error += "[Error   ] " + getLocationString(ex) + ": " + ex.getMessage();  //$NON-NLS-1$//$NON-NLS-2$
-		setErrorInformation(ex, "error"); //$NON-NLS-1$
-
-		parseCurrentDeclaration();
-	}
-
-	/* Fatal error. */
-	public void fatalError(SAXParseException ex) throws SAXException {
-		String error = "[Source Line] " + declString + contentString + "\n";  //$NON-NLS-1$//$NON-NLS-2$
-		error += "[Fatal Error] " + getLocationString(ex) + ": " + ex.getMessage();  //$NON-NLS-1$//$NON-NLS-2$
-		setErrorInformation(ex, "fatal"); //$NON-NLS-1$
-
-		parseCurrentDeclaration();
-	}
-
-	/* Returns a string of the location. */
-	private String getLocationString(SAXParseException ex) {
-		StringBuffer str = new StringBuffer();
-
-		String systemId = ex.getSystemId();
-		if (systemId != null) {
-			int index = systemId.lastIndexOf('/');
-			if (index != -1)
-				systemId = systemId.substring(index + 1);
-			str.append(systemId);
-		}
-		str.append(':');
-		str.append(ex.getLineNumber());
-		str.append(':');
-		str.append(ex.getColumnNumber());
-
-		return str.toString();
-
-	}
-
-	private void startDeclaration(int type) {
-		if (type == DeclNode.END_DTD || type == DeclNode.END_ENTITY_DTD || type == DeclNode.COMMENT || type == DeclNode.ERROR) {
-			previousDeclNode = currentDeclNode;
-			currentDeclNode = null;
-		}
-		else {
-			currentDeclNode = new DeclNode(type);
-			contentString = ""; //$NON-NLS-1$
-			declString = ""; //$NON-NLS-1$
-			expandedEntityValue = null;
-		}
-	}
-
-	private void parseCurrentDeclaration() {
-		parseCurrentDeclarationHelper(contentString);
-		contentString = ""; //$NON-NLS-1$
-	}
-
-	private void parseCurrentDeclarationHelper(String declarationString) {
-		DTDScanner scanner;
-		String name;
-
-		if (currentDeclNode == null && previousDeclNode != null && entityEnd) {
-			currentDeclNode = previousDeclNode;
-		}
-
-		// save the previous declNode
-		if (currentDeclNode != null) {
-			BaseNode baseNode = null;
-			// strip out the ending markup symbol ">"
-			if (declarationString.endsWith(">")) //$NON-NLS-1$
-				declarationString = declarationString.substring(0, declarationString.length() - 1);
-
-			int sIndex;
-			String cString;
-			int type = currentDeclNode.getType();
-			switch (type) {
-				case DeclNode.ELEMENT : {
-					name = TString.word(declarationString, 1);
-
-					// strip out the name
-					sIndex = declarationString.indexOf(name) + name.length();
-					cString = declarationString.substring(sIndex);
-
-					baseNode = new ElementDecl(name, currentDTD.getName());
-					scanner = new DTDScanner(currentDTD.getName(), cString);
-					CMNode contentModel = scanner.scanContentModel();
-					if (contentModel == null && errorMessage == null) {
-						createErrorMessage("Expecting '(' in content model", "error"); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-
-					((ElementDecl) baseNode).setContentModelNode(contentModel);
-					elementPool.put(name, baseNode);
-					break;
-				}
-				case DeclNode.INTERNAL_ENTITY :
-				case DeclNode.EXTERNAL_ENTITY : {
-					if (!parseExternalPEReference(declarationString)) {
-						scanner = new DTDScanner(currentDTD.getName(), declarationString);
-						baseNode = scanner.scanEntityDecl();
-						// System.out.println("----baseNode (" +
-						// declarationString + ")" + baseNode);
-						if (type == DeclNode.INTERNAL_ENTITY && expandedEntityValue != null) {
-							((EntityDecl) baseNode).expandedValue = expandedEntityValue;
-						}
-						if (baseNode != null) {
-							entityPool.add((EntityDecl) baseNode);
-						}
-					}
-
-					break;
-				}
-				case DeclNode.NOTATION : {
-					scanner = new DTDScanner(currentDTD.getName(), declarationString);
-					baseNode = scanner.scanNotationDecl();
-					break;
-				}
-				case DeclNode.ATTLIST : {
-					name = TString.word(declarationString, 1);
-
-					// strip out the name
-					sIndex = declarationString.indexOf(name) + name.length();
-					cString = declarationString.substring(sIndex);
-
-					baseNode = new Attlist(name, currentDTD.getName());
-					scanner = new DTDScanner(currentDTD.getName(), cString.trim());
-					Vector attrs = scanner.scanAttlistDecl(entityPool);
-					String errorString = scanner.getErrorString();
-
-					if (attrs.size() > 0) {
-						((Attlist) baseNode).setAttDefs(attrs);
-					}
-					if (errorString != null) {
-						createErrorMessage(errorString, "error"); //$NON-NLS-1$
-					}
-					break;
-				}
-				default : {
-					currentDeclNode = null;
-				}
-			}
-
-			if (baseNode != null) {
-				if (comment != null) {
-					baseNode.setComment(comment);
-					comment = null;
-				}
-
-				if (errorMessage != null) {
-					baseNode.setErrorMessage(errorMessage);
-					errorMessage = null;
-				}
-
-				if (currentDeclNode != null) {
-					currentDTD.addDecl(baseNode);
-				}
-				lastBaseNode = baseNode;
-			}
-
-			currentDeclNode = null;
-		}
-		else {
-			if (lastBaseNode != null && errorMessage != null && lastBaseNode.getErrorMessage() == null) {
-				lastBaseNode.setErrorMessage(errorMessage);
-				errorMessage = null;
-			}
-		}
-	}
-
-	private void addPEReferenceNode(String name) {
-		if (name.startsWith("%")) { //$NON-NLS-1$
-			name = name.substring(1); // strip out the % from entity name
-		}
-		EntityDecl e = new EntityDecl(name, currentDTD.getName(), null, true);
-		e.setEntityReferenced(true);
-		e.setErrorMessage(errorMessage);
-		errorMessage = null;
-		currentDTD.addDecl(e);
-	}
-
-	void printBaseNodes() {
-		Enumeration dtds = dtdList.elements();
-		while (dtds.hasMoreElements()) {
-			DTD dtd = (DTD) dtds.nextElement();
-			Enumeration en = dtd.externalElements();
-
-			while (en.hasMoreElements()) {
-				BaseNode n = (BaseNode) en.nextElement();
-			}
-		}
-	}
-
-	private boolean isDTDLoaded(String uri) {
-		boolean loaded = false;
-		String list = ""; //$NON-NLS-1$
-		if (dtdList != null) {
-			Enumeration en = dtdList.elements();
-			while (en.hasMoreElements()) {
-				DTD dtd = (DTD) en.nextElement();
-				list += dtd.getName();
-				list += ","; //$NON-NLS-1$
-				if (dtd.getName().equals(uri)) {
-					loaded = true;
-					break;
-				}
-			}
-		}
-		return loaded;
-	}
-
-	public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
-		InputSource result = null;
-		URIResolver idResolver = URIResolverPlugin.createResolver();
-		String uri = idResolver.resolve(currentDTD.getName(), publicId, systemId);
-		if(uri == null){
-			uri = systemId;
-		}
-		result = new InputSource(uri);
-		return result;
-	}
-
-	//
-	// Main
-	//
-
-	/** Main program entry point. */
-	public static void main(String argv[]) {
-
-		// is there anything to do?
-		if (argv.length == 0) {
-			printUsage();
-			System.exit(1);
-		}
-
-		// vars
-		boolean canonical = false;
-		boolean expandEntityReferences = false;
-		DTDParser parser;
-
-		// check parameters
-		for (int i = 0; i < argv.length; i++) {
-			String arg = argv[i];
-
-			// options
-			if (arg.startsWith("-")) { //$NON-NLS-1$
-
-				if (arg.equals("-c")) { //$NON-NLS-1$
-					canonical = true;
-					continue;
-				}
-
-				if (arg.equals("-x")) { //$NON-NLS-1$
-					expandEntityReferences = true;
-					continue;
-				}
-
-				if (arg.equals("-h")) { //$NON-NLS-1$
-					printUsage();
-					System.exit(1);
-				}
-			}
-			try {
-				parser = new DTDParser(canonical);
-				parser.setExpandEntityReferences(expandEntityReferences);
-				parser.parse(arg);
-			}
-			catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-
-	} // main(String[])
-
-	/** Prints the usage. */
-	private static void printUsage() {
-
-		System.err.println("usage: java sax.DTDParser (options) uri ..."); //$NON-NLS-1$
-		System.err.println();
-		System.err.println("options:"); //$NON-NLS-1$
-		System.err.println("  -c       Canonical XML output."); //$NON-NLS-1$
-		System.err.println("  -x       Expand entity references."); //$NON-NLS-1$
-		System.err.println("  -h       This help screen."); //$NON-NLS-1$
-
-	} // printUsage()
-
-	private void setErrorInformation(SAXParseException ex, String severity) {
-		errorMessage = new ErrorMessage();
-
-		if (ex.getLineNumber() == -1) {
-			errorMessage.setErrorLine(lineNumber);
-		}
-		else {
-			errorMessage.setErrorLine(ex.getLineNumber());
-		}
-
-
-		errorMessage.setErrorMessage(ex.getMessage());
-		errorMessage.setErrorColumn(ex.getColumnNumber());
-		errorMessage.setSeverity(severity);
-		errorMessages.add(errorMessage);
-	}
-
-	private void createErrorMessage(String message, String severity) {
-		errorMessage = new ErrorMessage();
-
-		Locator locator = getLocator();
-
-		errorMessage.setErrorLine(locator.getLineNumber());
-		errorMessage.setErrorColumn(locator.getColumnNumber());
-
-		errorMessage.setErrorMessage(message);
-		errorMessage.setSeverity(severity);
-
-		errorMessages.add(errorMessage);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDSaxArtifactVisitor.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDSaxArtifactVisitor.java
deleted file mode 100644
index ed96bb1..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDSaxArtifactVisitor.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-import java.util.Enumeration;
-
-
-
-public class DTDSaxArtifactVisitor {
-	public void visitDTD(DTD dtd) {
-		Enumeration en = dtd.externalElements();
-
-		while (en.hasMoreElements()) {
-			Object e = en.nextElement();
-			if (e instanceof EntityDecl) {
-				visitEntityDecl((EntityDecl) e);
-			}
-			else if (e instanceof ElementDecl) {
-				visitElementDecl((ElementDecl) e);
-			}
-			else if (e instanceof NotationDecl) {
-				visitNotationDecl((NotationDecl) e);
-			}
-		}
-	}
-
-	public void visitNotationDecl(NotationDecl notation) {
-	}
-
-	public void visitElementDecl(ElementDecl element) {
-	}
-
-	public void visitEntityDecl(EntityDecl entity) {
-		if (entity.isEntityReferenced()) {
-			visitParameterEntityReferenceDecl(entity);
-		}
-		else {
-			if (entity.isExternal()) {
-				visitExternalEntityDecl(entity);
-			}
-			else {
-				visitInternalEntityDecl(entity);
-			}
-		}
-	}
-
-	public void visitParameterEntityReferenceDecl(EntityDecl entity) {
-	}
-
-	public void visitExternalEntityDecl(EntityDecl entity) {
-	}
-
-	public void visitInternalEntityDecl(EntityDecl entity) {
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDScanner.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDScanner.java
deleted file mode 100644
index 1435f51..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDScanner.java
+++ /dev/null
@@ -1,1137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-/**
- * Scanning / parsing the content string from the Decl statement
- * 
- * @version
- */
-public class DTDScanner {
-	// element content model strings
-	private static final char[] empty_string = {'E', 'M', 'P', 'T', 'Y'};
-	private static final char[] any_string = {'A', 'N', 'Y'};
-	private static final char[] pcdata_string = {'#', 'P', 'C', 'D', 'A', 'T', 'A'};
-
-	// attribute type and default type strings
-	private static final char[] cdata_string = {'C', 'D', 'A', 'T', 'A'};
-	private static final char[] id_string = {'I', 'D'};
-	private static final char[] ref_string = {'R', 'E', 'F'};
-	private static final char[] entit_string = {'E', 'N', 'T', 'I', 'T'};
-	private static final char[] ies_string = {'I', 'E', 'S'};
-	private static final char[] nmtoken_string = {'N', 'M', 'T', 'O', 'K', 'E', 'N'};
-	private static final char[] notation_string = {'N', 'O', 'T', 'A', 'T', 'I', 'O', 'N'};
-	private static final char[] required_string = {'#', 'R', 'E', 'Q', 'U', 'I', 'R', 'E', 'D'};
-	private static final char[] implied_string = {'#', 'I', 'M', 'P', 'L', 'I', 'E', 'D'};
-	private static final char[] fixed_string = {'#', 'F', 'I', 'X', 'E', 'D'};
-
-	private static final char[] system_string = {'S', 'Y', 'S', 'T', 'E', 'M'};
-	private static final char[] public_string = {'P', 'U', 'B', 'L', 'I', 'C'};
-	private static final char[] ndata_string = {'N', 'D', 'A', 'T', 'A'};
-
-	private int[] fOpStack = null;
-	private CMGroupNode[] fGrpStack = null;
-
-	private EntityPool entityPool;
-
-	/* Attribute Def scanner state */
-	static final int Att_Scanner_State_Name = 1, Att_Scanner_State_Type = 2, Att_Scanner_State_DefaultType = 3, Att_Scanner_State_DefaultValue = 4;
-
-	private StringParser contentString;
-	private String cData;
-	private int prevNodeOffset = 0;
-	private int nodeOffset = 1;
-	private String ownerDTD;
-
-	private String errorString;
-
-	public DTDScanner(String ownerDTD, String cm) {
-		// System.out.println("Cm: " + cm);
-		contentString = new StringParser(cm);
-		cData = cm;
-		this.ownerDTD = ownerDTD;
-	}
-
-	//
-	// [46] contentspec ::= 'EMPTY' | 'ANY' | Mixed | children
-	//
-	// Specific to VisualDTD : also allows %PEReference;
-	//
-	public CMNode scanContentModel() {
-		CMNode cmNode = null;
-		contentString.skipPastSpaces();
-		if (contentString.skippedString(empty_string)) {
-			cmNode = new CMBasicNode("EMPTY", CMNodeType.EMPTY); //$NON-NLS-1$
-		}
-		else if (contentString.skippedString(any_string)) {
-			cmNode = new CMBasicNode("ANY", CMNodeType.ANY); //$NON-NLS-1$
-		}
-		else if (contentString.lookingAtChar('%', true)) {
-			cmNode = new CMReferenceNode(contentString.getData(), CMNodeType.ENTITY_REFERENCE);
-		}
-		else if (!contentString.lookingAtChar('(', true)) {
-			// This means that the contentmodel string is bad...
-			// System.out.println("!!! exception - no (");
-			return cmNode;
-		}
-		else {
-			// System.out.println("Remaining String = " +
-			// contentString.getRemainingString());
-
-			contentString.skipPastSpaces();
-			boolean skippedPCDATA = contentString.skippedString(pcdata_string);
-			if (skippedPCDATA) {
-				cmNode = scanMixed();
-			}
-			else {
-				cmNode = scanChildren();
-			}
-
-		}
-		return cmNode;
-	}
-
-	//
-	// [51] Mixed ::= '(' S? '#PCDATA' (S? '|' S? Name)* S? ')*' | '(' S?
-	// '#PCDATA' S? ')'
-	//
-	// Called after scanning past '(' S? '#PCDATA'
-	//
-	private CMNode scanMixed() {
-		// System.out.println("ScanMixed...");
-		CMGroupNode cmNode = new CMGroupNode();
-		cmNode.setGroupKind(CMNodeType.GROUP_CHOICE);
-		cmNode.addChild(new CMBasicNode("#PCDATA", CMNodeType.PCDATA)); //$NON-NLS-1$
-
-		// int prevNodeIndex = -1;
-		boolean starRequired = false;
-
-
-		while (true) {
-			if (contentString.lookingAtSpace(true)) {
-				contentString.skipPastSpaces();
-			}
-			prevNodeOffset = contentString.getCurrentOffset();
-
-			if (!contentString.lookingAtChar('|', true)) {
-				if (!contentString.lookingAtChar(')', true)) {
-					break;
-				}
-				if (contentString.lookingAtChar('*', true)) {
-					cmNode.setOccurrence(CMNodeType.ZERO_OR_MORE);
-				}
-				else if (starRequired) {
-					// System.out.println(" * is required ... ");
-				}
-				break;
-			}
-
-			if (contentString.lookingAtSpace(true)) {
-				contentString.skipPastSpaces();
-			}
-
-			nodeOffset = contentString.getCurrentOffset();
-			if (nodeOffset != -1) {
-				// skip pass "|"
-				prevNodeOffset = nodeOffset;
-			}
-
-			starRequired = true;
-			contentString.skipPastNameAndPEReference(')');
-			nodeOffset = contentString.getCurrentOffset();
-
-			if (nodeOffset == -1)
-				break;
-
-			// add leave node
-			int len = nodeOffset - prevNodeOffset;
-			String refName = contentString.getString(prevNodeOffset, len);
-			prevNodeOffset = nodeOffset;
-			if (refName.startsWith("%")) //$NON-NLS-1$
-				cmNode.addChild(new CMReferenceNode(refName, CMNodeType.ENTITY_REFERENCE));
-			else
-				cmNode.addChild(new CMReferenceNode(refName, CMNodeType.ELEMENT_REFERENCE));
-
-		} // end while
-
-
-		if (cmNode.getChildren().size() == 1) {
-			// simplify the contentModel if the CMGroupNode only has one child
-			// node.
-			return (CMBasicNode) cmNode.getChildren().elementAt(0);
-		}
-
-		return cmNode;
-	}
-
-	//
-	// [47] children ::= (choice | seq) ('?' | '*' | '+')?
-	// [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'
-	// [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'
-	// [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?
-	//
-	// Called after scanning past '('
-
-	private CMNode scanChildren() {
-
-		// System.out.println("scanChildren...");
-
-		if (contentString.lookingAtSpace(true)) {
-			contentString.skipPastSpaces();
-		}
-
-		prevNodeOffset = contentString.getCurrentOffset();
-		nodeOffset = contentString.getCurrentOffset();
-		int depth = 1;
-		initializeContentModelStack(depth);
-		int len;
-
-		String nodeName;
-		CMGroupNode cmNode = new CMGroupNode();
-		fGrpStack[depth] = cmNode;
-
-		while (true) {
-
-			// System.out.println(" Begin outter while loop ..." );
-			if (contentString.lookingAtChar('(', true)) {
-				if (contentString.lookingAtSpace(true)) {
-					// skip past any white spaces after the '('
-					contentString.skipPastSpaces();
-				}
-
-				depth++;
-				initializeContentModelStack(depth);
-				fGrpStack[depth] = new CMGroupNode();
-				fGrpStack[depth - 1].addChild(fGrpStack[depth]);
-				continue;
-			}
-
-			prevNodeOffset = contentString.getCurrentOffset();
-			contentString.skipPastNameAndPEReference(')');
-			nodeOffset = contentString.getCurrentOffset();
-
-			/*
-			 * System.out.println(" prevNodeOFfset " + prevNodeOffset);
-			 * System.out.println(" currentNodeOFfset " + nodeOffset);
-			 */
-
-			len = nodeOffset - prevNodeOffset;
-
-			if (nodeOffset == -1 || len < 1) {
-				break;
-			}
-
-			nodeName = contentString.getString(prevNodeOffset, len);
-
-			CMRepeatableNode rn;
-			if (nodeName.startsWith("%")) { //$NON-NLS-1$
-				rn = new CMReferenceNode(nodeName, CMNodeType.ENTITY_REFERENCE);
-			}
-			else {
-				rn = new CMReferenceNode(nodeName, CMNodeType.ELEMENT_REFERENCE);
-			}
-
-			fGrpStack[depth].addChild(rn);
-
-			prevNodeOffset = nodeOffset;
-
-			if (contentString.lookingAtChar('?', true)) {
-				rn.setOccurrence(CMNodeType.OPTIONAL);
-			}
-			else if (contentString.lookingAtChar('*', true)) {
-				rn.setOccurrence(CMNodeType.ZERO_OR_MORE);
-			}
-			else if (contentString.lookingAtChar('+', true)) {
-				rn.setOccurrence(CMNodeType.ONE_OR_MORE);
-			}
-
-			if (contentString.lookingAtSpace(true)) {
-				contentString.skipPastSpaces();
-			}
-
-			prevNodeOffset = contentString.getCurrentOffset();
-
-			while (true) {
-				// System.out.println(" Begin inner while loop ... depth " +
-				// depth );
-				if (fOpStack[depth] != CMNodeType.GROUP_SEQUENCE && contentString.lookingAtChar('|', true)) {
-					fOpStack[depth] = CMNodeType.GROUP_CHOICE;
-					fGrpStack[depth].setGroupKind(CMNodeType.GROUP_CHOICE);
-					if (contentString.lookingAtSpace(true))
-						contentString.skipPastSpaces();
-					break;
-				}
-				else if (fOpStack[depth] != CMNodeType.GROUP_CHOICE && contentString.lookingAtChar(',', true)) {
-					fOpStack[depth] = CMNodeType.GROUP_SEQUENCE;
-					fGrpStack[depth].setGroupKind(CMNodeType.GROUP_SEQUENCE);
-					if (contentString.lookingAtSpace(true))
-						contentString.skipPastSpaces();
-					break;
-				}
-				else {
-					if (contentString.lookingAtSpace(true)) {
-						contentString.skipPastSpaces();
-					}
-					if (!contentString.lookingAtChar(')', true)) {
-						// System.out.println(" error ) not found");
-					}
-					// end of the curent group node
-					if (contentString.lookingAtChar('?', true)) {
-						fGrpStack[depth].setOccurrence(CMNodeType.OPTIONAL);
-					}
-					else if (contentString.lookingAtChar('*', true)) {
-						fGrpStack[depth].setOccurrence(CMNodeType.ZERO_OR_MORE);
-					}
-					else if (contentString.lookingAtChar('+', true)) {
-						fGrpStack[depth].setOccurrence(CMNodeType.ONE_OR_MORE);
-					}
-					depth--;
-					if (depth == 0) {
-						break;
-					}
-					if (contentString.lookingAtSpace(true))
-						contentString.skipPastSpaces();
-
-					// System.out.println(" End end inner while loop ... depth
-					// " + depth );
-
-				}
-			} // inner while
-
-			if (depth == 0) {
-				break;
-			}
-		} // outer while
-
-		if (cmNode.getChildren().size() == 1) {
-			// simplify the contentModel if the CMGroupNode only has one child
-			// node and that node is an element ref.
-			CMRepeatableNode rn = (CMRepeatableNode) cmNode.getChildren().elementAt(0);
-			if (rn instanceof CMReferenceNode) {
-				CMReferenceNode ref = (CMReferenceNode) rn;
-				if (ref.getType() == CMNodeType.ELEMENT_REFERENCE) {
-					if (ref.getOccurrence() == CMNodeType.ONE) {
-						ref.setOccurrence(cmNode.getOccurrence());
-						return ref;
-					}
-					else if (cmNode.getOccurrence() == CMNodeType.ONE) {
-						return ref;
-					}
-				} // end of if ()
-			}
-		}
-
-		return cmNode;
-	}
-
-	//
-	// [52] AttlistDecl ::= '<!ATTLIST' S Name AttDef* S? '>'
-	// [53] AttDef ::= S Name S AttType S DefaultDecl
-	// [60] DefaultDecl ::= '#REQUIRED' | '#IMPLIED' | (('#FIXED' S)?
-	// AttValue)
-	//
-
-	public Vector scanAttlistDecl(EntityPool entityPool) {
-		Vector attList = new Vector();
-		this.entityPool = entityPool;
-
-		int scannerState = Att_Scanner_State_Name;
-		;
-		AttNode attNode;
-
-		while (true) {
-			attNode = new AttNode();
-
-			// System.out.println(" scanner state: " + scannerState);
-
-			// scanning att name
-			if (scannerState == Att_Scanner_State_Name) {
-				// System.out.println("scan att Name...");
-				scannerState = checkForAttributeWithPEReference(attNode, scannerState);
-				if (scannerState == -1) {
-					return attList;
-				}
-			}
-
-			// scanning att type
-			if (scannerState == Att_Scanner_State_Type) {
-				// System.out.println("scan att type...");
-
-				if (contentString.skippedString(cdata_string)) {
-					attNode.type = new String(cdata_string);
-					scannerState = Att_Scanner_State_DefaultType;
-				}
-				else if (contentString.skippedString(id_string)) {
-					if (!contentString.skippedString(ref_string)) {
-						attNode.type = new String(id_string);
-					}
-					else if (!contentString.lookingAtChar('S', true)) {
-						attNode.type = "IDREF"; //$NON-NLS-1$
-					}
-					else {
-						attNode.type = "IDREFS"; //$NON-NLS-1$
-					}
-					scannerState = Att_Scanner_State_DefaultType;
-				}
-				else if (contentString.skippedString(entit_string)) {
-					if (contentString.lookingAtChar('Y', true)) {
-						attNode.type = "ENTITY"; //$NON-NLS-1$
-					}
-					else if (contentString.skippedString(ies_string)) {
-						attNode.type = "ENTITIES"; //$NON-NLS-1$
-					}
-					scannerState = Att_Scanner_State_DefaultType;
-				}
-				else if (contentString.skippedString(nmtoken_string)) {
-					if (contentString.lookingAtChar('S', true)) {
-						attNode.type = "NMTOKENS"; //$NON-NLS-1$
-					}
-					else {
-						attNode.type = "NMTOKEN"; //$NON-NLS-1$
-					}
-					scannerState = Att_Scanner_State_DefaultType;
-				}
-				else if (contentString.skippedString(notation_string)) {
-					if (contentString.lookingAtSpace(true)) {
-						contentString.skipPastSpaces();
-					}
-					if (!contentString.lookingAtChar('(', true)) {
-						System.out.println(" missing ( in notation "); //$NON-NLS-1$
-					}
-					attNode.type = "NOTATION"; //$NON-NLS-1$
-					attNode.enumList = scanEnumeration(contentString, true);
-					scannerState = Att_Scanner_State_DefaultType;
-				}
-				else if (contentString.lookingAtChar('(', true)) {
-					attNode.type = "ENUMERATION"; //$NON-NLS-1$
-					attNode.enumList = scanEnumeration(contentString, false);
-					scannerState = Att_Scanner_State_DefaultType;
-				}
-				else {
-					scannerState = checkForAttributeWithPEReference(attNode, scannerState);
-					if (scannerState == Att_Scanner_State_Type) {
-						setErrorString("Failed to find type for attribute '" + attNode.name + "'.  Please refer to the original DTD file."); //$NON-NLS-1$ //$NON-NLS-2$
-						// we failed to find a type for this attribute
-						return attList;
-					}
-				}
-			}
-
-			if (scannerState == Att_Scanner_State_DefaultType) {
-				contentString.skipPastSpaces();
-				// System.out.println("scan default type...");
-				if (contentString.skippedString(required_string)) {
-					attNode.defaultType = new String(required_string);
-				}
-				else if (contentString.skippedString(implied_string)) {
-					attNode.defaultType = new String(implied_string);
-				}
-				else {
-					if (contentString.skippedString(fixed_string)) {
-						contentString.skipPastSpaces();
-						attNode.defaultType = new String(fixed_string);
-					}
-					else
-						// "default"
-						attNode.defaultType = "NOFIXED"; //$NON-NLS-1$
-
-					if (contentString.lookingAtSpace(true))
-						contentString.skipPastSpaces();
-					attNode.defaultValue = scanDefaultAttValue(contentString);
-				}
-				scannerState = Att_Scanner_State_Name; // next
-			}
-
-
-			attList.addElement(attNode);
-			if (contentString.lookingAtSpace(true))
-				contentString.skipPastSpaces();
-			nodeOffset = contentString.getCurrentOffset();
-
-			if (nodeOffset >= cData.length())
-				return attList;
-
-			prevNodeOffset = contentString.getCurrentOffset();
-
-		}// end while loop
-	}
-
-	//
-	// content model stack
-	//
-	private void initializeContentModelStack(int depth) {
-		if (fOpStack == null) {
-			fOpStack = new int[8];
-			fGrpStack = new CMGroupNode[8];
-		}
-		else if (depth == fOpStack.length) {
-			int[] newStack = new int[depth * 2];
-			System.arraycopy(fOpStack, 0, newStack, 0, depth);
-			fOpStack = newStack;
-
-			CMGroupNode[] newGrpStack = new CMGroupNode[depth * 2];
-			System.arraycopy(fGrpStack, 0, newGrpStack, 0, depth);
-			fGrpStack = newGrpStack;
-		}
-		fOpStack[depth] = -1;
-		fGrpStack[depth] = null;
-	}
-
-	//
-	private int checkForAttributeWithPEReference(AttNode attNode, int scannerState) {
-		int state = -1;
-		int len;
-		String rawText;
-		EntityDecl pEntity;
-
-		// System.out.println(" checkforATTPERReference- start scannerState: "
-		// + scannerState);
-		if (scannerState == Att_Scanner_State_Name) {
-			contentString.skipPastNameAndPEReference(' ');
-			nodeOffset = contentString.getCurrentOffset();
-			len = nodeOffset - prevNodeOffset;
-
-			rawText = contentString.getString(prevNodeOffset, len);
-			attNode.name = rawText;
-
-			// System.out.println("State_name : " + rawText);
-
-			if (rawText.startsWith("%") && rawText.endsWith(";")) { //$NON-NLS-1$ //$NON-NLS-2$
-				String pe = rawText.substring(1, rawText.length() - 1);
-
-				pEntity = entityPool.referPara(pe);
-				if (pEntity != null) {
-					// System.out.println(" name :" + rawText +" expandTo:" +
-					// pEntity.expandedValue);
-					state = whatIsTheNextAttributeScanningState(pEntity.expandedValue, scannerState);
-					// System.out.println("checkForAttrwithPER - nextstate: "
-					// + state);
-				}
-				else
-					state = Att_Scanner_State_Type;
-			}
-			else
-				state = Att_Scanner_State_Type;
-
-		}
-		else if (scannerState == Att_Scanner_State_Type) {
-			if (contentString.lookingAtChar('%', true)) {
-				rawText = getPEName();
-				attNode.type = "%" + rawText; //$NON-NLS-1$
-				String peName = rawText.substring(0, rawText.length() - 1);
-				// System.out.println("State_type : pe- " + peName);
-				pEntity = entityPool.referPara(peName);
-				if (pEntity != null) {
-					state = whatIsTheNextAttributeScanningState(pEntity.expandedValue, scannerState);
-				}
-				else
-					state = Att_Scanner_State_DefaultType;
-			}
-			else
-				state = Att_Scanner_State_Type;
-		}
-		else if (scannerState == Att_Scanner_State_DefaultType) {
-			if (contentString.lookingAtChar('%', true)) {
-				rawText = getPEName();
-				attNode.defaultType = rawText;
-				// System.out.println("State_defaultType : " + rawText);
-				pEntity = entityPool.referPara(rawText.substring(1, rawText.length() - 1));
-				if (pEntity != null) {
-					state = whatIsTheNextAttributeScanningState(pEntity.expandedValue, scannerState);
-				}
-				else
-					state = Att_Scanner_State_DefaultValue;
-			}
-			else
-				state = Att_Scanner_State_DefaultType;
-		}
-		else if (scannerState == Att_Scanner_State_DefaultValue) {
-			if (contentString.lookingAtChar('%', true)) {
-				rawText = getPEName();
-				attNode.defaultValue = rawText;
-				// System.out.println("State_defaultValue : " + rawText);
-
-				pEntity = entityPool.referPara(rawText.substring(1, rawText.length() - 1));
-				if (pEntity != null) {
-					state = whatIsTheNextAttributeScanningState(pEntity.expandedValue, scannerState);
-				}
-				else
-					state = Att_Scanner_State_DefaultValue;
-			}
-			else
-				state = Att_Scanner_State_DefaultValue;
-		}
-
-		if (contentString.lookingAtSpace(true))
-			contentString.skipPastSpaces();
-		prevNodeOffset = contentString.getCurrentOffset();
-		return state;
-	}
-
-	private String getPEName() {
-		prevNodeOffset = contentString.getCurrentOffset();
-		contentString.skipToChar(';', true);
-		nodeOffset = contentString.getCurrentOffset();
-		int len = nodeOffset - prevNodeOffset;
-		return contentString.getString(prevNodeOffset, len);
-	}
-
-	private int whatIsTheNextAttributeScanningState(String attrContentString, int currentState) {
-		StringParser sp = new StringParser(attrContentString.trim());
-
-
-		int nextState = currentState;
-		int nOffset = 0;
-
-		/*
-		 * System.out.println("WhatistheNext AttContentStringt : " +
-		 * attrContentString); System.out.println("WhatistheNext
-		 * AttContentStringL : " + attrContentString.length());
-		 * System.out.println("WhatistheNext currentstate : " + currentState);
-		 */
-
-		while (true) {
-			// System.out.println("WhatistheNext inside whil nextstate : " +
-			// nextState);
-			if (nextState == Att_Scanner_State_Name) { // the current
-														// scanning state is
-														// Attr Name, is the
-														// next part Attr Type
-														// ?
-				if (isAttrName(sp)) {
-					nextState = Att_Scanner_State_Type;
-				}
-			}
-			else if (nextState == Att_Scanner_State_Type) { // the current
-															// scanning state
-															// is Attr Type,
-															// is the next
-															// part Default
-															// Attr Type ?
-
-				if (isAttrType(sp)) {
-					nextState = Att_Scanner_State_DefaultType;
-				}
-				else
-					System.out.println("WhatistheNext Attr Part - is not an Attr Type"); //$NON-NLS-1$
-
-			}
-
-			if (nextState == Att_Scanner_State_DefaultType) {
-
-				int dType = isAttrDefaultType(sp);
-				// System.out.println("WhatistheNext inside dType : " +
-				// dType);
-				if (dType == 1) // #REQUIRED or #IMPLIED
-				{
-					nextState = Att_Scanner_State_Name;
-				}
-				else {
-					if (dType == 2) // #FIXED
-					{
-						// need to look at this again
-						nextState = Att_Scanner_State_DefaultType;
-					}
-
-					if (scanDefaultAttValue(sp) != null) {
-						nextState = Att_Scanner_State_Name;
-
-					}
-				}
-			}
-
-			sp.skipPastSpaces();
-
-			if (nOffset == sp.getCurrentOffset())
-				break;
-
-			nOffset = sp.getCurrentOffset();
-
-			if (nOffset >= attrContentString.length() || nOffset == -1)
-				break;
-
-		} // end while
-
-		return nextState;
-	}
-
-
-	private boolean isAttrName(StringParser sp) {
-		// System.out.println("isAttrName - sp:" + sp.fData);
-		// System.out.println("isAttrName - currentOffset:" +
-		// sp.getCurrentOffset());
-		boolean isAttrName = false;
-		int prev = sp.getCurrentOffset();
-		sp.skipPastName(' ');
-		if ((sp.getCurrentOffset() - prev) > 0)
-			isAttrName = true;
-		return isAttrName;
-
-	}
-
-	private boolean isAttrType(StringParser sp) {
-		// System.out.println("isAttrType - sp:" + sp.fData);
-		// System.out.println("isAttrType - currentOffset:" +
-		// sp.getCurrentOffset());
-		boolean isAttrType = false;
-		if (sp.skippedString(cdata_string)) {
-			isAttrType = true;
-		}
-		else if (sp.skippedString(id_string)) {
-			if (!sp.skippedString(ref_string)) {
-				isAttrType = true; // ID
-			}
-			else if (!sp.lookingAtChar('S', true)) {
-				isAttrType = true; // IDREFS
-			}
-			else {
-				isAttrType = true; // IDREF
-			}
-		}
-		else if (sp.skippedString(entit_string)) {
-			if (sp.lookingAtChar('Y', true)) {
-				isAttrType = true; // ENTITY
-			}
-			else if (sp.skippedString(ies_string)) {
-				isAttrType = true; // ENTITITES
-			}
-		}
-		else if (sp.skippedString(nmtoken_string)) {
-			if (sp.lookingAtChar('S', true)) {
-				isAttrType = true; // NMTOKENS
-			}
-			else {
-				isAttrType = true; // NMTOKEN
-			}
-		}
-		else if (sp.skippedString(notation_string)) {
-			if (!sp.lookingAtChar('(', true)) {
-				// System.out.println(" missing ( in notation ");
-			}
-			Vector enumList = scanEnumeration(sp, true);
-			if (enumList == null || enumList.size() == 0)
-				isAttrType = false;
-			else
-				isAttrType = true;
-		}
-		else if (sp.lookingAtChar('(', true)) {
-			// "ENUMERATION";
-			Vector enumList = scanEnumeration(sp, false);
-			if (enumList == null || enumList.size() == 0)
-				isAttrType = false;
-			else
-				isAttrType = true;
-		}
-
-		return isAttrType;
-
-	}
-
-	/*
-	 * return 0 - not default type 1 - #REQUIRED or #IMPLIED 2 - #FIXED
-	 */
-
-	private int isAttrDefaultType(StringParser sp) {
-		// System.out.println("isAttrDefaultType - sp:" + sp.fData);
-		int result = 0;
-		if (sp.skippedString(required_string)) {
-			result = 1;
-		}
-		else if (sp.skippedString(implied_string)) {
-			result = 1;
-		}
-		else if (sp.skippedString(fixed_string)) {
-			result = 2;
-		}
-		return result;
-	}
-
-	//
-	// [58] NotationType ::= 'NOTATION' S '(' S? Name (S? '|' S? Name)* S? ')'
-	// [59] Enumeration ::= '(' S? Nmtoken (S? '|' S? Nmtoken)* S? ')'
-	//
-	// Called after scanning '('
-	//
-	private Vector scanEnumeration(StringParser sp, boolean isNotationType) {
-		// System.out.println(" scanEnum ...");
-		Vector enumList = null;
-		int len;
-
-		if (sp.lookingAtSpace(true))
-			sp.skipPastSpaces();
-
-		int prevNodeOffset = sp.getCurrentOffset();
-		int nodeOffset;
-
-		String nodeName;
-
-		while (true) {
-
-			if (isNotationType)
-				sp.skipPastNameAndPEReference(')');
-			else
-				sp.skipPastNmtokenAndPEReference(')');
-
-			nodeOffset = sp.getCurrentOffset();
-
-			if (nodeOffset == -1) {
-				return enumList;
-			}
-
-			len = nodeOffset - prevNodeOffset;
-			nodeName = sp.getString(prevNodeOffset, len);
-
-			if (enumList == null)
-				enumList = new Vector();
-
-			enumList.addElement(nodeName);
-
-			if (sp.lookingAtSpace(true))
-				sp.skipPastSpaces();
-
-			if (!sp.lookingAtChar('|', true)) {
-				if (!sp.lookingAtChar(')', true)) {
-					System.out.println("scanning enum values - error missing ')'"); //$NON-NLS-1$
-					break;
-				}
-				break;
-			}
-
-			if (sp.lookingAtSpace(true))
-				sp.skipPastSpaces();
-
-			prevNodeOffset = sp.getCurrentOffset();
-		}
-		return enumList;
-	}
-
-	//
-	// [10] AttValue ::= '"' ([^<&"] | Reference)* '"'
-	// | "'" ([^<&'] | Reference)* "'"
-	//
-	/**
-	 * Scan the default value in an attribute declaration
-	 * 
-	 * @param elementType
-	 *            handle to the element that owns the attribute
-	 * @param attrName
-	 *            handle in the string pool for the attribute name
-	 * @return handle in the string pool for the default attribute value
-	 * @exception java.lang.Exception
-	 */
-	public String scanDefaultAttValue(StringParser sp) {
-		String value = null;
-		// System.out.println("scan default ATT Value... sp:" + sp.fData);
-
-		sp.skipPastSpaces();
-
-		boolean single;
-		if (!(single = sp.lookingAtChar('\'', true)) && !sp.lookingAtChar('\"', true)) {
-			return value;
-		}
-
-		char qchar = single ? '\'' : '\"';
-		int sOffset = sp.getCurrentOffset();
-		sp.skipToChar(qchar, true);
-		int len = sp.getCurrentOffset() - sOffset - 1;
-		if (len == 0)
-			value = ""; //$NON-NLS-1$
-		else
-			value = sp.getString(sOffset, len);
-
-		return value;
-	}
-
-	void printAttList(Vector attrs) {
-		Enumeration en = attrs.elements();
-		while (en.hasMoreElements()) {
-			AttNode an = (AttNode) en.nextElement();
-			// System.out.println("attNode: " + an);
-		}
-
-	}
-
-	//
-	// [70] EntityDecl ::= GEDecl | PEDecl
-	// [71] GEDecl ::= '<!ENTITY' S Name S EntityDef S? '>'
-	// [72] PEDecl ::= '<!ENTITY' S '%' S Name S PEDef S? '>'
-	// [73] EntityDef ::= EntityValue | (ExternalID NDataDecl?)
-	// [74] PEDef ::= EntityValue | ExternalID
-	// [75] ExternalID ::= 'SYSTEM' S SystemLiteral
-	// | 'PUBLIC' S PubidLiteral S SystemLiteral
-	// [76] NDataDecl ::= S 'NDATA' S Name
-	// [9] EntityValue ::= '"' ([^%&"] | PEReference | Reference)* '"'
-	// | "'" ([^%&'] | PEReference | Reference)* "'"
-	//
-	// Called after scanning 'ENTITY'
-	//
-	public EntityDecl scanEntityDecl() {
-		prevNodeOffset = 1;
-		nodeOffset = 1;
-		int len;
-		boolean isPEDecl = false;
-		EntityDecl entityDecl = null;
-
-		String name = null;
-		String ndata = null;
-
-		if (contentString.lookingAtSpace(true)) {
-			contentString.skipPastSpaces();
-			if (!contentString.lookingAtChar('%', true)) {
-				isPEDecl = false; // <!ENTITY x "x">
-			}
-			else if (contentString.lookingAtSpace(true)) {
-				isPEDecl = true; // <!ENTITY % x "x">
-			}
-			prevNodeOffset = contentString.getCurrentOffset();
-			contentString.skipPastName(' ');
-			nodeOffset = contentString.getCurrentOffset();
-			len = nodeOffset - prevNodeOffset;
-			if (len > 0) {
-				name = contentString.getString(prevNodeOffset, len);
-				prevNodeOffset = nodeOffset;
-			}
-		}
-
-		if (name == null)
-			return null;
-
-		contentString.skipPastSpaces();
-		prevNodeOffset = contentString.getCurrentOffset();
-
-		boolean single;
-		if ((single = contentString.lookingAtChar('\'', true)) || contentString.lookingAtChar('\"', true)) {
-			String value = scanEntityValue(single);
-			entityDecl = new EntityDecl(name, ownerDTD, value, isPEDecl);
-		}
-		else {
-			// external entity
-			ExternalID xID = scanExternalID();
-			if (xID != null) {
-				if (!isPEDecl) // general entity
-				{
-					boolean unparsed = false;
-					contentString.skipPastSpaces();
-					unparsed = contentString.skippedString(ndata_string);
-					if (unparsed) {
-						contentString.skipPastSpaces();
-						prevNodeOffset = contentString.getCurrentOffset();
-						contentString.skipPastName(' ');
-						nodeOffset = contentString.getCurrentOffset();
-						len = nodeOffset - prevNodeOffset;
-						ndata = contentString.getString(prevNodeOffset, len);
-					}
-				}
-				entityDecl = new EntityDecl(name, ownerDTD, xID, isPEDecl, ndata);
-			}
-		}
-		return entityDecl;
-	}
-
-
-	//
-	// [82] NotationDecl ::= '<!NOTATION' S Name S (ExternalID | PublicID) S?
-	// '>'
-	// [75] ExternalID ::= 'SYSTEM' S SystemLiteral
-	// | 'PUBLIC' S PubidLiteral S SystemLiteral
-	// [83] PublicID ::= 'PUBLIC' S PubidLiteral
-	//
-	// Called after scanning 'NOTATION'
-	//
-	public NotationDecl scanNotationDecl() {
-		prevNodeOffset = 1;
-		nodeOffset = 1;
-		int len;
-		boolean isPEDecl = false;
-		NotationDecl notationDecl = null;
-
-		String name = null;
-
-		if (contentString.lookingAtSpace(true)) {
-			contentString.skipPastSpaces();
-			prevNodeOffset = contentString.getCurrentOffset();
-			contentString.skipPastName(' ');
-			nodeOffset = contentString.getCurrentOffset();
-			len = nodeOffset - prevNodeOffset;
-			if (len > 0) {
-				name = contentString.getString(prevNodeOffset, len);
-				prevNodeOffset = nodeOffset;
-			}
-		}
-
-		if (name == null)
-			return null;
-
-		contentString.skipPastSpaces();
-		prevNodeOffset = contentString.getCurrentOffset();
-
-		notationDecl = new NotationDecl(name, ownerDTD);
-
-		ExternalID xID = scanExternalID();
-		if (xID != null) {
-			if (xID.getSystemLiteral() != null) {
-				notationDecl.setSystemId(xID.getSystemLiteral());
-			}
-			if (xID.getPubIdLiteral() != null) {
-				notationDecl.setPublicId(xID.getPubIdLiteral());
-			}
-		}
-
-		return notationDecl;
-	}
-
-
-	private String scanEntityValue(boolean single) {
-		char qchar = single ? '\'' : '\"';
-		prevNodeOffset = contentString.getCurrentOffset();
-		contentString.skipToChar(qchar, false);
-		int len = contentString.getCurrentOffset() - prevNodeOffset;
-		String value = contentString.getString(prevNodeOffset, len);
-		return value;
-	}
-
-	//
-	// [75] ExternalID ::= 'SYSTEM' S SystemLiteral
-	// | 'PUBLIC' S PubidLiteral S SystemLiteral
-	private ExternalID scanExternalID() {
-		ExternalID xID = null;
-		char qchar = '\"';
-		if (contentString.skippedString(system_string)) {
-			if (!contentString.lookingAtSpace(true)) {
-				return null;
-			}
-			contentString.skipPastSpaces();
-
-			if (contentString.lookingAtChar('\'', true))
-				qchar = '\'';
-			else if (contentString.lookingAtChar('\"', true))
-				qchar = '\"';
-
-			prevNodeOffset = contentString.getCurrentOffset();
-			contentString.skipToChar(qchar, true);
-			int len = contentString.getCurrentOffset() - prevNodeOffset - 1;
-			String systemId = contentString.getString(prevNodeOffset, len);
-			// System.out.println("systemid..." + systemId);
-			xID = new ExternalID(systemId);
-		}
-		else if (contentString.skippedString(public_string)) {
-			if (!contentString.lookingAtSpace(true)) {
-				return null;
-			}
-
-			contentString.skipPastSpaces();
-			if (contentString.lookingAtChar('\'', true))
-				qchar = '\'';
-			else if (contentString.lookingAtChar('\"', true))
-				qchar = '\"';
-
-			// publicLiteral
-			prevNodeOffset = contentString.getCurrentOffset();
-			contentString.skipToChar(qchar, true);
-			int len = contentString.getCurrentOffset() - prevNodeOffset - 1;
-			String publicId = contentString.getString(prevNodeOffset, len);
-
-			// systemLiteral
-			contentString.skipPastSpaces();
-			if (contentString.lookingAtChar('\'', true))
-				qchar = '\'';
-			else if (contentString.lookingAtChar('\"', true))
-				qchar = '\"';
-			prevNodeOffset = contentString.getCurrentOffset();
-			contentString.skipToChar(qchar, true);
-			len = contentString.getCurrentOffset() - prevNodeOffset - 1;
-
-			if (len > 0) {
-				String systemId = contentString.getString(prevNodeOffset, len);
-				xID = new ExternalID(publicId, systemId);
-			}
-			else {
-				xID = new ExternalID(publicId, null);
-			}
-		}
-		return xID;
-	}
-
-	//
-	// [83] PublicID ::= 'PUBLIC' S PubidLiteral
-	//
-
-	// dmw 11/15 private method never read locally
-	// TODO: change to private if used, otherwise should be removed
-	String scanPublicID() {
-		String pID = null;
-		if (contentString.skippedString(public_string)) {
-			if (!contentString.lookingAtSpace(true)) {
-				return pID;
-			}
-			contentString.skipPastSpaces();
-			prevNodeOffset = contentString.getCurrentOffset();
-
-			contentString.skipToChar(' ', true);
-			int len = contentString.getCurrentOffset() - prevNodeOffset;
-			pID = contentString.getString(prevNodeOffset, len);
-		}
-
-		return pID;
-	}
-
-	//
-	// Main
-	//
-
-	/** Main program entry point. */
-	public static void main(String argv[]) {
-
-		// is there anything to do?
-		if (argv.length == 0) {
-			System.exit(1);
-		}
-
-		// DTDScanner sc = new DTDScanner(argv[0]);
-		DTDScanner sc = new DTDScanner("hello.dtd", " gif SYSTEM \"GIF File\" "); //$NON-NLS-1$ //$NON-NLS-2$
-
-		NotationDecl n = sc.scanNotationDecl();
-		System.out.println("Noation Name: " + n.getNodeName()); //$NON-NLS-1$
-		System.out.println("SystemId: " + n.getSystemId()); //$NON-NLS-1$
-
-
-		// Attributes
-		// Vector lists = sc.scanAttlistDecl();
-		// sc.printAttList(lists);
-
-		// System.out.println("CM: " + sc.scanContentModel());
-
-	} // main(String[])
-
-	/**
-	 * Gets the errorString
-	 * 
-	 * @return Returns a String
-	 */
-	public String getErrorString() {
-		return errorString;
-	}
-
-	/**
-	 * Sets the errorString
-	 * 
-	 * @param errorString
-	 *            The errorString to set
-	 */
-	public void setErrorString(String errorString) {
-		this.errorString = errorString;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DeclNode.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DeclNode.java
deleted file mode 100644
index 25720b4..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DeclNode.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-public class DeclNode {
-	static public final int INVALID = -1;
-	static public final int ELEMENT = 1;
-	static public final int ATTLIST = 2;
-	static public final int ENTITY = 3;
-	static public final int INTERNAL_ENTITY = 4;
-	static public final int EXTERNAL_ENTITY = 5;
-	static public final int INTERNAL_GENERAL_ENTITY = 6;
-	static public final int INTERNAL_PARAMETER_ENTITY = 7;
-	static public final int EXTERNAL_GENERAL_ENTITY = 8;
-	static public final int EXTERNAL_PARAMETER_ENTITY = 9;
-	static public final int PARAMETER_ENTITY_REFERENCE = 10;
-	static public final int NOTATION = 11;
-	static public final int COMMENT = 12;
-
-	static public final int START_DTD = 21;
-	static public final int END_DTD = 22;
-	static public final int START_ENTITY_DTD = 23;
-	static public final int END_ENTITY_DTD = 24;
-	static public final int ERROR = 25;
-
-	public int type = INVALID;
-	private String declName = null;
-	private String contentString = null;
-	private String errorMessage = null;
-	private String comment = null;
-
-	//
-	// Constants
-	//
-
-	/** Default constructor. */
-	public DeclNode(int type) {
-		this(null, type, null);
-	}
-
-	public DeclNode(String name, int type, String contentString) {
-		this.declName = name;
-		this.type = type;
-		this.contentString = contentString;
-	}
-
-	public String getDeclName() {
-		return declName;
-	}
-
-	public void setDeclName(String name) {
-		declName = name;
-	}
-
-	public int getType() {
-		return type;
-	}
-
-	public void setType(int type) {
-		this.type = type;
-	}
-
-	public String getErrorMessage() {
-		return errorMessage;
-	}
-
-	public void setErrorMessage(String message) {
-		errorMessage = message;
-	}
-
-	public String getContentString() {
-		return contentString;
-	}
-
-	public void setContentString(String content) {
-		this.contentString = content;
-	}
-
-	public String getComment() {
-		return comment;
-	}
-
-	public void setComment(String comment) {
-		this.comment = comment;
-	}
-
-	public String toString()
-
-	{
-		return "Node Name: " + declName + " Type: " + type + " ContentString: " + contentString; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ElementDecl.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ElementDecl.java
deleted file mode 100644
index 3e87167..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ElementDecl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-public class ElementDecl extends BaseNode {
-	CMNode contentModelNode = null;
-
-	public ElementDecl(String name, String ownerDTD) {
-		this(name, ownerDTD, null, null);
-	}
-
-	public ElementDecl(String name, String ownerDTD, String comment, ErrorMessage errorMessage) {
-		super(name, ownerDTD, comment, errorMessage);
-	}
-
-	public CMNode getContentModelNode() {
-		return contentModelNode;
-	}
-
-	public void setContentModelNode(CMNode cmnode) {
-		contentModelNode = cmnode;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/EntityDecl.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/EntityDecl.java
deleted file mode 100644
index 673c99f..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/EntityDecl.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-public class EntityDecl extends BaseNode {
-	boolean isParameter = false;
-	String expandedValue = null; // Always <var>null</var> for external
-									// Entities
-	String value = null; // Always <var>null</var> for external Entities
-	ExternalID externalID = null; // Always <var>null</var> for internal
-									// Entities
-	String ndata = null; // Always <var>null</var> for internal Entities
-
-	boolean parsed = false;
-	DTDParser dtd = null; // Always null, except when it has been parsed.
-
-	boolean entityReferenced = false;
-
-	/**
-	 * Constructor for internal Entities.
-	 * 
-	 * @param name
-	 *            Name of this Entity.
-	 * @param value
-	 *            The XML-encoded value that was directly assigned to the
-	 *            Entity.
-	 * @param isParameter
-	 *            =true if a parameter Entity; otherwise =false.
-	 */
-	public EntityDecl(String name, String ownerDTD, String value, boolean isParameter) {
-		super(name, ownerDTD, null, null);
-		this.value = value;
-		this.isParameter = isParameter;
-	}
-
-	/**
-	 * Constructor for external Entities.
-	 * 
-	 * @param name
-	 *            Name of the Entity.
-	 * @param externalID
-	 *            The reference(s) to the external entity to retrieve.
-	 * @param isParameter
-	 *            =true if a parameter Entity; otherwise =false.
-	 * @param ndata
-	 *            The notation associated with the binary Entity, or <var>null</var>
-	 *            if the Entity is a text Entity.
-	 * @see sax.ExternalID
-	 */
-	public EntityDecl(String name, String ownerDTD, ExternalID externalID, boolean isParameter, String ndata) {
-		super(name, ownerDTD, null, null);
-		this.externalID = externalID;
-		this.isParameter = isParameter;
-		this.ndata = ndata;
-	}
-
-	/**
-	 * Returns whether this Entity is a parameter Entity.
-	 * 
-	 * @return =true if an internal parameter Entity; otherwise =false.
-	 */
-	public boolean isParameter() {
-		return this.isParameter;
-	}
-
-	/**
-	 * Returns the value of this Entity.
-	 * 
-	 * @return The XML-encoded value that was directly assigned to the
-	 *         internal Entity; otherwise, <var>null</var>.
-	 */
-	public String getValue() {
-		return this.value;
-	}
-
-	public boolean isEntityReferenced() {
-		return entityReferenced;
-	}
-
-	public void setEntityReferenced(boolean reference) {
-		entityReferenced = reference;
-	}
-
-
-	/**
-	 * Returns the system identifier of the Notation. A system identifier is a
-	 * URI, which may be used to retrieve an external entity's content.
-	 * <p>
-	 * This method is defined by DOM.
-	 * 
-	 * @return The system identifier, or <var>null</var> if the identifier is
-	 *         not defined.
-	 * @see org.eclipcse.wst.dtd.parser.ExternalID#getSystemLiteral
-	 */
-	public String getSystemId() {
-		if (externalID == null)
-			return null;
-		else
-			return this.externalID.getSystemLiteral();
-	}
-
-	/**
-	 * Sets the system identifier of the Notation. A system identifier is a
-	 * URI, which may be used to retrieve an external entity's content.
-	 * <p>
-	 * This method is defined by DOM.
-	 * 
-	 * @param systemIdentifier
-	 *            The system identifier.
-	 * @see org.eclipcse.wst.dtd.parser.ExternalID
-	 */
-	public void setSystemId(String systemIdentifier) {
-		// System.out.println("setSYstemId - externalId: " + externalID);
-		this.externalID = new ExternalID(this.externalID.getPubIdLiteral(), systemIdentifier);
-	}
-
-	/**
-	 * Returns the public identifier of the Notation. This value is only valid
-	 * if the identifier is defined as <var>public</var> (as opposed to
-	 * <var>system</var>). Public identifiers may be used to try to generate
-	 * an alternative URI in order to retrieve the an external entities
-	 * content. If retrieval fails using the public identifier, an attempt
-	 * must be made to retrieve content using the system identifier.
-	 * <p>
-	 * This method is defined by DOM.
-	 * 
-	 * @return The public identifier, or <var>null</var> if the identifier is
-	 *         not defined.
-	 * @see org.eclipcse.wst.dtd.parser.ExternalID
-	 */
-	public String getPublicId() {
-		if (externalID == null)
-			return null;
-		else
-			return this.externalID.getPubIdLiteral();
-	}
-
-	/**
-	 * Sets the public identifier of the Notation. This value is only valid if
-	 * the identifier is defined as <var>public</var> (as opposed to
-	 * <var>system</var>). Public identifiers may be used to try to generate
-	 * an alternative URI in order to retrieve the an external entities
-	 * content. If retrieval fails using the public identifier, an attempt
-	 * must be made to retrieve content using the system identifier.
-	 * <p>
-	 * This method is defined by DOM.
-	 * 
-	 * @param publicIdentifier
-	 *            The public identifier.
-	 * @see #getPublicId
-	 * @see org.eclipcse.wst.dtd.parser.ExternalID
-	 */
-	public void setPublicId(String publicIdentifier) {
-		this.externalID = new ExternalID(publicIdentifier, this.externalID.getSystemLiteral());
-	}
-
-	/**
-	 * Returns the external ID of this Entity.
-	 * 
-	 * @return The reference(s) to the external entity to retrieve; otherwise,
-	 *         <var>null</var>.
-	 * @see org.eclipcse.wst.dtd.parser.ExternalID
-	 */
-	public ExternalID getExternalID() {
-		return this.externalID;
-	}
-
-	/**
-	 * Returns whether this entity value is external.
-	 * 
-	 * @return =true if entity is external; otherwise, =false.
-	 * @see org.eclipcse.wst.dtd.parser.ExternalID
-	 */
-	public boolean isExternal() {
-		return this.externalID != null;
-	}
-
-	/**
-	 * Returns the notation associated with this Entity.
-	 * 
-	 * @return The notation associated with the external binary Entity,
-	 *         otherwise, <var>null</var>.
-	 */
-	public String getNotation() {
-		return this.ndata;
-	}
-
-	public void setNotation(String ndata) {
-		this.ndata = ndata;
-	}
-
-	/**
-	 * Returns the notation associated with this Entity.
-	 * <p>
-	 * This method is defined by DOM.
-	 * 
-	 * @return The notation associated with the external binary Entity,
-	 *         otherwise, <var>null</var>.
-	 */
-	public String getNotationName() {
-		return this.ndata;
-	}
-
-	/**
-	 * <p>
-	 * This method is defined by DOM.
-	 * 
-	 * public void setNotationName(String arg) { this.ndata = arg; }
-	 */
-
-	/**
-	 * Returns whether there is a notation associated with this entity value.
-	 * 
-	 * @return =true if the external binary entity contains a notation;
-	 *         otherwise, =false.
-	 */
-	public boolean isNotation() {
-		return this.ndata != null;
-	}
-
-	public void setValue(String s) {
-		this.value = s;
-	}
-
-	public void setParsed(boolean p) {
-		this.parsed = p;
-	}
-
-	public boolean getParsed() {
-		return this.parsed;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/EntityPool.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/EntityPool.java
deleted file mode 100644
index c43e414..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/EntityPool.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-public class EntityPool {
-	private Hashtable m_entity = new Hashtable();
-	private Hashtable m_para = new Hashtable(); // parameter references
-
-	public EntityPool() {
-	}
-
-	public boolean add(EntityDecl entity) {
-		String name = entity.getNodeName();
-		if (entity.isParameter()) {
-			if (m_para.containsKey(name))
-				return false;
-			m_para.put(name, entity);
-		}
-		else {
-			if (m_entity.containsKey(name))
-				return false;
-			m_entity.put(name, entity);
-		}
-		return true;
-	}
-
-	public EntityDecl refer(String name) {
-		return (EntityDecl) m_entity.get(name);
-	}
-
-	public EntityDecl referPara(String name) {
-		return (EntityDecl) m_para.get(name);
-	}
-
-	/**
-	 * Return an <CODE>Enumeration</CODE> of <CODE>EntityDecl</CODE>.
-	 * 
-	 * @see org.eclipcse.wst.dtd.parser.EntityDecl
-	 */
-	public Enumeration elements() {
-		return m_entity.elements();
-	}
-
-	/**
-	 * Return an <CODE>Enumeration</CODE> of <CODE>EntityDecl</CODE> for
-	 * parameter entities.
-	 * 
-	 * @see org.eclipcse.wst.dtd.parser.EntityDecl
-	 */
-	public Enumeration parameterEntityElements() {
-		return m_para.elements();
-	}
-
-	/**
-	 * For DTD#getEntities();
-	 */
-	Hashtable getEntityHash() {
-		return this.m_entity;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ErrorMessage.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ErrorMessage.java
deleted file mode 100644
index 6995e8a..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ErrorMessage.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-
-
-public class ErrorMessage {
-	private int errorLine, errorColumn, severity;
-	private String errorString;
-
-
-	public ErrorMessage() {
-	}
-
-	public void setErrorMessage(String error) {
-		errorString = error;
-	}
-
-	public void setSeverity(int severity) {
-		this.severity = severity;
-	}
-
-	public void setSeverity(String severity) {
-		if (severity == "warning") { //$NON-NLS-1$
-			this.severity = 0;
-		}
-		else if (severity == "error") { //$NON-NLS-1$
-			this.severity = 1;
-		}
-		else if (severity == "fatal") { //$NON-NLS-1$
-			this.severity = 2;
-		}
-	}
-
-	public void setErrorLine(int line) {
-		errorLine = line;
-	}
-
-	public void setErrorColumn(int column) {
-		errorColumn = column;
-	}
-
-	public String getErrorMessage() {
-		return errorString;
-	}
-
-	public int getSeverity() {
-		return severity;
-	}
-
-	public int getErrorLine() {
-		return errorLine;
-	}
-
-	public int getErrorColumn() {
-		return errorColumn;
-	}
-
-	private int startOffset = -1;
-
-	public void setErrorStartOffset(int start) {
-		startOffset = start;
-	}
-
-	public int getErrorStartOffset() {
-		return startOffset;
-	}
-
-	private int endOffset = -1;
-
-	public void setErrorEndOffset(int end) {
-		endOffset = end;
-	}
-
-	public int getErrorEndOffset() {
-		return endOffset;
-	}
-
-
-	Object object;
-
-	/**
-	 * Get the value of the closest object to the error.
-	 * 
-	 * @return value of object.
-	 */
-	public Object getObject() {
-		return object;
-	}
-
-	/**
-	 * Set the value of closest object to the error.
-	 * 
-	 * @param v
-	 *            Value to assign to object.
-	 */
-	public void setObject(Object v) {
-		this.object = v;
-	}
-
-
-	public void addNewErrorMessageLine(String newLine) {
-		errorString += "\n" + newLine; //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ExternalID.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ExternalID.java
deleted file mode 100644
index 11b0988..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ExternalID.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-public class ExternalID {
-	private static final int T_SYSTEM = 0;
-	private static final int T_PUBLIC = 1;
-
-	int type = T_PUBLIC;
-	String publicID = null;
-	String systemID = null;
-
-	/**
-	 * Constructor for system IDs.
-	 * 
-	 * @param systemID
-	 *            URI, which may be used to retrieve an external entity's
-	 *            content.
-	 */
-	public ExternalID(String systemID) {
-		this.type = T_SYSTEM;
-		this.publicID = null;
-		this.systemID = systemID;
-	}
-
-	/**
-	 * Constructor for public and system IDs.
-	 * 
-	 * @param publicID
-	 *            Identifier to be used to try to generate an alternative URI
-	 *            in order to retrieve the external entity's content, or
-	 *            <var>null</var> if a system identitier is to be
-	 *            constructed.
-	 * @param systemID
-	 *            URI, which may be used to retrieve an external entity's
-	 *            content.
-	 */
-	public ExternalID(String publicID, String systemID) {
-		this.type = T_PUBLIC;
-		this.publicID = publicID;
-		this.systemID = systemID;
-		if (null == this.publicID)
-			this.type = T_SYSTEM;
-	}
-
-	/**
-	 * Returns if this external ID is a system ID (or public ID).
-	 * 
-	 * @return System ID=true, Public ID=false.
-	 * @see #isPublic
-	 */
-	public boolean isSystem() {
-		return this.type == T_SYSTEM;
-	}
-
-	/**
-	 * Returns if this external ID is a public ID (or system ID).
-	 * 
-	 * @return Public ID=true, System ID=false.
-	 * @see #isSystem
-	 */
-	public boolean isPublic() {
-		return this.type == T_PUBLIC;
-	}
-
-	/**
-	 * Returns the system identifier of this external ID. A system identifier
-	 * is a URI, which may be used to retrieve an external entity's content.
-	 * 
-	 * @return The system identifier, or <var>null</var> if the identifier is
-	 *         not defined.
-	 * @see #getPubidLiteral
-	 */
-	public String getSystemLiteral() {
-		return this.systemID;
-	}
-
-	/**
-	 * Returns the public identifier of this external ID. This value is only
-	 * valid if the identifier is defined as <var>public</var> (as opposed to
-	 * <var>system</var>). Public identifiers may be used to try to generate
-	 * an alternative URI in order to retrieve an external entity's content.
-	 * If retrieval fails using the public identifier, an attempt must be made
-	 * to retrieve content using the system identifier.
-	 * 
-	 * @return The public identifier, or <var>null</var> if the identifier is
-	 *         not defined.
-	 * @see #getSystemLiteral
-	 */
-	public String getPubIdLiteral() {
-		return this.publicID;
-	}
-
-	/**
-	 * Returns this external ID in the format it was declared: <CODE>SYSTEM
-	 * &quot;<VAR>systemID</VAR>&quot;</CODE> or <CODE>PUBLIC &quot;<VAR>publicID</VAR>&quot;
-	 * &quot;<VAR>systemID</VAR>&quot;</CODE>.
-	 * 
-	 * @return XML string representing the content of the external ID (never
-	 *         <var>null</var>).
-	 */
-	public String toString() {
-		String ret;
-		if (isSystem()) {
-			ret = "SYSTEM \"" + getSystemLiteral() + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		else if (null != getSystemLiteral()) {
-			ret = "PUBLIC \"" + getPubIdLiteral() + "\" \"" + getSystemLiteral() + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-		else {
-			ret = "PUBLIC \"" + getPubIdLiteral() + "\""; // for NOTATION //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return ret;
-	}
-
-	/**
-	 * 
-	 */
-	public boolean equals(Object obj) {
-		if (obj == null)
-			return false;
-		if (!(obj instanceof ExternalID))
-			return false;
-		ExternalID eid = (ExternalID) obj;
-		if (!((eid.publicID == null && this.publicID == null) || eid.publicID != null && eid.publicID.equals(this.publicID)))
-			return false;
-		if (!((eid.systemID == null && this.systemID == null) || eid.systemID != null && eid.systemID.equals(this.systemID)))
-			return false;
-		return true;
-	}
-
-
-	/**
-	 * 
-	 */
-	public int hashCode() {
-		int retval = 0;
-		if (publicID != null)
-			retval = publicID.hashCode();
-		if (systemID != null)
-			retval += systemID.hashCode();
-		return retval;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/NotationDecl.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/NotationDecl.java
deleted file mode 100644
index 57d4e2f..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/NotationDecl.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-/**
- * Notations are how the Document Type Description (DTD) records hints about
- * the format of an XML "unparsed entity" -- in other words, non-XML data
- * bound to this document type, which some applications may wish to consult
- * when manipulating the document. A Notation represents a name-value pair,
- * with its nodeName being set to the declared name of the notation.
- */
-public class NotationDecl extends BaseNode {
-	/** Public identifier. */
-	protected String publicId = null;
-
-	/** System identifier. */
-	protected String systemId = null;
-
-	//
-	// Constructors
-	//
-
-	/** Factory constructor. */
-	public NotationDecl(String name, String ownerDTD) {
-		super(name, ownerDTD);
-	}
-
-	//
-	// Notation methods
-	//
-
-	/**
-	 * The Public Identifier for this Notation. If no public identifier was
-	 * specified, this will be null.
-	 */
-	public String getPublicId() {
-		return publicId;
-	} // getPublicId():String
-
-	/**
-	 * The System Identifier for this Notation. If no system identifier was
-	 * specified, this will be null.
-	 */
-	public String getSystemId() {
-		return systemId;
-	} // getSystemId():String
-
-	//
-	// Public methods
-	//
-
-	/**
-	 * NON-DOM: The Public Identifier for this Notation. If no public
-	 * identifier was specified, this will be null.
-	 */
-	public void setPublicId(String id) {
-		publicId = id;
-	} // setPublicId(String)
-
-	/**
-	 * NON-DOM: The System Identifier for this Notation. If no system
-	 * identifier was specified, this will be null.
-	 */
-	public void setSystemId(String id) {
-		systemId = id;
-	} // setSystemId(String)
-
-} // class NotationImpl
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/StringParser.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/StringParser.java
deleted file mode 100644
index 23a84ca..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/StringParser.java
+++ /dev/null
@@ -1,450 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-/**
- * Reader for processing/parsing xml string
- * 
- * @version
- */
-public class StringParser {
-	String fData = null;
-	int fEndOffset;
-	int fMostRecentChar;
-	int fCurrentOffset;
-	boolean fCalledCharPropInit = false;
-
-	public StringParser(String data) {
-		fData = data;
-		fCurrentOffset = 0;
-		fEndOffset = fData.length();
-		fMostRecentChar = fEndOffset == 0 ? -1 : fData.charAt(0);
-	}
-
-	public String getString(int offset, int length) {
-		if (length == 0)
-			return ""; //$NON-NLS-1$
-		return fData.substring(offset, offset + length);
-	}
-
-	public String getData() {
-		return fData;
-	}
-
-	public String getRemainingString() {
-		return fData.substring(getCurrentOffset());
-	}
-
-	public int getCurrentOffset() {
-		return fCurrentOffset;
-	}
-
-	//
-	//
-	public int loadNextChar() {
-		if (++fCurrentOffset >= fEndOffset) {
-			fMostRecentChar = -1;
-		}
-		else {
-			fMostRecentChar = fData.charAt(fCurrentOffset);
-		}
-		return fMostRecentChar;
-	}
-
-	//
-	//
-	public boolean lookingAtChar(char chr, boolean skipPastChar) {
-		int ch = fMostRecentChar;
-		if (ch != chr) {
-			return false;
-		}
-		if (skipPastChar) {
-			if (++fCurrentOffset >= fEndOffset) {
-				fMostRecentChar = -1;
-			}
-			else {
-				fMostRecentChar = fData.charAt(fCurrentOffset);
-			}
-		}
-		return true;
-	}
-
-	//
-	//
-	//
-	public boolean lookingAtValidChar(boolean skipPastChar) {
-		int ch = fMostRecentChar;
-		if (ch < 0xD800) {
-			if (ch < 0x20 && ch != 0x09 && ch != 0x0A && ch != 0x0D) {
-				return false;
-			}
-			if (skipPastChar) {
-				if (++fCurrentOffset >= fEndOffset) {
-					fMostRecentChar = -1;
-				}
-				else {
-					fMostRecentChar = fData.charAt(fCurrentOffset);
-				}
-			}
-			return true;
-		}
-		if (ch > 0xFFFD) {
-			return false;
-		}
-		if (ch < 0xDC00) {
-			if (fCurrentOffset + 1 >= fEndOffset) {
-				return false;
-			}
-			ch = fData.charAt(fCurrentOffset + 1);
-			if (ch < 0xDC00 || ch >= 0xE000) {
-				return false;
-			}
-			else if (!skipPastChar) {
-				return true;
-			}
-			else {
-				fCurrentOffset++;
-			}
-		}
-		else if (ch < 0xE000) {
-			return false;
-		}
-		if (skipPastChar) {
-			if (++fCurrentOffset >= fEndOffset) {
-				fMostRecentChar = -1;
-			}
-			else {
-				fMostRecentChar = fData.charAt(fCurrentOffset);
-			}
-		}
-		return true;
-	}
-
-	//
-	//
-	//
-	public boolean lookingAtSpace(boolean skipPastChar) {
-		int ch = fMostRecentChar;
-		if (ch > 0x20)
-			return false;
-		if (ch == 0x20 || ch == 0x0A || ch == 0x0D || ch == 0x09) {
-			if (skipPastChar) {
-				loadNextChar();
-			}
-			return true;
-		}
-		return false;
-	}
-
-	//
-	//
-	//
-	public void skipToChar(char chr, boolean skipPastChar) {
-		//
-		// REVISIT - this will skip invalid characters without reporting them.
-		//
-		int ch = fMostRecentChar;
-		while (true) {
-			if (ch == chr) {
-				if (skipPastChar) {
-					loadNextChar();
-				}
-				return;
-			}
-			if (ch == -1) {
-				return;
-			}
-			ch = loadNextChar();
-		}
-	}
-
-	//
-	//
-	//
-	public void skipPastSpaces() {
-		int ch = fMostRecentChar;
-		if (ch == -1) {
-			// changeReaders().skipPastSpaces();
-			return;
-		}
-		while (true) {
-			if (ch > 0x20 || (ch != 0x20 && ch != 0x0A && ch != 0x09 && ch != 0x0D)) {
-				fMostRecentChar = ch;
-				return;
-			}
-			if (++fCurrentOffset >= fEndOffset) {
-				return;
-			}
-			ch = fData.charAt(fCurrentOffset);
-		}
-	}
-
-	//
-	//
-	//
-
-	public void skipPastNameAndPEReference(char fastcheck) {
-		int ch = fMostRecentChar;
-
-		if (ch != '%') {
-			if (ch < 0x80) {
-				if (ch == -1 || XMLCharacterProperties.fgAsciiInitialNameChar[ch] == 0)
-					return;
-			}
-			else {
-				if (!fCalledCharPropInit) {
-					XMLCharacterProperties.initCharFlags();
-					fCalledCharPropInit = true;
-				}
-				if ((XMLCharacterProperties.fgCharFlags[ch] & XMLCharacterProperties.E_InitialNameCharFlag) == 0)
-					return;
-			}
-		}
-		while (true) {
-			ch = loadNextChar();
-			if (fastcheck == ch)
-				return;
-			if (ch == '%' || ch == ';') {
-				continue;
-			}
-
-			if (ch < 0x80) {
-				if (ch == -1 || XMLCharacterProperties.fgAsciiNameChar[ch] == 0)
-					return;
-			}
-			else {
-				if (!fCalledCharPropInit) {
-					XMLCharacterProperties.initCharFlags();
-					fCalledCharPropInit = true;
-				}
-				if ((XMLCharacterProperties.fgCharFlags[ch] & XMLCharacterProperties.E_NameCharFlag) == 0)
-					return;
-			}
-		}
-	}
-
-	public void skipPastName(char fastcheck) {
-		int ch = fMostRecentChar;
-		// System.out.println("skippastName ch: " +ch);
-
-		if (ch < 0x80) {
-			if (ch == -1 || XMLCharacterProperties.fgAsciiInitialNameChar[ch] == 0)
-				return;
-		}
-		else {
-			if (!fCalledCharPropInit) {
-				XMLCharacterProperties.initCharFlags();
-				fCalledCharPropInit = true;
-			}
-			if ((XMLCharacterProperties.fgCharFlags[ch] & XMLCharacterProperties.E_InitialNameCharFlag) == 0)
-				return;
-		}
-
-		while (true) {
-			ch = loadNextChar();
-			if (fastcheck == ch)
-				return;
-			if (ch < 0x80) {
-				if (ch == -1 || XMLCharacterProperties.fgAsciiNameChar[ch] == 0)
-					return;
-			}
-			else {
-				if (!fCalledCharPropInit) {
-					XMLCharacterProperties.initCharFlags();
-					fCalledCharPropInit = true;
-				}
-				if ((XMLCharacterProperties.fgCharFlags[ch] & XMLCharacterProperties.E_NameCharFlag) == 0)
-					return;
-			}
-		}
-	}
-
-	//
-	//
-	//
-
-	public void skipPastNmtoken(char fastcheck) {
-		int ch = fMostRecentChar;
-		while (true) {
-			if (fastcheck == ch)
-				return;
-			if (ch < 0x80) {
-				if (ch == -1 || XMLCharacterProperties.fgAsciiNameChar[ch] == 0)
-					return;
-			}
-			else {
-				if (!fCalledCharPropInit) {
-					XMLCharacterProperties.initCharFlags();
-					fCalledCharPropInit = true;
-				}
-				if ((XMLCharacterProperties.fgCharFlags[ch] & XMLCharacterProperties.E_NameCharFlag) == 0)
-					return;
-			}
-			ch = loadNextChar();
-		}
-	}
-
-	public void skipPastNmtokenAndPEReference(char fastcheck) {
-		int ch = fMostRecentChar;
-		while (true) {
-			if (fastcheck == ch)
-				return;
-			if (ch == '%' || ch == ';') {
-				ch = loadNextChar();
-				continue;
-			}
-			if (ch < 0x80) {
-				if (ch == -1 || XMLCharacterProperties.fgAsciiNameChar[ch] == 0)
-					return;
-			}
-			else {
-				if (!fCalledCharPropInit) {
-					XMLCharacterProperties.initCharFlags();
-					fCalledCharPropInit = true;
-				}
-				if ((XMLCharacterProperties.fgCharFlags[ch] & XMLCharacterProperties.E_NameCharFlag) == 0)
-					return;
-			}
-			ch = loadNextChar();
-		}
-	}
-
-	//
-	//
-	//
-	public boolean skippedString(char[] s) {
-		int ch = fMostRecentChar;
-		if (ch != s[0]) {
-			return false;
-		}
-		if (fCurrentOffset + s.length > fEndOffset)
-			return false;
-		for (int i = 1; i < s.length; i++) {
-			if (fData.charAt(fCurrentOffset + i) != s[i])
-				return false;
-		}
-		fCurrentOffset += (s.length - 1);
-		loadNextChar();
-		return true;
-	}
-
-	//
-	//
-	//
-	public int scanInvalidChar() throws Exception {
-		int ch = fMostRecentChar;
-		loadNextChar();
-		return ch;
-	}
-
-	//
-	//
-	//
-	/*
-	 * public int scanCharRef(boolean hex) throws Exception { int ch =
-	 * fMostRecentChar; if (ch == -1) // return
-	 * changeReaders().scanCharRef(hex); return ch; int num = 0; if (hex) { if
-	 * (ch > 'f' || XMLCharacterProperties.fgAsciiXDigitChar[ch] == 0) return
-	 * XMLEntityHandler.CHARREF_RESULT_INVALID_CHAR; num = ch - (ch < 'A' ?
-	 * '0' : (ch < 'a' ? 'A' : 'a') - 10); } else { if (ch < '0' || ch > '9')
-	 * return XMLEntityHandler.CHARREF_RESULT_INVALID_CHAR; num = ch - '0'; }
-	 * boolean toobig = false; while (true) { ch = loadNextChar(); if (ch ==
-	 * -1) return XMLEntityHandler.CHARREF_RESULT_SEMICOLON_REQUIRED; if (hex) {
-	 * if (ch > 'f' || XMLCharacterProperties.fgAsciiXDigitChar[ch] == 0)
-	 * break; } else { if (ch < '0' || ch > '9') break; } if (hex) { int dig =
-	 * ch - (ch < 'A' ? '0' : (ch < 'a' ? 'A' : 'a') - 10); num = (num << 4) +
-	 * dig; } else { int dig = ch - '0'; num = (num * 10) + dig; } if (num >
-	 * 0x10FFFF) { toobig = true; num = 0; } } if (ch != ';') return
-	 * XMLEntityHandler.CHARREF_RESULT_SEMICOLON_REQUIRED; loadNextChar(); if
-	 * (toobig) return XMLEntityHandler.CHARREF_RESULT_OUT_OF_RANGE; return
-	 * num; }
-	 */
-	//
-	//
-	//
-	/*
-	 * public int scanStringLiteral() throws Exception { boolean single; if
-	 * (!(single = lookingAtChar('\'', true)) && !lookingAtChar('\"', true)) {
-	 * return XMLEntityHandler.STRINGLIT_RESULT_QUOTE_REQUIRED; } int offset =
-	 * fCurrentOffset; char qchar = single ? '\'' : '\"'; while
-	 * (!lookingAtChar(qchar, false)) { if (!lookingAtValidChar(true)) {
-	 * return XMLEntityHandler.STRINGLIT_RESULT_INVALID_CHAR; } } // int
-	 * stringIndex = addString(offset, fCurrentOffset - offset); int
-	 * stringIndex = addString(offset, fCurrentOffset - offset);
-	 * lookingAtChar(qchar, true); // move past qchar return stringIndex; }
-	 */
-
-	//
-	//
-	public boolean scanAttValue(char qchar) {
-		int offset = fCurrentOffset;
-		boolean result = true;
-		while (true) {
-			if (lookingAtChar(qchar, false)) {
-				break;
-			}
-			if (lookingAtChar(' ', true)) {
-				continue;
-			}
-			if (!lookingAtValidChar(true)) {
-				result = false;
-			}
-		}
-		lookingAtChar(qchar, true);
-		return result;
-	}
-
-	//
-	// [9] EntityValue ::= '"' ([^%&"] | PEReference | Reference)* '"'
-	// | "'" ([^%&'] | PEReference | Reference)* "'"
-	//
-	// The values in the following table are defined as:
-	//
-	// 0 - not special
-	// 1 - quote character
-	// 2 - reference
-	// 3 - peref
-	// 4 - invalid
-	//
-	public static final byte fgAsciiEntityValueChar[] = {4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 4, 4, 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 1, 0, 0, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, // '\"',
-																																																			// '%',
-																																																			// '&',
-																																																			// '\''
-				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-
-	/*
-	 * public int scanEntityValue(int qchar, boolean createString) throws
-	 * Exception { int offset = fCurrentOffset; int ch = fMostRecentChar;
-	 * while (true) { if (ch == -1) { changeReaders(); // do not call next
-	 * reader, our caller may need to change the parameters return
-	 * XMLEntityHandler.ENTITYVALUE_RESULT_END_OF_INPUT; } if (ch < 0x80) {
-	 * switch (fgAsciiEntityValueChar[ch]) { case 1: // quote char if (ch ==
-	 * qchar) { if (!createString) return
-	 * XMLEntityHandler.ENTITYVALUE_RESULT_FINISHED; int length =
-	 * fCurrentOffset - offset; int result = length == 0 ?
-	 * StringPool.EMPTY_STRING : addString(offset, length); loadNextChar();
-	 * return result; } // the other quote character is not special // fall
-	 * through case 0: // non-special char if (++fCurrentOffset >= fEndOffset) {
-	 * if (oweTrailingSpace) { oweTrailingSpace = false; ch = fMostRecentChar = ' '; }
-	 * else { ch = fMostRecentChar = -1; } } else { ch = fMostRecentChar =
-	 * fData.charAt(fCurrentOffset); } continue; case 2: // reference return
-	 * XMLEntityHandler.ENTITYVALUE_RESULT_REFERENCE; case 3: // peref return
-	 * XMLEntityHandler.ENTITYVALUE_RESULT_PEREF; case 4: // invalid return
-	 * XMLEntityHandler.ENTITYVALUE_RESULT_INVALID_CHAR; } } else if (ch <
-	 * 0xD800) { ch = loadNextChar(); } else if (ch >= 0xE000 && (ch <= 0xFFFD ||
-	 * (ch >= 0x10000 && ch <= 0x10FFFF))) { // // REVISIT - needs more code
-	 * to check surrogates. // ch = loadNextChar(); } else { return
-	 * XMLEntityHandler.ENTITYVALUE_RESULT_INVALID_CHAR; } } }
-	 */
-
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/TString.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/TString.java
deleted file mode 100644
index 7e634bf..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/TString.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-import java.util.StringTokenizer;
-
-/**
- * This class provides static methods for some of the very used IString
- * operations
- */
-
-public class TString {
-	private static final String ALPHABET = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; //$NON-NLS-1$
-	private static final String ALPHANUMERIC = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; //$NON-NLS-1$
-	private static final String NUMERIC = "0123456789"; //$NON-NLS-1$
-
-	// change all occurrences of oldPat to newPat
-	public static String change(String in, String oldPat, String newPat) {
-		if (oldPat.length() == 0)
-			return in;
-		if (oldPat.length() == 1 && newPat.length() == 1)
-			return in.replace(oldPat.charAt(0), newPat.charAt(0));
-
-		int lastIndex = 0;
-		int newIndex = 0;
-		StringBuffer newString = new StringBuffer();
-		for (;;) {
-			newIndex = in.indexOf(oldPat, lastIndex);
-			if (newIndex != -1) {
-				newString.append(in.substring(lastIndex, newIndex) + newPat);
-				lastIndex = newIndex + oldPat.length();
-			}
-			else {
-				newString.append(in.substring(lastIndex));
-				break;
-			}
-		}
-		return newString.toString();
-	}
-
-	// change the occurrences of oldPat to newPat starting at startPosition
-	// for number of numChanges
-	// Note: the 1st char in the string has position of 0
-
-	public static String change(String in, String oldPat, String newPat, int startPos, int numChanges) {
-		if (oldPat.length() == 0)
-			return in;
-		if (oldPat.length() == 1 && newPat.length() == 1)
-			return in.replace(oldPat.charAt(0), newPat.charAt(0));
-
-		int inLen = in.length();
-
-		if (startPos >= inLen)
-			return in;
-
-		int lastIndex = startPos;
-		int newIndex = 0;
-		int countChanges = 0;
-
-
-		StringBuffer newString = new StringBuffer();
-
-		for (;;) {
-			newIndex = in.indexOf(oldPat, lastIndex);
-			if (newIndex != -1) {
-				newString.append(in.substring(lastIndex, newIndex) + newPat);
-				lastIndex = newIndex + oldPat.length();
-				countChanges++;
-			}
-			else {
-				newString.append(in.substring(lastIndex));
-				break;
-			}
-
-			if (countChanges == numChanges) {
-				newString.append(in.substring(lastIndex));
-				break;
-			}
-		}
-
-		return newString.toString();
-	}
-
-	public static String word(String in, int i) {
-		StringTokenizer st = new StringTokenizer(in);
-		if (i <= 0 || i > st.countTokens())
-			return ""; //$NON-NLS-1$
-		else {
-			String ret = new String();
-			while (st.hasMoreTokens()) {
-				ret = st.nextToken();
-				if (--i == 0)
-					return ret;
-			}
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public static String words(String in, int i) {
-		StringTokenizer st = new StringTokenizer(in);
-		if (i <= 0 || i > st.countTokens())
-			return ""; //$NON-NLS-1$
-		else {
-			while (st.hasMoreTokens()) {
-				if (--i == 0)
-					break;
-				st.nextToken();
-			}
-			if (st.hasMoreTokens())
-				return st.nextToken(""); //$NON-NLS-1$
-			else
-				return ""; //$NON-NLS-1$
-		}
-	}
-
-	public static String appendSpaces(String in, int len) {
-		if (len < 1)
-			return in;
-
-		StringBuffer sb = new StringBuffer(in);
-		for (int i = 0; i < len; i++) {
-			sb.append(" "); //$NON-NLS-1$
-		}
-		return sb.toString();
-	}
-
-	public static int numWords(String in) {
-		StringTokenizer st = new StringTokenizer(in);
-		return st.countTokens();
-	}
-
-	// return the first index within srcString that is not in the validString
-	// example:
-	// srcString = "abcdefg"
-	// validString = "bcfg"
-	// return = 0 (i.e. char a is not in "bcfg") - 1st index = 0
-
-	public static int indexOfAnyBut(String srcString, String validString) {
-		int result = -1;
-		int srcLen = srcString.length();
-
-		// walk backward to find if a char within srcString is in validString
-		for (int i = 0; i < srcLen; i++) {
-			// not found, stop it
-			if (validString.indexOf(srcString.charAt(i)) == -1) {
-				result = i;
-				break;
-			}
-
-		}
-
-		return result;
-	}
-
-	// return the last index within srcString that is not in the validString
-	// example:
-	// srcString = "abcdefg"
-	// validString = "bcfg"
-	// return = 4 (i.e. char e is not in "bcfg") - 1st index = 0
-
-	public static int lastIndexOfAnyBut(String srcString, String validString) {
-		int result = -1;
-		int srcLen = srcString.length();
-
-		// walk backward to find if a char within srcString is in validString
-		for (int i = srcLen - 1; i >= 0; i--) {
-			// not found, stop it
-			if (validString.indexOf(srcString.charAt(i)) == -1) {
-				result = i;
-				break;
-			}
-
-		}
-
-		return result;
-	}
-
-	// return number of occurrences of searchChar within srcString
-	// example:
-	// srcString = "::f::f::g"
-	// seachrChar = ':'
-	// return = 6
-
-	public static int occurrenceOf(String srcString, char searchChar) {
-		int result = 0;
-		// walk backward to find if a char within srcString is in validString
-		if (srcString.length() > 0) {
-
-			for (int i = 0; i < srcString.length(); i++) {
-				// found, increment the count
-				if (searchChar == srcString.charAt(i))
-					result++;
-			}
-		}
-
-		return result;
-	}
-
-	// strip the leading pString in the srcString
-	// example:
-	// srcString = "::f::f::g"
-	// pString "::"
-	// return = "f::f::g"
-
-	public static String stripLeading(String srcString, String pString) {
-		String result;
-
-		if (srcString.startsWith(pString)) // leading patString found
-			result = srcString.substring(pString.length(), srcString.length());
-		else
-			// not found
-			result = srcString;
-
-		return result;
-	}
-
-	// strip the trailing pString in the srcString
-	// example:
-	// srcString = "f::f::g::"
-	// pString "::"
-	// return = "f::f::g"
-
-	public static String stripTrailing(String srcString, String pString) {
-		String result;
-
-		if (srcString.endsWith(pString)) // leading patString found
-			result = srcString.substring(0, srcString.lastIndexOf(pString));
-		else
-			// not found
-			result = srcString;
-
-		return result;
-	}
-
-	/**
-	 * strip the trailing blanks in the src
-	 */
-	public static String stripTrailingBlanks(String src) {
-
-		if (src != null) {
-			while (src.length() > 0) {
-				if (src.endsWith(" ")) //$NON-NLS-1$
-					src = src.substring(0, src.length() - 1);
-				else
-					break;
-			}
-		}
-
-		return src;
-	}
-
-
-
-	// return a string that contains number of copies of srcString
-	// example:
-	// srcString = "abc"
-	// numberOfCopies = 2
-	// return string = "abcabc"
-
-	public static String copy(String srcString, int numberOfCopies) {
-		StringBuffer result = new StringBuffer();
-
-		if (numberOfCopies > 0) {
-			for (int i = 1; i <= numberOfCopies; i++)
-				result.append(srcString);
-		}
-		else
-			result = new StringBuffer(srcString);
-
-		return result.toString();
-	}
-
-	//
-	// return true if all chars in srcString are in {a...z} or {A...Z}
-
-	public static boolean isAlphabetic(String srcString) {
-		return (lastIndexOfAnyBut(srcString, ALPHABET) == -1);
-	}
-
-	//
-	// return true if all chars in srcString are in {a...z,} or {A...Z}
-	// {0...9}
-
-	public static boolean isAlphanumeric(String srcString) {
-		return (lastIndexOfAnyBut(srcString, ALPHANUMERIC) == -1);
-	}
-
-
-	//
-	// return true if all chars are in '0' - '9'
-
-	public static boolean isDigits(String srcString) {
-		return (lastIndexOfAnyBut(srcString, NUMERIC) == -1);
-	}
-
-
-	public static boolean isEmptyOrNull(String string) {
-		return string == null || string.length() == 0;
-	}
-
-
-	//
-	// return the string after the matching token is removed
-	public static String match(String in, String token) throws Exception {
-		if (in == null)
-			return null;
-
-		in = in.trim();
-		if (in.startsWith(token))
-			return in.substring(token.length(), in.length());
-		else
-			throw new Exception("Expected: " + token + " but got:" + word(in, 1)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public static long getLong(String str) {
-		try {
-			return Long.parseLong(str);
-		}
-		catch (Exception m) {
-			return 0;
-		}
-	}
-
-	// return true if the " " appears within srcString
-	// example:
-	// srcString = "a m"
-	// return = true
-
-	public static boolean containsDoubleBlanks(String srcString) {
-		String bb = "  "; //$NON-NLS-1$
-		char b = bb.charAt(0);
-
-		if (srcString.length() > 0) {
-			for (int i = 0; i < (srcString.length() - 1); i++) {
-				if ((b == srcString.charAt(i)) & (b == srcString.charAt(i + 1)))
-					return true;
-			}
-		}
-		return false;
-	}
-};
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/XMLCharacterProperties.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/XMLCharacterProperties.java
deleted file mode 100644
index c7d2f32..0000000
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/XMLCharacterProperties.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.saxparser;
-
-/**
- * A class representing properties of characters according to various W3C
- * recommendations
- * 
- * XMLCharacterProperties provides convenience methods for commonly used
- * character tests.
- * 
- * For performance reasons, the tables used by the convenience methods are
- * also public, and are directly accessed by performance critical routines.
- * 
- */
-
-public final class XMLCharacterProperties {
-	/*
-	 * [26] VersionNum ::= ([a-zA-Z0-9_.:] | '-')+
-	 * 
-	 * Note: This is the same as the ascii portion of the NameChar definition.
-	 */
-	/**
-	 * Check to see if a string is a valid version string according to [26] in
-	 * the XML 1.0 Recommendation
-	 * 
-	 * @param version
-	 *            string to check
-	 * @return true if version is a valid version string
-	 */
-	public static boolean validVersionNum(String version) {
-		if (version.length() == 0)
-			return false;
-		for (int i = 0; i < version.length(); i++) {
-			char ch = version.charAt(i);
-			if (ch > 'z' || fgAsciiNameChar[ch] == 0)
-				return false;
-		}
-		return true;
-	}
-
-	/*
-	 * [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')*
-	 */
-	/**
-	 * Check to see if a string is a valid encoding name according to [81] in
-	 * the XML 1.0 Recommendation
-	 * 
-	 * @param encoding
-	 *            string to check
-	 * @return true if encoding is a valid encoding name
-	 */
-	public static boolean validEncName(String encoding) {
-		if (encoding.length() == 0)
-			return false;
-		char ch = encoding.charAt(0);
-		if (ch > 'z' || fgAsciiAlphaChar[ch] == 0)
-			return false;
-		for (int i = 1; i < encoding.length(); i++) {
-			ch = encoding.charAt(i);
-			if (ch > 'z' || fgAsciiEncNameChar[ch] == 0)
-				return false;
-		}
-		return true;
-	}
-
-	/*
-	 * [13] PubidChar ::= #x20 | #xD | #xA | [a-zA-Z0-9] |
-	 * [-'()+,./:=?;!*#@$_%]
-	 */
-	/**
-	 * Check to see if a string is a valid public identifier according to [13]
-	 * in the XML 1.0 Recommendation
-	 * 
-	 * @param publicId
-	 *            string to check
-	 * @return true if publicId is a valid public identifier
-	 */
-	public static int validPublicId(String publicId) {
-		if (publicId.length() == 0)
-			return -1;
-		for (int i = 0; i < publicId.length(); i++) {
-			char ch = publicId.charAt(i);
-			if (ch > 'z' || fgAsciiPubidChar[ch] == 0)
-				return i;
-		}
-		return -1;
-	}
-
-	/*
-	 * [5] Name ::= (Letter | '_' | ':') (NameChar)*
-	 */
-	/**
-	 * Check to see if a string is a valid Name according to [5] in the XML
-	 * 1.0 Recommendation
-	 * 
-	 * @param name
-	 *            string to check
-	 * @return true if name is a valid Name
-	 */
-	public static boolean validName(String name) {
-		XMLCharacterProperties.initCharFlags();
-		if (name.length() == 0)
-			return false;
-		char ch = name.charAt(0);
-		if (ch > 'z') {
-			if ((fgCharFlags[ch] & E_InitialNameCharFlag) == 0)
-				return false;
-		}
-		else if (fgAsciiInitialNameChar[ch] == 0)
-			return false;
-		for (int i = 1; i < name.length(); i++) {
-			ch = name.charAt(i);
-			if (ch > 'z') {
-				if ((fgCharFlags[ch] & E_NameCharFlag) == 0)
-					return false;
-			}
-			else if (fgAsciiNameChar[ch] == 0)
-				return false;
-		}
-		return true;
-	}
-
-	/*
-	 * from the namespace rec [5] NCName ::= (Letter | '_' | ':')
-	 * (NameNCChar)*
-	 */
-	/**
-	 * Check to see if a string is a valid NCName according to [5] from the
-	 * XML Namespaces 1.0 Recommendation
-	 * 
-	 * @param name
-	 *            string to check
-	 * @return true if name is a valid NCName
-	 */
-	public static boolean validNCName(String name) {
-		XMLCharacterProperties.initCharFlags();
-		if (name.length() == 0)
-			return false;
-		char ch = name.charAt(0);
-		if (ch > 'z') {
-			if ((fgCharFlags[ch] & E_InitialNameCharFlag) == 0)
-				return false;
-		}
-		else if (fgAsciiInitialNCNameChar[ch] == 0)
-			return false;
-		for (int i = 1; i < name.length(); i++) {
-			ch = name.charAt(i);
-			if (ch > 'z') {
-				if ((fgCharFlags[ch] & E_NameCharFlag) == 0)
-					return false;
-			}
-			else if (fgAsciiNCNameChar[ch] == 0)
-				return false;
-		}
-		return true;
-	}
-
-
-	/*
-	 * [7] Nmtoken ::= (NameChar)+
-	 */
-	/**
-	 * Check to see if a string is a valid Nmtoken according to [7] in the XML
-	 * 1.0 Recommendation
-	 * 
-	 * @param nmtoken
-	 *            string to checj
-	 * @return true if nmtoken is a valid Nmtoken
-	 */
-	public static boolean validNmtoken(String nmtoken) {
-		XMLCharacterProperties.initCharFlags();
-		if (nmtoken.length() == 0)
-			return false;
-		for (int i = 0; i < nmtoken.length(); i++) {
-			char ch = nmtoken.charAt(i);
-			if (ch > 'z') {
-				if ((fgCharFlags[ch] & E_NameCharFlag) == 0)
-					return false;
-			}
-			else if (fgAsciiNameChar[ch] == 0) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/*
-	 * Here are tables used to build character properties.
-	 */
-	public static final byte fgAsciiXDigitChar[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, // '0'
-																																																													// -
-																																																													// '9'
-				0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 'A' - 'F'
-				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 'a'
-																												// -
-																												// 'f'
-				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-	public static final byte fgAsciiAlphaChar[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 'A'
-																																																																									// -
-																																																																									// 'O'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, // 'P' - 'Z'
-				0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 'a' - 'o'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 // 'p' - 'z'
-	};
-	public static final byte fgAsciiEncNameChar[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, // '-'
-																																																		// is
-																																																		// 0x2D
-																																																		// and
-																																																		// '.'
-																																																		// is
-																																																		// 0x2E
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, // '0' - '9'
-				0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 'A' - 'O'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, // 'P' - 'Z'
-																// and '_' is
-																// 0x5F
-				0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 'a' - 'o'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 // 'p' - 'z'
-	};
-	public static final byte fgAsciiPubidChar[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, // ' ',
-																																																	// '!',
-																																																	// '#',
-																																																	// '$',
-																																																	// '%',
-				// '\'', '(', ')', '*', '+', ',', '-', '.', '/'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, // '0' - '9',
-																// ':', ';',
-																// '=', '?'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // '@', 'A' -
-																// 'O'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, // 'P' - 'Z'
-																// and '_' is
-																// 0x5F
-				0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 'a' - 'o'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 // 'p' - 'z'
-	};
-	public static final byte fgAsciiInitialNameChar[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, // ':'
-																																																															// is
-																																																															// 0x3A
-				0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 'A' - 'O'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, // 'P' - 'Z'
-																// and '_' is
-																// 0x5F
-				0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 'a' - 'o'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 // 'p' - 'z'
-	};
-	public static final byte fgAsciiNameChar[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, // '-'
-																																																	// is
-																																																	// 0x2D
-																																																	// and
-																																																	// '.'
-																																																	// is
-																																																	// 0x2E
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, // '0' - '9'
-																// and ':' is
-																// 0x3A
-				0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 'A' - 'O'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, // 'P' - 'Z'
-																// and '_' is
-																// 0x5F
-				0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 'a' - 'o'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 // 'p' - 'z'
-	};
-	public static final byte fgAsciiInitialNCNameChar[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // ':'
-																																																															// is
-																																																															// 0x3A
-				0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 'A' - 'O'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, // 'P' - 'Z'
-																// and '_' is
-																// 0x5F
-				0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 'a' - 'o'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 // 'p' - 'z'
-	};
-	public static final byte fgAsciiNCNameChar[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, // '-'
-																																																	// is
-																																																	// 0x2D
-																																																	// and
-																																																	// '.'
-																																																	// is
-																																																	// 0x2E
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, // '0' - '9'
-																// and ':' is
-																// 0x3A
-				0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 'A' - 'O'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, // 'P' - 'Z'
-																// and '_' is
-																// 0x5F
-				0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 'a' - 'o'
-				1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 // 'p' - 'z'
-	};
-	public static final byte fgAsciiCharData[] = {4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 4, // tab
-																									// is
-																									// 0x09
-				4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, // '&'
-																												// is
-																												// 0x26
-				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, // '<' is 0x3C
-				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, // ']'
-																												// is
-																												// 0x5D
-				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-	public static final byte fgAsciiWSCharData[] = {4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 4, 4, 5, 4, 4, // tab
-																									// is
-																									// 0x09,
-																									// LF
-																									// is
-																									// 0x0A,
-																									// CR
-																									// is
-																									// 0x0D
-				4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, // ' '
-																												// is
-																												// 0x20,
-																												// '&'
-																												// is
-																												// 0x26
-				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, // '<' is 0x3C
-				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, // ']'
-																												// is
-																												// 0x5D
-				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-	public static final byte E_CharDataFlag = 1 << 0;
-	public static final byte E_InitialNameCharFlag = 1 << 1;
-	public static final byte E_NameCharFlag = 1 << 2;
-	public static byte[] fgCharFlags = null;
-
-	public static synchronized void initCharFlags() {
-		if (fgCharFlags == null) {
-			fgCharFlags = new byte[0x10000];
-			setFlagForRange(fgCharDataRanges, E_CharDataFlag);
-			setFlagForRange(fgInitialNameCharRanges, (byte) (E_InitialNameCharFlag | E_NameCharFlag));
-			setFlagForRange(fgNameCharRanges, E_NameCharFlag);
-		}
-	}
-
-	private static void setFlagForRange(char[] ranges, byte flag) {
-		int i;
-		int ch;
-		for (i = 0; (ch = ranges[i]) != 0; i += 2) {
-			int endch = ranges[i + 1];
-			while (ch <= endch)
-				fgCharFlags[ch++] |= flag;
-		}
-		for (i++; (ch = ranges[i]) != 0; i++)
-			fgCharFlags[ch] |= flag;
-	}
-
-	/*
-	 * [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] // any Unicode character,
-	 * excluding the | [#xE000-#xFFFD] | [#x10000-#x10FFFF] // surrogate
-	 * blocks, FFFE, and FFFF. [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*)
-	 * 
-	 * We will use Char - ( [^<&] | ']' | #xA | #xD ) and handle the special
-	 * cases inline.
-	 */
-	private static final char fgCharDataRanges[] = {0x0020, 0x0025, // '&' is
-																	// 0x0026
-				0x0027, 0x003B, // '<' is 0x003C
-				0x003D, 0x005C, // ']' is 0x005D
-				0x005E, 0xD7FF, 0xE000, 0xFFFD, 0x0000, 0x0009, // tab
-				0x0000};
-	/*
-	 * [5] Name ::= (Letter | '_' | ':') (NameChar)* [4] NameChar ::= Letter |
-	 * Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender [84] Letter
-	 * ::= BaseChar | Ideographic [85] BaseChar ::= <see standard> [86]
-	 * Ideographic ::= <see standard> [87] CombiningChar ::= <see standard>
-	 * [88] Digit ::= <see standard> [89] Extender ::= <see standard>
-	 */
-	private static final char fgInitialNameCharRanges[] = {
-	//
-				// Ranges:
-				//
-				// BaseChar ranges
-				//
-				0x0041, 0x005A, 0x0061, 0x007A, 0x00C0, 0x00D6, 0x00D8, 0x00F6, 0x00F8, 0x0131, 0x0134, 0x013E, 0x0141, 0x0148, 0x014A, 0x017E, 0x0180, 0x01C3, 0x01CD, 0x01F0, 0x01F4, 0x01F5, 0x01FA, 0x0217, 0x0250, 0x02A8, 0x02BB, 0x02C1, 0x0388, 0x038A, 0x038E, 0x03A1, 0x03A3, 0x03CE, 0x03D0, 0x03D6, 0x03E2, 0x03F3, 0x0401, 0x040C, 0x040E, 0x044F, 0x0451, 0x045C, 0x045E, 0x0481, 0x0490, 0x04C4, 0x04C7, 0x04C8, 0x04CB, 0x04CC, 0x04D0, 0x04EB, 0x04EE, 0x04F5, 0x04F8, 0x04F9, 0x0531, 0x0556, 0x0561, 0x0586, 0x05D0, 0x05EA, 0x05F0, 0x05F2, 0x0621, 0x063A, 0x0641, 0x064A, 0x0671, 0x06B7, 0x06BA, 0x06BE, 0x06C0, 0x06CE, 0x06D0, 0x06D3, 0x06E5, 0x06E6, 0x0905, 0x0939, 0x0958, 0x0961, 0x0985, 0x098C, 0x098F, 0x0990, 0x0993, 0x09A8, 0x09AA, 0x09B0, 0x09B6, 0x09B9, 0x09DC, 0x09DD, 0x09DF, 0x09E1, 0x09F0, 0x09F1, 0x0A05, 0x0A0A, 0x0A0F, 0x0A10, 0x0A13, 0x0A28, 0x0A2A, 0x0A30, 0x0A32, 0x0A33, 0x0A35, 0x0A36, 0x0A38, 0x0A39, 0x0A59, 0x0A5C, 0x0A72, 0x0A74, 0x0A85, 0x0A8B, 0x0A8F, 0x0A91,
-				0x0A93, 0x0AA8, 0x0AAA, 0x0AB0, 0x0AB2, 0x0AB3, 0x0AB5, 0x0AB9, 0x0B05, 0x0B0C, 0x0B0F, 0x0B10, 0x0B13, 0x0B28, 0x0B2A, 0x0B30, 0x0B32, 0x0B33, 0x0B36, 0x0B39, 0x0B5C, 0x0B5D, 0x0B5F, 0x0B61, 0x0B85, 0x0B8A, 0x0B8E, 0x0B90, 0x0B92, 0x0B95, 0x0B99, 0x0B9A, 0x0B9E, 0x0B9F, 0x0BA3, 0x0BA4, 0x0BA8, 0x0BAA, 0x0BAE, 0x0BB5, 0x0BB7, 0x0BB9, 0x0C05, 0x0C0C, 0x0C0E, 0x0C10, 0x0C12, 0x0C28, 0x0C2A, 0x0C33, 0x0C35, 0x0C39, 0x0C60, 0x0C61, 0x0C85, 0x0C8C, 0x0C8E, 0x0C90, 0x0C92, 0x0CA8, 0x0CAA, 0x0CB3, 0x0CB5, 0x0CB9, 0x0CE0, 0x0CE1, 0x0D05, 0x0D0C, 0x0D0E, 0x0D10, 0x0D12, 0x0D28, 0x0D2A, 0x0D39, 0x0D60, 0x0D61, 0x0E01, 0x0E2E, 0x0E32, 0x0E33, 0x0E40, 0x0E45, 0x0E81, 0x0E82, 0x0E87, 0x0E88, 0x0E94, 0x0E97, 0x0E99, 0x0E9F, 0x0EA1, 0x0EA3, 0x0EAA, 0x0EAB, 0x0EAD, 0x0EAE, 0x0EB2, 0x0EB3, 0x0EC0, 0x0EC4, 0x0F40, 0x0F47, 0x0F49, 0x0F69, 0x10A0, 0x10C5, 0x10D0, 0x10F6, 0x1102, 0x1103, 0x1105, 0x1107, 0x110B, 0x110C, 0x110E, 0x1112, 0x1154, 0x1155, 0x115F, 0x1161, 0x116D, 0x116E,
-				0x1172, 0x1173, 0x11AE, 0x11AF, 0x11B7, 0x11B8, 0x11BC, 0x11C2, 0x1E00, 0x1E9B, 0x1EA0, 0x1EF9, 0x1F00, 0x1F15, 0x1F18, 0x1F1D, 0x1F20, 0x1F45, 0x1F48, 0x1F4D, 0x1F50, 0x1F57, 0x1F5F, 0x1F7D, 0x1F80, 0x1FB4, 0x1FB6, 0x1FBC, 0x1FC2, 0x1FC4, 0x1FC6, 0x1FCC, 0x1FD0, 0x1FD3, 0x1FD6, 0x1FDB, 0x1FE0, 0x1FEC, 0x1FF2, 0x1FF4, 0x1FF6, 0x1FFC, 0x212A, 0x212B, 0x2180, 0x2182, 0x3041, 0x3094, 0x30A1, 0x30FA, 0x3105, 0x312C, 0xAC00, 0xD7A3,
-				//
-				// Ideographic ranges
-				//
-				0x3021, 0x3029, 0x4E00, 0x9FA5,
-				//
-				// Ranges end marker
-				//
-				0x0000,
-				//
-				// Single char values
-				//
-				0x003A, // ':'
-				0x005F, // '_'
-				//
-				// BaseChar singles
-				//
-				0x0386, 0x038C, 0x03DA, 0x03DC, 0x03DE, 0x03E0, 0x0559, 0x06D5, 0x093D, 0x09B2, 0x0A5E, 0x0A8D, 0x0ABD, 0x0AE0, 0x0B3D, 0x0B9C, 0x0CDE, 0x0E30, 0x0E84, 0x0E8A, 0x0E8D, 0x0EA5, 0x0EA7, 0x0EB0, 0x0EBD, 0x1100, 0x1109, 0x113C, 0x113E, 0x1140, 0x114C, 0x114E, 0x1150, 0x1159, 0x1163, 0x1165, 0x1167, 0x1169, 0x1175, 0x119E, 0x11A8, 0x11AB, 0x11BA, 0x11EB, 0x11F0, 0x11F9, 0x1F59, 0x1F5B, 0x1F5D, 0x1FBE, 0x2126, 0x212E,
-				//
-				// Ideographic singles
-				//
-				0x3007,
-				//
-				// Singles end marker
-				//
-				0x0000};
-	private static final char fgNameCharRanges[] = {
-	//
-				// Ranges:
-				//
-				0x002D, 0x002E, // '-' and '.'
-				//
-				// CombiningChar ranges
-				//
-				0x0300, 0x0345, 0x0360, 0x0361, 0x0483, 0x0486, 0x0591, 0x05A1, 0x05A3, 0x05B9, 0x05BB, 0x05BD, 0x05C1, 0x05C2, 0x064B, 0x0652, 0x06D6, 0x06DC, 0x06DD, 0x06DF, 0x06E0, 0x06E4, 0x06E7, 0x06E8, 0x06EA, 0x06ED, 0x0901, 0x0903, 0x093E, 0x094C, 0x0951, 0x0954, 0x0962, 0x0963, 0x0981, 0x0983, 0x09C0, 0x09C4, 0x09C7, 0x09C8, 0x09CB, 0x09CD, 0x09E2, 0x09E3, 0x0A40, 0x0A42, 0x0A47, 0x0A48, 0x0A4B, 0x0A4D, 0x0A70, 0x0A71, 0x0A81, 0x0A83, 0x0ABE, 0x0AC5, 0x0AC7, 0x0AC9, 0x0ACB, 0x0ACD, 0x0B01, 0x0B03, 0x0B3E, 0x0B43, 0x0B47, 0x0B48, 0x0B4B, 0x0B4D, 0x0B56, 0x0B57, 0x0B82, 0x0B83, 0x0BBE, 0x0BC2, 0x0BC6, 0x0BC8, 0x0BCA, 0x0BCD, 0x0C01, 0x0C03, 0x0C3E, 0x0C44, 0x0C46, 0x0C48, 0x0C4A, 0x0C4D, 0x0C55, 0x0C56, 0x0C82, 0x0C83, 0x0CBE, 0x0CC4, 0x0CC6, 0x0CC8, 0x0CCA, 0x0CCD, 0x0CD5, 0x0CD6, 0x0D02, 0x0D03, 0x0D3E, 0x0D43, 0x0D46, 0x0D48, 0x0D4A, 0x0D4D, 0x0E34, 0x0E3A, 0x0E47, 0x0E4E, 0x0EB4, 0x0EB9, 0x0EBB, 0x0EBC, 0x0EC8, 0x0ECD, 0x0F18, 0x0F19, 0x0F71, 0x0F84, 0x0F86, 0x0F8B,
-				0x0F90, 0x0F95, 0x0F99, 0x0FAD, 0x0FB1, 0x0FB7, 0x20D0, 0x20DC, 0x302A, 0x302F,
-				//
-				// Digit ranges
-				//
-				0x0030, 0x0039, 0x0660, 0x0669, 0x06F0, 0x06F9, 0x0966, 0x096F, 0x09E6, 0x09EF, 0x0A66, 0x0A6F, 0x0AE6, 0x0AEF, 0x0B66, 0x0B6F, 0x0BE7, 0x0BEF, 0x0C66, 0x0C6F, 0x0CE6, 0x0CEF, 0x0D66, 0x0D6F, 0x0E50, 0x0E59, 0x0ED0, 0x0ED9, 0x0F20, 0x0F29,
-				//
-				// Extender ranges
-				//
-				0x3031, 0x3035, 0x309D, 0x309E, 0x30FC, 0x30FE,
-				//
-				// Ranges end marker
-				//
-				0x0000,
-				//
-				// Single char values
-				//
-				// CombiningChar singles
-				//
-				0x05BF, 0x05C4, 0x0670, 0x093C, 0x094D, 0x09BC, 0x09BE, 0x09BF, 0x09D7, 0x0A02, 0x0A3C, 0x0A3E, 0x0A3F, 0x0ABC, 0x0B3C, 0x0BD7, 0x0D57, 0x0E31, 0x0EB1, 0x0F35, 0x0F37, 0x0F39, 0x0F3E, 0x0F3F, 0x0F97, 0x0FB9, 0x20E1, 0x3099, 0x309A,
-				//
-				// Extender singles
-				//
-				0x00B7, 0x02D0, 0x02D1, 0x0387, 0x0640, 0x0E46, 0x0EC6, 0x3005,
-				//
-				// Singles end marker
-				//
-				0x0000};
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src-validation/org/eclipse/wst/dtd/core/internal/validation/DTDValidationMessages.java b/bundles/org.eclipse.wst.dtd.core/src-validation/org/eclipse/wst/dtd/core/internal/validation/DTDValidationMessages.java
deleted file mode 100644
index a143120..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src-validation/org/eclipse/wst/dtd/core/internal/validation/DTDValidationMessages.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 IBM Corporation and others. All rights reserved.   This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.wst.dtd.core.internal.validation;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by DTD Validation
- * 
- * @plannedfor 1.0
- */
-public class DTDValidationMessages extends NLS {
-	public static String _ERROR_REF_ELEMENT_UNDEFINED;
-
-	public static String _UI_DIALOG_DTD_INVALID_TEXT;
-	public static String _UI_DIALOG_DTD_INVALID_TITLE;
-	public static String _UI_DIALOG_DTD_VALID_TEXT;
-	public static String _UI_DIALOG_DTD_VALID_TITLE;
-	private static final String BUNDLE_NAME = "org.eclipse.wst.dtd.core.internal.validation.DTDValidationResources";//$NON-NLS-1$
-	public static String Missing_required_files_1;
-	public static String Missing_required_files_2;
-	public static String Missing_required_files_3;
-	public static String Missing_required_files_4;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, DTDValidationMessages.class);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src-validation/org/eclipse/wst/dtd/core/internal/validation/DTDValidationResources.properties b/bundles/org.eclipse.wst.dtd.core/src-validation/org/eclipse/wst/dtd/core/internal/validation/DTDValidationResources.properties
deleted file mode 100644
index 1986a3c..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src-validation/org/eclipse/wst/dtd/core/internal/validation/DTDValidationResources.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-!
-! Validate DTD
-!
-_UI_DIALOG_DTD_INVALID_TITLE  = Validation Failed
-_UI_DIALOG_DTD_VALID_TITLE    = Validation Succeeded
-_UI_DIALOG_DTD_VALID_TEXT     = The DTD file is valid.
-_UI_DIALOG_DTD_INVALID_TEXT   = The DTD file is not valid. See the Problems view for error messages.
-
-!
-! Referenced Element Validation
-!
-_ERROR_REF_ELEMENT_UNDEFINED = The element {0} has not been declared.
-Missing_required_files_1=Required files xercesImpl.jar and xmlParserAPIs.jar cannot be found.\n\n
-Missing_required_files_2=Download Xerces 2.6.2 and place xercesImpl.jar and xmlParserAPIs.jar in a folder entitled jars in the org.eclipse.wst.xml.validation plugin.\n\n
-Missing_required_files_3=For more information see www.eclipse.org/webtools/wst/components/xml/xercesInfo.xml.
-Missing_required_files_4=Missing Xerces
diff --git a/bundles/org.eclipse.wst.dtd.core/src-validation/org/eclipse/wst/dtd/core/internal/validation/ElementRefLocation.java b/bundles/org.eclipse.wst.dtd.core/src-validation/org/eclipse/wst/dtd/core/internal/validation/ElementRefLocation.java
deleted file mode 100644
index d998da1..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src-validation/org/eclipse/wst/dtd/core/internal/validation/ElementRefLocation.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.validation;
-
-/**
- * An element references location holds the location of an element reference.
- * An element reference is declared in a DTD element declaration such as
- * <!ELEMENT myelem (elementref)> An element reference may be part of a linked
- * list and can contain a reference to the next element reference in the list.
- * 
- * @author Lawrence Mandel, IBM
- */
-class ElementRefLocation {
-	private int column = -1;
-
-	private int line = -1;
-
-	private ElementRefLocation next = null;
-
-	private String uri;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param line
-	 *            The line location of the element reference.
-	 * @param column
-	 *            The column location of the element reference.
-	 * @param uri
-	 *            The URI of the file containing the element reference.
-	 * @param next
-	 *            The next element reference in the list.
-	 */
-	public ElementRefLocation(int line, int column, String uri, ElementRefLocation next) {
-		this.line = line;
-		this.column = column;
-		this.uri = uri;
-		this.next = next;
-	}
-
-	/**
-	 * Get the column location of the element reference.
-	 * 
-	 * @return The column location of the element reference.
-	 */
-	public int getColumn() {
-		return column;
-	}
-
-	/**
-	 * Get the line location of the element reference.
-	 * 
-	 * @return The line location of the element reference.
-	 */
-	public int getLine() {
-		return line;
-	}
-
-	/**
-	 * Get the next element reference in the linked list.
-	 * 
-	 * @return The next element reference in the linked list.
-	 */
-	public ElementRefLocation getNext() {
-		return next;
-	}
-
-	/**
-	 * Get the URI of the file that contains the element reference.
-	 * 
-	 * @return The URI of the file that contains the element reference.
-	 */
-	public String getURI() {
-		return uri;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.core/src-validation/org/eclipse/wst/dtd/core/internal/validation/Validator.java b/bundles/org.eclipse.wst.dtd.core/src-validation/org/eclipse/wst/dtd/core/internal/validation/Validator.java
deleted file mode 100644
index 51fea6d..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src-validation/org/eclipse/wst/dtd/core/internal/validation/Validator.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.validation;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.StringTokenizer;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationInfo;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ext.DeclHandler;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * DTD validation.
- * 
- * @author Lawrence Mandel, IBM
- */
-public class Validator {
-	/**
-	 * An entity resolver that wraps a URI resolver.
-	 * 
-	 * @author Lawrence Mandel, IBM
-	 */
-	class DTDEntityResolver implements EntityResolver {
-		private String fBaseLocation = null;
-		private URIResolver fURIResolver = null;
-
-		/**
-		 * Constructor.
-		 * 
-		 * @param idresolver
-		 *            The idresolver this entity resolver wraps.
-		 * @param baselocation
-		 *            The base location to resolve with.
-		 */
-		public DTDEntityResolver(URIResolver uriresolver, String baselocation) {
-			this.fURIResolver = uriresolver;
-            
-            // TODO cs: we never seem to set a URIResolver
-            // I create one here up front just incase
-            //
-            if (fURIResolver == null)
-            {
-              fURIResolver = URIResolverPlugin.createResolver();              
-            }  
-			this.fBaseLocation = baselocation;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String,
-		 *      java.lang.String)
-		 */
-		public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
-			String location = null;
-            
-            
-			if (fBaseLocation.equals(systemId)) {
-				location = systemId;
-			}
-			else {
-				location = fURIResolver.resolve(fBaseLocation, publicId, systemId);
-			}
-			InputSource is = null;
-			if (location != null && !location.equals("")) //$NON-NLS-1$
-			{
-                try {
-                    String physical = fURIResolver.resolvePhysicalLocation(fBaseLocation, publicId, location); 
-					URL url = new URL(physical);		
-					is = new InputSource(location);
-					is.setByteStream(url.openStream());
-				}
-				catch (MalformedURLException e) {
-					throw new IOException(e.getMessage());
-				}
-                catch (Exception e)
-                {
-                }
-			}
-			return is;
-		}
-	}
-
-	/**
-	 * An error handler for DTD validation.
-	 * 
-	 * @author Lawrence Mandel, IBM
-	 */
-	class DTDErrorHandler implements ErrorHandler {
-
-		private final int ERROR = 0;
-		private final ValidationInfo fValidationInfo;
-
-		private final int WARNING = 1;
-
-		/**
-		 * Constructor.
-		 * 
-		 * @param valinfo
-		 *            The validation info object to use to register validation
-		 *            messages.
-		 */
-		public DTDErrorHandler(ValidationInfo valinfo) {
-			this.fValidationInfo = valinfo;
-		}
-
-		/**
-		 * Add a validation message with the given severity.
-		 * 
-		 * @param exception
-		 *            The exception that contains the information about the
-		 *            message.
-		 * @param severity
-		 *            The severity of the validation message.
-		 */
-		protected void addValidationMessage(SAXParseException exception, int severity) {
-			if (exception.getSystemId() != null) {
-				if (severity == WARNING) {
-					fValidationInfo.addWarning(exception.getLocalizedMessage(), exception.getLineNumber(), exception.getColumnNumber(), exception.getSystemId());
-				}
-				else {
-					fValidationInfo.addError(exception.getLocalizedMessage(), exception.getLineNumber(), exception.getColumnNumber(), exception.getSystemId());
-				}
-			}
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
-		 */
-		public void error(SAXParseException exception) throws SAXException {
-			addValidationMessage(exception, ERROR);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
-		 */
-		public void fatalError(SAXParseException exception) throws SAXException {
-			addValidationMessage(exception, ERROR);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
-		 */
-		public void warning(SAXParseException exception) throws SAXException {
-			addValidationMessage(exception, WARNING);
-		}
-	}
-
-	class MultiHandler extends DefaultHandler implements org.xml.sax.DTDHandler, ContentHandler, LexicalHandler, DeclHandler {
-		private static final String ELEMENT_MODIFIERS = "*+?"; //$NON-NLS-1$
-
-		private static final String MODEL_DELIMITERS = ",()| "; //$NON-NLS-1$
-
-		private List fElemDecls = new ArrayList();
-
-		private Hashtable fElemRefs = new Hashtable();
-
-		private List fIgnoreElemModel = new ArrayList();
-
-		private List fIgnoreElemRefs = new ArrayList();
-
-		private Locator fLocator = null;
-
-		public MultiHandler() {
-			fIgnoreElemRefs.add("#PCDATA"); //$NON-NLS-1$
-			fIgnoreElemModel.add("ANY"); //$NON-NLS-1$
-			fIgnoreElemModel.add("EMPTY"); //$NON-NLS-1$
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.ext.DeclHandler#attributeDecl(java.lang.String,
-		 *      java.lang.String, java.lang.String, java.lang.String,
-		 *      java.lang.String)
-		 */
-		public void attributeDecl(String eName, String aName, String type, String valueDefault, String value) throws SAXException {
-			// No method impl.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.ext.LexicalHandler#comment(char[], int, int)
-		 */
-		public void comment(char[] arg0, int arg1, int arg2) throws SAXException {
-			// No method impl.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.ext.DeclHandler#elementDecl(java.lang.String,
-		 *      java.lang.String)
-		 */
-		public void elementDecl(String name, String model) throws SAXException {
-			// Add this element to the list of declared elements.
-			fElemDecls.add(name);
-
-			// Return if the element model should be ignored. The model should
-			// be
-			// ignored in such cases as when it is equal to EMPTY or ANY.
-			if (fIgnoreElemModel.contains(model)) {
-				return;
-			}
-			// Add each referenced element to the list of referenced elements
-			int line = fLocator.getLineNumber();
-			int column = fLocator.getColumnNumber();
-			String uri = fLocator.getSystemId();
-
-			StringTokenizer strtok = new StringTokenizer(model, MODEL_DELIMITERS);
-			while (strtok.hasMoreTokens()) {
-				String token = strtok.nextToken();
-				int tokenlength = token.length();
-				if (ELEMENT_MODIFIERS.indexOf(token.charAt(tokenlength - 1)) != -1) {
-					token = token.substring(0, tokenlength - 1);
-					// If the token is now empty (it was only ?,* or +) then
-					// continue.
-					if (token.length() == 0) {
-						continue;
-					}
-				}
-				if (fIgnoreElemRefs.contains(token)) {
-					continue;
-				}
-				ElementRefLocation elemLoc = (ElementRefLocation) fElemRefs.get(token);
-				ElementRefLocation tokenLoc = new ElementRefLocation(line, column, uri, elemLoc);
-				fElemRefs.put(token, tokenLoc);
-			}
-
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.ext.LexicalHandler#endCDATA()
-		 */
-		public void endCDATA() throws SAXException {
-			// No method impl.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.ext.LexicalHandler#endDTD()
-		 */
-		public void endDTD() throws SAXException {
-			// No method impl.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.ext.LexicalHandler#endEntity(java.lang.String)
-		 */
-		public void endEntity(String arg0) throws SAXException {
-			// No method impl.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.ext.DeclHandler#externalEntityDecl(java.lang.String,
-		 *      java.lang.String, java.lang.String)
-		 */
-		public void externalEntityDecl(String name, String publicId, String systemId) throws SAXException {
-			// No method impl.
-		}
-
-		/**
-		 * Get the list of element declarations.
-		 * 
-		 * @return The list of element declarations.
-		 */
-		public List getElementDeclarations() {
-			return fElemDecls;
-		}
-
-		/**
-		 * Get the element references hashtable.
-		 * 
-		 * @return The element references hashtable.
-		 */
-		public Hashtable getElementReferences() {
-			return fElemRefs;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.ext.DeclHandler#internalEntityDecl(java.lang.String,
-		 *      java.lang.String)
-		 */
-		public void internalEntityDecl(String name, String value) throws SAXException {
-			// No method impl.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.ContentHandler#setDocumentLocator(org.xml.sax.Locator)
-		 */
-		public void setDocumentLocator(Locator locator) {
-			super.setDocumentLocator(locator);
-			this.fLocator = locator;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.ext.LexicalHandler#startCDATA()
-		 */
-		public void startCDATA() throws SAXException {
-			// No method impl.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.ext.LexicalHandler#startDTD(java.lang.String,
-		 *      java.lang.String, java.lang.String)
-		 */
-		public void startDTD(String name, String publicId, String systemId) throws SAXException {
-			// No method impl.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.xml.sax.ext.LexicalHandler#startEntity(java.lang.String)
-		 */
-		public void startEntity(String name) throws SAXException {
-			// No method impl.
-		}
-	}
-
-	private static Validator _instance = null;
-
-	public static Validator getInstance() {
-		if (_instance == null) {
-			_instance = new Validator();
-		}
-		return _instance;
-	}
-
-	private URIResolver fResolver = null;
-
-	private Validator() {
-		super();
-	}
-
-	/**
-	 * Set the URI resolver to use with XSD validation.
-	 * 
-	 * @param uriresolver
-	 *            The URI resolver to use.
-	 */
-	public void setURIResolver(URIResolver uriresolver) {
-		this.fResolver = uriresolver;
-	}
-
-	/**
-	 * Validate the DTD file located at the URI.
-	 * 
-	 * @param uri
-	 *            The URI of the file to validate.
-	 * @return A validation report for the validation.
-	 */
-	public ValidationReport validate(String uri) {
-		ValidationInfo valinfo = new ValidationInfo(uri);
-		try {
-			SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
-			XMLReader reader = parser.getXMLReader();
-			MultiHandler dtdHandler = new MultiHandler();
-			reader.setProperty("http://xml.org/sax/properties/declaration-handler", dtdHandler); //$NON-NLS-1$
-			reader.setProperty("http://xml.org/sax/properties/lexical-handler", dtdHandler); //$NON-NLS-1$
-			reader.setContentHandler(dtdHandler);
-			reader.setDTDHandler(dtdHandler);
-			reader.setErrorHandler(new DTDErrorHandler(valinfo));
-			reader.setEntityResolver(new DTDEntityResolver(fResolver, uri));
-			String document = "<!DOCTYPE root SYSTEM \"" + uri + "\"><root/>"; //$NON-NLS-1$ //$NON-NLS-2$
-
-			reader.parse(new InputSource(new StringReader(document)));
-
-			List elemDecls = dtdHandler.getElementDeclarations();
-			Hashtable elemRefs = dtdHandler.getElementReferences();
-			validateElementReferences(elemDecls, elemRefs, valinfo);
-		}
-		catch (ParserConfigurationException e) {
-
-		}
-		catch (IOException e) {
-
-		}
-		catch (SAXException e) {
-
-		}
-		return valinfo;
-	}
-
-	/**
-	 * Validate the element references in the DTD. An element reference is
-	 * <!ELEMENT elem (elementReference)>
-	 * 
-	 * @param elemDecls
-	 *            A list of valid element declarations.
-	 * @param elemRefs
-	 *            A hashtable containing element references as keys and
-	 *            locations in the document as values.
-	 * @param valinfo
-	 *            The validation info object to store validation information.
-	 */
-	private void validateElementReferences(List elemDecls, Hashtable elemRefs, ValidationInfo valinfo) {
-		Enumeration keys = elemRefs.keys();
-		while (keys.hasMoreElements()) {
-			String elemRef = (String) keys.nextElement();
-			// If the element hasn't been declared create an error.
-			if (!elemDecls.contains(elemRef)) {
-				ElementRefLocation elemLoc = (ElementRefLocation) elemRefs.get(elemRef);
-				do {
-					valinfo.addError(NLS.bind(DTDValidationMessages._ERROR_REF_ELEMENT_UNDEFINED, "'" + elemRef + "'"), elemLoc.getLine(), elemLoc.getColumn(), elemLoc.getURI()); //$NON-NLS-1$ //$NON-NLS-2$
-					elemLoc = elemLoc.getNext();
-				}
-				while (elemLoc != null);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Attribute.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Attribute.java
deleted file mode 100644
index 5dd9fe5..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Attribute.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import java.util.Hashtable;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.text.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-// base class for an Element's contentmodel
-public class Attribute extends DTDNode {
-
-	public static final String CDATA = DTDCoreMessages._UI_CHARACTER_DATA_DESC; //$NON-NLS-1$
-	public static final String ENTITIES = DTDCoreMessages._UI_ENTITY_NAMES_DESC; //$NON-NLS-1$
-	public static final String ENTITY = DTDCoreMessages._UI_ENTITY_NAME_DESC; //$NON-NLS-1$
-	public static final String ENUMERATED_NAME = DTDCoreMessages._UI_ENUM_NAME_TOKENS_DESC; //$NON-NLS-1$
-	public static final String ENUMERATED_NOTATION = DTDCoreMessages._UI_ENUM_NOTATION_DESC; //$NON-NLS-1$
-	public static final String FIXED = "#FIXED"; //$NON-NLS-1$
-	public static final String ID = DTDCoreMessages._UI_IDENTIFIER_DESC; //$NON-NLS-1$
-	public static final String IDREF = DTDCoreMessages._UI_ID_REFERENCE_DESC; //$NON-NLS-1$
-	public static final String IDREFS = DTDCoreMessages._UI_ID_REFERENCES_DESC; //$NON-NLS-1$
-
-	public static final String IMPLIED = "#IMPLIED"; //$NON-NLS-1$
-	public static final String NMTOKEN = DTDCoreMessages._UI_NAME_TOKEN_DESC; //$NON-NLS-1$
-	public static final String NMTOKENS = DTDCoreMessages._UI_NAME_TOKENS_DESC; //$NON-NLS-1$
-	public static final String REQUIRED = "#REQUIRED"; //$NON-NLS-1$
-
-	protected static Hashtable typeHash = new Hashtable();
-
-	public static final String[] types = {CDATA, ID, IDREF, IDREFS, ENTITY, ENTITIES, NMTOKEN, NMTOKENS, ENUMERATED_NAME, ENUMERATED_NOTATION};
-
-	{
-		typeHash.put(DTDRegionTypes.CDATA_KEYWORD, CDATA);
-		typeHash.put(DTDRegionTypes.ID_KEYWORD, ID);
-		typeHash.put(DTDRegionTypes.IDREF_KEYWORD, IDREF);
-		typeHash.put(DTDRegionTypes.IDREFS_KEYWORD, IDREFS);
-		typeHash.put(DTDRegionTypes.ENTITY_KEYWORD, ENTITY);
-		typeHash.put(DTDRegionTypes.ENTITIES_KEYWORD, ENTITIES);
-		typeHash.put(DTDRegionTypes.NMTOKEN_KEYWORD, NMTOKEN);
-		typeHash.put(DTDRegionTypes.NMTOKENS_KEYWORD, NMTOKENS);
-		typeHash.put(DTDRegionTypes.NOTATION_KEYWORD, ENUMERATED_NOTATION);
-		// this one's a special case since there is no keyword for
-		// enumerated name tokens
-		typeHash.put("()", ENUMERATED_NAME); //$NON-NLS-1$
-
-		// now put the reverse in place. This gives us a 2 way lookup
-		// for when we want to retrieve the value and when we want to set it
-		typeHash.put(CDATA, "CDATA"); //$NON-NLS-1$
-		typeHash.put(ID, "ID"); //$NON-NLS-1$
-		typeHash.put(IDREF, "IDREF"); //$NON-NLS-1$
-		typeHash.put(IDREFS, "IDREFS"); //$NON-NLS-1$
-		typeHash.put(ENTITY, "ENTITY"); //$NON-NLS-1$
-		typeHash.put(ENTITIES, "ENTITIES"); //$NON-NLS-1$
-		typeHash.put(NMTOKEN, "NMTOKEN"); //$NON-NLS-1$
-		typeHash.put(NMTOKENS, "NMTOKENS"); //$NON-NLS-1$
-		typeHash.put(ENUMERATED_NAME, ""); //$NON-NLS-1$
-		typeHash.put(ENUMERATED_NOTATION, "NOTATION"); //$NON-NLS-1$
-	}
-
-	private AttributeEnumList enumList = null;
-
-	// public static final String IMPLIED = "IMPLIED";
-
-	public Attribute(DTDFile file, IStructuredDocumentRegion flatNode) {
-		super(file, flatNode);
-	}
-
-	public String getDefaultKind() {
-		ITextRegion defaultKindRegion = getDefaultKindRegion();
-		if (defaultKindRegion != null) {
-			return getStructuredDTDDocumentRegion().getText(defaultKindRegion);
-		}
-
-		return ""; //$NON-NLS-1$
-	}
-
-	public ITextRegion getDefaultKindRegion() {
-		RegionIterator iter = iterator();
-		while (iter.hasNext()) {
-			ITextRegion region = iter.next();
-			if (region.getType() == DTDRegionTypes.IMPLIED_KEYWORD || region.getType() == DTDRegionTypes.REQUIRED_KEYWORD || region.getType() == DTDRegionTypes.FIXED_KEYWORD) {
-				return region;
-			}
-		}
-		return null;
-	}
-
-	public String getDefaultValue() {
-		ITextRegion defaultValue = getNextQuotedLiteral(iterator());
-		if (defaultValue != null) {
-			return getValueFromQuotedRegion(defaultValue);
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public AttributeEnumList getEnumList() {
-		return enumList;
-	}
-
-	public Image getImage() {
-		return DTDCorePlugin.getInstance().getImage(DTDResource.ATTRIBUTEICON);
-	}
-
-	public ITextRegion getNameRegion() {
-		return getNextRegion(iterator(), DTDRegionTypes.ATTRIBUTE_NAME);
-	}
-
-	public ITextRegion getNextQuotedLiteral(RegionIterator iter) {
-		while (iter.hasNext()) {
-			ITextRegion region = iter.next();
-			if (region.getType().equals(DTDRegionTypes.SINGLEQUOTED_LITERAL) || region.getType().equals(DTDRegionTypes.DOUBLEQUOTED_LITERAL)) {
-				return region;
-			}
-		}
-		return null;
-	}
-
-	protected int getOffsetAfterType() {
-		ITextRegion typeRegion = getTypeRegion();
-
-		String type = getType();
-		boolean isEnumeration = type.equals(ENUMERATED_NAME) || type.equals(ENUMERATED_NOTATION);
-		if (isEnumeration) {
-			// now check if maybe this is an enumeration
-			if (getEnumList() != null) {
-				return getEnumList().getEndOffset();
-			}
-		}
-		if (typeRegion != null) {
-			return getStructuredDTDDocumentRegion().getEndOffset(typeRegion);
-		}
-		else {
-			ITextRegion nameRegion = getNameRegion();
-			return getStructuredDTDDocumentRegion().getEndOffset(nameRegion);
-			// // create one
-			// typeRegion =
-			// findOrCreateTypeRegion((String)typeHash.get(CDATA));
-		}
-	}
-
-	public String getType() {
-		ITextRegion region = getTypeRegion();
-		if (region != null) {
-			String type = (String) typeHash.get(region.getType());
-			if (type == null) {
-				// just return the text of the type region since this may be
-				// an entity representing the type;
-				return getStructuredDTDDocumentRegion().getText(region);
-			}
-			return type;
-		}
-		else if (getEnumList() != null) {
-			// enumerated name tokens don't have a type keyword. just
-			// the existence of the left paren is enough
-			return (String) typeHash.get("()"); //$NON-NLS-1$
-		}
-
-		return ""; //$NON-NLS-1$
-	}
-
-	public ITextRegion getTypeRegion() {
-		RegionIterator iter = iterator();
-
-		while (iter.hasNext()) {
-			ITextRegion region = iter.next();
-			if (region.getType() == DTDRegionTypes.CDATA_KEYWORD || region.getType() == DTDRegionTypes.ID_KEYWORD || region.getType() == DTDRegionTypes.IDREF_KEYWORD || region.getType() == DTDRegionTypes.IDREFS_KEYWORD || region.getType() == DTDRegionTypes.ENTITY_KEYWORD || region.getType() == DTDRegionTypes.ENTITIES_KEYWORD || region.getType() == DTDRegionTypes.NMTOKEN_KEYWORD || region.getType() == DTDRegionTypes.NMTOKENS_KEYWORD || region.getType() == DTDRegionTypes.NOTATION_KEYWORD || region.getType() == DTDRegionTypes.PARM_ENTITY_TYPE) {
-				return region;
-			}
-		}
-		return null;
-	}
-
-	public String getValueFromQuotedRegion(ITextRegion region) {
-		String type = region.getType();
-		if (type.equals(DTDRegionTypes.SINGLEQUOTED_LITERAL) || type.equals(DTDRegionTypes.DOUBLEQUOTED_LITERAL)) {
-			String text = getStructuredDTDDocumentRegion().getText(region);
-			return text.substring(1, text.length() - 1);
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public void resolveRegions() {
-		removeChildNodes();
-		RegionIterator iter = iterator();
-
-		while (iter.hasNext()) {
-			ITextRegion currentRegion = iter.next();
-			if (currentRegion.getType().equals(DTDRegionTypes.LEFT_PAREN)) {
-				enumList = new AttributeEnumList(getDTDFile(), getStructuredDTDDocumentRegion());
-			}
-			if (enumList != null) {
-				enumList.addRegion(currentRegion);
-				if (currentRegion.getType() == DTDRegionTypes.RIGHT_PAREN) {
-					return;
-				}
-			}
-		}
-
-	}
-
-	public void setDefaultKind(Object requestor, String kind) {
-
-		ITextRegion defaultKindRegion = getDefaultKindRegion();
-		String oldDefaultKind = defaultKindRegion == null ? "" : getStructuredDTDDocumentRegion().getText(defaultKindRegion); //$NON-NLS-1$
-		if (!kind.equals(oldDefaultKind)) {
-			String newText = kind;
-			int startOffset = 0;
-			int length = 0;
-			if (defaultKindRegion != null) {
-				startOffset = getStructuredDTDDocumentRegion().getStartOffset(defaultKindRegion);
-				length = getStructuredDTDDocumentRegion().getEndOffset(defaultKindRegion) - startOffset;
-			}
-			else {
-				startOffset = getOffsetAfterType();
-				newText = " " + newText; //$NON-NLS-1$
-			}
-
-			ITextRegion defaultValue = getNextQuotedLiteral(iterator());
-
-			if (kind.equals(Attribute.FIXED) || kind.equals("")) { //$NON-NLS-1$
-				if (defaultValue == null) {
-					// we are changing to fixed and wehave no quoted region.
-					// put in an empty value
-					newText += " \"\""; //$NON-NLS-1$
-				}
-			}
-			else {
-				if (defaultValue != null) {
-					length = getStructuredDTDDocumentRegion().getEndOffset(defaultValue) - startOffset;
-				}
-			}
-			replaceText(requestor, startOffset, length, newText);
-			// do something if there is no "kind" region
-		}
-	}
-
-	public void setDefaultKind(String kind) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_ATTR_DEFAULT_KIND); //$NON-NLS-1$
-		setDefaultKind(this, kind);
-		endRecording(this);
-	}
-
-	public void setDefaultValue(Object requestor, String value, boolean fixed) {
-		ITextRegion defaultValue = getNextQuotedLiteral(iterator());
-		String quoteChar = value.indexOf("\"") == -1 ? "\"" : "'"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		int startOffset = 0;
-		int endOffset = 0;
-		String newText = ""; //$NON-NLS-1$
-
-		String oldValue = getDefaultValue();
-		boolean oldKindIsFixed = getDefaultKind().equals(Attribute.FIXED);
-		if (oldValue.equals(value) && fixed == oldKindIsFixed) {
-			// nothing to do
-			return;
-		}
-
-		if (defaultValue != null) {
-			startOffset = getStructuredDTDDocumentRegion().getStartOffset(defaultValue);
-			endOffset = getStructuredDTDDocumentRegion().getEndOffset(defaultValue);
-		}
-
-		ITextRegion defaultKindRegion = getDefaultKindRegion();
-		if (defaultKindRegion != null) {
-			startOffset = getStructuredDTDDocumentRegion().getStartOffset(defaultKindRegion);
-			endOffset = endOffset == 0 ? getStructuredDTDDocumentRegion().getEndOffset(defaultKindRegion) : endOffset;
-		}
-		else {
-			if (startOffset == 0) {
-				endOffset = startOffset = getOffsetAfterType();
-				newText += " "; //$NON-NLS-1$
-			}
-			ITextRegion typeRegion = getTypeRegion();
-			if (typeRegion == null && getEnumList() == null) {
-				// tack on a default type
-				// newText += "CDATA ";
-			}
-		}
-		if (fixed) {
-			newText += "#FIXED "; //$NON-NLS-1$
-		}
-		else {
-			if (getDefaultKind().equals("") && value.equals("")) { //$NON-NLS-1$ //$NON-NLS-2$
-				// if not fixed and value is "" then reset the default kind to
-				// implied
-				newText += "#IMPLIED"; //$NON-NLS-1$
-			}
-		}
-
-		if (!getType().equals("") && !value.equals("")) { //$NON-NLS-1$ //$NON-NLS-2$
-			newText += quoteChar + value + quoteChar;
-		}
-		replaceText(requestor, startOffset, endOffset - startOffset, newText);
-	}
-
-	public void setDefaultValue(String value, boolean fixed) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_ATTR_DEFAULT_VAL); //$NON-NLS-1$
-		setDefaultValue(this, value, fixed);
-		endRecording(this);
-	}
-
-	public void setType(Object requestor, String type) {
-		String oldType = getType();
-		if (!type.equals(oldType)) {
-			boolean wasEnumeration = oldType.equals(ENUMERATED_NAME) || oldType.equals(ENUMERATED_NOTATION);
-			boolean isEnumeration = type.equals(ENUMERATED_NAME) || type.equals(ENUMERATED_NOTATION);
-			String newText = ""; //$NON-NLS-1$
-			int startOffset = 0;
-			int endOffset = 0;
-
-			if (wasEnumeration && !isEnumeration) {
-				// get rid of the old enumlist
-				AttributeEnumList enumList = getEnumList();
-				if (enumList != null) {
-					startOffset = enumList.getStartOffset();
-					endOffset = enumList.getEndOffset();
-				}
-			}
-
-			ITextRegion region = getTypeRegion();
-			if (region != null) {
-				startOffset = getStructuredDTDDocumentRegion().getStartOffset(region);
-				if (endOffset == 0) {
-					endOffset = getStructuredDTDDocumentRegion().getEndOffset(region);
-				}
-			}
-			else if (startOffset == 0) {
-				ITextRegion nameRegion = getNameRegion();
-				newText += " "; //$NON-NLS-1$
-				endOffset = startOffset = getStructuredDTDDocumentRegion().getEndOffset(nameRegion);
-			}
-
-			String newTypeWord = (String) typeHash.get(type);
-			if (newTypeWord == null) {
-				// then this must be a parm entity being used in the type
-				// use the type text directly
-				newTypeWord = type;
-			}
-
-			newText += newTypeWord;
-
-			if (isEnumeration && !wasEnumeration) {
-				// put in a new numlist
-				boolean isSpaceNeeded = !type.equals(ENUMERATED_NAME);
-				newText += isSpaceNeeded ? " " : ""; //$NON-NLS-1$ //$NON-NLS-2$
-				newText += "()"; //$NON-NLS-1$
-			}
-			replaceText(requestor, startOffset, endOffset - startOffset, newText);
-			if (newTypeWord.equals("") && !type.equals(ENUMERATED_NAME)) { //$NON-NLS-1$
-				// the set the defaultkind to ""
-				// setDefaultKind(requestor, "");
-				setDefaultValue(requestor, "", false); //$NON-NLS-1$
-			}
-
-		}
-	}
-
-	public void setType(String type) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_ATTR_TYPE); //$NON-NLS-1$
-		setType(this, type);
-		endRecording(this);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/AttributeEnumList.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/AttributeEnumList.java
deleted file mode 100644
index a50e12e..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/AttributeEnumList.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.text.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-public class AttributeEnumList extends DTDNode {
-
-	private ArrayList list = new ArrayList();
-
-	public AttributeEnumList(DTDFile file, IStructuredDocumentRegion flatNode) {
-		super(file, flatNode);
-	}
-
-	public Image getImage() {
-		// never exposed in tree
-		return null;
-	}
-
-	// return the items that are in this enumerated list
-	public List getItems() {
-		list.clear();
-		RegionIterator iter = iterator();
-		while (iter.hasNext()) {
-			ITextRegion name = getNextRegion(iter, DTDRegionTypes.NAME);
-			if (name != null) {
-				list.add(getStructuredDTDDocumentRegion().getText(name));
-			}
-		}
-		return list;
-	}
-
-	public void setItems(Object requestor, String[] items) {
-		if (items != null) {
-			String text = "("; //$NON-NLS-1$
-			for (int i = 0; i < items.length; i++) {
-				if (i > 0) {
-					text += " | " + items[i]; //$NON-NLS-1$
-				}
-				else {
-					text += items[i];
-				}
-			}
-			text += ")"; //$NON-NLS-1$
-			replaceText(requestor, getStartOffset(), getNodeLength(), text);
-		}
-	}
-
-	public void setItems(String[] items) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_ATTR_ENUM_ITEMS); //$NON-NLS-1$
-		setItems(this, items);
-		endRecording(this);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/AttributeList.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/AttributeList.java
deleted file mode 100644
index ae22b6a..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/AttributeList.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import java.util.ArrayList;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.text.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-public class AttributeList extends NamedTopLevelNode {
-	public AttributeList(DTDFile file, IStructuredDocumentRegion flatNode) {
-		super(file, flatNode, DTDRegionTypes.ATTLIST_TAG);
-	}
-
-	public void addAttribute(String name) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_ATTR_LIST_ADD); //$NON-NLS-1$
-
-		DTDNode lastAttribute = (DTDNode) getLastChild();
-		if (lastAttribute != null) {
-			replaceText(this, lastAttribute.getEndOffset(), 0, "\n\t" + name + " CDATA #IMPLIED"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		else {
-			ITextRegion nameRegion = getNameRegion();
-			if (nameRegion != null) {
-				replaceText(this, getStructuredDTDDocumentRegion().getEndOffset(nameRegion), 0, "\n\t" + name + " CDATA #IMPLIED"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-		}
-
-		endRecording(this);
-	}
-
-	public Image getImage() {
-		return DTDCorePlugin.getInstance().getImage(DTDResource.ATTRIBUTELISTICON);
-	}
-
-	public void insertIntoModel(Object requestor, Attribute reference, Attribute node, boolean isAfter) {
-		int offset = 0;
-		String newText = ""; //$NON-NLS-1$
-		String nodeText = node.getFullNodeText();
-		if (!isAfter) {
-			offset = reference.getStartOffset();
-		}
-		else {
-			// try and get next child
-			Attribute attr = (Attribute) reference.getNextSibling();
-			if (attr != null) {
-				offset = attr.getStartOffset();
-			}
-			else {
-				// just use the end offset
-				offset = reference.getWhitespaceEndOffset();
-			}
-		}
-		newText += nodeText;// + (isLastChild ? "\n" : "\n\t");
-		if (!node.hasTrailingWhitespace()) {
-			newText += "\n\t"; //$NON-NLS-1$
-		}
-		replaceText(requestor, offset, 0, newText);
-	}
-
-	public void resolveRegions() {
-		removeChildNodes();
-		RegionIterator iter = iterator();
-
-		if (getNameRegion() != null) {
-			// we skip past the name token is our name
-			skipPastName(iter);
-		}
-
-		ArrayList children = new ArrayList();
-		Attribute attribute = null;
-		boolean trailingWhitespace = false;
-		while (iter.hasNext()) {
-			ITextRegion currentRegion = iter.next();
-			if (currentRegion.getType().equals(DTDRegionTypes.ATTRIBUTE_NAME)) {
-				attribute = new Attribute(getDTDFile(), getStructuredDTDDocumentRegion());
-				children.add(attribute);
-				appendChild(attribute);
-				trailingWhitespace = false;
-			}
-			if (attribute != null && currentRegion.getType() != DTDRegionTypes.END_TAG) {
-				if (!trailingWhitespace) {
-					attribute.addRegion(currentRegion);
-				}
-				else {
-					if (currentRegion.getType() == DTDRegionTypes.WHITESPACE) {
-						attribute.addWhitespaceRegion(currentRegion);
-					}
-				}
-
-				// the following prevents extra whitespace from being picked
-				// up by the attribute
-				if (currentRegion.getType() == DTDRegionTypes.REQUIRED_KEYWORD || currentRegion.getType() == DTDRegionTypes.IMPLIED_KEYWORD || currentRegion.getType() == DTDRegionTypes.SINGLEQUOTED_LITERAL || currentRegion.getType() == DTDRegionTypes.DOUBLEQUOTED_LITERAL) {
-					trailingWhitespace = true;
-				}
-			}
-		}
-		int numKids = children.size();
-		for (int i = 0; i < numKids; i++) {
-			((Attribute) children.get(i)).resolveRegions();
-		} // end of for ()
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMBasicNode.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMBasicNode.java
deleted file mode 100644
index 5b27f02..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMBasicNode.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.text.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-/*
- * CMBasicNode combines all the different content types into one. The idea
- * behind this is to allow arbitrary name changes to not require a tree
- * update.
- */
-public class CMBasicNode extends CMRepeatableNode {
-
-	// static final int EMPTY = 0;
-	// static final int ANY = 1;
-	// static final int PCDATA = 2;
-
-	public CMBasicNode(DTDFile file, IStructuredDocumentRegion flatNode) {
-		super(file, flatNode);
-	}
-
-	public Image getImage() {
-		final String name = getName();
-		ITextRegion pcdata = getNextRegion(iterator(), DTDRegionTypes.CONTENT_PCDATA);
-		if (pcdata != null) {
-			return DTDCorePlugin.getInstance().getImage(DTDResource.PCDATAICON);
-		}
-
-		if (isRootElementContent()) {
-			if (name.equals(EMPTY)) {
-				return DTDCorePlugin.getInstance().getImage(DTDResource.EMPTYICON);
-			}
-			else if (name.equals(ANY)) {
-				return DTDCorePlugin.getInstance().getImage(DTDResource.ANYICON);
-			}
-		}
-
-		// Otherwise this is just an element reference node. Just return
-		// what CMRepeatableNode would give us
-		return super.getImage();
-	}
-
-	public ITextRegion getNameRegion() {
-		RegionIterator iter = iterator();
-		while (iter.hasNext()) {
-			ITextRegion region = iter.next();
-			if (region.getType() == DTDRegionTypes.NAME || region.getType() == DTDRegionTypes.CONTENT_PCDATA) {
-				return region;
-			}
-		}
-		return null;
-	}
-
-	// returns the occurrencetoken, or the token where the occurrence token
-	// should appear after
-	public ITextRegion getOccurrenceRegion() {
-		RegionIterator iter = iterator();
-		skipPastName(iter);
-		if (iter.hasNext()) {
-			ITextRegion region = iter.next();
-			if (region.getType() == DTDRegionTypes.OCCUR_TYPE) {
-				return region;
-			}
-		}
-		return getNameRegion();
-	}
-
-	public String getType() {
-		ITextRegion pcdata = getNextRegion(iterator(), DTDRegionTypes.CONTENT_PCDATA);
-		if (pcdata != null) {
-			return PCDATA;
-		}
-
-		if (isRootElementContent()) {
-			final String name = getName();
-			if (isRootElementContent()) {
-				if (name.equals(EMPTY)) {
-					return EMPTY;
-				}
-				else if (name.equals(ANY)) {
-					return ANY;
-				}
-				else {
-					// otherwise just return it's name as the type
-					return name;
-				}
-
-			}
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public boolean isEmptyAnyOrPCData() {
-		if (isPCData()) {
-			return true;
-		}
-
-
-		final String name = getName();
-		if (isRootElementContent()) {
-			if (name.equals(EMPTY) || name.equals(ANY)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public boolean isPCData() {
-		ITextRegion pcdata = getNextRegion(iterator(), DTDRegionTypes.CONTENT_PCDATA);
-		if (pcdata != null) {
-			return true;
-		}
-		return false;
-	}
-
-	// public Node insertRegion(Region token)
-	// {
-	// if (!tokenStream.containsToken(token) && token.getType() ==
-	// Token.OCCUR_TYPE)
-	// {
-	// // then add it so that our range contains it
-	// insertIntoTokenStream(token);
-	// }
-	// return this;
-	// }
-
-	public boolean isReference() {
-		return !isEmptyAnyOrPCData();
-	}
-
-	public void setName(Object requestor, String name) {
-		// beginRecording(requestor, "Name Change");
-
-		super.setName(requestor, name);
-		if (!isReference()) {
-			// if it is no longer a reference node, remove the occurrence
-			// token
-			setOccurrence(requestor, CMRepeatableNode.ONCE);
-		}
-
-		// endRecording(requestor);
-	}
-
-	/*
-	 * public static String getName(int type) { switch (type) { case EMPTY:
-	 * return emptyString; case ANY: return anyString; case PCDATA: return
-	 * pcdataString; default: break; } // end of switch () return ""; }
-	 */
-
-}// CMBasicNode
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMGroupNode.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMGroupNode.java
deleted file mode 100644
index 1951fd7..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMGroupNode.java
+++ /dev/null
@@ -1,430 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import java.util.List;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.text.RegionIterator;
-import org.eclipse.wst.dtd.core.internal.util.DTDUniqueNameHelper;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-public class CMGroupNode extends CMRepeatableNode {
-
-	public static final char CHOICE = '|';
-	public static final char SEQUENCE = ',';
-
-	protected char connector = SEQUENCE;
-
-	// protected ArrayList children = new ArrayList();
-
-	public CMGroupNode(DTDFile file, IStructuredDocumentRegion flatNode) {
-		super(file, flatNode);
-	}
-
-	public void addChild() {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_CM_GRP_NODE_ADD_CHILD); //$NON-NLS-1$
-		DTDNode lastNode = (DTDNode) getLastChild();
-		String elementName = DTDUniqueNameHelper.getUniqueName(getChildrenList(), "ChildNode"); //$NON-NLS-1$
-		if (lastNode != null) {
-			replaceText(this, lastNode.getEndOffset(), 0, String.valueOf(getConnector()) + elementName); //$NON-NLS-1$
-		}
-		else {
-			replaceText(this, getStartOffset() + 1, 0, elementName); //$NON-NLS-1$
-		}
-
-		endRecording(this);
-	}
-
-	public void addGroup() {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_CM_GRP_NODE_ADD_GRP); //$NON-NLS-1$
-		DTDNode lastNode = (DTDNode) getLastChild();
-		if (lastNode != null) {
-			replaceText(this, lastNode.getEndOffset(), 0, String.valueOf(getConnector()) + " ()"); //$NON-NLS-1$
-		}
-		else {
-			replaceText(this, getStartOffset() + 1, 0, "()"); //$NON-NLS-1$
-		}
-
-		endRecording(this);
-	}
-
-	public void delete(Object requestor, DTDNode child) {
-		Object[] children = getChildren();
-
-		if (children.length == 1 && getFirstChild() == child) {
-			replaceText(requestor, child.getStartOffset(), child.getNodeLength(), null);
-			return;
-		}
-
-		for (int i = 0; i < children.length - 1; i++) {
-			DTDNode childA = (DTDNode) children[i];
-			DTDNode childB = (DTDNode) children[i + 1];
-
-			boolean childADeleted = childA == child;
-			boolean childBDeleted = childB == child;
-			if (childADeleted || childBDeleted) {
-				// we found the child
-				int startOffset = childADeleted ? childA.getStartOffset() : childA.getEndOffset();
-				int endOffset = childADeleted ? childB.getStartOffset() : childB.getEndOffset();
-				replaceText(requestor, startOffset, endOffset - startOffset, ""); //$NON-NLS-1$
-				removeChild(child);
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Get the value of connector.
-	 * 
-	 * @return value of connector.
-	 */
-	public char getConnector() {
-		Object[] children = getChildren();
-		for (int i = 0; i < children.length - 1; i++) {
-			DTDNode childA = (DTDNode) children[i];
-			DTDNode childB = (DTDNode) children[i + 1];
-
-			// create a stream between the two siblings and walk it
-			// note that this stream includes the last region of the first
-			// sibling and the first region of the next sibling.
-			// both these should be ignored
-			RegionIterator iter = new RegionIterator(getStructuredDTDDocumentRegion(), childA.getEndOffset(), childB.getStartOffset());
-			// stream.setFirstRegion(childA.getLastRegion());
-			// stream.setLastRegion(childB.getFirstRegion());
-			// Iterator iter = stream.iterator();
-			// skip the first region which is the last region of childA
-			// do we need this now ?
-			// iter.next();
-			ITextRegion currentRegion = null;
-			while (iter.hasNext() && currentRegion != childB.getStartRegion()) {
-				currentRegion = iter.next();
-				if (currentRegion.getType() == DTDRegionTypes.CONNECTOR) {
-					connector = getStructuredDTDDocumentRegion().getText(currentRegion).charAt(0);
-					return connector;
-				}
-			}
-		}
-		return connector;
-	}
-
-	public Image getImage() {
-		DTDCorePlugin resourcePlugin = DTDCorePlugin.getInstance();
-		switch (getConnector()) {
-			case SEQUENCE :
-				return resourcePlugin.getImage(DTDResource.ONESEQUENCEICON);
-			/*
-			 * switch (getOccurrence()) { case ONCE : return
-			 * resourcePlugin.getImage(DTDResource.ONESEQUENCEICON); case
-			 * OPTIONAL : return
-			 * resourcePlugin.getImage(DTDResource.OPTIONALSEQUENCEICON); case
-			 * ONE_OR_MORE : return
-			 * resourcePlugin.getImage(DTDResource.ONEORMORESEQUENCEICON);
-			 * case ZERO_OR_MORE : return
-			 * resourcePlugin.getImage(DTDResource.ZEROORMORESEQUENCEICON); }
-			 */
-			case CHOICE :
-				return resourcePlugin.getImage(DTDResource.ONECHOICEICON);
-		/*
-		 * switch (getOccurrence()) { case ONCE : return
-		 * resourcePlugin.getImage(DTDResource.ONECHOICEICON); case OPTIONAL :
-		 * return resourcePlugin.getImage(DTDResource.OPTIONALCHOICEICON);
-		 * case ONE_OR_MORE : return
-		 * resourcePlugin.getImage(DTDResource.ONEORMORECHOICEICON); case
-		 * ZERO_OR_MORE : return
-		 * resourcePlugin.getImage(DTDResource.ZEROORMORECHOICEICON); }
-		 */
-		}
-		return null;
-	}
-
-	public String getName() {
-		return ""; //$NON-NLS-1$
-	}
-
-	// returns the occurrenceregion, or the last region where the occurrence
-	// region should appear after
-	public ITextRegion getOccurrenceRegion() {
-		int nesting = 0;
-
-		// we skip past the first left paren we see since that is the
-		// beginning of our own node
-		RegionIterator iter = iterator();
-		// we assume the first region is the '('
-		iter.next();
-		ITextRegion currentRegion = null;
-		while (iter.hasNext() && nesting >= 0) {
-			currentRegion = iter.next();
-			if (currentRegion.getType() == DTDRegionTypes.LEFT_PAREN) {
-				nesting++;
-			}
-			if (currentRegion.getType() == DTDRegionTypes.RIGHT_PAREN) {
-				nesting--;
-			}
-		}
-		if (nesting < 0) {
-			// This means we have passed over the right paren that marks the
-			// end of our grouping.
-			// Look for an occurrence region
-			while (iter.hasNext()) {
-				currentRegion = iter.next();
-				if (currentRegion.getType() == DTDRegionTypes.OCCUR_TYPE) {
-					return currentRegion;
-				}
-			}
-		}
-		// if we're here, this means that there is no occur region. return the
-		// last region
-		return iter.previous();
-	}
-
-	public String getType() {
-		if (isRootElementContent()) {
-			if (getFirstChild() != null) {
-				CMNode node = (CMNode) getFirstChild();
-				if (node.getType().equals(PCDATA)) {
-					return MIXED;
-				}
-				else {
-					return CHILDREN;
-				}
-			}
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public void insertChildNode(Object requestor, String nodeText, int position) {
-		Object[] children = getChildren();
-
-		int startOffset = 0;
-		String newText = ""; //$NON-NLS-1$
-		if (position < children.length) {
-			DTDNode reference = (DTDNode) children[position];
-			startOffset = reference.getStartOffset();
-			newText = nodeText + " " + String.valueOf(getConnector()) + " "; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		else if (position == children.length) {
-			// add to end
-			DTDNode reference = (DTDNode) children[position - 1];
-			startOffset = reference.getEndOffset();
-			newText = " " + String.valueOf(getConnector()) + " " + nodeText; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		replaceText(requestor, startOffset, 0, newText);
-	}
-
-	public void insertChildNode(String nodeText, int position) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_CM_GRP_NODE_INSERT_ELEMENT); //$NON-NLS-1$
-		insertChildNode(this, nodeText, position);
-		endRecording(this);
-	}
-
-	public void insertIntoModel(Object requestor, CMNode reference, CMNode node, boolean isAfter) {
-		String nodeText = node.getNodeText();
-		List children = getChildrenList();
-
-		int index = children.indexOf(reference);
-		if (index == -1) {
-			// no reference node, add it to the end??
-			index = children.size();
-		}
-		else {
-			// got an index. if we want to add after, increase by 1
-			index = isAfter ? index + 1 : index;
-		}
-		insertChildNode(requestor, nodeText, index);
-	}
-
-	public void resolveRegions() {
-		int nesting = 0;
-		// children.clear();
-		removeChildNodes();
-		DTDNode currentGroupNode = null;
-		CMBasicNode currentReferenceNode = null;
-		RegionIterator iter = iterator();
-		// we assume the first region is the '('
-		iter.next();
-		while (iter.hasNext() && nesting >= 0) {
-			ITextRegion currentRegion = iter.next();
-			if (nesting == 0) {
-				if (currentRegion.getType().equals(DTDRegionTypes.CONTENT_PCDATA)) {
-					currentGroupNode = currentReferenceNode = null;
-					DTDNode pcData = new CMBasicNode(getDTDFile(), getStructuredDTDDocumentRegion());
-					pcData.addRegion(currentRegion);
-					appendChild(pcData);
-					// children.add(pcData);
-				}
-				else if (currentRegion.getType().equals(DTDRegionTypes.NAME)) {
-					// we have hit a new reference node. Make sure we reset
-					// the groupnode var so it doesn't collect more regions
-					currentGroupNode = null;
-					currentReferenceNode = new CMBasicNode(getDTDFile(), getStructuredDTDDocumentRegion());
-					currentReferenceNode.addRegion(currentRegion);
-					appendChild(currentReferenceNode);
-					// children.add(currentReferenceNode);
-				}
-				else if (currentRegion.getType().equals(DTDRegionTypes.OCCUR_TYPE)) {
-					// we could potentially flag an error here if we hit an
-					// occurrence type and currentRefNode and currentGroupNode
-					// are null
-					if (currentReferenceNode != null) {
-						// currentReferenceNode.setOccurrence(currentRegion.getText().toCharArray()[0]);
-						currentReferenceNode.addRegion(currentRegion);
-						currentReferenceNode = null;
-					}
-				}
-				else if (currentRegion.getType().equals(DTDRegionTypes.CONNECTOR)) {
-					// note that if connector is already set and it is
-					// different from the current connector region, then we
-					// have an error!
-					// setConnector(currentRegion.getText().toCharArray()[0]);
-				}
-				else if (currentRegion.getType().equals(DTDRegionTypes.LEFT_PAREN)) {
-					if (currentGroupNode == null) {
-						// we have hit a new group. Make sure we reset the
-						// referencenode var so it doesn't collect any more
-						// regions
-						currentReferenceNode = null;
-						currentGroupNode = new CMGroupNode(getDTDFile(), getStructuredDTDDocumentRegion());
-						appendChild(currentGroupNode);
-						// children.add(currentGroupNode);
-					}
-				}
-			}
-
-			if (currentRegion.getType().equals(DTDRegionTypes.LEFT_PAREN)) {
-				nesting++;
-			}
-			if (currentRegion.getType().equals(DTDRegionTypes.RIGHT_PAREN)) {
-				nesting--;
-				if (nesting == 0 && currentGroupNode != null) {
-					currentGroupNode.addRegion(currentRegion);
-					// peek at next region to see if it is an occur region. if
-					// so, add it to the groupnode
-					if (iter.hasNext()) {
-						ITextRegion nextRegion = iter.next();
-						if (nextRegion.getType().equals(DTDRegionTypes.OCCUR_TYPE)) {
-							currentGroupNode.addRegion(nextRegion);
-						}
-						else {
-							// Otherwise, push it back as the next item to be
-							// retrieved by a future next() call
-							iter.previous();
-						}
-					}
-					currentGroupNode = null;
-				}
-			}
-			if (currentGroupNode != null) {
-				currentGroupNode.addRegion(currentRegion);
-			}
-		}
-
-		if (nesting < 0) {
-			// This means we have passed over the right paren that marks the
-			// end of our grouping.
-			// Look for an occurrence region
-			while (iter.hasNext()) {
-				ITextRegion currentRegion = iter.next();
-				if (currentRegion.getType().equals(DTDRegionTypes.OCCUR_TYPE)) {
-					// setOccurrence(currentRegion.getText().toCharArray()[0]);
-				}
-			} // end of while ()
-		}
-
-		// for (org.w3c.dom.Node child = getFirstChild(); child != null; child
-		// = child.getNextSibling())
-		// {
-		// System.out.println("child found = " + child);
-		// }
-
-		Object[] children = getChildren();
-		// System.out.println("children legnth = " + children.length);
-
-		for (int i = 0; i < children.length; i++) {
-			DTDNode currentNode = (DTDNode) children[i];
-			currentNode.resolveRegions();
-		} // end of while ()
-
-	}
-
-	/**
-	 * Set the value of connector.
-	 * 
-	 * @param v
-	 *            Value to assign to connector.
-	 */
-	public void setConnector(char v) {
-		if (connector != v) {
-			connector = v;
-			// walk through our kids and see if there is a connector between
-			// each sibling. if not, create one and set the connector. if
-			// there is
-			// then just change the text of the connector
-			Object[] children = getChildren();
-			if (children.length <= 1) {
-				// there won't be any connector existing between the children
-				// just notify a change in the node and return;
-				getDTDFile().notifyNodeChanged(this);
-				return;
-			}
-			beginRecording(this, DTDCoreMessages._UI_LABEL_CM_GRP_NODE_CONNECTOR); //$NON-NLS-1$
-			for (int i = 0; i < children.length - 1; i++) {
-				DTDNode childA = (DTDNode) children[i];
-				DTDNode childB = (DTDNode) children[i + 1];
-
-				// create a stream between the two siblings and walk it
-				// note that this stream includes the last region of the first
-				// sibling and the first region of the next sibling.
-				// both these should be ignored
-				RegionIterator iter = new RegionIterator(getStructuredDTDDocumentRegion(), childA.getEndOffset(), childB.getStartOffset());
-				// skip the first region which is the last region of childA
-
-				// do we still need this
-				// iter.next();
-				ITextRegion currentRegion = null;
-				boolean foundConnector = false;
-				while (iter.hasNext() && currentRegion != childB.getStartRegion()) {
-					currentRegion = iter.next();
-					if (currentRegion.getType() == DTDRegionTypes.CONNECTOR) {
-						foundConnector = true;
-						// Region oldRegion = currentRegion.createCopy();
-						// found a connector! on to the next sibling pair
-						// currentRegion.updateText(String.valueOf(v));
-						replaceText(this, getStructuredDTDDocumentRegion().getStartOffset(currentRegion), 1, String.valueOf(connector));
-						// changeStructuredDocument(oldRegion, currentRegion);
-						break;
-					}
-				}
-
-				if (!foundConnector) {
-					// if we're here, that means we need to insert a new
-					// connector region after childA
-					replaceText(this, childA.getEndOffset(), 0, String.valueOf(connector));
-					// DTDRegion connectorRegion = new
-					// DTDRegion(DTDRegionTypes.CONNECTOR,
-					// childA.getEndOffset(), 1);
-					// insertIntoStructuredDocument(connectorRegion);
-				}
-			}
-			endRecording(this);
-		}
-	}
-
-	// public Object[] getChildren()
-	// {
-	// return children.toArray();
-	// }
-}// CMGroupNode
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMNode.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMNode.java
deleted file mode 100644
index 6c93c5d..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMNode.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-// base class for an Element's contentmodel
-public abstract class CMNode extends DTDNode {
-	public static final String ANY = DTDCoreMessages._UI_LABEL_CM_NODE_ANY; //$NON-NLS-1$
-	public static final String CHILDREN = DTDCoreMessages._UI_LABEL_CM_NODE_CHILD_CONTENT; //$NON-NLS-1$
-
-	public static final String EMPTY = DTDCoreMessages._UI_LABEL_CM_NODE_EMPTY; //$NON-NLS-1$
-	public static final String MIXED = DTDCoreMessages._UI_LABEL_CM_NODE_MIX_CONTENT; //$NON-NLS-1$
-	public static final String PCDATA = DTDCoreMessages._UI_LABEL_CM_NODE_PCDATA; //$NON-NLS-1$
-
-
-	boolean rootElementContent;
-
-	public CMNode(DTDFile file, IStructuredDocumentRegion flatNode) {
-		super(file, flatNode);
-	}
-
-	// this is only valid to ask if the content is a root element content
-	abstract public String getType();
-
-	/**
-	 * Get the value of rootElementContent. This tells us whether this element
-	 * content's parent is a direct decendent of the containing element
-	 * 
-	 * @return value of rootElementContent.
-	 */
-	public boolean isRootElementContent() {
-		return rootElementContent;
-	}
-
-	// if this is a root element, change the content to children
-	// ie . (child1)
-	public void setChildrenContent(String newChild) {
-		if (isRootElementContent()) {
-			if (!newChild.equals("")) { //$NON-NLS-1$
-				beginRecording(this, DTDCoreMessages._UI_LABEL_CM_NODE_SET_CHILD_CONTENT); //$NON-NLS-1$
-				replaceText(this, getStartOffset(), getNodeLength(), "(" + newChild + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-				endRecording(this);
-				return;
-			}
-
-			if (!getType().equals(CHILDREN)) {
-				beginRecording(this, DTDCoreMessages._UI_LABEL_CM_NODE_SET_CHILD_CONTENT); //$NON-NLS-1$
-				if (this instanceof CMBasicNode) {
-					replaceText(this, getStartOffset(), getNodeLength(), "(newChild)"); //$NON-NLS-1$
-				}
-				else {
-					// now must convert from mixed content to this one. must
-					// preserve the remaining children
-					CMGroupNode group = (CMGroupNode) this;
-					CMNode firstChild = (CMNode) group.getFirstChild();
-					if (firstChild.getType().equals(PCDATA)) {
-						group.delete(firstChild);
-					}
-				}
-
-				endRecording(this);
-			}
-		}
-	}
-
-	public void setContent(String content) {
-		if (isRootElementContent()) {
-			beginRecording(this, DTDCoreMessages._UI_LABEL_CM_NODE_SET + " " + content + " " + DTDCoreMessages._UI_LABEL_CM_NODE_CONTENT); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-			replaceText(this, getStartOffset(), getNodeLength(), content);
-			endRecording(this);
-		}
-	}
-
-	// if this is a root element, change the content to mixed
-	// ie . (#PCDATA, child1)
-	public void setMixedContent() {
-		if (isRootElementContent()) {
-			if (!getType().equals(MIXED)) {
-				beginRecording(this, DTDCoreMessages._UI_LABEL_CM_NODE_SET_MIX_CONTENT); //$NON-NLS-1$
-				if (this instanceof CMBasicNode) {
-					replaceText(this, getStartOffset(), getNodeLength(), "(#PCDATA | newChild)*"); //$NON-NLS-1$
-				}
-				else {
-					// now must convert from children content to this one.
-					// must
-					// preserve the children
-					CMGroupNode group = (CMGroupNode) this;
-					group.setConnector(CMGroupNode.CHOICE);
-					group.setOccurrence(CMRepeatableNode.ZERO_OR_MORE);
-					CMNode firstChild = (CMNode) group.getFirstChild();
-					if (!firstChild.getType().equals(PCDATA)) {
-						group.insertChildNode("#PCDATA", 0); //$NON-NLS-1$
-					}
-				}
-				endRecording(this);
-			}
-		}
-	}
-
-	/**
-	 * Set the value of rootElementContent.
-	 * 
-	 * @param v
-	 *            Value to assign to rootElementContent.
-	 */
-	public void setRootElementContent(boolean v) {
-		this.rootElementContent = v;
-	}
-
-	// public void delete()
-	// {
-	// if (isRootElementContent())
-	// {
-	// // then the superclasses delete will be fine
-	// super.delete();
-	// return;
-	// }
-
-	// CMGroupNode parent = (CMGroupNode) getParentNode();
-	// parent.removeChildNode(this);
-	// }
-
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMRepeatableNode.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMRepeatableNode.java
deleted file mode 100644
index 69ce110..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMRepeatableNode.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-public abstract class CMRepeatableNode extends CMNode {
-
-	public static final char ONCE = '1';
-	public static final char ONE_OR_MORE = '+';
-	public static final char OPTIONAL = '?';
-	public static final char ZERO_OR_MORE = '*';
-
-
-	public CMRepeatableNode(DTDFile file, IStructuredDocumentRegion flatNode) {
-		super(file, flatNode);
-	}
-
-	public Image getImage() {
-		DTDCorePlugin resourcePlugin = DTDCorePlugin.getInstance();
-		return resourcePlugin.getImage(DTDResource.ELEMENTREFICON);
-	}
-
-	public char getOccurrence() {
-		ITextRegion occurRegion = getOccurrenceRegion();
-		if (occurRegion != null && occurRegion.getType() == DTDRegionTypes.OCCUR_TYPE) {
-			return getStructuredDTDDocumentRegion().getText(occurRegion).charAt(0);
-		}
-		return CMRepeatableNode.ONCE;
-	}
-
-	// returns the occurrenceregion, or the last region where the occurrence
-	// region should appear after
-	abstract public ITextRegion getOccurrenceRegion();
-
-	public void setOccurrence(char occurrence) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_CM_REP_NODE_CHG_OCCUR); //$NON-NLS-1$
-		setOccurrence(this, occurrence);
-		endRecording(this);
-	}
-
-	public void setOccurrence(Object requestor, char occurrence) {
-		if (getOccurrence() != occurrence) {
-			ITextRegion region = getOccurrenceRegion();
-			if (region != null) {
-				if (region.getType().equals(DTDRegionTypes.OCCUR_TYPE)) {
-					if (occurrence == CMRepeatableNode.ONCE) {
-						// we need to remove the occur region from the flat
-						// model;
-						getDTDFile().getStructuredDocument().replaceText(requestor, getStructuredDTDDocumentRegion().getStartOffset(region), 1, ""); //$NON-NLS-1$
-					}
-					else {
-						// Region oldOccur = region.createCopy();
-						getDTDFile().getStructuredDocument().replaceText(requestor, getStructuredDTDDocumentRegion().getStartOffset(region), 1, String.valueOf(occurrence));
-						// changeStructuredDocument(oldOccur, region);
-					}
-				}
-				else if (occurrence != CMRepeatableNode.ONCE) {
-					// System.out.println(getString());
-					// we need to create an occurrenceRegion
-					replaceText(requestor, getStructuredDTDDocumentRegion().getEndOffset(region), 0, String.valueOf(occurrence));
-				}
-			}
-		}
-	}
-
-}// CMRepeatableNode
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Comment.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Comment.java
deleted file mode 100644
index 935ff52..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Comment.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.text.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-public class Comment extends NamedTopLevelNode {
-
-	public class StartEndPair {
-		public int startOffset, endOffset;
-	}
-
-	public Comment(DTDFile file, IStructuredDocumentRegion flatNode) {
-		super(file, flatNode, DTDRegionTypes.COMMENT_START);
-	}
-
-	public Image getImage() {
-		return DTDCorePlugin.getInstance().getImage(DTDResource.COMMENTICON);
-	}
-
-	public String getName() {
-		String text = getText();
-		if (text.length() <= 30) {
-			return text;
-		}
-		else {
-			return text.substring(0, 29) + "..."; //$NON-NLS-1$
-		}
-	}
-
-	private void getStartAndEndOffsetForText(StartEndPair pair) {
-		RegionIterator iter = iterator();
-		ITextRegion commentStartTag = getStartTag(iter);
-		ITextRegion endCommentTag = getNextRegion(iter, DTDRegionTypes.COMMENT_END);
-		pair.endOffset = getStructuredDTDDocumentRegion().getEndOffset();
-		if (commentStartTag != null) {
-			pair.startOffset = getStructuredDTDDocumentRegion().getEndOffset(commentStartTag);
-		}
-		if (endCommentTag != null) {
-			pair.endOffset = getStructuredDTDDocumentRegion().getStartOffset(endCommentTag);
-		}
-	}
-
-	public String getText() {
-		String text = getStructuredDTDDocumentRegion().getText();
-		int flatNodeStart = getStructuredDTDDocumentRegion().getStartOffset();
-		StartEndPair pair = new StartEndPair();
-		getStartAndEndOffsetForText(pair);
-		return text.substring(pair.startOffset - flatNodeStart, pair.endOffset - flatNodeStart);
-	}
-
-	public void setText(String newText) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_COMMENT_CHG); //$NON-NLS-1$
-		StartEndPair pair = new StartEndPair();
-		getStartAndEndOffsetForText(pair);
-		replaceText(this, pair.startOffset, pair.endOffset - pair.startOffset, newText);
-		endRecording(this);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCoreMessages.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCoreMessages.java
deleted file mode 100644
index 0e12f8e..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCoreMessages.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 IBM Corporation and others. All rights reserved.   This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by DTD Core
- * 
- * @plannedfor 1.0
- */
-public class DTDCoreMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.dtd.core.internal.DTDCorePluginResources";//$NON-NLS-1$
-
-	public static String _UI_NONE_DESC;
-	public static String _UI_CHARACTER_DATA_DESC;
-	public static String _UI_IDENTIFIER_DESC;
-	public static String _UI_ID_REFERENCE_DESC;
-	public static String _UI_ID_REFERENCES_DESC;
-	public static String _UI_ENTITY_NAME_DESC;
-	public static String _UI_ENTITY_NAMES_DESC;
-	public static String _UI_NAME_TOKEN_DESC;
-	public static String _UI_NAME_TOKENS_DESC;
-	public static String _UI_ENUM_NAME_TOKENS_DESC;
-	public static String _UI_ENUM_NOTATION_DESC;
-	public static String _UI_LABEL_ATTR_DEFAULT_VAL;
-	public static String _UI_LABEL_ATTR_DEFAULT_KIND;
-	public static String _UI_LABEL_ATTR_TYPE;
-	public static String _UI_LABEL_ATTR_ENUM_ITEMS;
-	public static String _UI_LABEL_ATTR_LIST_ADD;
-	public static String _UI_LABEL_CM_GRP_NODE_CONNECTOR;
-	public static String _UI_LABEL_CM_GRP_NODE_INSERT_ELEMENT;
-	public static String _UI_LABEL_CM_GRP_NODE_ADD_GRP;
-	public static String _UI_LABEL_CM_GRP_NODE_ADD_CHILD;
-	public static String _UI_LABEL_CM_NODE_MIX_CONTENT;
-	public static String _UI_LABEL_CM_NODE_CHILD_CONTENT;
-	public static String _UI_LABEL_CM_NODE_SET_MIX_CONTENT;
-	public static String _UI_LABEL_CM_NODE_SET_CHILD_CONTENT;
-	public static String _UI_LABEL_CM_NODE_SET;
-	public static String _UI_LABEL_CM_NODE_CONTENT;
-	public static String _UI_LABEL_CM_NODE_PCDATA;
-	public static String _UI_LABEL_CM_NODE_ANY;
-	public static String _UI_LABEL_CM_NODE_EMPTY;
-	public static String _UI_LABEL_CM_REP_NODE_CHG_OCCUR;
-	public static String _UI_LABEL_COMMENT_CHG;
-	public static String _UI_LABEL_DTD_FILE_ADD_ELEMENT;
-	public static String _UI_LABEL_DTD_FILE_ADD_ENTITY;
-	public static String _UI_LABEL_DTD_FILE_ADD_COMMENT;
-	public static String _UI_LABEL_DTD_FILE_ADD_PARM_ENTITY_REF;
-	public static String _UI_LABEL_DTD_FILE_ADD_NOTATION;
-	public static String _UI_LABEL_DTD_FILE_ADD_ATTR_LIST;
-	public static String _UI_LABEL_DTD_FILE_DELETE;
-	public static String _UI_LABEL_DTD_NODE_NAME_CHG;
-	public static String _UI_LABEL_DTD_NODE_DELETE;
-	public static String _UI_LABEL_ELEMENT_ADD_ATTR;
-	public static String _UI_LABEL_ELEMENT_ADD_GRP;
-	public static String _UI_LABEL_ELEMENT_ADD_CHILD;
-	public static String _UI_LABEL_ENTITY_SET_PARM_ENTITY;
-	public static String _UI_LABEL_ENTITY_SET_GENERAL_ENTITY;
-	public static String _UI_LABEL_ENTITY_SET_EXT_ENTITY;
-	public static String _UI_LABEL_ENTITY_SET_INT_ENTITY;
-	public static String _UI_LABEL_ENTITY_VALUE_CHG;
-	public static String _UI_LABEL_ENTITY_NDATA_CHANGE;
-	public static String _UI_LABEL_EXT_NODE_PUBLIC_ID_CHG;
-	public static String _UI_LABEL_EXT_NODE_SYSTEM_ID_CHG;
-	public static String _UI_LABEL_NODE_LIST_ELEMENTS;
-	public static String _UI_LABEL_NODE_LIST_ENTITIES;
-	public static String _UI_LABEL_NODE_LIST_NOTATIONS;
-	public static String _UI_LABEL_NODE_LIST_COMMENTS;
-	public static String _UI_LABEL_NODE_LIST_OTHER;
-	public static String _UI_LABEL_NODE_LIST_ATTRIBUTES;
-	public static String _UI_LABEL_PARM_ENTITY_REF_CHG_ENTITY_REF;
-	public static String _UI_LABEL_PARM_ENTITY_REF_COMMENT_CHG;
-	public static String _UI_LABEL_TOP_LEVEL_NODE_DELETE;
-	public static String _ERROR_INCL_FILE_LOAD_FAILURE;
-	public static String _ERROR_UNDECLARED_ELEMENT_1;
-	public static String _UI_ERRORPART_UNDECLARED_ELEMENT_2;
-	public static String _ERROR_DUP_ID_ATTRIBUTE_1;
-	public static String _UI_ERRORPART_DUP_ID_ATTRIBUTE_2;
-	public static String _ERROR_INVALID_DEFAULT_ATTR_VALUE_1;
-	public static String _UI_ERRORPART_INVALID_DEFAULT_ATTR_VALUE_2;
-	public static String _EXC_OPERATION_NOT_SUPPORTED;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, DTDCoreMessages.class);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCorePlugin.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCorePlugin.java
deleted file mode 100644
index 5cb55c5..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCorePlugin.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-public class DTDCorePlugin extends AbstractUIPlugin {
-	private static DTDCorePlugin instance;
-
-	public static Image getDTDImage(String iconName) {
-		return getInstance().getImage(iconName);
-	}
-
-	public static ImageDescriptor getDTDImageDescriptor(String iconName) {
-		String thisID = getInstance().getBundle().getSymbolicName();
-		return AbstractUIPlugin.imageDescriptorFromPlugin(thisID, iconName);
-	}
-
-	public synchronized static DTDCorePlugin getInstance() {
-		return instance;
-	}
-
-	public static DTDCorePlugin getPlugin() {
-		return instance;
-	}
-
-	public DTDCorePlugin() {
-		super();
-		instance = this;
-	}
-
-	public Image getImage(String iconName) {
-		ImageRegistry imageRegistry = getImageRegistry();
-		Image image = imageRegistry.get(iconName);
-
-		if (image == null) {
-			String thisID = getInstance().getBundle().getSymbolicName();
-			imageRegistry.put(iconName, imageDescriptorFromPlugin(thisID, iconName));
-			image = imageRegistry.get(iconName);
-		}
-
-		return image;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCorePluginResources.properties b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCorePluginResources.properties
deleted file mode 100644
index a7ac3db..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCorePluginResources.properties
+++ /dev/null
@@ -1,127 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-! Strings for DTDBasicTypeImpl type descriptions
-_UI_NONE_DESC=None
-
-!! NOTE TO TRANSLATOR: Do not translate following text in parentheses on following 10 lines i.e.(CDATA)
-_UI_CHARACTER_DATA_DESC=Character Data (CDATA)
-_UI_IDENTIFIER_DESC=Identifier (ID)
-_UI_ID_REFERENCE_DESC=ID Reference (IDREF)
-_UI_ID_REFERENCES_DESC=ID References (IDREFS)
-_UI_ENTITY_NAME_DESC=Entity Name (ENTITY)
-_UI_ENTITY_NAMES_DESC=Entity Names (ENTITIES)
-_UI_NAME_TOKEN_DESC=Name Token (NMTOKEN)
-_UI_NAME_TOKENS_DESC=Name Tokens (NMTOKENS)
-_UI_ENUM_NAME_TOKENS_DESC=Enumerated Name Tokens
-_UI_ENUM_NOTATION_DESC=Enumerated NOTATION
-
-! Strings from sed/model
-
-! Attribute.java
-_UI_LABEL_ATTR_DEFAULT_VAL=Attribute Default Change Value
-_UI_LABEL_ATTR_DEFAULT_KIND=Change Attribute Default Value
-_UI_LABEL_ATTR_TYPE=Change Attribute Type
-
-! AttributeEnumList
-_UI_LABEL_ATTR_ENUM_ITEMS=Change Attribute Enumeration Value
-
-! AttributeList
-_UI_LABEL_ATTR_LIST_ADD=Add Attribute
-
-! CMGroupNode
-_UI_LABEL_CM_GRP_NODE_CONNECTOR=Change Connector
-_UI_LABEL_CM_GRP_NODE_INSERT_ELEMENT=Insert Element
-_UI_LABEL_CM_GRP_NODE_ADD_GRP=Add Group
-_UI_LABEL_CM_GRP_NODE_ADD_CHILD=Add Child Element
-
-! CMNode
-_UI_LABEL_CM_NODE_MIX_CONTENT=Mixed Content
-_UI_LABEL_CM_NODE_CHILD_CONTENT=Children Content
-_UI_LABEL_CM_NODE_SET_MIX_CONTENT=Set Mixed Content
-_UI_LABEL_CM_NODE_SET_CHILD_CONTENT=Set Children Content
-
-!! NOTE TO TRANSLATOR - USAGE: "Set <variable content> Content"
-_UI_LABEL_CM_NODE_SET=Set
-_UI_LABEL_CM_NODE_CONTENT=Content
-
-!! NOTE TO TRANSLATOR - DO NOT TRANSLATE FOLLOWING 3 LINES
-_UI_LABEL_CM_NODE_PCDATA=(#PCDATA)
-_UI_LABEL_CM_NODE_ANY=ANY
-_UI_LABEL_CM_NODE_EMPTY=EMPTY
-
-! CMRepeatableNode
-_UI_LABEL_CM_REP_NODE_CHG_OCCUR=Change Occurrence
-
-! Comment
-_UI_LABEL_COMMENT_CHG=Comment Change
-
-! DTDFile
-_UI_LABEL_DTD_FILE_ADD_ELEMENT=Add Element
-_UI_LABEL_DTD_FILE_ADD_ENTITY=Add Entity
-_UI_LABEL_DTD_FILE_ADD_COMMENT=Add Comment
-_UI_LABEL_DTD_FILE_ADD_PARM_ENTITY_REF=Add Parameter Entity Reference
-_UI_LABEL_DTD_FILE_ADD_NOTATION=Add Notation
-_UI_LABEL_DTD_FILE_ADD_ATTR_LIST=Add Attribute List
-_UI_LABEL_DTD_FILE_DELETE=Delete
-
-! DTDNode
-_UI_LABEL_DTD_NODE_NAME_CHG=Name Change
-_UI_LABEL_DTD_NODE_DELETE=Delete
-
-! Element
-_UI_LABEL_ELEMENT_ADD_ATTR=Add Attribute
-_UI_LABEL_ELEMENT_ADD_GRP=Add Group
-_UI_LABEL_ELEMENT_ADD_CHILD=Add Child Element
-
-! Entity
-_UI_LABEL_ENTITY_SET_PARM_ENTITY=Set Parameter Entity
-_UI_LABEL_ENTITY_SET_GENERAL_ENTITY=Set General Entity
-_UI_LABEL_ENTITY_SET_EXT_ENTITY=Set External Entity
-_UI_LABEL_ENTITY_SET_INT_ENTITY=Set Internal Entity
-_UI_LABEL_ENTITY_VALUE_CHG=Entity Value Change
-
-!! NOTE TO TRANSLATOR - USAGE: "NDATA Change"
-_UI_LABEL_ENTITY_NDATA_CHANGE=Change
-
-! ExternalNode
-_UI_LABEL_EXT_NODE_PUBLIC_ID_CHG=Public ID Change
-_UI_LABEL_EXT_NODE_SYSTEM_ID_CHG=System ID Change
-
-! NodeList
-_UI_LABEL_NODE_LIST_ELEMENTS=Elements
-_UI_LABEL_NODE_LIST_ENTITIES=Entities
-_UI_LABEL_NODE_LIST_NOTATIONS=Notations
-_UI_LABEL_NODE_LIST_COMMENTS=Comments
-_UI_LABEL_NODE_LIST_OTHER=Other
-_UI_LABEL_NODE_LIST_ATTRIBUTES=Attributes
-
-! ParameterEntityReference
-_UI_LABEL_PARM_ENTITY_REF_CHG_ENTITY_REF=Change Entity Reference
-_UI_LABEL_PARM_ENTITY_REF_COMMENT_CHG=Comment Change
-
-! TopLevelNode
-_UI_LABEL_TOP_LEVEL_NODE_DELETE=Delete
-
-_ERROR_INCL_FILE_LOAD_FAILURE       = Failed to load included file
-
-! usage: _ERROR_UNDECLARED_ELEMENT_1  + <elementName> + _PARTERROR_UNDECLARED_ELEMENT_2
-_ERROR_UNDECLARED_ELEMENT_1         = Reference to undeclared element '
-_UI_ERRORPART_UNDECLARED_ELEMENT_2  =' in content model.
-
-! usage: _ERROR_DUP_ID_ATTRIBUTE_1  + <attributeName> + _PARTERROR_DUP_ID_ATTRIBUTE_2
-_ERROR_DUP_ID_ATTRIBUTE_1         = Duplicate ID attribute '
-_UI_ERRORPART_DUP_ID_ATTRIBUTE_2  = '. Only one ID attribute can be specified per ELEMENT type.
-
-! usage:_ERROR_INVALID_DEFAULT_ATTR_VALUE_1 + <typeString> + _PARTERROR_INVALID_DEFAULT_ATTR_VALUE_2 + <attributeName>
-_ERROR_INVALID_DEFAULT_ATTR_VALUE_1         = Invalid default
-_UI_ERRORPART_INVALID_DEFAULT_ATTR_VALUE_2  =  value for attribute '
-
-_EXC_OPERATION_NOT_SUPPORTED  = Operation not supported
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDFile.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDFile.java
deleted file mode 100644
index 7c5a8e1..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDFile.java
+++ /dev/null
@@ -1,674 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-import org.eclipse.wst.dtd.core.internal.event.IDTDFileListener;
-import org.eclipse.wst.dtd.core.internal.event.NodesEvent;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.util.DTDExternalReferenceRemover;
-import org.eclipse.wst.dtd.core.internal.util.DTDModelUpdater;
-import org.eclipse.wst.dtd.core.internal.util.DTDNotationReferenceRemover;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-public class DTDFile implements IndexedRegion {
-	 private NodeList attlistList = new NodeList(this, DTDRegionTypes.ATTLIST_TAG);
-	private NodeList commentList = new NodeList(this, DTDRegionTypes.COMMENT_START);
-
-	boolean creatingNewModel = false;
-	private DTDModelImpl fDTDModel;
-
-	private NodeList elementList = new NodeList(this, DTDRegionTypes.ELEMENT_TAG);
-	private NodeList entityList = new NodeList(this, DTDRegionTypes.ENTITY_TAG);
-
-	private List folderList = null;
-
-	private boolean isMovingNode = false;
-
-	private List modelListeners = new ArrayList();
-
-	private List nodeList = new ArrayList();
-	private NodeList notationList = new NodeList(this, DTDRegionTypes.NOTATION_TAG);
-	private NodeList unrecognizedList = new NodeList(this, DTDRegionTypes.UNKNOWN_CONTENT);
-
-	public DTDFile(DTDModelImpl dtdModel) {
-		this.fDTDModel = dtdModel;
-	}
-
-	public void addDTDFileListener(IDTDFileListener listener) {
-		modelListeners.add(listener);
-	}
-
-	protected void addNode(DTDNode node) {
-		addNode(nodeList.size(), node);
-	}
-
-	protected void addNode(int index, DTDNode node) {
-		nodeList.add(index, node);
-		/*
-		 * if (index < nodeList.size()) { insertBefore(node, (DTDNode)
-		 * nodeList.get(index)); } else { appendChild(node); }
-		 */
-	}
-
-	public DTDNode buildNode(IStructuredDocumentRegion flatNode) {
-		// ITextRegionList regions = flatNode.getRegions();
-		DTDNode node = null;
-		if (isElement(flatNode)) {
-			// then this is an element
-			node = new Element(this, flatNode);
-		}
-		else if (isEntity(flatNode)) {
-			node = new Entity(this, flatNode);
-		}
-		else if (isNotation(flatNode)) {
-			node = new Notation(this, flatNode);
-		}
-		else if (isAttributeList(flatNode)) {
-			node = new AttributeList(this, flatNode);
-		}
-		else if (isComment(flatNode)) {
-			node = new Comment(this, flatNode);
-		}
-		else if (isParameterEntityReference(flatNode)) {
-			node = new ParameterEntityReference(this, flatNode);
-		}
-		else if (!flatNode.getText().trim().equals("")) { //$NON-NLS-1$
-			node = new Unrecognized(this, flatNode);
-		}
-		if (node != null) {
-			insertNode(node);
-			node.resolveRegions();
-		}
-		return node;
-	}
-
-	public void buildNodes(IStructuredDocumentRegionList list) {
-		NodesEvent addedDTDNodes = new NodesEvent();
-
-		TopLevelNode previousNode = null;
-		for (int i = 0; i < list.getLength(); i++) {
-			IStructuredDocumentRegion flatNode = list.item(i);
-			TopLevelNode node = (TopLevelNode) buildNode(flatNode);
-			// if we don't create a node, then we assume that the flat
-			// node was whitespace. Tack it on to a previous toplevel
-			// node
-			if (node != null) {
-				previousNode = node;
-				addedDTDNodes.add(node);
-			}
-			else {
-				if (previousNode != null) {
-					previousNode.addWhitespaceStructuredDocumentRegion(flatNode);
-				}
-			}
-		}
-
-		if (addedDTDNodes.getNodes().size() > 0)// &&
-		// creatingNewModel == false)
-		{
-			// now tell people about the additions
-			notifyNodesAdded(addedDTDNodes);
-		}
-	}
-
-	// Implements IndexedRegion
-
-	public boolean contains(int testPosition) {
-		return getStartOffset() <= testPosition && testPosition <= getEndOffset();
-	}
-
-	public void createAttributeList(DTDNode node, String name, boolean isAfter) {
-		getDTDModel().beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_FILE_ADD_ATTR_LIST); //$NON-NLS-1$
-		String newStream = "<!ATTLIST " + name + ">\n"; //$NON-NLS-1$ //$NON-NLS-2$
-		int offset = getInsertOffset(node, isAfter);
-		getStructuredDocument().replaceText(this, offset, 0, newStream);
-		getDTDModel().endRecording(this);
-	}
-
-	public void createComment(DTDNode node, String name, boolean isAfter) {
-		getDTDModel().beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_FILE_ADD_COMMENT); //$NON-NLS-1$
-		String newStream = "<!-- " + name + " -->\n"; //$NON-NLS-1$ //$NON-NLS-2$
-		int offset = getInsertOffset(node, isAfter);
-		getStructuredDocument().replaceText(this, offset, 0, newStream);
-		getDTDModel().endRecording(this);
-	}
-
-	public void createElement(DTDNode node, String name, boolean isAfter) {
-		getDTDModel().beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_FILE_ADD_ELEMENT); //$NON-NLS-1$
-		String newStream = "<!ELEMENT " + name + " EMPTY>\n"; //$NON-NLS-1$ //$NON-NLS-2$
-		int offset = getInsertOffset(node, isAfter);
-		getStructuredDocument().replaceText(this, offset, 0, newStream);
-		getDTDModel().endRecording(this);
-	}
-
-	public void createEntity(DTDNode node, String name, boolean isAfter) {
-		getDTDModel().beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_FILE_ADD_ENTITY); //$NON-NLS-1$
-		String newStream = "<!ENTITY " + name + " \"\">\n"; //$NON-NLS-1$//$NON-NLS-2$
-		int offset = getInsertOffset(node, isAfter);
-		getStructuredDocument().replaceText(this, offset, 0, newStream);
-		getDTDModel().endRecording(this);
-	}
-
-	public void createNotation(DTDNode node, String name, boolean isAfter) {
-		getDTDModel().beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_FILE_ADD_NOTATION); //$NON-NLS-1$
-		String newStream = "<!NOTATION " + name + " SYSTEM \"\">\n"; //$NON-NLS-1$ //$NON-NLS-2$
-		int offset = getInsertOffset(node, isAfter);
-		getStructuredDocument().replaceText(this, offset, 0, newStream);
-		getDTDModel().endRecording(this);
-	}
-
-	public void createParameterEntityReference(DTDNode node, String name, boolean isAfter) {
-		getDTDModel().beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_FILE_ADD_PARM_ENTITY_REF); //$NON-NLS-1$
-		String newStream = name + "\n"; //$NON-NLS-1$
-		int offset = getInsertOffset(node, isAfter);
-		getStructuredDocument().replaceText(this, offset, 0, newStream);
-		getDTDModel().endRecording(this);
-	}
-
-	public void deleteNode(DTDNode node) {
-		getDTDModel().beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_FILE_DELETE); //$NON-NLS-1$
-		deleteNode(this, node);
-		getDTDModel().endRecording(this);
-	}
-
-	public void deleteNode(Object requestor, DTDNode node) {
-		DTDNode parent = (DTDNode) node.getParentNode();
-		if (parent != null) {
-			parent.delete(requestor, node);
-		}
-		else {
-			if (!isMovingNode) {
-				DTDModelUpdater updater = new DTDModelUpdater();
-				updater.objectAboutToBeDeleted(requestor, node);
-				if (node instanceof ParameterEntityReference) {
-					Entity referencedEntity = ((ParameterEntityReference) node).getEntityObject();
-					if (referencedEntity != null) {
-						// remove references to all elements and parm entities
-						// contained in our current model
-						DTDExternalReferenceRemover remover = new DTDExternalReferenceRemover();
-						remover.externalReferenceAboutToChange(requestor, referencedEntity);
-					}
-				}
-				else if (node instanceof Notation) {
-					Notation notation = ((Notation) node);
-					DTDNotationReferenceRemover remover = new DTDNotationReferenceRemover();
-					remover.notationAboutToBeDeleted(requestor, notation);
-				}
-			}
-
-			// no parent? then delete up until the start of the next node
-			// if it is a top level node
-			int startOffset = node.getStartOffset();
-			int endOffset = node.getWhitespaceEndOffset();
-			if (node instanceof TopLevelNode) {
-				endOffset = getInsertOffset(node, true);
-			}
-			getStructuredDocument().replaceText(requestor, startOffset, endOffset - startOffset, ""); //$NON-NLS-1$
-		}
-	}
-
-	public NodeList getComments() {
-		return commentList;
-	}
-
-	public DTDModelImpl getDTDModel() {
-		return fDTDModel;
-	}
-
-	public NodeList getElementsAndParameterEntityReferences() {
-		return elementList;
-	}
-
-	public int getEndOffset() {
-		int result = -1;
-		IStructuredDocumentRegion region = getStructuredDocument().getLastStructuredDocumentRegion();
-		if (region != null) {
-			result = region.getEndOffset();
-		}
-		return result;
-	}
-
-	public int getLength() {
-		int result = -1;
-		int start = getStartOffset();
-		if (start >= 0) {
-			int end = getEndOffset();
-			if (end >= 0) {
-				result = end - start;
-				if (result < -1) {
-					result = -1;
-				}
-			}
-		}
-		return result;
-	}
-
-	public NodeList getEntities() {
-		return entityList;
-	}
-
-	public Image getImage() {
-		return DTDCorePlugin.getInstance().getImage(DTDResource.DTDFILEICON);
-	}
-
-
-
-	public int getInsertOffset(DTDNode node, boolean isAfter) {
-		int offset = 0;
-		if (node != null) {
-			if (isAfter) {
-				// then get the next node and use it's start offset
-				int index = getNodes().indexOf(getNode(node.getStructuredDTDDocumentRegion()));
-
-				DTDNode afterNode = null;
-				if (index + 1 < getNodes().size()) {
-					afterNode = (DTDNode) getNodes().get(index + 1);
-				}
-				if (afterNode != null) {
-					offset = afterNode.getStructuredDTDDocumentRegion().getStartOffset();
-				}
-				else {
-					// add to end
-					if (getStructuredDocument().getLastStructuredDocumentRegion() != null) {
-						offset = getStructuredDocument().getLastStructuredDocumentRegion().getEndOffset();
-					}
-				}
-			}
-			else {
-				offset = node.getStructuredDTDDocumentRegion().getStartOffset();
-			}
-		}
-		else {
-			// add to end
-			if (getStructuredDocument().getLastStructuredDocumentRegion() != null) {
-				offset = getStructuredDocument().getLastStructuredDocumentRegion().getEndOffset();
-			}
-		}
-		return offset;
-	}
-
-	public String getName() {
-		org.eclipse.core.runtime.Path path = new org.eclipse.core.runtime.Path(getDTDModel().getId().toString());
-		return path.lastSegment();
-	}
-
-	public DTDNode getNode(IStructuredDocumentRegion flatNode) {
-		for (int i = 0; i < nodeList.size(); i++) {
-			DTDNode node = (DTDNode) nodeList.get(i);
-			if (node.getStructuredDTDDocumentRegion() == flatNode) {
-				return node;
-			}
-		}
-		return null;
-	}
-
-	public IndexedRegion getNodeAt(int offset) {
-		DTDNode node = getTopLevelNodeAt(offset);
-		if (node != null) {
-			return node.getDeepestNode(offset);
-		}
-		return null;
-	}
-
-	public IndexedRegion getNodeAt(int startOffset, int endOffset) {
-		DTDNode node = getTopLevelNodeAt(startOffset);
-		if (node != null) {
-			return node.getDeepestNode(startOffset, endOffset);
-		}
-		return null;
-	}
-
-	public List getNodeLists() {
-		if (folderList == null) {
-			folderList = new ArrayList();
-			folderList.add(notationList);
-			folderList.add(entityList);
-			folderList.add(elementList);
-			folderList.add(attlistList);
-			folderList.add(commentList);
-			folderList.add(unrecognizedList);
-		}
-		return folderList;
-	}
-
-	public List getNodes() {
-		return nodeList;
-	}
-
-	public NodeList getNotations() {
-		return notationList;
-	}
-
-	public int getStartOffset() {
-		int result = -1;
-		IStructuredDocumentRegion region = getStructuredDocument().getFirstStructuredDocumentRegion();
-		if (region != null) {
-			result = region.getStartOffset();
-		}
-		return result;
-	}
-
-	public IStructuredDocument getStructuredDocument() {
-		return fDTDModel.getStructuredDocument();
-	}
-
-	public DTDNode getTopLevelNodeAt(int offset) {
-		for (int i = 0; i < nodeList.size(); i++) {
-			DTDNode node = (DTDNode) nodeList.get(i);
-			if (node.contains(offset)) {
-				return node;
-			}
-		}
-		return null;
-	}
-
-	public NodeList getUnrecognized() {
-		return unrecognizedList;
-	}
-
-	public void insertIntoModel(Object requestor, DTDNode reference, DTDNode node, boolean isAfter) {
-		String nodeText = ""; //$NON-NLS-1$
-		if (node instanceof TopLevelNode) {
-			nodeText = ((TopLevelNode) node).getFullText();
-		}
-		else {
-			nodeText = node.getNodeText();
-		}
-		int offset = getInsertOffset(reference, isAfter);
-		getStructuredDocument().replaceText(requestor, offset, 0, nodeText);
-	}
-
-
-	public void insertNode(DTDNode node) {
-		int startOffset = node.getStartOffset();
-		int insertIndex = -1;
-		// System.out.println("startoffset = " + startOffset);
-		for (int i = 0; i < getNodes().size(); i++) {
-			DTDNode currentNode = (DTDNode) getNodes().get(i);
-			// System.out.println("currentNode endOffset = "
-			// +currentNode.getEndOffset());
-
-			if (currentNode.getEndOffset() > startOffset) {
-				// System.out.println("endoffset " +
-				// currentNode.getEndOffset() + " > " + startOffset);
-				insertIndex = i;
-				break;
-			}
-		}
-		if (insertIndex == -1) {
-			insertIndex = getNodes().size();
-		}
-
-
-		// System.out.println("insert index = " + insertIndex);
-
-		addNode(insertIndex, node);
-	}
-
-	// it is assumed that flatnode contains at least 3 regions
-	public boolean isAttributeList(IStructuredDocumentRegion flatNode) {
-		if (flatNode.getRegions().size() >= 3) {
-			ITextRegion second = flatNode.getRegions().get(1);
-			ITextRegion third = flatNode.getRegions().get(2);
-			if (second.getType().equals(DTDRegionTypes.EXCLAMATION) && third.getType().equals(DTDRegionTypes.ATTLIST_TAG)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	// it is assumed that flatnode contains at least 3 regions
-	public boolean isComment(IStructuredDocumentRegion flatNode) {
-		if (flatNode.getRegions().size() >= 2) {
-			ITextRegion region = flatNode.getRegions().get(1);
-			if (region.getType().equals(DTDRegionTypes.COMMENT_START)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	// it is assumed that flatnode contains at least 3 regions
-	public boolean isElement(IStructuredDocumentRegion flatNode) {
-		if (flatNode.getRegions().size() >= 3) {
-			ITextRegion second = flatNode.getRegions().get(1);
-			ITextRegion third = flatNode.getRegions().get(2);
-			if (second.getType().equals(DTDRegionTypes.EXCLAMATION) && third.getType().equals(DTDRegionTypes.ELEMENT_TAG)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	// it is assumed that flatnode contains at least 3 regions
-	public boolean isEntity(IStructuredDocumentRegion flatNode) {
-		if (flatNode.getRegions().size() >= 3) {
-			ITextRegion second = flatNode.getRegions().get(1);
-			ITextRegion third = flatNode.getRegions().get(2);
-			if (second.getType().equals(DTDRegionTypes.EXCLAMATION) && third.getType().equals(DTDRegionTypes.ENTITY_TAG)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	// it is assumed that flatnode contains at least 3 regions
-	public boolean isNotation(IStructuredDocumentRegion flatNode) {
-		if (flatNode.getRegions().size() >= 3) {
-			ITextRegion second = flatNode.getRegions().get(1);
-			ITextRegion third = flatNode.getRegions().get(2);
-			if (second.getType().equals(DTDRegionTypes.EXCLAMATION) && third.getType().equals(DTDRegionTypes.NOTATION_TAG)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	// it is assumed that flatnode contains at least 3 regions
-	public boolean isParameterEntityReference(IStructuredDocumentRegion flatNode) {
-		if (flatNode.getRegions().size() == 1) {
-			ITextRegion region = flatNode.getRegions().get(0);
-			if (region.getType().equals(DTDRegionTypes.ENTITY_PARM)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	boolean isSameTopLevelType(DTDNode affectedNode) {
-		IStructuredDocumentRegion flatNode = affectedNode.getStructuredDTDDocumentRegion();
-		// return true if the flatnode still matches what the affectedNode
-		// is representing
-		if (affectedNode instanceof Element && isElement(flatNode)) {
-			return true;
-		}
-		if (affectedNode instanceof Entity && isEntity(flatNode)) {
-			return true;
-		}
-		if (affectedNode instanceof Comment && isComment(flatNode)) {
-			return true;
-		}
-		if (affectedNode instanceof AttributeList && isAttributeList(flatNode)) {
-			return true;
-		}
-		if (affectedNode instanceof Notation && isNotation(flatNode)) {
-			return true;
-		}
-		if (affectedNode instanceof Unrecognized && isUnrecognized(flatNode)) {
-			return true;
-		}
-		return false;
-	}
-
-	public boolean isUnrecognized(IStructuredDocumentRegion flatNode) {
-		return !isElement(flatNode) && !isEntity(flatNode) && !isNotation(flatNode) && !isParameterEntityReference(flatNode) && !isAttributeList(flatNode) && !isComment(flatNode);
-	}
-
-	public void moveNode(Object requestor, DTDNode referenceNode, DTDNode nodeToMove, boolean isAfter) {
-		isMovingNode = true;
-
-		deleteNode(requestor, nodeToMove);
-		insertIntoModel(requestor, referenceNode, nodeToMove, isAfter);
-		isMovingNode = false;
-	}
-
-	public void newModel(NewDocumentEvent event) {
-		creatingNewModel = true;
-		nodeList.clear();
-		NodesEvent removeEvent = new NodesEvent();
-		removeEvent.getNodes().addAll(nodeList);
-		notifyNodesRemoved(removeEvent);
-		/* removeChildNodes(); */
-
-		if (event.getStructuredDocument() != null && event.getStructuredDocument().getRegionList() != null) {
-			buildNodes(event.getStructuredDocument().getRegionList());
-		}
-		creatingNewModel = false;
-	}
-
-	public void nodesReplaced(StructuredDocumentRegionsReplacedEvent event) {
-		IStructuredDocumentRegionList oldNodes = event.getOldStructuredDocumentRegions();
-		NodesEvent removedDTDNodes = new NodesEvent();
-		for (int i = 0; i < oldNodes.getLength(); i++) {
-			IStructuredDocumentRegion flatNode = oldNodes.item(i);
-
-			for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-				DTDNode node = (DTDNode) iter.next();
-				if (node.getStructuredDTDDocumentRegion() == flatNode) {
-					removedDTDNodes.add(node);
-				}
-			}
-		}
-
-		buildNodes(event.getNewStructuredDocumentRegions());
-
-		if (removedDTDNodes.getNodes().size() > 0) {
-			notifyNodesRemoved(removedDTDNodes);
-			removeNodes(removedDTDNodes.getNodes());
-		}
-	}
-
-	public void notifyNodeChanged(DTDNode node) {
-		Iterator iter = modelListeners.iterator();
-		while (iter.hasNext()) {
-			IDTDFileListener listener = (IDTDFileListener) iter.next();
-			listener.nodeChanged(node);
-		}
-	}
-
-	public void notifyNodesAdded(NodesEvent addedNodes) {
-		Iterator iter = modelListeners.iterator();
-		while (iter.hasNext()) {
-			IDTDFileListener listener = (IDTDFileListener) iter.next();
-			listener.nodesAdded(addedNodes);
-		}
-	}
-
-	protected void notifyNodesRemoved(NodesEvent event) {
-		Iterator iter = modelListeners.iterator();
-		while (iter.hasNext()) {
-			IDTDFileListener listener = (IDTDFileListener) iter.next();
-			listener.nodesRemoved(event);
-		}
-	}
-
-	public void rebuildNodes(List nodes) {
-		// remove the old nodes
-		removeNodes(nodes);
-
-		// now rebuild them
-		NodesEvent addedDTDNodes = new NodesEvent();
-		Iterator dtdNodes = nodes.iterator();
-		while (dtdNodes.hasNext()) {
-			DTDNode dtdNode = (DTDNode) dtdNodes.next();
-			// System.out.println("rebuilding " +
-			// dtdNode.getStructuredDocumentRegion().getText());
-
-			DTDNode node = buildNode(dtdNode.getStructuredDTDDocumentRegion());
-			if (node != null) {
-				addedDTDNodes.add(node);
-			}
-		}
-		if (addedDTDNodes.getNodes().size() > 0) {
-			// now tell people about the additions
-			notifyNodesAdded(addedDTDNodes);
-		}
-	}
-
-	public void regionChanged(RegionChangedEvent event) {
-		ITextRegion changedRegion = event.getRegion();
-		IStructuredDocumentRegion flatNode = event.getStructuredDocumentRegion();
-		DTDNode affectedNode = (DTDNode) getNodeAt(flatNode.getStartOffset(changedRegion), flatNode.getEndOffset(changedRegion));
-		if (affectedNode != null) {
-			// no need to resolve regions as it is just a change
-			// affectedNode.resolveRegions();
-			notifyNodeChanged(affectedNode);
-		}
-	}
-
-	public void regionsReplaced(RegionsReplacedEvent event) {
-		List nodesToRebuild = new ArrayList();
-		IStructuredDocumentRegion flatNode = event.getStructuredDocumentRegion();
-		DTDNode affectedNode = getNode(flatNode);
-
-		if (!isSameTopLevelType(affectedNode)) {
-			nodesToRebuild.add(affectedNode);
-			rebuildNodes(nodesToRebuild);
-		}
-		else {
-			affectedNode.resolveRegions();
-			notifyNodeChanged(affectedNode);
-			// now try and determine which ones were added
-			NodesEvent addedDTDNodes = new NodesEvent();
-			ITextRegionList newRegions = event.getNewRegions();
-			int size = newRegions.size();
-			for (int i = 0; i < size; i++) {
-				ITextRegion region = newRegions.get(i);
-				DTDNode deepestNode = affectedNode.getDeepestNode(flatNode.getStartOffset(region), flatNode.getEndOffset(region));
-				if (!addedDTDNodes.getNodes().contains(deepestNode)) {
-					addedDTDNodes.add(deepestNode);
-				}
-			}
-			if (addedDTDNodes.getNodes().size() > 0) {
-				notifyNodesAdded(addedDTDNodes);
-			}
-		}
-	}
-
-	public void removeDTDFileListener(IDTDFileListener listener) {
-		modelListeners.remove(listener);
-	}
-
-	protected void removeNodes(List nodes) {
-		getNodes().removeAll(nodes);
-		/*
-		 * for (int i = 0; i < nodes.size(); i++) {
-		 * removeChild((DTDNode)nodes.get(i)); } // end of for ()
-		 */
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDNode.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDNode.java
deleted file mode 100644
index b15037c..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDNode.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.text.RegionIterator;
-import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.text.TextRegionListImpl;
-import org.eclipse.wst.xml.core.internal.document.NodeContainer;
-import org.w3c.dom.Node;
-
-
-public abstract class DTDNode extends NodeContainer implements IndexedRegion {
-
-	// these are characteroffsets
-	protected DTDFile dtdFile;
-
-	// flat node that contains this node
-	protected IStructuredDocumentRegion flatNode;
-
-	protected TextRegionListImpl regions = new TextRegionListImpl();
-
-	protected TextRegionListImpl whitespace = new TextRegionListImpl();
-
-	public DTDNode(DTDFile dtdFile, IStructuredDocumentRegion flatNode) {
-		this.dtdFile = dtdFile;
-		this.flatNode = flatNode;
-	}
-
-	public void addRegion(ITextRegion region) {
-		/*
-		 * if (startRegion == null) { startRegion = region; } endRegion =
-		 * region;
-		 */
-		regions.add(region);
-	}
-
-	public void addWhitespaceRegion(ITextRegion region) {
-		whitespace.add(region);
-	}
-
-	public void beginRecording(Object requestor, String label) {
-		getDTDFile().getDTDModel().beginRecording(requestor, label);
-	}
-
-	public Node cloneNode(boolean deepest) {
-		return null;
-	}
-
-	public boolean contains(int testPosition) {
-		return containsRange(testPosition, testPosition);
-	}
-
-	public boolean containsRange(int start, int end) {
-		return getStartOffset() <= start && end <= getEndOffset();
-	}
-
-	public void delete(DTDNode child) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_NODE_DELETE); //$NON-NLS-1$
-		delete(this, child);
-		endRecording(this);
-	}
-
-	public void delete(Object requestor, DTDNode child) {
-		replaceText(requestor, child.getStartOffset(), child.getFullNodeLength(), ""); //$NON-NLS-1$
-	}
-
-	public void endRecording(Object requestor) {
-		getDTDFile().getDTDModel().endRecording(requestor);
-	}
-
-	public Object[] getChildren() {
-		return getChildrenList().toArray();
-	}
-
-	public List getChildrenList() {
-		Node child = getFirstChild();
-		if (child != null) {
-			List children = new ArrayList();
-			for (; child != null; child = child.getNextSibling()) {
-				children.add(child);
-			}
-			return children;
-		}
-		else {
-			return Collections.EMPTY_LIST;
-		}
-	}
-
-	public DTDNode getDeepestNode(int offset) {
-		if (contains(offset)) {
-			// now see if a child contains this offset
-			Object[] children = getChildren();
-			for (int i = 0; i < children.length; i++) {
-				DTDNode child = (DTDNode) children[i];
-				DTDNode deepest = child.getDeepestNode(offset);
-				if (deepest != null) {
-					return deepest;
-				}
-			} // end of for ()
-			return this;
-		}
-		return null;
-	}
-
-	public DTDNode getDeepestNode(int start, int end) {
-		if (containsRange(start, end)) {
-			// now see if a child contains this offset
-			Object[] children = getChildren();
-			for (int i = 0; i < children.length; i++) {
-				DTDNode child = (DTDNode) children[i];
-				DTDNode deepest = child.getDeepestNode(start, end);
-				if (deepest != null) {
-					return deepest;
-				}
-			} // end of for ()
-			return this;
-		}
-		return null;
-	}
-
-	public DTDFile getDTDFile() {
-		return dtdFile;
-	}
-
-	public int getEndOffset() {
-		return getStructuredDTDDocumentRegion().getEndOffset(getEndRegion());
-	}
-
-	public ITextRegion getEndRegion() {
-		return regions.get(regions.size() - 1);// endRegion;
-	}
-
-	/**
-	 */
-	public FactoryRegistry getFactoryRegistry() {
-		DTDModelImpl model = dtdFile.getDTDModel();
-		if (model != null) {
-			FactoryRegistry reg = model.getFactoryRegistry();
-			if (reg != null)
-				return reg;
-		}
-		return null;
-	}
-
-	public int getFullNodeLength() {
-		return getWhitespaceEndOffset() - getStartOffset();
-	}
-
-	public String getFullNodeText() {
-		String text = getNodeText();
-		if (whitespace.size() > 0) {
-			RegionIterator iter = new RegionIterator(whitespace);
-			while (iter.hasNext()) {
-				ITextRegion region = iter.next();
-				text += getStructuredDTDDocumentRegion().getText(region);
-			}
-		}
-		return text;
-	}
-
-	abstract public Image getImage();
-
-	public String getName() {
-		ITextRegion region = getNameRegion();
-		if (region != null) {
-			return getStructuredDTDDocumentRegion().getText(region);
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public ITextRegion getNameRegion() {
-		RegionIterator iter = iterator();
-		while (iter.hasNext()) {
-			ITextRegion region = iter.next();
-			if (region.getType() == DTDRegionTypes.NAME) {
-				return region;
-			}
-		}
-		return null;
-	}
-
-	// return the first token containing the specified token type
-	public ITextRegion getNextRegion(RegionIterator iter, String type) {
-		while (iter.hasNext()) {
-			ITextRegion region = iter.next();
-			if (region.getType().equals(type)) {
-				return region;
-			}
-		}
-		return null;
-	}
-
-	public int getNodeLength() {
-		return getEndOffset() - getStartOffset();
-	}
-
-	public String getNodeName() {
-		return getName();
-	}
-
-	public String getNodeText() {
-		StringBuffer sb = new StringBuffer();
-
-		RegionIterator iter = iterator();
-		while (iter.hasNext()) {
-			ITextRegion region = iter.next();
-			sb.append(getStructuredDTDDocumentRegion().getText(region));
-		}
-		return sb.toString();
-	}
-
-	public short getNodeType() {
-		return -1;
-	}
-
-	public int getStartOffset() {
-		return getStructuredDTDDocumentRegion().getStartOffset(getStartRegion());
-	}
-
-	// private Region startRegion,endRegion;
-	public ITextRegion getStartRegion() {
-		return regions.get(0);
-		// return startRegion;
-	}
-
-	/**
-	 * Get the value of flatNode.
-	 * 
-	 * @return value of flatNode.
-	 * 
-	 * ISSUE:named changed not to be confused with default access protected
-	 * super class method, but should re-think if this is correct technique.
-	 * Perhaps getFirstRegion?
-	 */
-	public IStructuredDocumentRegion getStructuredDTDDocumentRegion() {
-		return flatNode;
-	}
-
-	// return end offset including whitespace
-	// or just the end offset if there is no whitespace
-	public int getWhitespaceEndOffset() {
-		if (whitespace.size() > 0) {
-			ITextRegion region = whitespace.get(whitespace.size() - 1);
-			return getStructuredDTDDocumentRegion().getEndOffset(region);
-		}
-
-		return getEndOffset();
-	}
-
-	public boolean hasTrailingWhitespace() {
-		return whitespace.size() > 0;
-	}
-
-	public RegionIterator iterator() {
-		// System.out.println("create region iter " + this.getClass() + " with
-		// start , end = " + getStartOffset() + ", " +getEndOffset());
-		return new RegionIterator(regions);
-	}
-
-	public void replaceText(Object requestor, int start, int length, String newText) {
-		getDTDFile().getStructuredDocument().replaceText(requestor, start, length, newText);
-	}
-
-	public void resolveRegions() {
-	}
-
-	public void setName(Object requestor, String name) {
-		if (!getName().equals(name)) {
-			ITextRegion nameRegion = getNameRegion();
-			if (nameRegion != null) {
-				// nameToken.updateText(name);
-				getDTDFile().getDTDModel().getReferenceUpdater().nameAboutToChange(requestor, this, name);
-				replaceText(requestor, getStructuredDTDDocumentRegion().getStartOffset(nameRegion), nameRegion.getLength(), name);
-			}
-		}
-	}
-
-	public void setName(String name) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_NODE_NAME_CHG); //$NON-NLS-1$
-		setName(this, name);
-		endRecording(this);
-	}
-
-	/**
-	 * Set the value of flatNode.
-	 * 
-	 * @param v
-	 *            Value to assign to flatNode. ISSUE:named changed not to be
-	 *            confused with default access protected super class method,
-	 *            but should re-think if this is correct technique
-	 */
-	void setStructuredDTDDocumentRegion(IStructuredDocumentRegion v) {
-		this.flatNode = v;
-	}
-
-	// skips past next name token in the iterator
-	protected void skipPastName(RegionIterator iter) {
-		while (iter.hasNext()) {
-			ITextRegion currentRegion = iter.next();
-			if (currentRegion.getType() == DTDRegionTypes.NAME) {
-				break;
-			}
-		}
-	}
-
-	public boolean supports(java.lang.String feature, java.lang.String version) {
-		return false;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDResource.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDResource.java
deleted file mode 100644
index c7d2440..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDResource.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-
-public interface DTDResource {
-	// Enumeration Constants
-	public static final String ANYICON = "icons/full/obj16/any.gif"; //$NON-NLS-1$
-	public static final String ATTRIBUTEICON = "icons/full/obj16/attribute.gif"; //$NON-NLS-1$
-	public static final String ATTRIBUTELISTICON = "icons/full/obj16/attribute_list.gif"; //$NON-NLS-1$
-	public static final String COMMENTICON = "icons/full/obj16/comment.gif"; //$NON-NLS-1$
-
-	public static final String DTDFILEICON = "icons/full/obj16/DTDFile.gif"; //$NON-NLS-1$
-	public static final String ELEMENTICON = "icons/full/obj16/element.gif"; //$NON-NLS-1$
-	public static final String ELEMENTREFICON = "icons/full/obj16/element_ref.gif"; //$NON-NLS-1$
-	public static final String EMPTYICON = "icons/full/obj16/emptycontent.gif"; //$NON-NLS-1$
-	public static final String ENTITYICON = "icons/full/obj16/entity.gif"; //$NON-NLS-1$
-	public static final String ENTITYREFERENCEICON = "icons/full/obj16/entity_reference.gif"; //$NON-NLS-1$
-	public static final String FLDR_ATTLIST = "icons/full/obj16/folder_attlist_obj.gif"; //$NON-NLS-1$
-	public static final String FLDR_COMM = "icons/full/obj16/folder_comments_obj.gif"; //$NON-NLS-1$
-
-	public static final String FLDR_EL = "icons/full/obj16/fldr_el.gif"; //$NON-NLS-1$
-	public static final String FLDR_ENT = "icons/full/obj16/fldr_ent.gif"; //$NON-NLS-1$
-	public static final String FLDR_NOT = "icons/full/obj16/fldr_not.gif"; //$NON-NLS-1$
-	public static final String FLDR_UNREC = "icons/full/obj16/fldr_unrec.gif"; //$NON-NLS-1$
-
-	public static final String NEWHTMLFORM = "icons/full/obj16/genhtmform_wiz.gif"; //$NON-NLS-1$
-	public static final String NOTATIONICON = "icons/full/obj16/notation.gif"; //$NON-NLS-1$
-
-	public static final String ONECHOICEICON = "icons/full/obj16/onechoice.gif"; //$NON-NLS-1$
-
-	public static final String ONEICON = "icons/full/obj16/one.gif"; //$NON-NLS-1$
-	public static final String ONEORMORECHOICEICON = "icons/full/obj16/oneormorechoice.gif"; //$NON-NLS-1$
-	public static final String ONEORMOREICON = "icons/full/obj16/oneormore.gif"; //$NON-NLS-1$
-	public static final String ONEORMORESEQUENCEICON = "icons/full/obj16/oneormoresequence.gif"; //$NON-NLS-1$
-
-	public static final String ONESEQUENCEICON = "icons/full/obj16/onesequence.gif"; //$NON-NLS-1$
-	public static final String OPTIONALCHOICEICON = "icons/full/obj16/optionalchoice.gif"; //$NON-NLS-1$
-	public static final String OPTIONALICON = "icons/full/obj16/optional.gif"; //$NON-NLS-1$
-	public static final String OPTIONALSEQUENCEICON = "icons/full/obj16/optionalsequence.gif"; //$NON-NLS-1$
-	public static final String PCDATAICON = "icons/full/obj16/txtext.gif"; //$NON-NLS-1$
-	public static final String UNRECOGNIZEDICON = "icons/full/obj16/unrecognized_content.gif"; //$NON-NLS-1$
-	public static final String ZEROORMORECHOICEICON = "icons/full/obj16/zeroormorechoice.gif"; //$NON-NLS-1$
-	public static final String ZEROORMOREICON = "icons/full/obj16/zeroormore.gif"; //$NON-NLS-1$
-	public static final String ZEROORMORESEQUENCEICON = "icons/full/obj16/zeroormoresequence.gif"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Element.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Element.java
deleted file mode 100644
index 989b57e..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Element.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.text.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.w3c.dom.Node;
-
-
-public class Element extends NamedTopLevelNode {
-
-	List attListList = new ArrayList();
-
-	List attributes = new ArrayList();
-
-	protected CMNode contentModel;
-
-	public Element(DTDFile dtdFile, IStructuredDocumentRegion flatNode) {
-		super(dtdFile, flatNode, DTDRegionTypes.ELEMENT_TAG);
-	}
-
-	public void addAttribute(String name) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_ELEMENT_ADD_ATTR); //$NON-NLS-1$
-		List attLists = getAttributeLists();
-		if (attLists.size() == 0) {
-			getDTDFile().createAttributeList(this, getName(), true);
-			attLists = getAttributeLists();
-		}
-		if (attLists.size() > 0) {
-			AttributeList attList = (AttributeList) attLists.get(attLists.size() - 1);
-			attList.addAttribute(name);
-		}
-		endRecording(this);
-	}
-
-	public void addChild() {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_ELEMENT_ADD_CHILD); //$NON-NLS-1$
-		addContent(this, " EMPTY"); //$NON-NLS-1$
-		endRecording(this);
-	}
-
-	protected void addContent(Object requestor, String content) {
-		ITextRegion whitespace = getWhitespaceAfterName();
-		int startOffset = 0;
-		int length = 0;
-		if (whitespace != null) {
-			startOffset = getStructuredDTDDocumentRegion().getStartOffset(whitespace);
-			length = whitespace.getLength() >= 2 ? 1 : 0;
-		}
-		else {
-			ITextRegion nameRegion = getNameRegion();
-			if (nameRegion != null) {
-				startOffset = getStructuredDTDDocumentRegion().getEndOffset(nameRegion);
-			}
-			else {
-				ITextRegion elementTag = getNextRegion(iterator(), DTDRegionTypes.ELEMENT_TAG);
-				startOffset = getStructuredDTDDocumentRegion().getEndOffset(elementTag);
-			}
-		}
-		replaceText(requestor, startOffset, length, content);
-	}
-
-	public void addGroup() {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_ELEMENT_ADD_GRP); //$NON-NLS-1$
-		addContent(this, " ()"); //$NON-NLS-1$
-		endRecording(this);
-	}
-
-	public Node cloneNode(boolean deep) {
-		return new Element(dtdFile, flatNode);
-	}
-
-	public List getAttributeLists() {
-		attListList.clear();
-		String elementName = getName();
-		Iterator iter = dtdFile.getNodes().iterator();
-		while (iter.hasNext()) {
-			DTDNode node = (DTDNode) iter.next();
-			if (node instanceof AttributeList && node.getName().equals(elementName)) {
-				attListList.add(node);
-			}
-		}
-		return attListList;
-	}
-
-
-
-	public CMNode getContentModel() {
-		// Object[] children = getChildren()
-		return (CMNode) getFirstChild();// contentModel;
-	}
-
-	public List getElementAttributes() {
-		attributes.clear();
-		Iterator attLists = getAttributeLists().iterator();
-		while (attLists.hasNext()) {
-			AttributeList attList = (AttributeList) attLists.next();
-
-			Object[] children = attList.getChildren();
-			for (int i = 0; i < children.length; i++) {
-				attributes.add(children[i]);
-			}
-		}
-		return attributes;
-	}
-
-	public Image getImage() {
-		return DTDCorePlugin.getInstance().getImage(DTDResource.ELEMENTICON);
-	}
-
-	public short getNodeType() {
-		return Node.ELEMENT_NODE;
-	}
-
-	public void replaceContentModel(Object requestor, CMNode node) {
-		int offset = 0;
-		int length = 0;
-		String nodeText = node.getNodeText();
-		CMNode contentModel = getContentModel();
-		if (contentModel != null) {
-			offset = contentModel.getStartOffset();
-			length = contentModel.getWhitespaceEndOffset() - offset;
-			replaceText(requestor, offset, length, nodeText);
-		}
-		else {
-			addContent(requestor, nodeText);
-		}
-	}
-
-	public void resolveRegions() {
-		// System.out.println("element node stream = " +
-		// tokenStream.getString());
-		contentModel = null;
-		removeChildNodes();
-		RegionIterator iter = iterator();
-
-		if (getNameRegion() != null) {
-			// we skip past the name token is our name
-			skipPastName(iter);
-		}
-
-		while (iter.hasNext()) {
-			ITextRegion currentRegion = iter.next();
-
-			if (contentModel == null) {
-				if (currentRegion.getType().equals(DTDRegionTypes.NAME)) {
-					contentModel = new CMBasicNode(getDTDFile(), getStructuredDTDDocumentRegion());
-				}
-				else if (currentRegion.getType().equals(DTDRegionTypes.CONTENT_PCDATA)) {
-					contentModel = new CMBasicNode(getDTDFile(), getStructuredDTDDocumentRegion());
-				}
-				else if (currentRegion.getType().equals(DTDRegionTypes.LEFT_PAREN)) {
-					contentModel = new CMGroupNode(getDTDFile(), getStructuredDTDDocumentRegion());
-				}
-			}
-
-			if (contentModel != null) {
-				if (!currentRegion.getType().equals(DTDRegionTypes.END_TAG)) {
-					// content model gets all regions except for the '>'
-					contentModel.addRegion(currentRegion);
-				}
-				else {
-					// if it is equal to the end tag, then don't add anymore
-					// regions
-					// for the content model
-					break;
-				}
-
-			}
-
-		}
-		if (contentModel != null) {
-			appendChild(contentModel);
-			// this is the root element content so set it true
-			contentModel.setRootElementContent(true);
-			// now tell the content model to resolve it's regions
-			contentModel.resolveRegions();
-
-		}
-	}
-
-	public void setContentModel(CMNode contentModel) {
-		this.contentModel = contentModel;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Entity.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Entity.java
deleted file mode 100644
index 2ed2f42..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Entity.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.text.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-// external node contains code to help set and get public ids
-public class Entity extends ExternalNode {
-
-	private static String setExternalEntity = DTDCoreMessages._UI_LABEL_ENTITY_SET_EXT_ENTITY; //$NON-NLS-1$
-	private static String setGeneralEntity = DTDCoreMessages._UI_LABEL_ENTITY_SET_GENERAL_ENTITY; //$NON-NLS-1$
-	private static String setInternalEntity = DTDCoreMessages._UI_LABEL_ENTITY_SET_INT_ENTITY; //$NON-NLS-1$
-
-	private static String setParameterEntity = DTDCoreMessages._UI_LABEL_ENTITY_SET_PARM_ENTITY; //$NON-NLS-1$
-
-	public Entity(DTDFile file, IStructuredDocumentRegion flatNode) {
-		super(file, flatNode, DTDRegionTypes.ENTITY_TAG);
-	}
-
-	public Image getImage() {
-		return DTDCorePlugin.getInstance().getImage(DTDResource.ENTITYICON);
-	}
-
-
-	/**
-	 * Get the value of notationName.
-	 * 
-	 * @return value of notationName.
-	 */
-	public String getNotationName() {
-		ITextRegion ndataRegion = getNextRegion(iterator(), DTDRegionTypes.NDATA_VALUE);
-		if (ndataRegion != null) {
-			return getStructuredDTDDocumentRegion().getText(ndataRegion);
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public ITextRegion getPercentRegion() {
-		return getNextRegion(iterator(), DTDRegionTypes.PERCENT);
-	}
-
-	/**
-	 * Get the value of value.
-	 * 
-	 * @return value of value.
-	 */
-	public String getValue() {
-		if (!isExternalEntity()) {
-			ITextRegion valueRegion = getNextQuotedLiteral(iterator());
-			if (valueRegion != null) {
-				return getValueFromQuotedRegion(valueRegion);
-			}
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the value of externalEntity.
-	 * 
-	 * @return value of externalEntity.
-	 */
-	public boolean isExternalEntity() {
-		return getPublicKeywordRegion(iterator()) != null || getSystemKeywordRegion(iterator()) != null;
-	}
-
-	/**
-	 * Get the value of isParameterEntity.
-	 * 
-	 * @return value of isParameterEntity.
-	 */
-	public boolean isParameterEntity() {
-		return getPercentRegion() != null;
-	}
-
-	private void removeNData(Object requestor) {
-		ITextRegion ndataRegion = null;
-
-		// see if we have an NDATA keyword
-		ndataRegion = getNextRegion(iterator(), DTDRegionTypes.NDATA_KEYWORD);
-		int startOffset = 0, endOffset = 0;
-		if (ndataRegion != null) {
-			startOffset = getStructuredDTDDocumentRegion().getStartOffset(ndataRegion);
-			endOffset = getStructuredDTDDocumentRegion().getEndOffset(ndataRegion);
-		}
-		ITextRegion value = getNextRegion(iterator(), DTDRegionTypes.NDATA_VALUE);
-		if (value != null) {
-			if (startOffset == 0) {
-				startOffset = getStructuredDTDDocumentRegion().getStartOffset(value);
-			}
-			endOffset = getStructuredDTDDocumentRegion().getEndOffset(value);
-		}
-		replaceText(requestor, startOffset, endOffset - startOffset, ""); //$NON-NLS-1$
-	}
-
-	/**
-	 * Set the value of externalEntity.
-	 * 
-	 * @param v
-	 *            Value to assign to externalEntity.
-	 */
-	public void setExternalEntity(boolean isExternalEntity) {
-		if (isExternalEntity() != isExternalEntity) {
-			// externalEntity = v;
-			beginRecording(this, isExternalEntity ? setExternalEntity : setInternalEntity);
-			if (isExternalEntity) {
-				// we need to get rid of the value literal
-				ITextRegion quote = getNextRegion(iterator(), DTDRegionTypes.SINGLEQUOTED_LITERAL);
-				if (quote == null) {
-					quote = getNextRegion(iterator(), DTDRegionTypes.DOUBLEQUOTED_LITERAL);
-				}
-				if (quote != null) {
-					replaceText(this, getStructuredDTDDocumentRegion().getStartOffset(quote), quote.getLength(), ""); //$NON-NLS-1$
-				}
-				setSystemID(""); //$NON-NLS-1$
-			}
-			else {
-				// we need to get rid of text between end of name region and
-				// the last double quoted literal
-				RegionIterator iter = iterator();
-				ITextRegion keyword = getSystemKeywordRegion(iter);
-				int startOffset = 0;
-				int length = 0;
-				if (keyword == null) {
-					// reset the iterator
-					iter = iterator();
-					keyword = getPublicKeywordRegion(iter);
-				}
-				if (keyword != null) {
-					startOffset = getStructuredDTDDocumentRegion().getStartOffset(keyword);
-					// start with a length just equal to the keyword for now
-					length = keyword.getLength();
-				}
-				else {
-					// reset the iterator since we didn't find the keyword
-					iter = iterator();
-					// just go from after the name
-					startOffset = getStructuredDTDDocumentRegion().getEndOffset(getNameRegion());
-				}
-
-				// now that we have the start, look for the end
-				ITextRegion lastRegion = null;
-
-				if (lastRegion == null) {
-					// then look for last quoted literal
-					while (iter.hasNext()) {
-						ITextRegion literal = getNextQuotedLiteral(iter);
-						if (literal != null) {
-							lastRegion = literal;
-						}
-					}
-				}
-
-				if (lastRegion != null) {
-					length = getStructuredDTDDocumentRegion().getEndOffset(lastRegion) - startOffset;
-				}
-				replaceText(this, startOffset, length, "\"\""); //$NON-NLS-1$
-				removeNData(this);
-			}
-			endRecording(this);
-		}
-	}
-
-	public void setNotationName(Object requestor, String newNotation) {
-		if (!getNotationName().equals(newNotation)) {
-			if (!newNotation.equals("")) { //$NON-NLS-1$
-				// 
-				ITextRegion ndataRegion = getNextRegion(iterator(), DTDRegionTypes.NDATA_VALUE);
-				if (ndataRegion != null) {
-					replaceText(requestor, getStructuredDTDDocumentRegion().getStartOffset(ndataRegion), ndataRegion.getLength(), newNotation);
-				}
-				else {
-					// time to create one
-					int startOffset = 0;
-					String string = ""; //$NON-NLS-1$
-					RegionIterator iter = iterator();
-					ITextRegion ndataKeyword = getNextRegion(iter, DTDRegionTypes.NDATA_KEYWORD);
-					if (ndataKeyword == null) {
-						// we'll need to create one after the last quoted
-						// literal
-						// Reset iterator
-						string += " NDATA "; //$NON-NLS-1$
-						iter = iterator();
-						ITextRegion lastQuotedLiteral = null;
-						while (iter.hasNext()) {
-							ITextRegion literal = getNextQuotedLiteral(iter);
-							if (literal != null) {
-								lastQuotedLiteral = literal;
-							}
-						}
-						if (lastQuotedLiteral != null) {
-							startOffset = getStructuredDTDDocumentRegion().getEndOffset(lastQuotedLiteral);
-						}
-						else {
-							// created after the system or public keyword
-							ITextRegion keyword = getPublicKeywordRegion(iterator());
-							if (keyword == null) {
-								keyword = getSystemKeywordRegion(iterator());
-							}
-							// we shouldn't be null here since we check if we
-							// were external already
-							startOffset = getStructuredDTDDocumentRegion().getEndOffset(keyword);
-						}
-
-					}
-					else {
-						startOffset = getStructuredDTDDocumentRegion().getEndOffset(ndataKeyword);
-					}
-					replaceText(requestor, startOffset, 0, string + newNotation);
-				}
-			}
-			else {
-				// need to remove the ndata stuff
-				removeNData(requestor);
-			}
-		}
-	}
-
-	/**
-	 * Set the value of notationName.
-	 * 
-	 * @param newNotation
-	 *            Value to assign to notationName.
-	 */
-	public void setNotationName(String newNotation) {
-		beginRecording(this, "NDATA " + DTDCoreMessages._UI_LABEL_ENTITY_NDATA_CHANGE); //$NON-NLS-1$ //$NON-NLS-2$
-		setNotationName(this, newNotation);
-		endRecording(this);
-	}
-
-	/**
-	 * Set the value of isParameterEntity.
-	 * 
-	 * @param v
-	 *            Value to assign to isParameterEntity.
-	 */
-	public void setParameterEntity(boolean v) {
-		if (isParameterEntity() != v) {
-			beginRecording(this, v ? setParameterEntity : setGeneralEntity);
-			if (v) {
-				RegionIterator iter = iterator();
-				ITextRegion startTag = getNextRegion(iter, DTDRegionTypes.ENTITY_TAG);
-				int startOffset = 0, length = 0;
-
-				if (iter.hasNext()) {
-					ITextRegion region = iter.next();
-					startOffset = getStructuredDTDDocumentRegion().getStartOffset(region);
-					if (region.getType() == DTDRegionTypes.WHITESPACE && region.getLength() > 1) {
-						length = 1;
-					}
-				}
-				else {
-					startOffset = getStructuredDTDDocumentRegion().getEndOffset(startTag);
-				}
-				replaceText(this, startOffset, length, " %"); //$NON-NLS-1$
-				// now get rid of any NData since it is only allowed if the
-				// entity is a general entity and not a parameter entity
-				removeNData(this);
-			}
-			else {
-				// get rid of percent region
-				ITextRegion percentRegion = getPercentRegion();
-				replaceText(this, getStructuredDTDDocumentRegion().getStartOffset(percentRegion), percentRegion.getLength(), ""); //$NON-NLS-1$
-			}
-
-			endRecording(this);
-		}
-	}
-
-	/**
-	 * Set the value of value.
-	 * 
-	 * @param v
-	 *            Value to assign to value.
-	 */
-	public void setValue(Object requestor, String v) {
-		if (!isExternalEntity()) {
-			if (!getValue().equals(v)) {
-				// then it makes sense to change the value
-				ITextRegion valueRegion = getNextQuotedLiteral(iterator());
-				String quoteChar = v.indexOf("\"") == -1 ? "\"" : "'"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				if (valueRegion != null) {
-					replaceText(requestor, getStructuredDTDDocumentRegion().getStartOffset(valueRegion), valueRegion.getLength(), quoteChar + v + quoteChar);
-				}
-				else {
-					int startOffset = 0;
-					RegionIterator iter = iterator();
-					ITextRegion region = getNextRegion(iter, DTDRegionTypes.NAME);
-					if (region == null) {
-						// create it after the percent if there is one
-						region = getPercentRegion();
-					}
-					if (region == null) {
-						// if still null, then create it after the element tag
-						region = getStartTag(iterator());
-					}
-
-					if (region != null) {
-						startOffset = getStructuredDTDDocumentRegion().getEndOffset(region);
-						replaceText(requestor, startOffset, 0, quoteChar + v + quoteChar);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Set the value of value.
-	 * 
-	 * @param v
-	 *            Value to assign to value.
-	 */
-	public void setValue(String v) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_ENTITY_VALUE_CHG); //$NON-NLS-1$
-		setValue(this, v);
-		endRecording(this);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/ExternalNode.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/ExternalNode.java
deleted file mode 100644
index bcf709d..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/ExternalNode.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.text.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-// base class for nodes that can contain external content
-public abstract class ExternalNode extends NamedTopLevelNode {
-
-	String publicID;
-
-	String systemID;
-
-	public ExternalNode(DTDFile file, IStructuredDocumentRegion flatNode, String tagType) {
-		super(file, flatNode, tagType);
-	}
-
-	public ITextRegion getNextQuotedLiteral(RegionIterator iter) {
-		while (iter.hasNext()) {
-			ITextRegion region = iter.next();
-			if (region.getType().equals(DTDRegionTypes.SINGLEQUOTED_LITERAL) || region.getType().equals(DTDRegionTypes.DOUBLEQUOTED_LITERAL)) {
-				return region;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Get the value of publicID.
-	 * 
-	 * @return value of publicID.
-	 */
-	public String getPublicID() {
-		ITextRegion publicValue = getPublicValueRegion();
-		if (publicValue != null) {
-			return getValueFromQuotedRegion(publicValue);
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public ITextRegion getPublicKeywordRegion(RegionIterator iter) {
-		return getNextRegion(iter, DTDRegionTypes.PUBLIC_KEYWORD);
-	}
-
-	public ITextRegion getPublicValueRegion() {
-		RegionIterator iter = iterator();
-
-		ITextRegion publicKeyword = getPublicKeywordRegion(iter);
-
-		if (publicKeyword != null && iter.hasNext()) {
-			ITextRegion quotedLiteral = getNextQuotedLiteral(iter);
-			if (quotedLiteral != null) {
-				return quotedLiteral;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Get the value of systemID.
-	 * 
-	 * @return value of systemID.
-	 */
-	public String getSystemID() {
-		ITextRegion systemValue = getSystemValueRegion();
-		if (systemValue != null) {
-			return getValueFromQuotedRegion(systemValue);
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public ITextRegion getSystemKeywordRegion(RegionIterator iter) {
-		return getNextRegion(iter, DTDRegionTypes.SYSTEM_KEYWORD);
-	}
-
-	public ITextRegion getSystemValueRegion() {
-		RegionIterator iter = iterator();
-
-		ITextRegion systemKeyword = getSystemKeywordRegion(iter);
-		if (systemKeyword != null && iter.hasNext()) {
-			ITextRegion quotedLiteral = getNextQuotedLiteral(iter);
-			if (quotedLiteral != null) {
-				return quotedLiteral;
-			}
-		}
-		else {
-			// try and see if there is a second quoted literal after a public
-			// keyword
-			iter = iterator();
-			ITextRegion publicKeyword = getPublicKeywordRegion(iter);
-
-			if (publicKeyword != null && iter.hasNext()) {
-				ITextRegion quotedLiteral = getNextQuotedLiteral(iter);
-				if (quotedLiteral != null && iter.hasNext()) {
-					// now get the second quoted literal
-					quotedLiteral = getNextQuotedLiteral(iter);
-					if (quotedLiteral != null) {
-						// got it!
-						return quotedLiteral;
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	public String getValueFromQuotedRegion(ITextRegion region) {
-		String type = region.getType();
-		if (type.equals(DTDRegionTypes.SINGLEQUOTED_LITERAL) || type.equals(DTDRegionTypes.DOUBLEQUOTED_LITERAL)) {
-			String text = getStructuredDTDDocumentRegion().getText(region);
-			return text.substring(1, text.length() - 1);
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Set the value of publicID.
-	 * 
-	 * @param v
-	 *            Value to assign to publicID.
-	 */
-	public void setPublicID(Object requestor, String v) {
-		if (!v.equals(publicID)) {
-			publicID = v;
-			ITextRegion publicValue = getPublicValueRegion();
-			ITextRegion publicKeyword = getPublicKeywordRegion(iterator());
-			ITextRegion systemKeyword = getSystemKeywordRegion(iterator());
-			ITextRegion systemValue = getSystemValueRegion();
-
-			if (v.equals("")) { //$NON-NLS-1$
-				if (publicKeyword != null) {
-					// time to get rid of the public keyword and value
-					// and replace it with the system one
-					int startOffset = getStructuredDTDDocumentRegion().getStartOffset(publicKeyword);
-					String newString = "SYSTEM"; //$NON-NLS-1$
-					if (systemValue == null) {
-						newString += " \"\""; //$NON-NLS-1$
-					}
-					replaceText(requestor, startOffset, getStructuredDTDDocumentRegion().getEndOffset(publicValue) - startOffset, newString);
-				}
-			}
-			else {
-				// here were setting a non empty value
-				String quoteChar = v.indexOf("\"") == -1 ? "\"" : "'"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				if (publicValue != null) {
-					replaceText(requestor, getStructuredDTDDocumentRegion().getStartOffset(publicValue), publicValue.getLength(), quoteChar + publicID + quoteChar);
-				}
-				else {
-					// time to create stuff
-					if (publicKeyword != null) {
-						// then just put our new value after the keyword
-						replaceText(requestor, getStructuredDTDDocumentRegion().getEndOffset(publicKeyword), 0, " " + quoteChar + v + quoteChar); //$NON-NLS-1$
-					}
-					else {
-						// we need the public keyword as well
-						if (systemKeyword != null) {
-							replaceText(requestor, getStructuredDTDDocumentRegion().getStartOffset(systemKeyword), systemKeyword.getLength(), "PUBLIC " + quoteChar + v + quoteChar); //$NON-NLS-1$
-						}
-						else {
-							ITextRegion nameRegion = getNameRegion();
-							replaceText(requestor, getStructuredDTDDocumentRegion().getEndOffset(nameRegion), 0, " PUBLIC " + quoteChar + v + quoteChar); //$NON-NLS-1$
-						}
-					}
-				}
-			}
-		}
-	}
-
-
-	/**
-	 * Set the value of publicID.
-	 * 
-	 * @param v
-	 *            Value to assign to publicID.
-	 */
-	public void setPublicID(String v) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_EXT_NODE_PUBLIC_ID_CHG); //$NON-NLS-1$
-		setPublicID(this, v);
-		endRecording(this);
-	}
-
-	/**
-	 * Set the value of systemID.
-	 * 
-	 * @param v
-	 *            Value to assign to systemID.
-	 */
-	public void setSystemID(Object requestor, String v) {
-		if (!v.equals(systemID) || (getPublicKeywordRegion(iterator()) == null && getSystemKeywordRegion(iterator()) == null)) {
-			systemID = v;
-			String quoteChar = v.indexOf("\"") == -1 ? "\"" : "'"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			ITextRegion systemValue = getSystemValueRegion();
-			if (systemValue != null) {
-				replaceText(requestor, getStructuredDTDDocumentRegion().getStartOffset(systemValue), systemValue.getLength(), quoteChar + systemID + quoteChar);
-			}
-			else {
-				ITextRegion systemKeyword = getSystemKeywordRegion(iterator());
-
-				// time to create stuff
-				if (systemKeyword != null) {
-					// then just put our new value after the keyword
-					replaceText(requestor, getStructuredDTDDocumentRegion().getEndOffset(systemKeyword), 0, " " + quoteChar + v + quoteChar); //$NON-NLS-1$
-				}
-				else {
-					// see if we have a public keyword
-					ITextRegion publicKeyword = getPublicKeywordRegion(iterator());
-					if (publicKeyword == null) {
-						ITextRegion nameRegion = getNameRegion();
-
-						replaceText(requestor, getStructuredDTDDocumentRegion().getEndOffset(nameRegion), 0, " SYSTEM " + quoteChar + v + quoteChar); //$NON-NLS-1$
-					}
-					else {
-						// put it after the public value region
-						ITextRegion publicValueRegion = getPublicValueRegion();
-						replaceText(requestor, getStructuredDTDDocumentRegion().getEndOffset(publicValueRegion), 0, " " + quoteChar + v + quoteChar); //$NON-NLS-1$
-					}
-
-				}
-			}
-
-		}
-	}
-
-
-	/**
-	 * Set the value of systemID.
-	 * 
-	 * @param v
-	 *            Value to assign to systemID.
-	 */
-	public void setSystemID(String v) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_EXT_NODE_SYSTEM_ID_CHG); //$NON-NLS-1$
-		setSystemID(this, v);
-		endRecording(this);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Logger.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Logger.java
deleted file mode 100644
index 39c11cb..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Logger.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.dtd.core"; //$NON-NLS-1$
-
-	public static final int ERROR = IStatus.ERROR; // 4
-	public static final int ERROR_DEBUG = 200 + ERROR;
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int INFO_DEBUG = 200 + INFO;
-
-	public static final int OK = IStatus.OK; // 0
-
-	public static final int OK_DEBUG = 200 + OK;
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int WARNING_DEBUG = 200 + WARNING;
-
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 *            OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null)
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * 
-	 * @param message
-	 *            text to print
-	 * @param category
-	 *            category of the message, to be compared with
-	 *            /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (!isDebugging())
-			return;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-					Bundle bundle = Platform.getBundle(PLUGIN_ID);
-					if (bundle != null)
-						Platform.getLog(bundle).log(statusObj);
-					return;
-				}
-			}
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/NamedTopLevelNode.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/NamedTopLevelNode.java
deleted file mode 100644
index bca29d4..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/NamedTopLevelNode.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.text.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-// interface for nodes that can exist at the top level in a dtdfile
-// eg. entity, notation, element, comment, attlist, or unrecognized stuff (ie
-// <junk dkfjdl>
-public abstract class NamedTopLevelNode extends TopLevelNode {
-
-	private String tagStartType;
-
-	public NamedTopLevelNode(DTDFile dtdFile, IStructuredDocumentRegion flatNode, String type) {
-		super(dtdFile, flatNode);
-		tagStartType = type;
-	}
-
-	public ITextRegion getNameRegion() {
-		// name region is located after the whitespace (which is after
-		// the elementtag
-		RegionIterator iter = iterator();
-		ITextRegion startTag = getNextRegion(iter, tagStartType);
-
-		if (!iter.hasNext()) {
-			return null;
-		}
-
-		ITextRegion region = iter.next();
-		if (!region.getType().equals(DTDRegionTypes.WHITESPACE)) {
-			return null;
-		}
-
-		if (!iter.hasNext()) {
-			return null;
-		}
-
-		region = iter.next();
-		if (region.getType().equals(DTDRegionTypes.NAME)) {
-			return region;
-		}
-
-		// we normally stop here, but for entities, we have to see if we are
-		// at a '%'. if so, we skip that and find the name after the
-		// whitespace again
-		if (tagStartType == DTDRegionTypes.ENTITY_TAG && region.getType().equals(DTDRegionTypes.PERCENT) && iter.hasNext()) {
-			region = iter.next();
-
-			if (!region.getType().equals(DTDRegionTypes.WHITESPACE)) {
-				return null;
-			}
-
-			if (!iter.hasNext()) {
-				return null;
-			}
-
-			region = iter.next();
-			if (region.getType().equals(DTDRegionTypes.NAME)) {
-				return region;
-			}
-		}
-
-		return null;
-	}
-
-	public ITextRegion getStartTag(RegionIterator iter) {
-		return getNextRegion(iter, tagStartType);
-	}
-
-	public ITextRegion getWhitespaceAfterName() {
-		ITextRegion nameRegion = getNameRegion();
-		RegionIterator iter = iterator();
-		// skip past the element tag region
-		ITextRegion elementTagRegion = getNextRegion(iter, tagStartType);
-		boolean foundName = false;
-		while (iter.hasNext()) {
-			ITextRegion region = iter.next();
-			if (!foundName && nameRegion != null && region == nameRegion) {
-				foundName = true;
-			}
-
-			if (region.getType().equals(DTDRegionTypes.WHITESPACE)) {
-				// there is no name region or we have already passed it
-				if (nameRegion == null || foundName) {
-					return region;
-				}
-			}
-		}
-		return null;
-	}
-
-	public void setName(Object requestor, String name) {
-		ITextRegion nameRegion = getNameRegion();
-		if (nameRegion != null) {
-			super.setName(requestor, name);
-		}
-		else {
-			RegionIterator iter = iterator();
-			ITextRegion elementTagRegion = getNextRegion(iter, tagStartType);
-			int replaceLength = 0;
-			if (iter.hasNext()) {
-				ITextRegion region = iter.next();
-				if (region.getType().equals(DTDRegionTypes.WHITESPACE)) {
-					if (region.getLength() >= 2) {
-						// there are 2 spaces between 'ELEMENT' and the
-						// content
-						// Change replace length to 1 so that the new name and
-						// the content are separated by a single space
-						replaceLength = 1;
-					}
-				}
-			}
-
-			// beginRecording(requestor, "Name Change");
-			String newText = " " + name; //$NON-NLS-1$
-			replaceText(requestor, getStructuredDTDDocumentRegion().getEndOffset(elementTagRegion), replaceLength, newText);
-			// endRecording(requestor);
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/NodeList.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/NodeList.java
deleted file mode 100644
index ba84128..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/NodeList.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-
-
-public class NodeList {
-	protected DTDFile dtdFile;
-
-	ArrayList listNodes = new ArrayList();
-
-	protected String listType;
-
-	public NodeList(DTDFile dtdFile, String tokenType) {
-		listType = tokenType;
-		this.dtdFile = dtdFile;
-	}
-
-	public Image getImage() {
-		if (listType == DTDRegionTypes.ELEMENT_TAG) {
-			return DTDCorePlugin.getInstance().getImage(DTDResource.FLDR_EL);
-		}
-		else if (listType == DTDRegionTypes.ENTITY_TAG) {
-			return DTDCorePlugin.getInstance().getImage(DTDResource.FLDR_ENT);
-		}
-		else if (listType == DTDRegionTypes.NOTATION_TAG) {
-			return DTDCorePlugin.getInstance().getImage(DTDResource.FLDR_NOT);
-		}
-		else if (listType == DTDRegionTypes.COMMENT_START) {
-			return DTDCorePlugin.getInstance().getImage(DTDResource.FLDR_COMM);
-		}
-		else if (listType == DTDRegionTypes.ATTLIST_TAG) {
-			return DTDCorePlugin.getInstance().getImage(DTDResource.FLDR_ATTLIST);
-		}
-		else if (listType == DTDRegionTypes.UNKNOWN_CONTENT) {
-			return DTDCorePlugin.getInstance().getImage(DTDResource.FLDR_UNREC);
-		}
-		else
-			return null;
-	}
-
-	public String getListType() {
-		return listType;
-	}
-
-	public String getName() {
-		if (listType == DTDRegionTypes.ELEMENT_TAG) {
-			return DTDCoreMessages._UI_LABEL_NODE_LIST_ELEMENTS; //$NON-NLS-1$
-		}
-		else if (listType == DTDRegionTypes.ENTITY_TAG) {
-			return DTDCoreMessages._UI_LABEL_NODE_LIST_ENTITIES; //$NON-NLS-1$
-		}
-		else if (listType == DTDRegionTypes.NOTATION_TAG) {
-			return DTDCoreMessages._UI_LABEL_NODE_LIST_NOTATIONS; //$NON-NLS-1$
-		}
-		else if (listType == DTDRegionTypes.COMMENT_START) {
-			return DTDCoreMessages._UI_LABEL_NODE_LIST_COMMENTS; //$NON-NLS-1$
-		}
-		else if (listType == DTDRegionTypes.ATTLIST_TAG) {
-			return DTDCoreMessages._UI_LABEL_NODE_LIST_ATTRIBUTES; //$NON-NLS-1$
-		}
-		else if (listType == DTDRegionTypes.UNKNOWN_CONTENT) {
-			return DTDCoreMessages._UI_LABEL_NODE_LIST_OTHER; //$NON-NLS-1$
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public ArrayList getNodes() {
-		listNodes.clear();
-		Iterator iter = dtdFile.getNodes().iterator();
-		while (iter.hasNext()) {
-			DTDNode node = (DTDNode) iter.next();
-			if (listType == DTDRegionTypes.ELEMENT_TAG && (node instanceof Element || node instanceof ParameterEntityReference)) {
-				listNodes.add(node);
-			}
-			else if (listType == DTDRegionTypes.ATTLIST_TAG && node instanceof AttributeList) {
-				listNodes.add(node);
-			}
-			else if (listType == DTDRegionTypes.ENTITY_TAG && node instanceof Entity) {
-				listNodes.add(node);
-			}
-			else if (listType == DTDRegionTypes.NOTATION_TAG && node instanceof Notation) {
-				listNodes.add(node);
-			}
-			else if (listType == DTDRegionTypes.COMMENT_START && node instanceof Comment) {
-				listNodes.add(node);
-			}
-			else if (listType == DTDRegionTypes.UNKNOWN_CONTENT && node instanceof Unrecognized) {
-				listNodes.add(node);
-			}
-		}
-		return listNodes;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Notation.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Notation.java
deleted file mode 100644
index e9a1ac5..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Notation.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-
-public class Notation extends ExternalNode {
-
-	public Notation(DTDFile file, IStructuredDocumentRegion flatNode) {
-		super(file, flatNode, DTDRegionTypes.NOTATION_TAG);
-	}
-
-	public Image getImage() {
-		return DTDCorePlugin.getInstance().getImage(DTDResource.NOTATIONICON);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/ParameterEntityReference.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/ParameterEntityReference.java
deleted file mode 100644
index cd51a05..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/ParameterEntityReference.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import java.util.List;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.text.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-public class ParameterEntityReference extends NamedTopLevelNode {
-
-
-
-	public class StartEndPair {
-		public int startOffset, endOffset;
-	}
-
-	private Entity cachedEntity = null;
-
-	public ParameterEntityReference(DTDFile file, IStructuredDocumentRegion flatNode) {
-		super(file, flatNode, DTDRegionTypes.COMMENT_START);
-	}
-
-	public Entity getEntityObject() {
-		if (cachedEntity != null && !cachedEntity.getName().equals(getReferencedEntity())) {
-			// if we have a cached entity, but the name doesnt match,
-			// null it now, so we perform a lookup
-			cachedEntity = null;
-		}
-
-		if (cachedEntity == null) {
-			List nodes = getDTDFile().getNodes();
-			for (int i = 0; i < nodes.size(); i++) {
-				DTDNode node = (DTDNode) nodes.get(i);
-				if (node instanceof Entity) {
-					Entity entity = (Entity) node;
-					if (entity.isParameterEntity() && entity.getName().equals(getReferencedEntity())) {
-						cachedEntity = entity;
-					}
-				}
-			}
-		}
-		return cachedEntity;
-	}
-
-	public Image getImage() {
-		return DTDCorePlugin.getInstance().getImage(DTDResource.ENTITYREFERENCEICON);
-	}
-
-	public String getName() {
-		return getStructuredDTDDocumentRegion().getText();
-	}
-
-	public String getReferencedEntity() {
-		String text = getName();
-		return getName().substring(1, text.length() - 1);
-	}
-
-	private void getStartAndEndOffsetForText(StartEndPair pair) {
-		RegionIterator iter = iterator();
-		ITextRegion commentStartTag = getStartTag(iter);
-		ITextRegion endCommentTag = getNextRegion(iter, DTDRegionTypes.COMMENT_END);
-		pair.endOffset = getStructuredDTDDocumentRegion().getEndOffset();
-		if (commentStartTag != null) {
-			pair.startOffset = getStructuredDTDDocumentRegion().getEndOffset(commentStartTag);
-		}
-		if (endCommentTag != null) {
-			pair.endOffset = getStructuredDTDDocumentRegion().getEndOffset(endCommentTag);
-		}
-	}
-
-	public String getText() {
-		String text = getStructuredDTDDocumentRegion().getText();
-		int flatNodeStart = getStructuredDTDDocumentRegion().getStartOffset();
-		StartEndPair pair = new StartEndPair();
-		getStartAndEndOffsetForText(pair);
-		return text.substring(pair.startOffset - flatNodeStart, pair.endOffset - flatNodeStart);
-	}
-
-	public void setReferencedEntity(Object requestor, String name) {
-		replaceText(requestor, getStructuredDTDDocumentRegion().getStartOffset(), getStructuredDTDDocumentRegion().getLength(), "%" + name + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void setReferencedEntity(String name) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_PARM_ENTITY_REF_CHG_ENTITY_REF); //$NON-NLS-1$
-		setReferencedEntity(this, name);
-		endRecording(this);
-	}
-
-	public void setText(String newText) {
-		beginRecording(this, DTDCoreMessages._UI_LABEL_PARM_ENTITY_REF_COMMENT_CHG); //$NON-NLS-1$
-		StartEndPair pair = new StartEndPair();
-		getStartAndEndOffsetForText(pair);
-		replaceText(this, pair.startOffset, pair.endOffset - pair.startOffset, newText);
-		endRecording(this);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/TopLevelNode.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/TopLevelNode.java
deleted file mode 100644
index 9ff2c8b..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/TopLevelNode.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.wst.dtd.core.internal.text.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-// interface for nodes that can exist at the top level in a dtdfile
-// eg. entity, notation, element, comment, attlist, or unrecognized stuff (ie
-// <junk dkfjdl>
-public abstract class TopLevelNode extends DTDNode {
-
-	private ArrayList flatNodes = new ArrayList();
-
-	public TopLevelNode(DTDFile dtdFile, IStructuredDocumentRegion flatNode) {
-		super(dtdFile, flatNode);
-		flatNodes.add(flatNode);
-	}
-
-	public void addWhitespaceStructuredDocumentRegion(IStructuredDocumentRegion node) {
-		flatNodes.add(node);
-	}
-
-	// specialize this so we delete the objects flat node range
-	// AND any whitespace
-	public void delete() {
-		beginRecording(getDTDFile(), DTDCoreMessages._UI_LABEL_TOP_LEVEL_NODE_DELETE); //$NON-NLS-1$
-		IStructuredDocumentRegion first = (IStructuredDocumentRegion) flatNodes.get(0);
-		IStructuredDocumentRegion last = (IStructuredDocumentRegion) flatNodes.get(flatNodes.size() - 1);
-		int startOffset = first.getStartOffset();
-		int endOffset = last.getEndOffset();
-
-		replaceText(getDTDFile(), startOffset, endOffset - startOffset, ""); //$NON-NLS-1$
-		endRecording(getDTDFile());
-	}
-
-	public ITextRegion getEndRegion() {
-		int size = flatNode.getRegions().size();
-		if (size > 0) {
-			return flatNode.getRegions().get(size - 1);
-		}
-		return null;
-	}
-
-	// includes what gettext gives us plus any whitespace
-	// trailing it
-	public String getFullText() {
-		StringBuffer sb = new StringBuffer();
-		Iterator iter = flatNodes.iterator();
-		while (iter.hasNext()) {
-			IStructuredDocumentRegion fNode = (IStructuredDocumentRegion) iter.next();
-			sb.append(fNode.getText());
-		}
-		return sb.toString();
-	}
-
-	public ITextRegion getStartRegion() {
-		if (flatNode.getRegions().size() > 0) {
-			return flatNode.getRegions().get(0);
-		}
-		return null;
-	}
-
-	public RegionIterator iterator() {
-		// System.out.println("create region iter " + this.getClass() + " with
-		// start , end = " + getStartOffset() + ", " +getEndOffset());
-		return new RegionIterator(flatNode, getStartOffset(), getEndOffset());
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Unrecognized.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Unrecognized.java
deleted file mode 100644
index b144b4f..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Unrecognized.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-
-public class Unrecognized extends TopLevelNode {
-
-	public Unrecognized(DTDFile file, IStructuredDocumentRegion flatNode) {
-		super(file, flatNode);
-	}
-
-	public Image getImage() {
-		return DTDCorePlugin.getInstance().getImage(DTDResource.UNRECOGNIZEDICON);
-	}
-
-	public String getName() {
-		String text = getStructuredDTDDocumentRegion().getText();
-		if (text.length() <= 30) {
-			return text;
-		}
-		else {
-			return text.substring(0, 29) + "..."; //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/content/ContentDescriberForDTD.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/content/ContentDescriberForDTD.java
deleted file mode 100644
index 0fad934..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/content/ContentDescriberForDTD.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.content;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.content.IContentDescriber;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.ITextContentDescriber;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IContentDescriptionExtended;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLResourceEncodingDetector;
-
-
-
-public final class ContentDescriberForDTD implements ITextContentDescriber {
-	final private static QualifiedName[] SUPPORTED_OPTIONS = {IContentDescription.CHARSET, IContentDescription.BYTE_ORDER_MARK, IContentDescriptionExtended.DETECTED_CHARSET, IContentDescriptionExtended.UNSUPPORTED_CHARSET, IContentDescriptionExtended.APPROPRIATE_DEFAULT};
-	private IResourceCharsetDetector resourceCharsetDetector;
-
-	public int describe(InputStream contents, IContentDescription description) throws IOException {
-		int result = IContentDescriber.INDETERMINATE;
-
-		if (description == null) {
-			result = computeValidity(contents);
-		}
-		else {
-			calculateSupportedOptions(contents, description);
-			result = computeValidity(contents);
-		}
-		return result;
-	}
-
-	public int describe(Reader contents, IContentDescription description) throws IOException {
-		int result = IContentDescriber.INDETERMINATE;
-
-		if (description == null) {
-			result = computeValidity(contents);
-		}
-		else {
-			calculateSupportedOptions(contents, description);
-			result = computeValidity(contents);
-		}
-		return result;
-	}
-
-	public QualifiedName[] getSupportedOptions() {
-
-		return SUPPORTED_OPTIONS;
-	}
-
-	private void calculateSupportedOptions(InputStream contents, IContentDescription description) throws IOException {
-		if (isRelevent(description)) {
-			IResourceCharsetDetector detector = getDetector();
-			detector.set(contents);
-			handleCalculations(description, detector);
-		}
-	}
-
-	/**
-	 * @param contents
-	 * @param description
-	 * @throws IOException
-	 */
-	private void calculateSupportedOptions(Reader contents, IContentDescription description) throws IOException {
-		if (isRelevent(description)) {
-			IResourceCharsetDetector detector = getDetector();
-			detector.set(contents);
-			handleCalculations(description, detector);
-		}
-	}
-
-	private int computeValidity(InputStream inputStream) {
-		// currently no specific check for validilty
-		// based on contents.
-		return IContentDescriber.INDETERMINATE;
-	}
-
-	private int computeValidity(Reader reader) {
-		// currently no specific check for validilty
-		// based on contents.
-		return IContentDescriber.INDETERMINATE;
-	}
-
-	// same rules as for XML
-	private IResourceCharsetDetector getDetector() {
-		if (resourceCharsetDetector == null) {
-			resourceCharsetDetector = new XMLResourceEncodingDetector();
-		}
-		return resourceCharsetDetector;
-	}
-
-	/**
-	 * @param description
-	 * @param detector
-	 * @throws IOException
-	 */
-	private void handleCalculations(IContentDescription description, IResourceCharsetDetector detector) throws IOException {
-		// note: if we're asked for one, we set them all. I need to be sure if
-		// called
-		// mulitiple times (one for each, say) that we don't waste time
-		// processing same
-		// content again.
-		EncodingMemento encodingMemento = ((XMLResourceEncodingDetector) detector).getEncodingMemento();
-		// TODO: I need to verify to see if this BOM work is always done
-		// by text type.
-		Object detectedByteOrderMark = encodingMemento.getUnicodeBOM();
-		if (detectedByteOrderMark != null) {
-			Object existingByteOrderMark = description.getProperty(IContentDescription.BYTE_ORDER_MARK);
-			// not sure why would ever be different, so if is different, may
-			// need to "push" up into base.
-			if (!detectedByteOrderMark.equals(existingByteOrderMark))
-				description.setProperty(IContentDescription.BYTE_ORDER_MARK, detectedByteOrderMark);
-		}
-
-
-		if (!encodingMemento.isValid()) {
-			// note: after setting here, its the mere presence of
-			// IContentDescriptionExtended.UNSUPPORTED_CHARSET
-			// in the resource's description that can be used to determine if
-			// invalid
-			// in those cases, the "detected" property contains an
-			// "appropriate default" to use.
-			description.setProperty(IContentDescriptionExtended.UNSUPPORTED_CHARSET, encodingMemento.getInvalidEncoding());
-			description.setProperty(IContentDescriptionExtended.APPROPRIATE_DEFAULT, encodingMemento.getAppropriateDefault());
-		}
-
-		Object detectedCharset = encodingMemento.getDetectedCharsetName();
-		Object javaCharset = encodingMemento.getJavaCharsetName();
-
-		// we always include detected, if its different than java
-		handleDetectedSpecialCase(description, detectedCharset, javaCharset);
-
-		if (javaCharset != null) {
-			Object existingCharset = description.getProperty(IContentDescription.CHARSET);
-			if (javaCharset.equals(existingCharset)) {
-				handleDetectedSpecialCase(description, detectedCharset, javaCharset);
-			}
-			else {
-				// we may need to add what we found, but only need to add
-				// if different from default.the
-				Object defaultCharset = getDetector().getSpecDefaultEncoding();
-				if (defaultCharset != null) {
-					if (!defaultCharset.equals(javaCharset)) {
-						description.setProperty(IContentDescription.CHARSET, javaCharset);
-					}
-				}
-				else {
-					// assuming if there is no spec default, we always need to
-					// add, I'm assuming
-					description.setProperty(IContentDescription.CHARSET, javaCharset);
-				}
-			}
-		}
-
-	}
-
-	private void handleDetectedSpecialCase(IContentDescription description, Object detectedCharset, Object javaCharset) {
-		// since equal, we don't need to add, but if our detected version is
-		// different than
-		// javaCharset, then we should add it. This will happen, for example,
-		// if there's
-		// differences in case, or differences due to override properties
-		if (detectedCharset != null) {
-			// if (!detectedCharset.equals(javaCharset)) {
-			// description.setProperty(IContentDescriptionExtended.DETECTED_CHARSET,
-			// detectedCharset);
-			// }
-
-			// Once we detected a charset, we should set the property even
-			// though it's the same as javaCharset
-			// because there are clients that rely on this property to
-			// determine if the charset is actually detected in file or not.
-			description.setProperty(IContentDescriptionExtended.DETECTED_CHARSET, detectedCharset);
-		}
-	}
-
-	/**
-	 * @param description
-	 * @return
-	 */
-	private boolean isRelevent(IContentDescription description) {
-		boolean result = false;
-		if (description == null)
-			result = false;
-		else if (description.isRequested(IContentDescription.BYTE_ORDER_MARK))
-			result = true;
-		else if (description.isRequested(IContentDescription.CHARSET))
-			result = true;
-		else if (description.isRequested(IContentDescriptionExtended.APPROPRIATE_DEFAULT))
-			result = true;
-		else if (description.isRequested(IContentDescriptionExtended.DETECTED_CHARSET))
-			result = true;
-		else if (description.isRequested(IContentDescriptionExtended.UNSUPPORTED_CHARSET))
-			result = true;
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/document/DTDModelImpl.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/document/DTDModelImpl.java
deleted file mode 100644
index e33ca24..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/document/DTDModelImpl.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.document;
-
-import java.io.File;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Entity;
-import org.eclipse.wst.dtd.core.internal.NodeList;
-import org.eclipse.wst.dtd.core.internal.event.IDTDFileListener;
-import org.eclipse.wst.dtd.core.internal.event.NodesEvent;
-import org.eclipse.wst.dtd.core.internal.provisional.document.DTDModel;
-import org.eclipse.wst.dtd.core.internal.util.DTDReferenceUpdater;
-import org.eclipse.wst.dtd.core.internal.util.LabelValuePair;
-import org.eclipse.wst.sse.core.internal.model.AbstractStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-
-public final class DTDModelImpl extends AbstractStructuredModel implements IStructuredDocumentListener, DTDModel {
-
-	public static boolean deleteFile(String fileName) {
-		boolean result = false;
-
-		// create the temp File object
-		File file = new File(fileName);
-		if (file.exists())
-			result = file.delete();
-		return result;
-	}
-
-	private DTDFile document;
-
-	// private List errorMessages = new ArrayList();
-
-	// entity reference names found in the conditional IGNORE sections
-	private Vector ignoredEntityRefs;
-
-	private boolean refreshRequired = false;
-
-	protected DTDReferenceUpdater refUpdater = new DTDReferenceUpdater();
-
-	public DTDModelImpl() {
-		super();
-		document = new DTDFile(this);
-		document.addDTDFileListener(new IDTDFileListener() {
-
-			public void nodeChanged(DTDNode node) {
-				if (node instanceof Entity) {
-					Entity entity = (Entity) node;
-					if (entity.isParameterEntity() && entity.isExternalEntity()) {
-						// just say they have changed for now
-						setReferencedModelsChanged();
-					}
-				}
-			}
-
-			public void nodesAdded(NodesEvent event) {
-				checkIfExternalReferencesChanged(event);
-			}
-
-			public void nodesRemoved(NodesEvent event) {
-				checkIfExternalReferencesChanged(event);
-			}
-		});
-	}
-
-	public void beginRecording(Object requester, String label) {
-		super.beginRecording(requester, label);
-		// clear reference updater cache
-		getReferenceUpdater().clearCache();
-	}
-
-	private void checkIfExternalReferencesChanged(NodesEvent event) {
-		Iterator iter = event.getNodes().iterator();
-		while (iter.hasNext()) {
-			DTDNode node = (DTDNode) iter.next();
-			if (node instanceof Entity) {
-				Entity entity = (Entity) node;
-				if (entity.isParameterEntity() && entity.isExternalEntity()) {
-					// just say they have changed for now
-					setReferencedModelsChanged();
-				}
-			}
-		}
-	}
-
-	//
-	// The following function helps determine the list of things that
-	// can be used in a parameter entity reference content
-	// Optional parameter is to allow the currently used DTDEntity to
-	// be included in the combobox.
-	//
-	public LabelValuePair[] createParmEntityContentItems(Entity entity) {
-		NodeList entities = getDTDFile().getEntities();
-
-		Vector items = new Vector();
-
-		if (entity != null) {
-			String name = "%" + entity.getName() + ";"; //$NON-NLS-1$ //$NON-NLS-2$
-			items.addElement(new LabelValuePair(name, name));
-		}
-
-		for (Iterator i = entities.getNodes().iterator(); i.hasNext();) {
-			Entity entityAt = (Entity) i.next();
-			if (entityAt.isParameterEntity() && entityAt.isExternalEntity()) {
-				String name = "%" + entityAt.getName() + ";"; //$NON-NLS-1$ //$NON-NLS-2$
-				items.addElement(new LabelValuePair(name, name));
-			}
-		}
-		LabelValuePair[] comboArray = new LabelValuePair[items.size()];
-		items.copyInto(comboArray);
-		return comboArray;
-	}
-
-	public void endRecording(Object requester) {
-		super.endRecording(requester);
-		// clear reference updater cache
-		getReferenceUpdater().clearCache();
-	}
-
-
-	public DTDFile getDTDFile() {
-		return document;
-	}
-
-	// Returns entity reference names that are in
-	// the conditional IGNORE sections.
-	public Vector getIgnoredEntityRefs() {
-		if (ignoredEntityRefs == null)
-			ignoredEntityRefs = new Vector();
-		return ignoredEntityRefs;
-	}
-
-	public IndexedRegion getIndexedRegion(int offset) {
-		if (this.document == null)
-			return null;
-		// System.out.println("getNode at " + offset + " returning = " +
-		// this.document.getNodeAt(offset));
-
-		return this.document.getNodeAt(offset);
-	}
-
-	public DTDReferenceUpdater getReferenceUpdater() {
-		return refUpdater;
-	}
-
-	public boolean isReferencedModelsChanged() {
-		return refreshRequired;
-	}
-
-	public boolean isRefreshRequired() {
-		return refreshRequired;
-	}
-
-	public void newModel(NewDocumentEvent flatModelEvent) {
-		document.newModel(flatModelEvent);
-		// System.out.println("\nnewmodel");
-		outputStructuredDocument(flatModelEvent);
-	}
-
-	public void noChange(NoChangeEvent flatModelEvent) {
-		// System.out.println("\nnochange");
-		outputStructuredDocument(flatModelEvent);
-
-	}
-
-	public void nodesReplaced(StructuredDocumentRegionsReplacedEvent flatModelEvent) {
-		// System.out.println("\nnodesreplaced");
-		document.nodesReplaced(flatModelEvent);
-		outputStructuredDocument(flatModelEvent);
-
-	}
-
-	public void outputStructuredDocument(StructuredDocumentEvent flatModelEvent) {
-		// System.out.println("structuredDocument source = '" +
-		// flatModelEvent.getStructuredDocument().getText() + "'");
-		// System.out.println("new String = '" +
-		// flatModelEvent.getOriginalChanges() +"'");
-		// System.out.println("deleted String = '" +
-		// flatModelEvent.getDeletedText() +"'");
-		// Enumeration e =
-		// flatModelEvent.getStructuredDocument().getNodes().elements();
-		// int i = 0;
-		// for (; e.hasMoreElements(); i++)
-		// {
-		// BasicStructuredDocumentRegion node =
-		// (BasicStructuredDocumentRegion) e.nextElement();
-		// outputStructuredDocumentRegion(node);
-		// System.out.println(" " + i +". " + node.hashCode() + " '"
-		// +node.getText() + "'");
-		// }
-	}
-
-	public void outputStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		// int size = flatNode.getNumberOfRegions();
-		// for (int i = 0; i < size; i++)
-		// {
-		// Region region = (Region) flatNode.getRegions().get(i);
-		// System.out.println(i + ". " + region.getType());
-
-		// } // end of for ()
-
-	}
-
-	public void regionChanged(RegionChangedEvent flatModelEvent) {
-		// System.out.println("\nregion changed");
-		document.regionChanged(flatModelEvent);
-		// System.out.println("= " +
-		// flatModelEvent.getStructuredDocumentRegion().getText());
-		// System.out.println("region changed " +
-		// flatModelEvent.getRegion().hashCode() + " = " +
-		// flatModelEvent.getRegion());
-
-		outputStructuredDocument(flatModelEvent);
-	}
-
-	public void regionsReplaced(RegionsReplacedEvent flatModelEvent) {
-		// System.out.println("\nregion replaced");
-		document.regionsReplaced(flatModelEvent);
-		outputStructuredDocument(flatModelEvent);
-	}
-
-	public void setReferencedModelsChanged() {
-		refreshRequired = true;
-	}
-
-	public void setRefreshRequired(boolean value) {
-		refreshRequired = value;
-	}
-
-
-	/**
-	 * @param newStructuredDocument
-	 *            org.eclipse.wst.sse.core.text.IStructuredDocument
-	 */
-	public void setStructuredDocument(IStructuredDocument newStructuredDocument) {
-		IStructuredDocument oldStructuredDocument = super.getStructuredDocument();
-		if (newStructuredDocument == oldStructuredDocument)
-			return; // noting to do
-
-		if (oldStructuredDocument != null)
-			oldStructuredDocument.removeDocumentChangingListener(this);
-		super.setStructuredDocument(newStructuredDocument);
-		if (newStructuredDocument != null) {
-			if (newStructuredDocument.getLength() > 0) {
-				newModel(new NewDocumentEvent(newStructuredDocument, this));
-			}
-			newStructuredDocument.addDocumentChangingListener(this);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/AbstractResourceEncodingDetector.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/AbstractResourceEncodingDetector.java
deleted file mode 100644
index 07937e3..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/AbstractResourceEncodingDetector.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.encoding;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.IllegalCharsetNameException;
-import java.nio.charset.UnsupportedCharsetException;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.sse.core.internal.encoding.CodedIO;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-
-public abstract class AbstractResourceEncodingDetector implements IResourceCharsetDetector {
-
-	protected EncodingMemento fEncodingMemento;
-
-	protected boolean fHeaderParsed;
-
-	protected Reader fReader;
-
-	/**
-	 * 
-	 */
-	public AbstractResourceEncodingDetector() {
-		super();
-	}
-
-	/**
-	 * Note: once this instance is created, trace info still needs to be
-	 * appended by caller, depending on the context its created.
-	 */
-	private void createEncodingMemento(String detectedCharsetName) {
-		fEncodingMemento = new EncodingMemento();
-		fEncodingMemento.setJavaCharsetName(getAppropriateJavaCharset(detectedCharsetName));
-		fEncodingMemento.setDetectedCharsetName(detectedCharsetName);
-		// TODO: if detectedCharset and spec default is
-		// null, need to use "work
-		// bench based" defaults.
-		fEncodingMemento.setAppropriateDefault(getSpecDefaultEncoding());
-	}
-
-	/**
-	 * convience method all subclasses can use (but not override)
-	 * 
-	 * @param detectedCharsetName
-	 * @param reason
-	 */
-	final protected void createEncodingMemento(String detectedCharsetName, String reason) {
-		createEncodingMemento(detectedCharsetName);
-	}
-
-	/**
-	 * convience method all subclasses can use (but not override)
-	 */
-	final protected void ensureInputSet() {
-		if (fReader == null) {
-			throw new IllegalStateException("input must be set before use"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * This method can return null, if invalid charset name (in which case
-	 * "appropriateDefault" should be used, if a name is really need for some
-	 * "save anyway" cases).
-	 * 
-	 * @param detectedCharsetName
-	 * @return
-	 */
-	private String getAppropriateJavaCharset(String detectedCharsetName) {
-		String result = null;
-		// 1. Check explicit mapping overrides from
-		// property file -- its here we pick up "rules" for cases
-		// that are not even in Java
-		result = CodedIO.checkMappingOverrides(detectedCharsetName);
-		// 2. Use the "canonical" name from JRE mappings
-		// Note: see Charset JavaDoc, the name you get one
-		// with can be alias,
-		// the name you get back is "standard" name.
-		Charset javaCharset = null;
-		try {
-			javaCharset = Charset.forName(detectedCharsetName);
-		}
-		catch (UnsupportedCharsetException e) {
-			// only set invalid, if result is same as detected -- they won't
-			// be equal if
-			// overridden
-			if (result != null && result.equals(detectedCharsetName)) {
-				fEncodingMemento.setInvalidEncoding(detectedCharsetName);
-			}
-		}
-		catch (IllegalCharsetNameException e) {
-			// only set invalid, if result is same as detected -- they won't
-			// be equal if
-			// overridden
-			if (result != null && result.equals(detectedCharsetName)) {
-				fEncodingMemento.setInvalidEncoding(detectedCharsetName);
-			}
-		}
-		// give priority to java cononical name, if present
-		if (javaCharset != null) {
-			result = javaCharset.name();
-			// but still allow overrides
-			result = CodedIO.checkMappingOverrides(result);
-		}
-		return result;
-	}
-
-	public String getEncoding() throws IOException {
-		return getEncodingMemento().getDetectedCharsetName();
-	}
-
-	// to ensure consist overall rules used, we'll mark as
-	// final,
-	// and require subclasses to provide certain pieces of
-	// the
-	// implementation
-	public EncodingMemento getEncodingMemento() throws IOException {
-		ensureInputSet();
-		if (!fHeaderParsed) {
-			parseInput();
-			// we keep track of if header's already been
-			// parse, so can make
-			// multiple 'get' calls, without causing
-			// reparsing.
-			fHeaderParsed = true;
-			// Note: there is a "hidden assumption" here
-			// that an empty
-			// string in content should be treated same as
-			// not present.
-		}
-		if (fEncodingMemento == null) {
-			handleSpecDefault();
-		}
-		if (fEncodingMemento == null) {
-			// safty net
-			fEncodingMemento = new NullMemento();
-		}
-		return fEncodingMemento;
-	}
-
-	/**
-	 * This is to return a default encoding -- as specified by an industry
-	 * content type spec -- when not present in the stream, for example, XML
-	 * specifies UTF-8, JSP specifies ISO-8859-1. This method should return
-	 * null if there is no such "spec default".
-	 */
-	abstract public String getSpecDefaultEncoding();
-
-	public EncodingMemento getSpecDefaultEncodingMemento() {
-		resetAll();
-		EncodingMemento result = null;
-		String enc = getSpecDefaultEncoding();
-		if (enc != null) {
-			createEncodingMemento(enc, EncodingMemento.DEFAULTS_ASSUMED_FOR_EMPTY_INPUT);
-			fEncodingMemento.setAppropriateDefault(enc);
-			result = fEncodingMemento;
-		}
-		return result;
-	}
-
-	private void handleSpecDefault() {
-		String encodingName;
-		encodingName = getSpecDefaultEncoding();
-		if (encodingName != null) {
-			// createEncodingMemento(encodingName,
-			// EncodingMemento.USED_CONTENT_TYPE_DEFAULT);
-			fEncodingMemento = new EncodingMemento();
-			fEncodingMemento.setJavaCharsetName(encodingName);
-			fEncodingMemento.setAppropriateDefault(encodingName);
-		}
-	}
-
-	/**
-	 * Every subclass must provide a way to parse the input. This method has
-	 * several critical responsibilities:
-	 * <li>set the fEncodingMemento field appropriately, according to the
-	 * results of the parse of fReader.</li>
-	 * <li>set fHarderParsed to true, to avoid wasted re-parsing.</li>
-	 */
-	abstract protected void parseInput() throws IOException;
-
-	/**
-	 * 
-	 */
-	private void resetAll() {
-		fReader = null;
-		fHeaderParsed = false;
-		fEncodingMemento = null;
-	}
-
-	/**
-	 * 
-	 */
-	public void set(InputStream inputStream) {
-		resetAll();
-		fReader = new ByteReader(inputStream);
-		try {
-			fReader.mark(CodedIO.MAX_MARK_SIZE);
-		}
-		catch (IOException e) {
-			// impossible, since we know ByteReader
-			// supports marking
-			throw new Error(e);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void set(IStorage iStorage) throws CoreException {
-		resetAll();
-		InputStream inputStream = iStorage.getContents();
-		InputStream resettableStream = new BufferedInputStream(inputStream, CodedIO.MAX_BUF_SIZE);
-		resettableStream.mark(CodedIO.MAX_MARK_SIZE);
-		set(resettableStream);
-		// TODO we'll need to "remember" IFile, or
-		// get its (or its project's) settings, in case
-		// those are needed to handle cases when the
-		// encoding is not in the file stream.
-	}
-
-	/**
-	 * Note: this is not part of interface to help avoid confusion ... it
-	 * expected this Reader is a well formed character reader ... that is, its
-	 * all ready been determined to not be a unicode marked input stream. And,
-	 * its assumed to be in the correct position, at position zero, ready to
-	 * read first character.
-	 */
-	public void set(Reader reader) {
-		resetAll();
-		fReader = reader;
-		if (!fReader.markSupported()) {
-			fReader = new BufferedReader(fReader);
-		}
-		try {
-			fReader.mark(CodedIO.MAX_MARK_SIZE);
-		}
-		catch (IOException e) {
-			// impossble, since we just checked if markable
-			throw new Error(e);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/ByteReader.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/ByteReader.java
deleted file mode 100644
index 1550a62..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/ByteReader.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.encoding;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.eclipse.wst.sse.core.internal.encoding.CodedIO;
-
-/**
- * This is an "adapter" class, simply to get in input stream to act like a
- * reader. We could not use InputStreamReader directly because its internal
- * buffers are not controllable, and it sometimes pulls too much out of input
- * stream (even when it wasn't needed for our purposes).
- * 
- * The use of this class is highly specialized and by not means meant to be
- * general purpose. Its use is restricted to those cases where the input
- * stream can be regarded as ascii just long enough to determine what the real
- * encoding should be.
- */
-
-public class ByteReader extends Reader {
-
-	
-	public static final int DEFAULT_BUFFER_SIZE = CodedIO.MAX_BUF_SIZE;
-
-	protected byte[] fBuffer;
-
-	protected InputStream fInputStream;
-
-	protected ByteReader() {
-		super();
-	}
-
-	public ByteReader(InputStream inputStream) {
-		this(inputStream, DEFAULT_BUFFER_SIZE);
-		if (!inputStream.markSupported()) {
-			throw new IllegalArgumentException("ByteReader is required to have a resettable stream"); //$NON-NLS-1$
-		}
-	}
-
-	public ByteReader(InputStream inputStream, int size) {
-		this.fInputStream = inputStream;
-		if (!inputStream.markSupported()) {
-			throw new IllegalArgumentException("ByteReader is required to have a resettable stream"); //$NON-NLS-1$
-		}
-		this.fBuffer = new byte[size];
-
-	}
-
-	public void close() throws IOException {
-		this.fInputStream.close();
-	}
-
-	public void mark(int readAheadLimit) {
-		this.fInputStream.mark(readAheadLimit);
-	}
-
-	public boolean markSupported() {
-		return true;
-	}
-
-	public int read() throws IOException {
-		int b0 = this.fInputStream.read();
-		return (b0 & 0x00FF);
-	}
-
-	public int read(char ch[], int offset, int length) throws IOException {
-		if (length > this.fBuffer.length) {
-			length = this.fBuffer.length;
-		}
-
-		int count = this.fInputStream.read(this.fBuffer, 0, length);
-
-		for (int i = 0; i < count; i++) {
-			int b0 = this.fBuffer[i];
-			// the 0x00FF is to "lose" the negative bits filled in the byte to
-			// int conversion
-			// (and which would be there if cast directly from byte to char).
-			char c0 = (char) (b0 & 0x00FF);
-			ch[offset + i] = c0;
-		}
-		return count;
-	}
-
-	public boolean ready() throws IOException {
-		return this.fInputStream.available() > 0;
-	}
-
-	public void reset() throws IOException {
-		this.fInputStream.reset();
-	}
-
-	public long skip(long n) throws IOException {
-		return this.fInputStream.skip(n);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/DTDDocumentCharsetDetector.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/DTDDocumentCharsetDetector.java
deleted file mode 100644
index 11ae9f8..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/DTDDocumentCharsetDetector.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-/*
- * Created on 28-Aug-03
- * 
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.wst.dtd.core.internal.encoding;
-
-import java.io.IOException;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.sse.core.internal.document.DocumentReader;
-import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLResourceEncodingDetector;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentCharsetDetector;
-
-
-/**
- * @author kboo
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public final class DTDDocumentCharsetDetector extends AbstractResourceEncodingDetector implements IDocumentCharsetDetector {
-
-	public String getSpecDefaultEncoding() {
-		// by default, UTF-8 as per XML spec
-		final String enc = "UTF-8"; //$NON-NLS-1$
-		return enc;
-	}
-
-	/**
-	 * 
-	 */
-
-	protected void parseInput() throws IOException {
-		IDocumentCharsetDetector documentEncodingDetector = new XMLDocumentCharsetDetector();
-		documentEncodingDetector.set(fReader);
-		fEncodingMemento = ((XMLResourceEncodingDetector)documentEncodingDetector).getEncodingMemento();
-
-	}
-
-	public void set(IDocument document) {
-		set(new DocumentReader(document, 0));
-
-
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/DTDDocumentLoader.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/DTDDocumentLoader.java
deleted file mode 100644
index 9ab8cc2..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/DTDDocumentLoader.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.encoding;
-
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionParser;
-import org.eclipse.wst.dtd.core.internal.text.DTDStructuredDocumentReParser;
-import org.eclipse.wst.dtd.core.internal.text.StructuredTextPartitionerForDTD;
-import org.eclipse.wst.sse.core.internal.document.AbstractDocumentLoader;
-import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-
-
-public final class DTDDocumentLoader extends AbstractDocumentLoader {
-
-	public DTDDocumentLoader() {
-		super();
-	}
-
-	public IDocumentPartitioner getDefaultDocumentPartitioner() {
-		return new StructuredTextPartitionerForDTD();
-	}
-
-	public IDocumentCharsetDetector getDocumentEncodingDetector() {
-		if (fDocumentEncodingDetector == null) {
-			fDocumentEncodingDetector = new DTDDocumentCharsetDetector();
-		}
-		return fDocumentEncodingDetector;
-	}
-
-	public RegionParser getParser() {
-		return new DTDRegionParser();
-	}
-
-	protected String getSpecDefaultEncoding() {
-		String enc = "UTF-8"; //$NON-NLS-1$
-		return enc;
-	}
-
-	protected IEncodedDocument newEncodedDocument() {
-		IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(getParser());
-		DTDStructuredDocumentReParser reParser = new DTDStructuredDocumentReParser();
-		reParser.setStructuredDocument(document);
-		if (document instanceof BasicStructuredDocument) {
-			((BasicStructuredDocument) document).setReParser(reParser);
-		}
-		return document;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/NullMemento.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/NullMemento.java
deleted file mode 100644
index 0cd01fc..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/NullMemento.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.encoding;
-
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.NonContentBasedEncodingRules;
-
-
-
-/**
- * This class can be used in place of an EncodingMemento (its super class),
- * when there is not in fact ANY encoding information. For example, when a
- * structuredDocument is created directly from a String
- */
-public class NullMemento extends EncodingMemento {
-	/**
-	 * 
-	 */
-	public NullMemento() {
-		super();
-		String defaultCharset = NonContentBasedEncodingRules.useDefaultNameRules(null);
-		setJavaCharsetName(defaultCharset);
-		setAppropriateDefault(defaultCharset);
-		setDetectedCharsetName(null);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/event/IDTDFileListener.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/event/IDTDFileListener.java
deleted file mode 100644
index fe29fb5..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/event/IDTDFileListener.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.event;
-
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-
-public interface IDTDFileListener {
-
-	public void nodeChanged(DTDNode node);
-
-	public void nodesAdded(NodesEvent event);
-
-	public void nodesRemoved(NodesEvent event);
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/event/NodesEvent.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/event/NodesEvent.java
deleted file mode 100644
index 89974e8..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/event/NodesEvent.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-
-
-public final class NodesEvent {
-	private ArrayList changedNodes = new ArrayList();
-
-	public void add(DTDNode changedNode) {
-		changedNodes.add(changedNode);
-	}
-
-	public List getNodes() {
-		return changedNodes;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/modelhandler/DTDModelLoader.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/modelhandler/DTDModelLoader.java
deleted file mode 100644
index 8db31f0..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/modelhandler/DTDModelLoader.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.modelhandler;
-
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-import org.eclipse.wst.dtd.core.internal.encoding.DTDDocumentLoader;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.model.AbstractModelLoader;
-import org.eclipse.wst.sse.core.internal.provisional.IModelLoader;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-
-
-public final class DTDModelLoader extends AbstractModelLoader {
-	public DTDModelLoader() {
-		super();
-	}
-
-	public IDocumentLoader getDocumentLoader() {
-		if (documentLoaderInstance == null) {
-			documentLoaderInstance = new DTDDocumentLoader();
-		}
-		return documentLoaderInstance;
-	}
-
-	public IModelLoader newInstance() {
-		return new DTDModelLoader();
-	}
-
-	public IStructuredModel newModel() {
-		IStructuredModel model = new DTDModelImpl();
-		// now done in create
-		// model.setStructuredDocument(createNewStructuredDocument());
-		// model.setFactoryRegistry(defaultFactoryRegistry());
-		return model;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/modelhandler/ModelHandlerForDTD.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/modelhandler/ModelHandlerForDTD.java
deleted file mode 100644
index b17a55a..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/modelhandler/ModelHandlerForDTD.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.modelhandler;
-
-import org.eclipse.wst.dtd.core.internal.encoding.DTDDocumentCharsetDetector;
-import org.eclipse.wst.dtd.core.internal.encoding.DTDDocumentLoader;
-import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.AbstractModelHandler;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.provisional.IModelLoader;
-
-
-public final class ModelHandlerForDTD extends AbstractModelHandler implements IModelHandler {
-	private static String AssociatedContentTypeId = "org.eclipse.wst.dtd.core.dtdsource"; //$NON-NLS-1$
-	private static String ModelHandlerID = "org.eclipse.wst.dtd.core.internal.modelhandler"; //$NON-NLS-1$
-
-	public ModelHandlerForDTD() {
-		super();
-		setId(ModelHandlerID);
-		setAssociatedContentTypeId(AssociatedContentTypeId);
-	}
-
-	public IDocumentLoader getDocumentLoader() {
-		return new DTDDocumentLoader();
-	}
-
-	public IDocumentCharsetDetector getEncodingDetector() {
-		return new DTDDocumentCharsetDetector();
-	}
-
-	public IModelLoader getModelLoader() {
-		return new DTDModelLoader();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/parser/DTDRegionFactory.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/parser/DTDRegionFactory.java
deleted file mode 100644
index 2b018b1..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/parser/DTDRegionFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.parser;
-
-import org.eclipse.wst.sse.core.internal.parser.ContextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-public class DTDRegionFactory {
-	public static ITextRegion createRegion(String tokenKind, int start, int length) {
-		ITextRegion region = null;
-		if (tokenKind != null) {
-			// ISSUE: DTD regions don't distinguish text from white space
-			region = new ContextRegion(tokenKind, start, length, length);
-		}
-		return region;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/parser/DTDRegionParser.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/parser/DTDRegionParser.java
deleted file mode 100644
index 553ea59..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/parser/DTDRegionParser.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.parser;
-
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Vector;
-
-import org.eclipse.wst.dtd.core.internal.text.DTDStructuredDocumentRegionFactory;
-import org.eclipse.wst.dtd.core.internal.tokenizer.DTDTokenizer;
-import org.eclipse.wst.dtd.core.internal.tokenizer.Token;
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-public class DTDRegionParser implements RegionParser {
-	private Vector cachedRegions = null;
-	private DTDTokenizer tokenizer = null;
-	private IStructuredDocumentRegion cachedNode = null; // top of node
-															// chain
-
-	public RegionParser newInstance() {
-		return new DTDRegionParser();
-	}
-
-	private IStructuredDocumentRegion addNewNodes(IStructuredDocumentRegion lastNode, Vector regions) {
-		IStructuredDocumentRegion leadingSpaceNode = null;
-		IStructuredDocumentRegion contentNode = null;
-		IStructuredDocumentRegion trailingSpaceNode = null;
-		LinkedList nodeSeeds = new LinkedList();
-		int nRegions = regions.size();
-		int leadingSpaceEnd = -1;
-		int trailingSpaceBegin = nRegions;
-
-		// find leading space
-		nodeSeeds.clear();
-		for (int i = 0; i < nRegions; i++) {
-			ITextRegion region = (ITextRegion) regions.get(i);
-			String type = region.getType();
-			if (isBlankRegion(type)) {
-				leadingSpaceEnd = i;
-				nodeSeeds.addLast(region);
-			}
-			else {
-				break;
-			}
-		}
-		if (!nodeSeeds.isEmpty()) {
-			leadingSpaceNode = createNode(nodeSeeds);
-			if (lastNode != null) {
-				lastNode.setNext(leadingSpaceNode);
-				leadingSpaceNode.setPrevious(lastNode);
-			}
-			lastNode = leadingSpaceNode;
-		}
-
-		// find trailing space
-		if (leadingSpaceEnd < nRegions - 1) {
-			nodeSeeds.clear();
-			for (int i = nRegions - 1; 0 <= i; i--) {
-				ITextRegion region = (ITextRegion) regions.get(i);
-				String type = ((ITextRegion) regions.get(i)).getType();
-				if (isBlankRegion(type)) {
-					trailingSpaceBegin = i;
-					nodeSeeds.addFirst(region);
-				}
-				else {
-					break;
-				}
-			}
-			if (!nodeSeeds.isEmpty()) {
-				trailingSpaceNode = createNode(nodeSeeds);
-			}
-
-			nodeSeeds.clear();
-			for (int i = leadingSpaceEnd + 1; i < trailingSpaceBegin; i++) {
-				nodeSeeds.addLast(regions.get(i));
-			}
-			if (!nodeSeeds.isEmpty()) {
-				contentNode = createNode(nodeSeeds);
-				if (lastNode != null) {
-					lastNode.setNext(contentNode);
-					contentNode.setPrevious(lastNode);
-				}
-				lastNode = contentNode;
-			}
-			if (trailingSpaceNode != null) {
-				lastNode.setNext(trailingSpaceNode);
-				trailingSpaceNode.setPrevious(lastNode);
-				lastNode = trailingSpaceNode;
-			}
-		}
-
-		return lastNode;
-	}
-
-	private IStructuredDocumentRegion createNode(LinkedList regions) {
-		if (regions.size() == 0) {
-			return null;
-		}
-
-		IStructuredDocumentRegion node = DTDStructuredDocumentRegionFactory.createStructuredDocumentRegion(DTDStructuredDocumentRegionFactory.DTD_GENERIC);
-		int start = ((ITextRegion) regions.getFirst()).getStart();
-		int length = ((ITextRegion) regions.getLast()).getEnd() - start;
-		node.setStart(start);
-		node.setLength(length);
-		for (ListIterator i = regions.listIterator(0); i.hasNext();) {
-			ITextRegion region = (ITextRegion) i.next();
-			node.addRegion(region);
-			region.adjustStart(-start);
-		}
-		node.setEnded(true);
-
-		return node;
-	}
-
-	private IStructuredDocumentRegion createNodeChain(List regions) {
-		IStructuredDocumentRegion headNode = null;
-		IStructuredDocumentRegion lastNode = null;
-		Vector nodeSeeds = new Vector();
-
-		for (Iterator e = regions.iterator(); e.hasNext();) {
-			ITextRegion region = (ITextRegion) e.next();
-			String type = region.getType();
-			// If the following regions appear,
-			// a previous node is closed in front of it.
-			if (!nodeSeeds.isEmpty() && isBeginningRegion(type)) {
-				lastNode = addNewNodes(lastNode, nodeSeeds);
-				nodeSeeds.clear();
-			}
-			nodeSeeds.addElement(region);
-
-			// The following regions close the current node.
-			if (!nodeSeeds.isEmpty() && isEndingRegion(type)) {
-				lastNode = addNewNodes(lastNode, nodeSeeds);
-				nodeSeeds.clear();
-			}
-
-			if (headNode == null && lastNode != null) {
-				headNode = findFirstNode(lastNode);
-			}
-		}
-
-		// close current node forcibly.
-		if (!nodeSeeds.isEmpty()) {
-			lastNode = addNewNodes(lastNode, nodeSeeds);
-			if (headNode == null && lastNode != null) {
-				headNode = findFirstNode(lastNode);
-			}
-		}
-		return headNode;
-	}
-
-	private IStructuredDocumentRegion findFirstNode(IStructuredDocumentRegion node) {
-		IStructuredDocumentRegion firstNode = node;
-		IStructuredDocumentRegion prevNode = null;
-		while ((prevNode = firstNode.getPrevious()) != null) {
-			firstNode = prevNode;
-		}
-		return firstNode;
-	}
-
-	public IStructuredDocumentRegion getDocumentRegions() {
-		if (cachedNode != null) {
-			return cachedNode;
-		}
-
-		List regions = getRegions();
-		IStructuredDocumentRegion headNode = createNodeChain(regions);
-		cachedNode = headNode;
-
-		return headNode;
-	}
-
-	public List getRegions() {
-		if (cachedRegions != null) {
-			return cachedRegions;
-		}
-
-		Vector regions = new Vector();
-		Token currentToken = null;
-		do {
-			try {
-				currentToken = (Token) tokenizer.yylex();
-				if (currentToken != null) {
-					ITextRegion region = DTDRegionFactory.createRegion(currentToken.getType(), currentToken.getStartOffset(), currentToken.getLength());
-					regions.add(region);
-				}
-			}
-			catch (java.io.FileNotFoundException e) {
-				System.out.println("File not found"); //$NON-NLS-1$
-			}
-			catch (java.io.IOException e) {
-				System.out.println("Error opening file"); //$NON-NLS-1$
-			}
-		}
-		while (currentToken != null);
-
-		cachedRegions = regions;
-		return regions;
-	}
-
-	public void reset(Reader reader) {
-		if (tokenizer == null) {
-			try {
-				tokenizer = new DTDTokenizer(reader);
-			}
-			catch (ArrayIndexOutOfBoundsException e) {
-				System.out.println("Usage : java DTDTokenizer <inputfile>"); //$NON-NLS-1$
-			}
-		}
-		else {
-			try {
-				tokenizer.yyreset(reader);
-			}
-			catch (java.io.IOException e) {
-				System.out.println("Error opening file"); //$NON-NLS-1$
-			}
-		}
-
-		cachedNode = null;
-		cachedRegions = null;
-	}
-
-	/**
-	 * An additional offset for use with any position-dependant parsing rules
-	 */
-	public void reset(Reader reader, int offset) {
-		reset(reader);
-	}
-
-	public void reset(String input) {
-		reset(new StringReader(input));
-	}
-
-	public void reset(String input, int offset) {
-		reset(input);
-	}
-
-	// never used
-	DTDTokenizer getTokenizer() {
-		return tokenizer;
-	}
-
-	private boolean isBeginningRegion(String type) {
-		return (type == DTDRegionTypes.START_TAG) || (type == DTDRegionTypes.ENTITY_PARM);
-	}
-
-	private boolean isBlankRegion(String type) {
-		return (type == DTDRegionTypes.WHITESPACE);
-	}
-
-	private boolean isEndingRegion(String type) {
-		return (type == DTDRegionTypes.END_TAG) || (type == DTDRegionTypes.ENTITY_PARM) || (type == DTDRegionTypes.COMMENT_END);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/parser/DTDRegionTypes.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/parser/DTDRegionTypes.java
deleted file mode 100644
index 50ecd6b..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/parser/DTDRegionTypes.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.parser;
-
-public interface DTDRegionTypes {
-	public static final String regionPrefix = "org.eclipse.wst.dtd.core.internal.util.parser.DTDRegionTypes."; //$NON-NLS-1$
-
-	public static final String NAME = regionPrefix + "NAME"; //$NON-NLS-1$
-	public static final String START_TAG = regionPrefix + "START_TAG"; //$NON-NLS-1$
-	public static final String END_TAG = regionPrefix + "END_TAG"; //$NON-NLS-1$
-	public static final String LEFT_PAREN = regionPrefix + "LEFT_PAREN"; //$NON-NLS-1$
-	public static final String RIGHT_PAREN = regionPrefix + "RIGHT_PAREN"; //$NON-NLS-1$
-	public static final String WHITESPACE = regionPrefix + "WHITESPACE"; //$NON-NLS-1$
-	public static final String CONNECTOR = regionPrefix + "CONNECTOR"; //$NON-NLS-1$
-
-	public static final String OCCUR_TYPE = regionPrefix + "OCCUR_TYPE"; //$NON-NLS-1$
-	public static final String EXCLAMATION = regionPrefix + "EXCLAMATION"; //$NON-NLS-1$
-	public static final String PERCENT = regionPrefix + "PERCENT"; //$NON-NLS-1$
-	public static final String SEMICOLON = regionPrefix + "SEMICOLON"; //$NON-NLS-1$
-	public static final String COMMENT_START = regionPrefix + "COMMENT"; //$NON-NLS-1$
-	public static final String COMMENT_CONTENT = regionPrefix + "COMMENT_CONTENT"; //$NON-NLS-1$
-	public static final String COMMENT_END = regionPrefix + "COMMENT_END"; //$NON-NLS-1$
-
-	public static final String NOTATION_TAG = regionPrefix + "NOTATION_TAG"; //$NON-NLS-1$
-	public static final String NOTATION_CONTENT = regionPrefix + "NOTATION_CONTENT"; //$NON-NLS-1$
-
-	public static final String ENTITY_TAG = regionPrefix + "ENTITY_TAG"; //$NON-NLS-1$
-	public static final String ENTITY_PARM = regionPrefix + "ENTITY_PARM"; //$NON-NLS-1$
-	public static final String ENTITY_CONTENT = regionPrefix + "ENTITY_CONTENT"; //$NON-NLS-1$
-	public static final String NDATA_VALUE = regionPrefix + "NDATA_VALUE"; //$NON-NLS-1$
-
-	public static final String ELEMENT_TAG = regionPrefix + "ELEMENT_TAG"; //$NON-NLS-1$
-	public static final String ELEMENT_CONTENT = regionPrefix + "ELEMENT_CONTENT"; //$NON-NLS-1$
-	public static final String CONTENT_EMPTY = regionPrefix + "CONTENT_EMPTY"; //$NON-NLS-1$
-	public static final String CONTENT_ANY = regionPrefix + "CONTENT_ANY"; //$NON-NLS-1$
-	public static final String CONTENT_PCDATA = regionPrefix + "CONTENT_PCDATA"; //$NON-NLS-1$
-
-	public static final String ATTLIST_TAG = regionPrefix + "ATTLIST_TAG"; //$NON-NLS-1$
-
-	public static final String SYSTEM_KEYWORD = regionPrefix + "SYSTEM_KEYWORD"; //$NON-NLS-1$
-	public static final String PUBLIC_KEYWORD = regionPrefix + "PUBLIC_KEYWORD"; //$NON-NLS-1$
-	public static final String NDATA_KEYWORD = regionPrefix + "NDATA_KEYWORD"; //$NON-NLS-1$
-	public static final String SINGLEQUOTED_LITERAL = regionPrefix + "SINGLEQUOTED_LITERAL"; //$NON-NLS-1$
-	public static final String DOUBLEQUOTED_LITERAL = regionPrefix + "DOUBLEQUOTED_LITERAL"; //$NON-NLS-1$
-	public static final String UNKNOWN_CONTENT = regionPrefix + "UNKNOWN_CONTENT"; //$NON-NLS-1$
-
-	public static final String ATTRIBUTE_NAME = regionPrefix + "ATTRIBUTE_NAME"; //$NON-NLS-1$
-
-	// attribute type keywords
-	public static final String CDATA_KEYWORD = regionPrefix + "CDATA_KEYWORD"; //$NON-NLS-1$
-	public static final String ID_KEYWORD = regionPrefix + "ID_KEYWORD"; //$NON-NLS-1$
-	public static final String IDREF_KEYWORD = regionPrefix + "IDREF_KEYWORD"; //$NON-NLS-1$
-	public static final String IDREFS_KEYWORD = regionPrefix + "IDREFS_KEYWORD"; //$NON-NLS-1$
-	public static final String ENTITY_KEYWORD = regionPrefix + "ENTITY_KEYWORD"; //$NON-NLS-1$
-	public static final String ENTITIES_KEYWORD = regionPrefix + "ENTITIES_KEYWORD"; //$NON-NLS-1$
-	public static final String NMTOKEN_KEYWORD = regionPrefix + "NMTOKEN_KEYWORD"; //$NON-NLS-1$
-	public static final String NMTOKENS_KEYWORD = regionPrefix + "NMTOKENS_KEYWORD"; //$NON-NLS-1$
-	public static final String NOTATION_KEYWORD = regionPrefix + "NOTATION_KEYWORD"; //$NON-NLS-1$
-	public static final String ENUM_CHOICE = regionPrefix + "ENUM_CHOICE"; //$NON-NLS-1$
-	public static final String PARM_ENTITY_TYPE = regionPrefix + "PARM_ENTITY_TYPE"; //$NON-NLS-1$
-
-	// attribute defaults keywords
-	public static final String REQUIRED_KEYWORD = regionPrefix + "REQUIRED_KEYWORD"; //$NON-NLS-1$
-	public static final String IMPLIED_KEYWORD = regionPrefix + "IMPLIED_KEYWORD"; //$NON-NLS-1$
-	public static final String FIXED_KEYWORD = regionPrefix + "FIXED_KEYWORD"; //$NON-NLS-1$
-}// DTDRegionTypes
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/provisional/contenttype/ContentTypeIdForDTD.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/provisional/contenttype/ContentTypeIdForDTD.java
deleted file mode 100644
index 9795522..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/provisional/contenttype/ContentTypeIdForDTD.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.provisional.contenttype;
-
-/**
- * <p>
- * This class, with its one field, is a convenience to provide compile-time
- * safety when referring to the DTD contentType ID.
- * </p>
- * 
- * <p>
- * This class is not meant to be instantiated or subclassed.
- * </p>
- */
-
-public final class ContentTypeIdForDTD {
-	/**
-	 * The value of the ContentTypeID_DTD id field will match what is
-	 * specified in org.eclipse.wst.dtd.core/plugin.xml for the DTD content
-	 * type.
-	 * 
-	 * This value is intentionally set through a default protected method so
-	 * that it will not be inlined.
-	 */
-	public final static String ContentTypeID_DTD = getConstantString();
-
-	private ContentTypeIdForDTD() {
-		super();
-	}
-
-	/**
-	 * @return the DTD Content Type Identifier ID as a String
-	 */
-	static String getConstantString() {
-		return "org.eclipse.wst.dtd.core.dtdsource"; //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/provisional/document/DTDModel.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/provisional/document/DTDModel.java
deleted file mode 100644
index 623ca49..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/provisional/document/DTDModel.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.provisional.document;
-
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-/**
- * <p>
- * An interface implemented by the SSE-based DTD model.
- * </p>
- * 
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- */
-public interface DTDModel extends IStructuredModel{
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/provisional/text/IDTDPartitionTypes.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/provisional/text/IDTDPartitionTypes.java
deleted file mode 100644
index fa5233b..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/provisional/text/IDTDPartitionTypes.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.wst.dtd.core.internal.provisional.text;
-
-
-/**
- * This interface is not intended to be implemented.
- * It defines the partition types DTD.
- * Clients should reference the partition type Strings defined here directly.
- * 
- * @plannedfor 1.0
- */
-public interface IDTDPartitionTypes {
-	
-	String DTD_DEFAULT = "org.eclipse.wst.dtd.DEFAULT"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tasks/DTDFileTaskScanner.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tasks/DTDFileTaskScanner.java
deleted file mode 100644
index 7b3269e..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tasks/DTDFileTaskScanner.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.tasks;
-
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.tasks.StructuredFileTaskScanner;
-
-public class DTDFileTaskScanner extends StructuredFileTaskScanner {
-	public DTDFileTaskScanner() {
-		super();
-	}
-
-	protected boolean isCommentRegion(IStructuredDocumentRegion region, ITextRegion textRegion) {
-		return textRegion.getType().equals(DTDRegionTypes.COMMENT_CONTENT);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/text/DTDStructuredDocumentReParser.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/text/DTDStructuredDocumentReParser.java
deleted file mode 100644
index 741b5b6..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/text/DTDStructuredDocumentReParser.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.text;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredTextReParser;
-import org.eclipse.wst.sse.core.internal.text.StructuredDocumentReParser;
-
-
-public class DTDStructuredDocumentReParser extends StructuredDocumentReParser {
-
-	public StructuredDocumentEvent checkForCrossStructuredDocumentRegionBoundryCases() {
-		IStructuredDocumentRegion startNode = fStructuredDocument.getRegionAtCharacterOffset(fStart);
-		IStructuredDocumentRegion endNode = fStructuredDocument.getRegionAtCharacterOffset(fStart + fLengthToReplace - 1);
-		return reparse(startNode.getStart(), endNode.getEnd());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.core.internal.text.StructuredDocumentReParser#newInstance()
-	 */
-	public IStructuredTextReParser newInstance() {
-		return new DTDStructuredDocumentReParser();
-	}
-
-	protected StructuredDocumentEvent reparse(IStructuredDocumentRegion dirtyStart, IStructuredDocumentRegion dirtyEnd) {
-		return super.reparse(dirtyStart, dirtyEnd);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/text/DTDStructuredDocumentRegionFactory.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/text/DTDStructuredDocumentRegionFactory.java
deleted file mode 100644
index e15b0e6..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/text/DTDStructuredDocumentRegionFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.text;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocumentRegion;
-
-
-public class DTDStructuredDocumentRegionFactory {
-	public static final int DTD_GENERIC = 5;
-
-	public static IStructuredDocumentRegion createStructuredDocumentRegion(int type) {
-		IStructuredDocumentRegion instance = null;
-		switch (type) {
-			case DTD_GENERIC :
-				instance = new BasicStructuredDocumentRegion();
-				break;
-			default :
-				break;
-		}
-		return instance;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/text/RegionIterator.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/text/RegionIterator.java
deleted file mode 100644
index 7f7dcf7..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/text/RegionIterator.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.text;
-
-import java.util.NoSuchElementException;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-
-public class RegionIterator {
-
-	private int currentIndex;
-
-	// private IStructuredDocumentRegion flatNode;
-	private ITextRegionList regions;
-	// private int startOffset, endOffset;
-	private ITextRegion startRegion, endRegion;
-
-	public RegionIterator(IStructuredDocumentRegion node) {
-		this(node, node.getStart(), node.getEnd());
-	}
-
-	public RegionIterator(IStructuredDocumentRegion node, int startOffset, int endOffset) {
-		regions = node.getRegions();
-		startRegion = node.getRegionAtCharacterOffset(startOffset);
-		endRegion = node.getRegionAtCharacterOffset(endOffset - 1);
-
-		for (int i = 0; i < regions.size(); i++) {
-			ITextRegion region = regions.get(i);
-			if (startRegion == region) {
-				currentIndex = i;
-				break;
-			}
-		}
-	}
-
-	public RegionIterator(ITextRegionList regions) {
-		this.regions = regions;
-		startRegion = regions.get(0);
-		endRegion = regions.get(regions.size() - 1);
-		currentIndex = 0;
-		// this(node, node.getStart(), node.getEnd());
-	}
-
-	public boolean hasNext() {
-		if (currentIndex < regions.size()) {
-			return currentIndex <= regions.indexOf(endRegion);
-		}
-		return false;
-	}
-
-	public boolean hasPrevious() {
-		if (currentIndex >= 0) {
-			return currentIndex >= regions.indexOf(startRegion);
-		}
-		return false;
-	}
-
-	public ITextRegion next() {
-		if (hasNext()) {
-			return regions.get(currentIndex++);
-		}
-		throw new NoSuchElementException();
-	}
-
-	public ITextRegion previous() {
-		if (hasPrevious()) {
-			return regions.get(--currentIndex);
-		}
-		throw new NoSuchElementException();
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/text/StructuredTextPartitionerForDTD.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/text/StructuredTextPartitionerForDTD.java
deleted file mode 100644
index 0dadbc9..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/text/StructuredTextPartitionerForDTD.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.text;
-
-import org.eclipse.wst.dtd.core.internal.provisional.text.IDTDPartitionTypes;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitionTypes;
-import org.eclipse.wst.sse.core.internal.text.rules.StructuredTextPartitioner;
-
-public class StructuredTextPartitionerForDTD extends StructuredTextPartitioner {
-
-	public StructuredTextPartitionerForDTD() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.core.text.rules.StructuredTextPartitioner#getDefault()
-	 */
-	public String getDefaultPartitionType() {
-		return IDTDPartitionTypes.DTD_DEFAULT;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.core.text.rules.StructuredTextPartitioner#initLegalContentTypes()
-	 */
-	protected void initLegalContentTypes() {
-		fSupportedTypes = new String[]{IDTDPartitionTypes.DTD_DEFAULT, IStructuredPartitionTypes.UNKNOWN_PARTITION};
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/DTDTokenizer.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/DTDTokenizer.java
deleted file mode 100644
index c2206b3..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/DTDTokenizer.java
+++ /dev/null
@@ -1,1091 +0,0 @@
-/* The following code was generated by JFlex 1.3.5 on 3/14/05 9:37 PM */
-
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-/*nlsXXX*/
-package org.eclipse.wst.dtd.core.internal.tokenizer;
-
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-
-/** 
- * Generate with "dtdskeleton".
- *
- * It removes some unused fields and avoids some compiler warnings 
- */
-
-
-/**
- * This class is a scanner generated by 
- * <a href="http://www.jflex.de/">JFlex</a> 1.3.5
- * on 3/14/05 9:37 PM from the specification file
- * <tt>file:/D:/eclipse.wtp/workspace/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/dtd.flex</tt>
- */
-public class DTDTokenizer {
-
-  /** This character denotes the end of file */
-  final public static int YYEOF = -1;
-
-  /** initial size of the lookahead buffer */
-  final private static int YY_BUFFERSIZE = 16384;
-
-  /** lexical states */
-  final public static int ATTRIBUTE_ENUMERATION = 13;
-  final public static int NOTATION_NAME = 6;
-  final public static int ELEMENT_CHILD = 1;
-  final public static int ENTITY_CONTENT = 4;
-  final public static int COMMENT_CONTENT = 8;
-  final public static int ATTLIST_NAME = 9;
-  final public static int EXTERNALID_CONTENT = 7;
-  final public static int ELEMENT_CONTENT = 1;
-  final public static int ELEMENT_MIXED = 1;
-  final public static int ELEMENT_MIXED_OR_CHILD = 1;
-  final public static int ATTRIBUTE_CONTENT = 11;
-  final public static int ENTITY_NAME = 3;
-  final public static int ATTRIBUTE_DEFAULT = 12;
-  final public static int ELEMENT_NAME = 2;
-  final public static int YYINITIAL = 0;
-  final public static int NDATA_CONTENT = 5;
-  final public static int ATTLIST_CONTENT = 10;
-  final public static int NODE = 1;
-
-  /** 
-   * Translates characters to character classes
-   */
-  final private static String yycmap_packed = 
-    "\10\0\1\0\1\5\1\3\1\0\1\0\1\2\22\0\1\5\1\6"+
-    "\1\1\1\37\1\0\1\23\1\0\1\46\1\42\1\43\1\4\1\7"+
-    "\1\45\1\12\1\0\1\0\12\0\1\0\1\10\1\11\1\0\1\13"+
-    "\1\4\1\0\1\25\1\31\1\32\1\33\1\14\1\35\2\0\1\21"+
-    "\1\0\1\36\1\15\1\16\1\17\1\24\1\27\1\40\1\34\1\26"+
-    "\1\20\1\30\2\0\1\41\1\22\1\0\1\0\1\0\2\0\1\0"+
-    "\1\0\32\0\1\0\1\44\uff83\0";
-
-  /** 
-   * Translates characters to character classes
-   */
-  final private static char [] yycmap = yy_unpack_cmap(yycmap_packed);
-
-  /** 
-   * Translates a state to a row index in the transition table
-   */
-  final private static int yy_rowMap [] = { 
-        0,    39,    78,   117,   156,   195,   234,   273,   312,   351, 
-      390,   429,   468,   507,   546,   585,   624,    39,    39,    39, 
-      663,   702,   741,   780,   819,    39,    39,   858,   897,    39, 
-       39,   936,   936,   975,  1014,  1053,  1092,  1131,  1170,  1209, 
-     1248,  1287,  1326,  1365,  1404,  1443,    39,  1482,  1521,  1560, 
-     1599,  1638,    39,  1677,  1716,  1755,  1794,  1833,  1872,    39, 
-       39,  1911,  1950,  1989,  2028,  2067,  2106,    39,    39,    39, 
-     2145,  2184,  2223,  2262,  2301,  2340,  2379,   897,  2418,   975, 
-     2457,  2496,  2535,  2574,   975,  2613,  2652,  2691,  2730,  1560, 
-     2769,  2808,  2847,  2886,  2925,  2964,  3003,  3042,  3081,  3120, 
-     1950,  3159,  3198,  3237,  3276,  3315,  1950,    39,  3354,  3393, 
-     3432,    39,  3471,  3510,  3549,    39,  3588,  3627,    39,  3666, 
-     3705,  3744,    39,    39,  3783,  3822,  3861,  3900,  3939,  3978, 
-     4017,  4056,    39,  4095,  4134,  4173,    39,  4212,  4251,  4290, 
-     4329,  4368,  4407,  4446,  4485,  4524,  4563,  4602,  4641,  4680, 
-     4719,  4758,  4797,  4836,  4875,  4914,  4953,  4992,  5031,  5070, 
-     5109,  5148,  5187,  5226,  5265,  5304,  5343,   975,  5382,  5421, 
-     5460,  5499,  5538,  5577,  1560,  5616,  5655,  5694,  5733,  5772, 
-     5811,  5850,   546,  5889,  5928,  5967,  6006,   975,   975,   975, 
-     6045,  1560,  6084,  6123,  1560,  6162,  6201,  6240,  1950,   546, 
-     6279,   546,   819,  6318,  6357,  6396,  6435,  6474,  6513,   546, 
-     6552,  1560,  1560,  1560,  1950,  6591,    39,  1950
-  };
-
-  /** 
-   * The packed transition table of the DFA (part 0)
-   */
-  final private static String yy_packed0 = 
-    "\2\17\2\20\1\17\1\20\1\21\1\17\1\22\1\23"+
-    "\1\17\1\24\1\25\2\17\1\26\3\17\1\27\1\17"+
-    "\1\30\21\17\47\0\2\31\2\20\1\32\1\20\1\0"+
-    "\1\32\1\31\1\33\1\31\1\33\23\31\1\34\2\31"+
-    "\1\35\1\36\2\37\1\31\2\40\2\20\1\0\1\20"+
-    "\3\40\1\33\1\40\1\33\7\40\1\41\16\40\4\0"+
-    "\1\40\1\42\1\43\2\20\1\42\1\20\3\42\1\33"+
-    "\1\42\1\33\12\42\1\44\1\45\16\42\1\46\2\47"+
-    "\2\20\1\47\1\20\3\47\1\33\1\47\1\33\33\47"+
-    "\2\50\2\20\1\0\1\20\2\0\1\50\1\33\1\50"+
-    "\1\33\26\50\4\0\1\50\1\42\1\43\2\20\1\42"+
-    "\1\20\3\42\1\33\1\42\1\33\3\42\1\51\6\42"+
-    "\1\52\1\53\16\42\1\46\2\54\2\55\1\54\1\55"+
-    "\4\54\1\56\1\57\33\54\2\60\2\20\1\42\1\20"+
-    "\2\42\1\60\1\33\1\60\1\33\26\60\4\42\1\60"+
-    "\2\61\2\20\1\42\1\20\2\42\1\61\1\33\1\61"+
-    "\1\33\26\61\4\42\1\61\1\62\1\63\1\64\1\65"+
-    "\1\62\1\66\3\62\1\33\1\62\1\33\1\67\2\62"+
-    "\1\70\1\62\1\71\10\62\1\72\4\62\1\73\2\62"+
-    "\1\74\2\75\1\62\1\76\1\77\1\100\2\20\1\77"+
-    "\1\20\3\77\1\33\1\77\1\33\23\77\1\101\6\77"+
-    "\1\102\2\103\2\20\1\103\1\20\3\103\1\33\1\103"+
-    "\1\33\26\103\1\104\1\105\1\106\2\103\2\17\2\0"+
-    "\1\17\2\0\1\17\2\0\1\17\1\0\7\17\1\0"+
-    "\23\17\2\0\2\20\1\0\1\20\53\0\1\107\34\0"+
-    "\2\17\2\0\1\17\2\0\1\17\2\0\1\17\1\0"+
-    "\1\17\1\110\1\17\1\111\3\17\1\0\25\17\2\0"+
-    "\1\17\2\0\1\17\2\0\1\17\1\0\7\17\1\0"+
-    "\1\112\22\17\2\113\2\0\1\113\2\0\1\113\2\0"+
-    "\1\113\1\0\7\113\1\0\23\113\2\17\2\0\1\17"+
-    "\2\0\1\17\2\0\1\17\1\0\4\17\1\114\2\17"+
-    "\1\0\23\17\2\31\6\0\1\31\1\0\1\31\1\0"+
-    "\26\31\4\0\3\31\6\0\1\31\1\0\1\31\1\0"+
-    "\13\31\1\115\12\31\4\0\1\31\2\0\2\116\1\0"+
-    "\1\116\31\0\1\117\7\0\2\40\4\0\3\40\1\0"+
-    "\1\40\1\0\26\40\4\0\1\40\2\42\2\0\1\42"+
-    "\1\0\3\42\1\0\1\42\1\0\33\42\1\43\1\120"+
-    "\2\121\1\43\1\121\3\43\1\121\1\43\1\121\33\43"+
-    "\2\42\2\0\1\42\1\0\3\42\1\0\1\42\1\0"+
-    "\6\42\1\122\26\42\2\0\1\42\1\0\3\42\1\0"+
-    "\1\42\1\0\14\42\1\123\16\42\2\46\2\124\1\46"+
-    "\1\124\3\46\1\124\1\46\1\124\32\46\1\125\2\47"+
-    "\2\0\1\47\1\0\3\47\1\0\1\47\1\0\33\47"+
-    "\2\50\6\0\1\50\1\0\1\50\1\0\26\50\4\0"+
-    "\1\50\2\42\2\0\1\42\1\0\3\42\1\0\1\42"+
-    "\1\0\17\42\1\126\15\42\2\0\1\42\1\0\3\42"+
-    "\1\0\1\42\1\0\6\42\1\127\26\42\2\0\1\42"+
-    "\1\0\3\42\1\0\1\42\1\0\14\42\1\130\16\42"+
-    "\12\54\2\0\35\54\2\55\1\54\1\55\4\54\2\0"+
-    "\33\54\12\0\1\131\34\0\2\60\2\0\1\42\1\0"+
-    "\2\42\1\60\1\0\1\60\1\0\26\60\4\42\1\60"+
-    "\2\61\2\0\1\42\1\0\2\42\1\61\1\0\1\61"+
-    "\1\0\26\61\4\42\1\61\2\62\2\0\1\62\1\0"+
-    "\3\62\1\0\1\62\1\0\26\62\3\0\2\62\1\63"+
-    "\1\132\2\133\1\63\1\133\3\63\1\133\1\63\1\133"+
-    "\26\63\3\133\2\63\3\0\1\65\50\0\1\66\41\0"+
-    "\2\62\2\0\1\62\1\0\3\62\1\0\1\62\1\0"+
-    "\3\62\1\134\22\62\3\0\4\62\2\0\1\62\1\0"+
-    "\3\62\1\0\1\62\1\0\2\62\1\135\5\62\1\136"+
-    "\15\62\3\0\4\62\2\0\1\62\1\0\3\62\1\0"+
-    "\1\62\1\0\17\62\1\137\6\62\3\0\4\62\2\0"+
-    "\1\62\1\0\3\62\1\0\1\62\1\0\17\62\1\140"+
-    "\6\62\3\0\4\62\2\0\1\62\1\0\3\62\1\0"+
-    "\1\62\1\0\5\62\1\141\12\62\1\142\1\143\4\62"+
-    "\3\0\2\62\2\76\2\144\1\76\1\144\3\76\1\144"+
-    "\1\76\1\144\26\76\3\144\1\76\1\132\2\77\2\0"+
-    "\1\77\1\0\3\77\1\0\1\77\1\0\33\77\1\100"+
-    "\1\145\2\146\1\100\1\146\3\100\1\146\1\100\1\146"+
-    "\33\100\2\77\2\0\1\77\1\0\3\77\1\0\1\77"+
-    "\1\0\5\77\1\147\12\77\1\150\1\151\11\77\2\102"+
-    "\2\152\1\102\1\152\3\102\1\152\1\102\1\152\32\102"+
-    "\1\153\2\103\2\0\1\103\1\0\3\103\1\0\1\103"+
-    "\1\0\26\103\3\0\2\103\12\0\1\154\34\0\2\17"+
-    "\2\0\1\17\2\0\1\17\2\0\1\17\1\0\1\155"+
-    "\6\17\1\0\25\17\2\0\1\17\2\0\1\17\2\0"+
-    "\1\17\1\0\4\17\1\156\2\17\1\0\25\17\2\0"+
-    "\1\17\2\0\1\17\2\0\1\17\1\0\4\17\1\157"+
-    "\2\17\1\0\23\17\2\113\2\0\1\113\2\0\1\113"+
-    "\1\160\1\0\1\113\1\0\7\113\1\0\23\113\2\17"+
-    "\2\0\1\17\2\0\1\17\2\0\1\17\1\0\4\17"+
-    "\1\161\2\17\1\0\23\17\2\31\6\0\1\31\1\0"+
-    "\1\31\1\0\16\31\1\162\7\31\4\0\1\31\27\0"+
-    "\1\163\17\0\1\121\1\164\45\121\2\42\2\0\1\42"+
-    "\1\0\3\42\1\0\1\42\1\0\12\42\1\165\22\42"+
-    "\2\0\1\42\1\0\3\42\1\0\1\42\1\0\15\42"+
-    "\1\166\15\42\46\124\1\167\2\42\2\0\1\42\1\0"+
-    "\3\42\1\0\1\42\1\0\11\42\1\170\23\42\2\0"+
-    "\1\42\1\0\3\42\1\0\1\42\1\0\12\42\1\171"+
-    "\22\42\2\0\1\42\1\0\3\42\1\0\1\42\1\0"+
-    "\15\42\1\172\15\42\13\0\1\173\33\0\1\133\1\174"+
-    "\45\133\2\62\2\0\1\62\1\0\3\62\1\0\1\62"+
-    "\1\0\4\62\1\175\21\62\3\0\4\62\2\0\1\62"+
-    "\1\0\3\62\1\0\1\62\1\0\4\62\1\176\21\62"+
-    "\3\0\4\62\2\0\1\62\1\0\3\62\1\0\1\62"+
-    "\1\0\4\62\1\177\21\62\3\0\4\62\2\0\1\62"+
-    "\1\0\3\62\1\0\1\62\1\0\20\62\1\200\5\62"+
-    "\3\0\4\62\2\0\1\62\1\0\3\62\1\0\1\62"+
-    "\1\0\11\62\1\201\14\62\3\0\4\62\2\0\1\62"+
-    "\1\0\3\62\1\0\1\62\1\0\2\62\1\202\23\62"+
-    "\3\0\4\62\2\0\1\62\1\0\3\62\1\0\1\62"+
-    "\1\0\1\203\25\62\3\0\4\62\2\0\1\62\1\0"+
-    "\3\62\1\0\1\62\1\0\5\62\1\204\20\62\3\0"+
-    "\2\62\46\144\1\174\1\146\1\205\45\146\2\77\2\0"+
-    "\1\77\1\0\3\77\1\0\1\77\1\0\2\77\1\206"+
-    "\32\77\2\0\1\77\1\0\3\77\1\0\1\77\1\0"+
-    "\1\207\34\77\2\0\1\77\1\0\3\77\1\0\1\77"+
-    "\1\0\5\77\1\210\25\77\46\152\1\211\2\17\2\0"+
-    "\1\17\2\0\1\17\2\0\1\17\1\0\2\17\1\212"+
-    "\4\17\1\0\25\17\2\0\1\17\2\0\1\17\2\0"+
-    "\1\17\1\0\5\17\1\213\1\17\1\0\25\17\2\0"+
-    "\1\17\2\0\1\17\2\0\1\17\1\0\7\17\1\0"+
-    "\1\17\1\214\23\17\2\0\1\17\2\0\1\17\2\0"+
-    "\1\17\1\0\1\17\1\215\5\17\1\0\23\17\2\31"+
-    "\6\0\1\31\1\0\1\31\1\0\17\31\1\216\6\31"+
-    "\4\0\1\31\32\0\1\217\14\0\2\42\2\0\1\42"+
-    "\1\0\3\42\1\0\1\42\1\0\4\42\1\220\30\42"+
-    "\2\0\1\42\1\0\3\42\1\0\1\42\1\0\1\42"+
-    "\1\221\33\42\2\0\1\42\1\0\3\42\1\0\1\42"+
-    "\1\0\4\42\1\222\30\42\2\0\1\42\1\0\3\42"+
-    "\1\0\1\42\1\0\4\42\1\223\30\42\2\0\1\42"+
-    "\1\0\3\42\1\0\1\42\1\0\1\42\1\224\31\42"+
-    "\2\62\2\0\1\62\1\0\3\62\1\0\1\62\1\0"+
-    "\5\62\1\225\20\62\3\0\4\62\2\0\1\62\1\0"+
-    "\3\62\1\0\1\62\1\0\10\62\1\226\15\62\3\0"+
-    "\4\62\2\0\1\62\1\0\3\62\1\0\1\62\1\0"+
-    "\11\62\1\227\14\62\3\0\4\62\2\0\1\62\1\0"+
-    "\3\62\1\0\1\62\1\0\1\230\25\62\3\0\4\62"+
-    "\2\0\1\62\1\0\3\62\1\0\1\62\1\0\4\62"+
-    "\1\231\21\62\3\0\4\62\2\0\1\62\1\0\3\62"+
-    "\1\0\1\62\1\0\13\62\1\232\12\62\3\0\4\62"+
-    "\2\0\1\62\1\0\3\62\1\0\1\62\1\0\24\62"+
-    "\1\233\1\62\3\0\4\62\2\0\1\62\1\0\3\62"+
-    "\1\0\1\62\1\0\25\62\1\234\3\0\2\62\2\77"+
-    "\2\0\1\77\1\0\3\77\1\0\1\77\1\0\13\77"+
-    "\1\235\21\77\2\0\1\77\1\0\3\77\1\0\1\77"+
-    "\1\0\24\77\1\236\10\77\2\0\1\77\1\0\3\77"+
-    "\1\0\1\77\1\0\25\77\1\237\5\77\2\17\2\0"+
-    "\1\17\2\0\1\17\2\0\1\17\1\0\1\240\6\17"+
-    "\1\0\25\17\2\0\1\17\2\0\1\17\2\0\1\17"+
-    "\1\0\4\17\1\241\2\17\1\0\25\17\2\0\1\17"+
-    "\2\0\1\17\2\0\1\17\1\0\4\17\1\242\2\17"+
-    "\1\0\25\17\2\0\1\17\2\0\1\17\2\0\1\17"+
-    "\1\0\5\17\1\243\1\17\1\0\23\17\2\31\6\0"+
-    "\1\31\1\0\1\31\1\0\11\31\1\244\14\31\4\0"+
-    "\1\31\33\0\1\245\13\0\2\42\2\0\1\42\1\0"+
-    "\3\42\1\0\1\42\1\0\1\246\34\42\2\0\1\42"+
-    "\1\0\3\42\1\0\1\42\1\0\5\42\1\247\27\42"+
-    "\2\0\1\42\1\0\3\42\1\0\1\42\1\0\11\42"+
-    "\1\250\23\42\2\0\1\42\1\0\3\42\1\0\1\42"+
-    "\1\0\1\251\34\42\2\0\1\42\1\0\3\42\1\0"+
-    "\1\42\1\0\5\42\1\252\25\42\2\62\2\0\1\62"+
-    "\1\0\3\62\1\0\1\62\1\0\4\62\1\253\21\62"+
-    "\3\0\4\62\2\0\1\62\1\0\3\62\1\0\1\62"+
-    "\1\0\22\62\1\254\3\62\3\0\4\62\2\0\1\62"+
-    "\1\0\3\62\1\0\1\62\1\0\4\62\1\255\21\62"+
-    "\3\0\4\62\2\0\1\62\1\0\3\62\1\0\1\62"+
-    "\1\0\21\62\1\256\4\62\3\0\4\62\2\0\1\62"+
-    "\1\0\3\62\1\0\1\62\1\0\11\62\1\257\14\62"+
-    "\3\0\4\62\2\0\1\62\1\0\3\62\1\0\1\62"+
-    "\1\0\1\62\1\260\24\62\3\0\4\62\2\0\1\62"+
-    "\1\0\3\62\1\0\1\62\1\0\14\62\1\261\11\62"+
-    "\3\0\4\62\2\0\1\62\1\0\3\62\1\0\1\62"+
-    "\1\0\1\262\25\62\3\0\2\62\2\77\2\0\1\77"+
-    "\1\0\3\77\1\0\1\77\1\0\1\77\1\263\33\77"+
-    "\2\0\1\77\1\0\3\77\1\0\1\77\1\0\14\77"+
-    "\1\264\20\77\2\0\1\77\1\0\3\77\1\0\1\77"+
-    "\1\0\1\265\32\77\2\17\2\0\1\17\2\0\1\17"+
-    "\2\0\1\17\1\0\3\17\1\266\3\17\1\0\25\17"+
-    "\2\0\1\17\2\0\1\17\2\0\1\17\1\0\6\17"+
-    "\1\267\1\0\25\17\2\0\1\17\2\0\1\17\2\0"+
-    "\1\17\1\0\5\17\1\270\1\17\1\0\25\17\2\0"+
-    "\1\17\2\0\1\17\2\0\1\17\1\0\7\17\1\0"+
-    "\2\17\1\271\20\17\2\31\6\0\1\31\1\0\1\31"+
-    "\1\0\4\31\1\272\21\31\4\0\1\31\25\0\1\273"+
-    "\21\0\2\42\2\0\1\42\1\0\3\42\1\0\1\42"+
-    "\1\0\2\42\1\274\32\42\2\0\1\42\1\0\3\42"+
-    "\1\0\1\42\1\0\16\42\1\274\16\42\2\0\1\42"+
-    "\1\0\3\42\1\0\1\42\1\0\2\42\1\275\32\42"+
-    "\2\0\1\42\1\0\3\42\1\0\1\42\1\0\16\42"+
-    "\1\276\14\42\2\62\2\0\1\62\1\0\3\62\1\0"+
-    "\1\62\1\0\5\62\1\277\1\300\17\62\3\0\4\62"+
-    "\2\0\1\62\1\0\3\62\1\0\1\62\1\0\1\301"+
-    "\25\62\3\0\4\62\2\0\1\62\1\0\3\62\1\0"+
-    "\1\62\1\0\5\62\1\302\20\62\3\0\4\62\2\0"+
-    "\1\62\1\0\3\62\1\0\1\62\1\0\12\62\1\303"+
-    "\13\62\3\0\4\62\2\0\1\62\1\0\3\62\1\0"+
-    "\1\62\1\0\5\62\1\234\20\62\3\0\4\62\2\0"+
-    "\1\62\1\0\3\62\1\0\1\62\1\0\5\62\1\304"+
-    "\20\62\3\0\4\62\2\0\1\62\1\0\3\62\1\0"+
-    "\1\62\1\0\17\62\1\132\6\62\3\0\2\62\2\77"+
-    "\2\0\1\77\1\0\3\77\1\0\1\77\1\0\5\77"+
-    "\1\305\27\77\2\0\1\77\1\0\3\77\1\0\1\77"+
-    "\1\0\5\77\1\306\27\77\2\0\1\77\1\0\3\77"+
-    "\1\0\1\77\1\0\17\77\1\307\13\77\2\17\2\0"+
-    "\1\17\2\0\1\17\2\0\1\17\1\0\4\17\1\310"+
-    "\2\17\1\0\25\17\2\0\1\17\2\0\1\17\2\0"+
-    "\1\17\1\0\7\17\1\0\1\311\24\17\2\0\1\17"+
-    "\2\0\1\17\2\0\1\17\1\0\4\17\1\312\2\17"+
-    "\1\0\23\17\2\31\6\0\1\31\1\0\1\31\1\0"+
-    "\11\31\1\313\14\31\4\0\1\31\20\0\1\314\26\0"+
-    "\2\62\2\0\1\62\1\0\3\62\1\0\1\62\1\0"+
-    "\1\315\25\62\3\0\4\62\2\0\1\62\1\0\3\62"+
-    "\1\0\1\62\1\0\3\62\1\316\22\62\3\0\4\62"+
-    "\2\0\1\62\1\0\3\62\1\0\1\62\1\0\10\62"+
-    "\1\317\15\62\3\0\4\62\2\0\1\62\1\0\3\62"+
-    "\1\0\1\62\1\0\20\62\1\234\5\62\3\0\2\62"+
-    "\2\77\2\0\1\77\1\0\3\77\1\0\1\77\1\0"+
-    "\1\320\34\77\2\0\1\77\1\0\3\77\1\0\1\77"+
-    "\1\0\20\77\1\321\12\77\2\17\2\0\1\17\2\0"+
-    "\1\17\2\0\1\17\1\0\3\17\1\322\3\17\1\0"+
-    "\23\17\25\0\1\323\21\0\2\62\2\0\1\62\1\0"+
-    "\3\62\1\0\1\62\1\0\12\62\1\324\13\62\3\0"+
-    "\4\62\2\0\1\62\1\0\3\62\1\0\1\62\1\0"+
-    "\12\62\1\325\13\62\3\0\4\62\2\0\1\62\1\0"+
-    "\3\62\1\0\1\62\1\0\3\62\1\326\22\62\3\0"+
-    "\2\62\2\77\2\0\1\77\1\0\3\77\1\0\1\77"+
-    "\1\0\17\77\1\327\15\77\2\0\1\77\1\0\3\77"+
-    "\1\0\1\77\1\0\1\330\32\77\2\0\2\323\1\0"+
-    "\1\323\35\0\1\331\3\0\2\77\2\0\1\77\1\0"+
-    "\3\77\1\0\1\77\1\0\17\77\1\332\13\77";
-
-  /** 
-   * The transition table of the DFA
-   */
-  final private static int yytrans [] = yy_unpack();
-
-
-  /* error codes */
-  final private static int YY_UNKNOWN_ERROR = 0;
-  final static int YY_ILLEGAL_STATE = 1;
-  final private static int YY_NO_MATCH = 2;
-  final private static int YY_PUSHBACK_2BIG = 3;
-
-  /* error messages for the codes above */
-  final private static String YY_ERROR_MSG[] = {
-    "Unkown internal scanner error",
-    "Internal error: unknown state",
-    "Error: could not match input",
-    "Error: pushback value was too large"
-  };
-
-  /**
-   * YY_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
-   */
-  private final static byte YY_ATTRIBUTE[] = {
-     0,  8,  0,  0,  1,  1,  0,  1,  0,  1,  1,  1,  1,  1,  1,  1, 
-     1,  9,  9,  9,  1,  1,  1,  1,  1,  9,  9,  1,  1,  9,  9,  1, 
-     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  9,  1, 
-     1,  1,  1,  1,  9,  1,  1,  1,  1,  1,  1,  9,  9,  1,  1,  1, 
-     1,  1,  1,  9,  9,  9,  0,  1,  1,  1,  0,  1,  1,  0,  0,  1, 
-     0,  1,  1,  0,  1,  1,  1,  1,  0,  1,  0,  1,  1,  1,  1,  1, 
-     1,  1,  1,  0,  1,  0,  1,  1,  1,  0,  1,  9,  1,  1,  1,  9, 
-     1,  1,  0,  9,  1,  1,  9,  1,  1,  1,  9,  9,  1,  1,  1,  1, 
-     1,  1,  1,  1,  9,  1,  1,  1,  9,  1,  1,  1,  1,  1,  0,  1, 
-     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 
-     1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 
-     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1, 
-     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1, 
-     1,  1,  0,  1,  1,  1,  1,  1,  9,  1
-  };
-
-  /** the input device */
-  private java.io.Reader yy_reader;
-
-  /** the current state of the DFA */
-  private int yy_state;
-
-  /** the current lexical state */
-  private int yy_lexical_state = YYINITIAL;
-
-  /** this buffer contains the current text to be matched and is
-      the source of the yytext() string */
-  private char yy_buffer[] = new char[YY_BUFFERSIZE];
-
-  /** the textposition at the last accepting state */
-  private int yy_markedPos;
-
-  /** the textposition at the last state to be included in yytext */
-  private int yy_pushbackPos;
-
-  /** the current text position in the buffer */
-  private int yy_currentPos;
-
-  /** startRead marks the beginning of the yytext() string in the buffer */
-  private int yy_startRead;
-
-  /** endRead marks the last character in the buffer, that has been read
-      from input */
-  private int yy_endRead;
-
-  /** number of newlines encountered up to the start of the matched text */
-  private int yyline;
-
-  /** the number of characters up to the start of the matched text */
-  private int yychar;
-
-  /**
-   * the number of characters from the last newline up to the start of the 
-   * matched text
-   */
-  int yycolumn; 
-
-  /** yy_atEOF == true <=> the scanner is at the EOF */
-  private boolean yy_atEOF;
-
-  /* user code: */
-	int node_count = 0;
-	String currentString;
-
-	private Token createToken(String type) {
-		return new Token(type, yytext(), yyline, yychar + startOffset, yylength());
-	}
-
-	private int startOffset = 0;
-	public void setStartOffset(int offset) {
-		this.startOffset = offset;
-	}
-
-	public void setLine(int line) {
-		this.yyline = line;
-	}
-
-
-  /**
-   * Creates a new scanner
-   * There is also a java.io.InputStream version of this constructor.
-   *
-   * @param   in  the java.io.Reader to read input from.
-   */
-  public DTDTokenizer(java.io.Reader in) {
-    this.yy_reader = in;
-  }
-
-  /**
-   * Creates a new scanner.
-   * There is also java.io.Reader version of this constructor.
-   *
-   * @param   in  the java.io.Inputstream to read input from.
-   */
-  public DTDTokenizer(java.io.InputStream in) {
-    this(new java.io.InputStreamReader(in));
-  }
-
-  /** 
-   * Unpacks the split, compressed DFA transition table.
-   *
-   * @return the unpacked transition table
-   */
-  private static int [] yy_unpack() {
-    int [] trans = new int[6630];
-    int offset = 0;
-    offset = yy_unpack(yy_packed0, offset, trans);
-    return trans;
-  }
-
-  /** 
-   * Unpacks the compressed DFA transition table.
-   *
-   * @param packed   the packed transition table
-   * @return         the index of the last entry
-   */
-  private static int yy_unpack(String packed, int offset, int [] trans) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      value--;
-      do trans[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-  /** 
-   * Unpacks the compressed character translation table.
-   *
-   * @param packed   the packed character translation table
-   * @return         the unpacked character translation table
-   */
-  private static char [] yy_unpack_cmap(String packed) {
-    char [] map = new char[0x10000];
-    int i = 0;  /* index in packed string  */
-    int j = 0;  /* index in unpacked array */
-    while (i < 130) {
-      int  count = packed.charAt(i++);
-      char value = packed.charAt(i++);
-      do map[j++] = value; while (--count > 0);
-    }
-    return map;
-  }
-
-
-  /**
-   * Refills the input buffer.
-   *
-   * @return      <code>false</code>, iff there was new input.
-   * 
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  private boolean yy_refill() throws java.io.IOException {
-
-    /* first: make room (if you can) */
-    if (yy_startRead > 0) {
-      System.arraycopy(yy_buffer, yy_startRead, 
-                       yy_buffer, 0, 
-                       yy_endRead-yy_startRead);
-
-      /* translate stored positions */
-      yy_endRead-= yy_startRead;
-      yy_currentPos-= yy_startRead;
-      yy_markedPos-= yy_startRead;
-      yy_pushbackPos-= yy_startRead;
-      yy_startRead = 0;
-    }
-
-    /* is the buffer big enough? */
-    if (yy_currentPos >= yy_buffer.length) {
-      /* if not: blow it up */
-      char newBuffer[] = new char[yy_currentPos*2];
-      System.arraycopy(yy_buffer, 0, newBuffer, 0, yy_buffer.length);
-      yy_buffer = newBuffer;
-    }
-
-    /* finally: fill the buffer with new input */
-    int numRead = yy_reader.read(yy_buffer, yy_endRead, 
-                                            yy_buffer.length-yy_endRead);
-
-    if (numRead < 0) {
-      return true;
-    }
-    else {
-      yy_endRead+= numRead;  
-      return false;
-    }
-  }
-
-    
-  /**
-   * Closes the input stream.
-   */
-  final public void yyclose() throws java.io.IOException {
-    yy_atEOF = true;            /* indicate end of file */
-    yy_endRead = yy_startRead;  /* invalidate buffer    */
-
-    if (yy_reader != null)
-      yy_reader.close();
-  }
-
-
-  /**
-   * Closes the current stream, and resets the
-   * scanner to read from a new input stream.
-   *
-   * All internal variables are reset, the old input stream 
-   * <b>cannot</b> be reused (internal buffer is discarded and lost).
-   * Lexical state is set to <tt>YY_INITIAL</tt>.
-   *
-   * @param reader   the new input stream 
-   */
-  final public void yyreset(java.io.Reader reader) throws java.io.IOException {
-    yyclose();
-    yy_reader = reader;
-    yy_atEOF  = false;
-    yy_endRead = yy_startRead = 0;
-    yy_currentPos = yy_markedPos = yy_pushbackPos = 0;
-    yyline = yychar = yycolumn = 0;
-    yy_lexical_state = YYINITIAL;
-  }
-
-
-  /**
-   * Returns the current lexical state.
-   */
-  final public int yystate() {
-    return yy_lexical_state;
-  }
-
-
-  /**
-   * Enters a new lexical state
-   *
-   * @param newState the new lexical state
-   */
-  final public void yybegin(int newState) {
-    yy_lexical_state = newState;
-  }
-
-
-  /**
-   * Returns the text matched by the current regular expression.
-   */
-  final public String yytext() {
-    return new String( yy_buffer, yy_startRead, yy_markedPos-yy_startRead );
-  }
-
-
-  /**
-   * Returns the character at position <tt>pos</tt> from the 
-   * matched text. 
-   * 
-   * It is equivalent to yytext().charAt(pos), but faster
-   *
-   * @param pos the position of the character to fetch. 
-   *            A value from 0 to yylength()-1.
-   *
-   * @return the character at position pos
-   */
-  final public char yycharat(int pos) {
-    return yy_buffer[yy_startRead+pos];
-  }
-
-
-  /**
-   * Returns the length of the matched text region.
-   */
-  final public int yylength() {
-    return yy_markedPos-yy_startRead;
-  }
-
-
-  /**
-   * Reports an error that occured while scanning.
-   *
-   * In a wellformed scanner (no or only correct usage of 
-   * yypushback(int) and a match-all fallback rule) this method 
-   * will only be called with things that "Can't Possibly Happen".
-   * If this method is called, something is seriously wrong
-   * (e.g. a JFlex bug producing a faulty scanner etc.).
-   *
-   * Usual syntax/scanner level error handling should be done
-   * in error fallback rules.
-   *
-   * @param   errorCode  the code of the errormessage to display
-   */
-  private void yy_ScanError(int errorCode) {
-    String message;
-    try {
-      message = YY_ERROR_MSG[errorCode];
-    }
-    catch (ArrayIndexOutOfBoundsException e) {
-      message = YY_ERROR_MSG[YY_UNKNOWN_ERROR];
-    }
-
-    throw new Error(message);
-  } 
-
-
-  /**
-   * Pushes the specified amount of characters back into the input stream.
-   *
-   * They will be read again by then next call of the scanning method
-   *
-   * @param number  the number of characters to be read again.
-   *                This number must not be greater than yylength()!
-   */
-  private void yypushback(int number)  {
-    if ( number > yylength() )
-      yy_ScanError(YY_PUSHBACK_2BIG);
-
-    yy_markedPos -= number;
-  }
-
-
-  /**
-   * Resumes scanning until the next regular expression is matched,
-   * the end of input is encountered or an I/O-Error occurs.
-   *
-   * @return      the next token
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  public Yytoken yylex() throws java.io.IOException {
-    int yy_input;
-    int yy_action;
-
-    // cached fields:
-    int yy_currentPos_l;
-    int yy_markedPos_l;
-    int yy_endRead_l = yy_endRead;
-    char [] yy_buffer_l = yy_buffer;
-    char [] yycmap_l = yycmap;
-
-    int [] yytrans_l = yytrans;
-    int [] yy_rowMap_l = yy_rowMap;
-    byte [] yy_attr_l = YY_ATTRIBUTE;
-
-    while (true) {
-      yy_markedPos_l = yy_markedPos;
-
-      yychar+= yy_markedPos_l-yy_startRead;
-
-      yy_action = -1;
-
-      yy_currentPos_l = yy_currentPos = 
-                       yy_startRead = yy_markedPos_l;
-  
-      yy_state = yy_lexical_state;
-
-
-      yy_forAction: {
-        while (true) {
-    
-          if (yy_currentPos_l < yy_endRead_l)
-            yy_input = yy_buffer_l[yy_currentPos_l++];
-          else if (yy_atEOF) {
-            yy_input = YYEOF;
-            break yy_forAction;
-          }
-          else {
-            // store back cached positions
-            yy_currentPos  = yy_currentPos_l;
-            yy_markedPos   = yy_markedPos_l;
-            boolean eof = yy_refill();
-            // get translated positions and possibly new buffer
-            yy_currentPos_l  = yy_currentPos;
-            yy_markedPos_l   = yy_markedPos;
-            yy_buffer_l      = yy_buffer;
-            yy_endRead_l     = yy_endRead;
-            if (eof) {
-              yy_input = YYEOF;
-              break yy_forAction;
-            }
-            else {
-              yy_input = yy_buffer_l[yy_currentPos_l++];
-            }
-          }
-          int yy_next = yytrans_l[ yy_rowMap_l[yy_state] + yycmap_l[yy_input] ];
-          if (yy_next == -1) break yy_forAction;
-          yy_state = yy_next;
-
-          int yy_attributes = yy_attr_l[yy_state];
-          if ( (yy_attributes & 1) == 1 ) {
-            yy_action = yy_state; 
-            yy_markedPos_l = yy_currentPos_l; 
-            if ( (yy_attributes & 8) == 8 ) break yy_forAction;
-          }
-
-        }
-      }
-
-      // store back cached position
-      yy_markedPos = yy_markedPos_l;
-
-      switch (yy_action) {
-
-        case 26: 
-          {  yypushback(yylength()); yybegin(YYINITIAL);  }
-        case 219: break;
-        case 89: 
-        case 123: 
-          {  yypushback(yylength()); yybegin(ATTRIBUTE_DEFAULT);  }
-        case 220: break;
-        case 12: 
-        case 62: 
-        case 63: 
-        case 64: 
-        case 65: 
-        case 102: 
-        case 103: 
-        case 104: 
-        case 133: 
-        case 134: 
-        case 135: 
-        case 156: 
-        case 157: 
-        case 158: 
-        case 178: 
-        case 179: 
-        case 180: 
-        case 196: 
-        case 197: 
-        case 207: 
-        case 208: 
-        case 215: 
-          {  yypushback(yylength()); yybegin(ATTLIST_CONTENT);  }
-        case 221: break;
-        case 51: 
-        case 52: 
-          {  yypushback(yylength()); yybegin(ATTLIST_CONTENT);  }
-        case 222: break;
-        case 205: 
-          {  yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.NMTOKEN_KEYWORD);  }
-        case 223: break;
-        case 194: 
-          {  yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.IDREFS_KEYWORD);  }
-        case 224: break;
-        case 191: 
-          {  yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.ENTITY_KEYWORD);  }
-        case 225: break;
-        case 107: 
-          {  yybegin(COMMENT_CONTENT); return createToken(DTDRegionTypes.COMMENT_START);  }
-        case 226: break;
-        case 48: 
-          {  yybegin(ATTRIBUTE_CONTENT); return createToken(DTDRegionTypes.ATTRIBUTE_NAME);  }
-        case 227: break;
-        case 39: 
-          {  yybegin(EXTERNALID_CONTENT); return createToken(DTDRegionTypes.NAME);  }
-        case 228: break;
-        case 106: 
-        case 136: 
-          {  yybegin(ATTLIST_CONTENT); return createToken(DTDRegionTypes.SINGLEQUOTED_LITERAL);  }
-        case 229: break;
-        case 100: 
-        case 132: 
-          {  yybegin(ATTLIST_CONTENT); return createToken(DTDRegionTypes.DOUBLEQUOTED_LITERAL);  }
-        case 230: break;
-        case 202: 
-        case 216: 
-          {  return createToken(DTDRegionTypes.CONTENT_PCDATA);  }
-        case 231: break;
-        case 189: 
-          {  return createToken(DTDRegionTypes.PUBLIC_KEYWORD);  }
-        case 232: break;
-        case 188: 
-          {  return createToken(DTDRegionTypes.SYSTEM_KEYWORD);  }
-        case 233: break;
-        case 14: 
-        case 20: 
-        case 21: 
-        case 23: 
-        case 71: 
-        case 72: 
-        case 73: 
-        case 75: 
-        case 108: 
-        case 109: 
-        case 110: 
-        case 112: 
-        case 137: 
-        case 138: 
-        case 139: 
-        case 140: 
-        case 159: 
-        case 160: 
-        case 161: 
-        case 162: 
-        case 181: 
-        case 183: 
-        case 184: 
-        case 200: 
-          {  return createToken(DTDRegionTypes.UNKNOWN_CONTENT);  }
-        case 234: break;
-        case 4: 
-        case 33: 
-        case 34: 
-        case 35: 
-        case 36: 
-        case 37: 
-        case 81: 
-        case 82: 
-        case 116: 
-        case 117: 
-        case 143: 
-        case 144: 
-        case 165: 
-        case 166: 
-          {  return createToken(DTDRegionTypes.UNKNOWN_CONTENT);  }
-        case 235: break;
-        case 7: 
-        case 40: 
-        case 41: 
-        case 42: 
-        case 85: 
-        case 86: 
-        case 87: 
-        case 119: 
-        case 120: 
-        case 121: 
-        case 145: 
-        case 146: 
-        case 147: 
-        case 168: 
-        case 169: 
-          {  return createToken(DTDRegionTypes.UNKNOWN_CONTENT);  }
-        case 236: break;
-        case 9: 
-          {  return createToken(DTDRegionTypes.UNKNOWN_CONTENT);  }
-        case 237: break;
-        case 10: 
-          {  return createToken(DTDRegionTypes.UNKNOWN_CONTENT);  }
-        case 238: break;
-        case 43: 
-        case 45: 
-        case 46: 
-          {  return createToken(DTDRegionTypes.COMMENT_CONTENT);  }
-        case 239: break;
-        case 60: 
-          {  return createToken(DTDRegionTypes.UNKNOWN_CONTENT);  }
-        case 240: break;
-        case 198: 
-          {  return createToken(DTDRegionTypes.FIXED_KEYWORD);  }
-        case 241: break;
-        case 214: 
-          {  yybegin(ATTLIST_CONTENT); return createToken(DTDRegionTypes.IMPLIED_KEYWORD);  }
-        case 242: break;
-        case 212: 
-          {  yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.NMTOKENS_KEYWORD);  }
-        case 243: break;
-        case 211: 
-          {  yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.ENTITIES_KEYWORD);  }
-        case 244: break;
-        case 209: 
-          {  yybegin(NOTATION_NAME); return createToken(DTDRegionTypes.NOTATION_TAG);  }
-        case 245: break;
-        case 201: 
-          {  yybegin(ATTLIST_NAME); return createToken(DTDRegionTypes.ATTLIST_TAG);  }
-        case 246: break;
-        case 199: 
-          {  yybegin(ELEMENT_NAME); return createToken(DTDRegionTypes.ELEMENT_TAG);  }
-        case 247: break;
-        case 182: 
-          {  yybegin(ENTITY_NAME); return createToken(DTDRegionTypes.ENTITY_TAG);  }
-        case 248: break;
-        case 167: 
-          {  yybegin(NDATA_CONTENT); return createToken(DTDRegionTypes.NDATA_KEYWORD);  }
-        case 249: break;
-        case 111: 
-          {  return createToken(DTDRegionTypes.ENTITY_PARM);  }
-        case 250: break;
-        case 94: 
-          {  yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.ID_KEYWORD);  }
-        case 251: break;
-        case 25: 
-          {  return createToken(DTDRegionTypes.OCCUR_TYPE);  }
-        case 252: break;
-        case 16: 
-          {  return createToken(DTDRegionTypes.EXCLAMATION);  }
-        case 253: break;
-        case 15: 
-          {  return createToken(DTDRegionTypes.WHITESPACE);  }
-        case 254: break;
-        case 11: 
-        case 49: 
-        case 50: 
-        case 54: 
-        case 55: 
-        case 56: 
-        case 57: 
-        case 58: 
-        case 61: 
-        case 91: 
-        case 92: 
-        case 93: 
-        case 95: 
-        case 96: 
-        case 97: 
-        case 98: 
-        case 124: 
-        case 125: 
-        case 126: 
-        case 127: 
-        case 128: 
-        case 129: 
-        case 130: 
-        case 131: 
-        case 148: 
-        case 149: 
-        case 150: 
-        case 151: 
-        case 152: 
-        case 153: 
-        case 154: 
-        case 155: 
-        case 170: 
-        case 171: 
-        case 172: 
-        case 175: 
-        case 176: 
-        case 177: 
-        case 190: 
-        case 192: 
-        case 193: 
-        case 195: 
-        case 204: 
-        case 206: 
-          {  yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.PARM_ENTITY_TYPE);  }
-        case 255: break;
-        case 28: 
-          {  return createToken(DTDRegionTypes.LEFT_PAREN);  }
-        case 256: break;
-        case 29: 
-          {  return createToken(DTDRegionTypes.RIGHT_PAREN);  }
-        case 257: break;
-        case 44: 
-          {  return createToken(DTDRegionTypes.WHITESPACE);  }
-        case 258: break;
-        case 53: 
-          {  return createToken(DTDRegionTypes.WHITESPACE);  }
-        case 259: break;
-        case 59: 
-          {  yypushback(yylength()); yybegin(ATTRIBUTE_ENUMERATION);  }
-        case 260: break;
-        case 67: 
-          {  return createToken(DTDRegionTypes.LEFT_PAREN);  }
-        case 261: break;
-        case 68: 
-          {  yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.RIGHT_PAREN);  }
-        case 262: break;
-        case 69: 
-          {  return createToken(DTDRegionTypes.ENUM_CHOICE);  }
-        case 263: break;
-        case 31: 
-          {  yybegin(ENTITY_CONTENT); return createToken(DTDRegionTypes.NAME);  }
-        case 264: break;
-        case 47: 
-          {  yybegin(ATTLIST_CONTENT); return createToken(DTDRegionTypes.NAME);  }
-        case 265: break;
-        case 187: 
-          {  yypushback(yylength()); yybegin(EXTERNALID_CONTENT);  }
-        case 266: break;
-        case 213: 
-          {  yybegin(ATTRIBUTE_ENUMERATION); return createToken(DTDRegionTypes.NOTATION_KEYWORD);  }
-        case 267: break;
-        case 174: 
-          {  yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.CDATA_KEYWORD);  }
-        case 268: break;
-        case 173: 
-          {  yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.IDREF_KEYWORD);  }
-        case 269: break;
-        case 217: 
-          {  yybegin(ATTLIST_CONTENT); return createToken(DTDRegionTypes.REQUIRED_KEYWORD);  }
-        case 270: break;
-        case 122: 
-          {  yybegin(YYINITIAL); return createToken(DTDRegionTypes.COMMENT_END);  }
-        case 271: break;
-        case 84: 
-        case 118: 
-          {  return createToken(DTDRegionTypes.SINGLEQUOTED_LITERAL);  }
-        case 272: break;
-        case 79: 
-        case 115: 
-          {  return createToken(DTDRegionTypes.DOUBLEQUOTED_LITERAL);  }
-        case 273: break;
-        case 24: 
-        case 27: 
-        case 76: 
-        case 113: 
-        case 141: 
-        case 163: 
-        case 185: 
-          {  return createToken(DTDRegionTypes.NAME);  }
-        case 274: break;
-        case 5: 
-        case 38: 
-          {  yybegin(YYINITIAL); return createToken(DTDRegionTypes.NDATA_VALUE);  }
-        case 275: break;
-        case 13: 
-        case 66: 
-          {  return createToken(DTDRegionTypes.NAME);  }
-        case 276: break;
-        case 18: 
-          {  return createToken(DTDRegionTypes.START_TAG);  }
-        case 277: break;
-        case 17: 
-          {  return createToken(DTDRegionTypes.SEMICOLON);  }
-        case 278: break;
-        case 30: 
-          {  return createToken(DTDRegionTypes.CONNECTOR);  }
-        case 279: break;
-        case 22: 
-          {  return createToken(DTDRegionTypes.PERCENT);  }
-        case 280: break;
-        case 19: 
-          {  return createToken(DTDRegionTypes.END_TAG);  }
-        case 281: break;
-        case 32: 
-          {  return createToken(DTDRegionTypes.PERCENT);  }
-        case 282: break;
-        default: 
-          if (yy_input == YYEOF && yy_startRead == yy_currentPos) {
-            yy_atEOF = true;
-            return null;
-          } 
-          else {
-            yy_ScanError(YY_NO_MATCH);
-          }
-      }
-    }
-  }
-
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/Token.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/Token.java
deleted file mode 100644
index f8dbaba..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/Token.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.tokenizer;
-
-public class Token extends Yytoken {
-	public static final int COMMENT_START = 9;
-	public static final int CONNECTOR = 6;
-	public static final int CONTENT_ANY = 43;
-	public static final int CONTENT_EMPTY = 42;
-	public static final int CONTENT_PCDATA = 44;
-	public static final int ELEMENT_CONTENT = 41;
-
-	public static final int ELEMENT_TAG = 40;
-	public static final int END_TAG = 2;
-	public static final int ENTITY_CONTENT = 32;
-	public static final int ENTITY_PARM = 31;
-
-	public static final int ENTITY_TAG = 30;
-	public static final int EXCLAMATION = 8;
-	public static final int LEFT_PAREN = 3;
-	public static final int NAME = 0;
-	public static final int NOTATION_CONTENT = 21;
-
-
-	public static final int NOTATION_TAG = 20;
-
-	// public static final int CONNECT_CHOICE = 5;
-	// public static final int CONNECT_SEQUENCE = 6;
-	// public static final int OCCUR_OPTIONAL = 7;
-	// public static final int OCCUR_ONE_OR_MORE = 8;
-	// public static final int OCCUR_ZERO_OR_MORE = 9;
-	public static final int OCCUR_TYPE = 7;
-	public static final int RIGHT_PAREN = 4;
-	public static final int START_TAG = 1;
-	public static final int WHITESPACE = 5;
-
-
-	public Token(String type) {
-		super(type);
-	}
-
-	public Token(String type, String text, int line, int charBegin, int length) {
-		super(type, text, line, charBegin, length);
-	}
-
-	public Token createCopy() {
-		Token copy = new Token(getType(), getText(), getStartLine(), getStartOffset(), getLength());
-		return copy;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/Yytoken.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/Yytoken.java
deleted file mode 100644
index 120da07..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/Yytoken.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.tokenizer;
-
-class Yytoken {
-	public int m_charBegin;
-	public int m_length;
-	public int m_line;
-	public String m_text;
-	public String m_type;
-
-	Yytoken(String type) {
-		m_type = type;
-	}
-
-	Yytoken(String type, String text, int line, int charBegin, int length) {
-		m_type = type;
-		m_text = new String(text);
-		m_line = line;
-		m_charBegin = charBegin;
-		m_length = length;
-	}
-
-	public void delete(int start, int length) {
-		int stringStart = start - m_charBegin;
-		String oldString = m_text;
-		m_text = oldString.substring(0, stringStart);
-		m_text += oldString.substring(stringStart + length);
-
-		m_length = m_text.length();
-		System.out.println("new string = " + m_text); //$NON-NLS-1$
-
-	}
-
-	public boolean equals(Yytoken other) {
-		return m_type == other.getType() && m_text.equals(other.getText()) && m_line == other.getStartLine() && m_charBegin == other.getStartOffset() && m_length == other.getLength();
-	}
-
-	public int getEndOffset() {
-		return m_charBegin + m_length;
-	}
-
-	public int getLength() {
-		return m_length;
-	}
-
-	public int getStartLine() {
-		return m_line;
-	}
-
-	public int getStartOffset() {
-		return m_charBegin;
-	}
-
-	public String getText() {
-		return m_text;
-	}
-
-	public String getType() {
-		return m_type;
-	}
-
-	public void setStartOffset(int startOffset) {
-		m_charBegin = startOffset;
-	}
-
-	public String toString() {
-		return "Text   : " + m_text + "\ntype : " + m_type + "\nline  : " + m_line + "\ncBeg. : " + m_charBegin + "\ncEnd. : " + getEndOffset() + "\ncLength. : " + m_length; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-	}
-
-	public void updateOffset(int delta) {
-		m_charBegin += delta;
-	}
-
-	public void updateText(String newText) {
-		m_text = newText;
-		m_length = newText.length();
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/dtd.flex b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/dtd.flex
deleted file mode 100644
index e3a14aa..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/dtd.flex
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.internal.tokenizer;
-
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-
-/** 
- * Generate with "dtdskeleton".
- *
- * It removes some unused fields and avoids some compiler warnings 
- */
-
-%%
-
-%{
-	int node_count = 0;
-	String currentString;
-
-	private Token createToken(String type) {
-		return new Token(type, yytext(), yyline, yychar + startOffset, yylength());
-	}
-
-	private int startOffset = 0;
-	public void setStartOffset(int offset) {
-		this.startOffset = offset;
-	}
-
-	public void setLine(int line) {
-		this.yyline = line;
-	}
-%}
-
-%class DTDTokenizer
-%public
-%unicode
-%char
-
-%state NODE
-%state ELEMENT_NAME
-%state ELEMENT_CONTENT
-%state ELEMENT_MIXED_OR_CHILD
-%state ELEMENT_MIXED
-%state ELEMENT_CHILD
-%state ENTITY_NAME
-%state ENTITY_CONTENT
-%state NDATA_CONTENT
-
-%state NOTATION_NAME
-%state EXTERNALID_CONTENT
-
-%state COMMENT_CONTENT
-%state ATTLIST_NAME
-%state ATTLIST_CONTENT
-%state ATTRIBUTE_CONTENT
-%state ATTRIBUTE_DEFAULT
-%state ATTRIBUTE_ENUMERATION
-
-
-ALPHA=[A-Za-z]
-DIGIT=[0-9]
-NONNEWLINE_WHITE_SPACE_CHAR=[\ \t\b\012]
-STRING_TEXT=(\\\"|[^\n\r\"]|\\{WHITE_SPACE_CHAR}+\\)*
-COMMENT_TEXT=([^*/\n]|[^*\n]"/"[^*\n]|[^/\n]"*"[^/\n]|"*"[^/\n]|"/"[^*\n])*
-Ident = {ALPHA}({ALPHA}|{DIGIT}|_)*
-InputCharacter = [^\r\n]
-
-LineTerminator = \r|\n|\r\n
-
-/* 3 - White Space */
-S              =    (\x20 | \x09 | \x0D | \x0A)+
-NonLineTerminatorWhitespace = (\x20 | \x09)+
-
-WhiteSpace     = {LineTerminator} | [ \t\f]
-
-/* 84 */
-/*Letter         =    {BaseChar} | {Ideographic}
-
-/* 85 */
-BaseChar       =    [\u0041-\u005A] | [\u0061-\u007A] | [\u00C0-\u00D6] | [\u00D8-\u00F6] | [\u00F8-\u00FF] | [\u0100-\u0131] | [\u0134-\u013E] | [\u0141-\u0148] | [\u014A-\u017E] | [\u0180-\u01C3] | [\u01CD-\u01F0] | [\u01F4-\u01F5] | [\u01FA-\u0217] | [\u0250-\u02A8] | [\u02BB-\u02C1] | \u0386 | [\u0388-\u038A] | \u038C | [\u038E-\u03A1] | [\u03A3-\u03CE] | [\u03D0-\u03D6] | \u03DA | \u03DC | \u03DE | \u03E0 | [\u03E2-\u03F3] | [\u0401-\u040C] | [\u040E-\u044F] | [\u0451-\u045C] | [\u045E-\u0481] | [\u0490-\u04C4] | [\u04C7-\u04C8] | [\u04CB-\u04CC] | [\u04D0-\u04EB] | [\u04EE-\u04F5] | [\u04F8-\u04F9] | [\u0531-\u0556] | \u0559 | [\u0561-\u0586] | [\u05D0-\u05EA] | [\u05F0-\u05F2] | [\u0621-\u063A] | [\u0641-\u064A] | [\u0671-\u06B7] | [\u06BA-\u06BE] | [\u06C0-\u06CE] | [\u06D0-\u06D3] | \u06D5 | [\u06E5-\u06E6] | [\u0905-\u0939] | \u093D | [\u0958-\u0961] | [\u0985-\u098C] | [\u098F-\u0990] | [\u0993-\u09A8] | [\u09AA-\u09B0] | \u09B2 | [\u09B6-\u09B9] | [\u09DC-\u09DD] | [\u09DF-\u09E1] | [\u09F0-\u09F1] | [\u0A05-\u0A0A] | [\u0A0F-\u0A10] | [\u0A13-\u0A28] | [\u0A2A-\u0A30] | [\u0A32-\u0A33] | [\u0A35-\u0A36] | [\u0A38-\u0A39] | [\u0A59-\u0A5C] | \u0A5E | [\u0A72-\u0A74] | [\u0A85-\u0A8B] | \u0A8D | [\u0A8F-\u0A91] | [\u0A93-\u0AA8] | [\u0AAA-\u0AB0] | [\u0AB2-\u0AB3] | [\u0AB5-\u0AB9] | \u0ABD | \u0AE0 | [\u0B05-\u0B0C] | [\u0B0F-\u0B10] | [\u0B13-\u0B28] | [\u0B2A-\u0B30] | [\u0B32-\u0B33] | [\u0B36-\u0B39] | \u0B3D | [\u0B5C-\u0B5D] | [\u0B5F-\u0B61] | [\u0B85-\u0B8A] | [\u0B8E-\u0B90] | [\u0B92-\u0B95] | [\u0B99-\u0B9A] | \u0B9C | [\u0B9E-\u0B9F] | [\u0BA3-\u0BA4] | [\u0BA8-\u0BAA] | [\u0BAE-\u0BB5] | [\u0BB7-\u0BB9] | [\u0C05-\u0C0C] | [\u0C0E-\u0C10] | [\u0C12-\u0C28] | [\u0C2A-\u0C33] | [\u0C35-\u0C39] | [\u0C60-\u0C61] | [\u0C85-\u0C8C] | [\u0C8E-\u0C90] | [\u0C92-\u0CA8] | [\u0CAA-\u0CB3] | [\u0CB5-\u0CB9] | \u0CDE | [\u0CE0-\u0CE1] | [\u0D05-\u0D0C] | [\u0D0E-\u0D10] | [\u0D12-\u0D28] | [\u0D2A-\u0D39] | [\u0D60-\u0D61] | [\u0E01-\u0E2E] | \u0E30 | [\u0E32-\u0E33] | [\u0E40-\u0E45] | [\u0E81-\u0E82] | \u0E84 | [\u0E87-\u0E88] | \u0E8A | \u0E8D | [\u0E94-\u0E97] | [\u0E99-\u0E9F] | [\u0EA1-\u0EA3] | \u0EA5 | \u0EA7 | [\u0EAA-\u0EAB] | [\u0EAD-\u0EAE] | \u0EB0 | [\u0EB2-\u0EB3] | \u0EBD | [\u0EC0-\u0EC4] | [\u0F40-\u0F47] | [\u0F49-\u0F69] | [\u10A0-\u10C5] | [\u10D0-\u10F6] | \u1100 | [\u1102-\u1103] | [\u1105-\u1107] | \u1109 | [\u110B-\u110C] | [\u110E-\u1112] | \u113C | \u113E | \u1140 | \u114C | \u114E | \u1150 | [\u1154-\u1155] | \u1159 | [\u115F-\u1161] | \u1163 | \u1165 | \u1167 | \u1169 | [\u116D-\u116E] | [\u1172-\u1173] | \u1175 | \u119E | \u11A8 | \u11AB | [\u11AE-\u11AF] | [\u11B7-\u11B8] | \u11BA | [\u11BC-\u11C2] | \u11EB | \u11F0 | \u11F9 | [\u1E00-\u1E9B] | [\u1EA0-\u1EF9] | [\u1F00-\u1F15] | [\u1F18-\u1F1D] | [\u1F20-\u1F45] | [\u1F48-\u1F4D] | [\u1F50-\u1F57] | \u1F59 | \u1F5B | \u1F5D | [\u1F5F-\u1F7D] | [\u1F80-\u1FB4] | [\u1FB6-\u1FBC] | \u1FBE | [\u1FC2-\u1FC4] | [\u1FC6-\u1FCC] | [\u1FD0-\u1FD3] | [\u1FD6-\u1FDB] | [\u1FE0-\u1FEC] | [\u1FF2-\u1FF4] | [\u1FF6-\u1FFC] | \u2126 | [\u212A-\u212B] | \u212E | [\u2180-\u2182] | [\u3041-\u3094] | [\u30A1-\u30FA] | [\u3105-\u312C] | [\uAC00-\uD7A3]  
-
-/* 86 */
-Ideographic    =    [\u4E00-\u9FA5] | \u3007 | [\u3021-\u3029]  
-
-/* 4 */  /* is '.' to be escaped?? */
-NameChar       =    {Letter} | {Digit} | . | - | _ | : | {CombiningChar} | {Extender}
-
-/* 5 */
-Name           = ({Letter} | _ | :) {NameChar}* 
-
-/* 87 */
-CombiningChar  =    [\u0300-\u0345] | [\u0360-\u0361] | [\u0483-\u0486] | [\u0591-\u05A1] | [\u05A3-\u05B9] | [\u05BB-\u05BD] | \u05BF | [\u05C1-\u05C2] | \u05C4 | [\u064B-\u0652] | \u0670 | [\u06D6-\u06DC] | [\u06DD-\u06DF] | [\u06E0-\u06E4] | [\u06E7-\u06E8] | [\u06EA-\u06ED] | [\u0901-\u0903] | \u093C | [\u093E-\u094C] | \u094D | [\u0951-\u0954] | [\u0962-\u0963] | [\u0981-\u0983] | \u09BC | \u09BE | \u09BF | [\u09C0-\u09C4] | [\u09C7-\u09C8] | [\u09CB-\u09CD] | \u09D7 | [\u09E2-\u09E3] | \u0A02 | \u0A3C | \u0A3E | \u0A3F | [\u0A40-\u0A42] | [\u0A47-\u0A48] | [\u0A4B-\u0A4D] | [\u0A70-\u0A71] | [\u0A81-\u0A83] | \u0ABC | [\u0ABE-\u0AC5] | [\u0AC7-\u0AC9] | [\u0ACB-\u0ACD] | [\u0B01-\u0B03] | \u0B3C | [\u0B3E-\u0B43] | [\u0B47-\u0B48] | [\u0B4B-\u0B4D] | [\u0B56-\u0B57] | [\u0B82-\u0B83] | [\u0BBE-\u0BC2] | [\u0BC6-\u0BC8] | [\u0BCA-\u0BCD] | \u0BD7 | [\u0C01-\u0C03] | [\u0C3E-\u0C44] | [\u0C46-\u0C48] | [\u0C4A-\u0C4D] | [\u0C55-\u0C56] | [\u0C82-\u0C83] | [\u0CBE-\u0CC4] | [\u0CC6-\u0CC8] | [\u0CCA-\u0CCD] | [\u0CD5-\u0CD6] | [\u0D02-\u0D03] | [\u0D3E-\u0D43] | [\u0D46-\u0D48] | [\u0D4A-\u0D4D] | \u0D57 | \u0E31 | [\u0E34-\u0E3A] | [\u0E47-\u0E4E] | \u0EB1 | [\u0EB4-\u0EB9] | [\u0EBB-\u0EBC] | [\u0EC8-\u0ECD] | [\u0F18-\u0F19] | \u0F35 | \u0F37 | \u0F39 | \u0F3E | \u0F3F | [\u0F71-\u0F84] | [\u0F86-\u0F8B] | [\u0F90-\u0F95] | \u0F97 | [\u0F99-\u0FAD] | [\u0FB1-\u0FB7] | \u0FB9 | [\u20D0-\u20DC] | \u20E1 | [\u302A-\u302F] | \u3099 | \u309A  
-
-/* 88 */
-Digit          =    [\u0030-\u0039] | [\u0660-\u0669] | [\u06F0-\u06F9] | [\u0966-\u096F] | [\u09E6-\u09EF] | [\u0A66-\u0A6F] | [\u0AE6-\u0AEF] | [\u0B66-\u0B6F] | [\u0BE7-\u0BEF] | [\u0C66-\u0C6F] | [\u0CE6-\u0CEF] | [\u0D66-\u0D6F] | [\u0E50-\u0E59] | [\u0ED0-\u0ED9] | [\u0F20-\u0F29]  
-
-/* 89 */
-Extender       =    \u00B7 | \u02D0 | \u02D1 | \u0387 | \u0640 | \u0E46 | \u0EC6 | \u3005 | [\u3031-\u3035] | [\u309D-\u309E] | [\u30FC-\u30FE]  
-*/
-
-Letter         = [a-zA-Z]
-NameChar       = {Letter} | [0-9]
-//Name           = ({Letter} | _ | :) {NameChar}* 
-//Name           = [^\x20\x09\x0D\x0A]+
-Name           = [^\x20\x09\x0D\x0A\|,\!\?\+\*\(\)<>]+
-ElementRefName = [^\x20\x09\x0D\x0A\|,\?\+\*\(\)<>]+
-EntityName     = [^\x20\x09\x0D\x0A\|,\?\*\(\)<>]+
-ParmEntityName = [^\x20\x09\x0D\x0A\!%;<>]+
-
-CommentStart   = \!--
-CommentContent = [^->]+
-CommentEnd     = -->
-ElementStart   = ELEMENT
-ElementContent = [^<>]*
-
-EntityStart    = ENTITY
-Entity_Parm    = %{S}
-EntityContent  = {S}[^<>]*
-
-NotationStart  = NOTATION
-NotationContent = {S}[^<>]*
-AttList        = ATTLIST
-ExternalParmEntityRef = %{ParmEntityName};
-EndTag         = >
-StartTag       = <
-System         = SYSTEM
-Public         = PUBLIC
-NData          = NDATA
-
-// these are attribute type keywords
-//   we reuse NOTATION from NotationStart
-//   we reuse ENTITY from EntityStart
-CData          = CDATA
-ID             = ID
-IDRef          = IDREF
-IDRefs         = IDREFS
-Entities       = ENTITIES
-NMToken        = NMTOKEN
-NMTokens       = NMTOKENS
-
-// these are attribute defaults keywords
-Required       = #REQUIRED
-Implied        = #IMPLIED
-Fixed          = #FIXED
-
-
-Empty          = EMPTY
-Any            = ANY
-PcData         = #PCDATA
-LeftParen      = \(
-RightParen     = \)
-
-Percent        = %
-Semicolon      = ;
-Plus           = \+
-Choice  = \|
-Sequence = ,
-Connector      = {Choice}|{Sequence}
-OccurOptional  = \?
-OccurOneOrMore = \+
-OccurZeroOrMore = \*
-OccurType      = {OccurOptional}|{OccurOneOrMore}|{OccurZeroOrMore}
-Exclamation   = \!
-SingleQuotedLiteral = '[^']*'
-DoubleQuotedLiteral = \"[^\"]*\"
-NonTagContent = [^\x20\x09\x0D\x0A<>]*
-NonEnumContent = [^\x20\x09\x0D\x0A<>\(\)\|]*
-
-%%
-
-<YYINITIAL> {
-  {StartTag}       { return createToken(DTDRegionTypes.START_TAG); }
-  {EndTag}         { return createToken(DTDRegionTypes.END_TAG); }
-  {Exclamation}    { return createToken(DTDRegionTypes.EXCLAMATION); }
-  {Percent}        { return createToken(DTDRegionTypes.PERCENT); }
-  {Semicolon}      { return createToken(DTDRegionTypes.SEMICOLON); }
-
-  {ElementStart}   { yybegin(ELEMENT_NAME); return createToken(DTDRegionTypes.ELEMENT_TAG); }
-  {CommentStart}   { yybegin(COMMENT_CONTENT); return createToken(DTDRegionTypes.COMMENT_START); }
-  {EntityStart}    { yybegin(ENTITY_NAME); return createToken(DTDRegionTypes.ENTITY_TAG); }
-  {NotationStart}  { yybegin(NOTATION_NAME); return createToken(DTDRegionTypes.NOTATION_TAG); }
-  {AttList}        { yybegin(ATTLIST_NAME); return createToken(DTDRegionTypes.ATTLIST_TAG); }
-
-  {ExternalParmEntityRef}   { return createToken(DTDRegionTypes.ENTITY_PARM); }
-// just a parmentityname by itself is no good.  we use this
-// to capture garbage content at the top level
-  {ParmEntityName}          { return createToken(DTDRegionTypes.UNKNOWN_CONTENT); }
-
-  {S}              { return createToken(DTDRegionTypes.WHITESPACE); }
-}
-
-<ELEMENT_NAME> {
-  {S}              { return createToken(DTDRegionTypes.WHITESPACE); }
-  {PcData}|\({S}*{PcData}{S}*\) { return createToken(DTDRegionTypes.CONTENT_PCDATA); }
-  {Name}           { return createToken(DTDRegionTypes.NAME); }
-
-  {LeftParen}      { return createToken(DTDRegionTypes.LEFT_PAREN); }
-  {Connector}      { return createToken(DTDRegionTypes.CONNECTOR); }    
-  {OccurType}      { return createToken(DTDRegionTypes.OCCUR_TYPE); }
-  {RightParen}     { return createToken(DTDRegionTypes.RIGHT_PAREN); }
-
-  {StartTag}       { yypushback(yylength()); yybegin(YYINITIAL); }
-  {EndTag}         { yypushback(yylength()); yybegin(YYINITIAL); }
-}
-
-// ******** <!ATTLIST...>
-<ATTLIST_NAME> {
-  {S}              { return createToken(DTDRegionTypes.WHITESPACE); }
-  {Name}           { yybegin(ATTLIST_CONTENT); return createToken(DTDRegionTypes.NAME); }
-  {NonTagContent}  { return createToken(DTDRegionTypes.UNKNOWN_CONTENT); }
-  {StartTag} | {EndTag} { yypushback(yylength()); yybegin(YYINITIAL); }
-}
-
-<ATTLIST_CONTENT> {
-  {S}              { return createToken(DTDRegionTypes.WHITESPACE); }
-  {Name}           { yybegin(ATTRIBUTE_CONTENT); return createToken(DTDRegionTypes.ATTRIBUTE_NAME); }
-  {NonTagContent}  { return createToken(DTDRegionTypes.UNKNOWN_CONTENT); }
-  {StartTag} | {EndTag} { yypushback(yylength()); yybegin(YYINITIAL); }
-}
-
-<ATTRIBUTE_CONTENT> {
-  {LineTerminator} { yypushback(yylength()); yybegin(ATTLIST_CONTENT); }
-  {NonLineTerminatorWhitespace}
-                   { return createToken(DTDRegionTypes.WHITESPACE); }
-  {CData}          { yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.CDATA_KEYWORD); }  
-
-  {ID}             { yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.ID_KEYWORD); }       
-  {IDRef}          { yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.IDREF_KEYWORD); }  
-  {IDRefs}         { yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.IDREFS_KEYWORD); }  
-  {EntityStart}    { yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.ENTITY_KEYWORD); }  
-  {Entities}       { yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.ENTITIES_KEYWORD); }  
-  {NMToken}        { yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.NMTOKEN_KEYWORD); }  
-  {NMTokens}       { yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.NMTOKENS_KEYWORD); }  
-  {NotationStart}  { yybegin(ATTRIBUTE_ENUMERATION); return createToken(DTDRegionTypes.NOTATION_KEYWORD); }  
-
-  {Required} | {Implied} | {Fixed} | {SingleQuotedLiteral} | { DoubleQuotedLiteral}
-                   { yypushback(yylength()); yybegin(ATTRIBUTE_DEFAULT); }
-
-  {LeftParen}      { yypushback(yylength()); yybegin(ATTRIBUTE_ENUMERATION); }  
-  {NonEnumContent} { yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.PARM_ENTITY_TYPE); }
-  {NonEnumContent}|{RightParen}|{Choice}  { return createToken(DTDRegionTypes.UNKNOWN_CONTENT); }
-  {StartTag} | {EndTag} { yypushback(yylength()); yybegin(YYINITIAL); }
-}
-
-<ATTRIBUTE_DEFAULT> {
-  {S}              { return createToken(DTDRegionTypes.WHITESPACE); }
-  {Required}       { yybegin(ATTLIST_CONTENT); return createToken(DTDRegionTypes.REQUIRED_KEYWORD); }
-  {Implied}        { yybegin(ATTLIST_CONTENT); return createToken(DTDRegionTypes.IMPLIED_KEYWORD); }
-  {Fixed}          { return createToken(DTDRegionTypes.FIXED_KEYWORD); }
-  {SingleQuotedLiteral}  { yybegin(ATTLIST_CONTENT); return createToken(DTDRegionTypes.SINGLEQUOTED_LITERAL); }
-  {DoubleQuotedLiteral}  { yybegin(ATTLIST_CONTENT); return createToken(DTDRegionTypes.DOUBLEQUOTED_LITERAL); }
-  {NonTagContent}   { yypushback(yylength()); yybegin(ATTLIST_CONTENT); } //return createToken(DTDRegionTypes.UNKNOWN_CONTENT); }
-  {StartTag} | {EndTag} { yypushback(yylength()); yybegin(YYINITIAL); }
-}
-
-<ATTRIBUTE_ENUMERATION> {
-  {S}              { return createToken(DTDRegionTypes.WHITESPACE); }
-  {LeftParen}      { return createToken(DTDRegionTypes.LEFT_PAREN); }
-  {Choice}         { return createToken(DTDRegionTypes.ENUM_CHOICE); }
-  {RightParen}     { yybegin(ATTRIBUTE_DEFAULT); return createToken(DTDRegionTypes.RIGHT_PAREN); }
-  {NonEnumContent}   { return createToken(DTDRegionTypes.NAME); }
-  {StartTag} | {EndTag} { yypushback(yylength()); yybegin(YYINITIAL); }
-}
-
-
-// ******** <!ENTITY...>
-<ENTITY_NAME> {
-  {S}              { return createToken(DTDRegionTypes.WHITESPACE); }
-  {Percent}        { return createToken(DTDRegionTypes.PERCENT); }
-  {EntityName}     { yybegin(ENTITY_CONTENT); return createToken(DTDRegionTypes.NAME); }
-  {StartTag} | {EndTag} { yypushback(yylength()); yybegin(YYINITIAL); }
-}
-
-<ENTITY_CONTENT> {
-//  {EntityContent} { yybegin(YYINITIAL); return createToken(DTDRegionTypes.ENTITY_CONTENT); }
-  {S}              { return createToken(DTDRegionTypes.WHITESPACE); }
-  {System} | {Public} { yypushback(yylength()); yybegin(EXTERNALID_CONTENT); }
-  {SingleQuotedLiteral}  { return createToken(DTDRegionTypes.SINGLEQUOTED_LITERAL); }
-  {DoubleQuotedLiteral}  { return createToken(DTDRegionTypes.DOUBLEQUOTED_LITERAL); }
-  {NonTagContent}   { return createToken(DTDRegionTypes.UNKNOWN_CONTENT); }
-  {StartTag} | {EndTag} { yypushback(yylength()); yybegin(YYINITIAL); }
-}
-
-
-// ******** <!NOTATION...>
-<NOTATION_NAME> {
-  {S}              { return createToken(DTDRegionTypes.WHITESPACE); }
-  {Name}           { yybegin(EXTERNALID_CONTENT); return createToken(DTDRegionTypes.NAME); }
-  {StartTag} | {EndTag} { yypushback(yylength()); yybegin(YYINITIAL); }
-}
-
-<EXTERNALID_CONTENT> {
-  {S}              { return createToken(DTDRegionTypes.WHITESPACE); }
-  {System}         { return createToken(DTDRegionTypes.SYSTEM_KEYWORD); }  
-  {Public}         { return createToken(DTDRegionTypes.PUBLIC_KEYWORD); }  
-  {SingleQuotedLiteral}  { return createToken(DTDRegionTypes.SINGLEQUOTED_LITERAL); }
-  {DoubleQuotedLiteral}  { return createToken(DTDRegionTypes.DOUBLEQUOTED_LITERAL); }
-  {NData}          { yybegin(NDATA_CONTENT); return createToken(DTDRegionTypes.NDATA_KEYWORD); }
-  {NonTagContent}   { return createToken(DTDRegionTypes.UNKNOWN_CONTENT); }
-  {StartTag} | {EndTag} { yypushback(yylength()); yybegin(YYINITIAL); }
-}
-
-<NDATA_CONTENT> {
-  {S}              { return createToken(DTDRegionTypes.WHITESPACE); }
-  {NonTagContent}  { yybegin(YYINITIAL); return createToken(DTDRegionTypes.NDATA_VALUE); }
-  {StartTag} | {EndTag} { yypushback(yylength()); yybegin(YYINITIAL); }
-}
-  
-
-// ******** <!-- ...>
-<COMMENT_CONTENT> {
-  {CommentEnd}  { yybegin(YYINITIAL); return createToken(DTDRegionTypes.COMMENT_END); }
-  {S}              { return createToken(DTDRegionTypes.WHITESPACE); }
-  {CommentContent} | "-" | ">"  { return createToken(DTDRegionTypes.COMMENT_CONTENT); }
-}
-
-
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/dtdskeleton b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/dtdskeleton
deleted file mode 100644
index 3dbe086..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/dtdskeleton
+++ /dev/null
@@ -1,317 +0,0 @@
-
-  /** This character denotes the end of file */
-  final public static int YYEOF = -1;
-
-  /** initial size of the lookahead buffer */
---- final private static int YY_BUFFERSIZE = ...;
-
-  /** lexical states */
----  lexical states, charmap
-
-  /* error codes */
-  final private static int YY_UNKNOWN_ERROR = 0;
-  final static int YY_ILLEGAL_STATE = 1;
-  final private static int YY_NO_MATCH = 2;
-  final private static int YY_PUSHBACK_2BIG = 3;
-
-  /* error messages for the codes above */
-  final private static String YY_ERROR_MSG[] = {
-    "Unkown internal scanner error",
-    "Internal error: unknown state",
-    "Error: could not match input",
-    "Error: pushback value was too large"
-  };
-
---- isFinal list
-  /** the input device */
-  private java.io.Reader yy_reader;
-
-  /** the current state of the DFA */
-  private int yy_state;
-
-  /** the current lexical state */
-  private int yy_lexical_state = YYINITIAL;
-
-  /** this buffer contains the current text to be matched and is
-      the source of the yytext() string */
-  private char yy_buffer[] = new char[YY_BUFFERSIZE];
-
-  /** the textposition at the last accepting state */
-  private int yy_markedPos;
-
-  /** the textposition at the last state to be included in yytext */
-  private int yy_pushbackPos;
-
-  /** the current text position in the buffer */
-  private int yy_currentPos;
-
-  /** startRead marks the beginning of the yytext() string in the buffer */
-  private int yy_startRead;
-
-  /** endRead marks the last character in the buffer, that has been read
-      from input */
-  private int yy_endRead;
-
-  /** number of newlines encountered up to the start of the matched text */
-  private int yyline;
-
-  /** the number of characters up to the start of the matched text */
-  private int yychar;
-
-  /**
-   * the number of characters from the last newline up to the start of the 
-   * matched text
-   */
-  int yycolumn; 
-
-  /** yy_atEOF == true <=> the scanner is at the EOF */
-  private boolean yy_atEOF;
-
---- user class code
-
-  /**
-   * Creates a new scanner
-   * There is also a java.io.InputStream version of this constructor.
-   *
-   * @param   in  the java.io.Reader to read input from.
-   */
---- constructor declaration
-
-
-  /**
-   * Refills the input buffer.
-   *
-   * @return      <code>false</code>, iff there was new input.
-   * 
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  private boolean yy_refill() throws java.io.IOException {
-
-    /* first: make room (if you can) */
-    if (yy_startRead > 0) {
-      System.arraycopy(yy_buffer, yy_startRead, 
-                       yy_buffer, 0, 
-                       yy_endRead-yy_startRead);
-
-      /* translate stored positions */
-      yy_endRead-= yy_startRead;
-      yy_currentPos-= yy_startRead;
-      yy_markedPos-= yy_startRead;
-      yy_pushbackPos-= yy_startRead;
-      yy_startRead = 0;
-    }
-
-    /* is the buffer big enough? */
-    if (yy_currentPos >= yy_buffer.length) {
-      /* if not: blow it up */
-      char newBuffer[] = new char[yy_currentPos*2];
-      System.arraycopy(yy_buffer, 0, newBuffer, 0, yy_buffer.length);
-      yy_buffer = newBuffer;
-    }
-
-    /* finally: fill the buffer with new input */
-    int numRead = yy_reader.read(yy_buffer, yy_endRead, 
-                                            yy_buffer.length-yy_endRead);
-
-    if (numRead < 0) {
-      return true;
-    }
-    else {
-      yy_endRead+= numRead;  
-      return false;
-    }
-  }
-
-    
-  /**
-   * Closes the input stream.
-   */
-  final public void yyclose() throws java.io.IOException {
-    yy_atEOF = true;            /* indicate end of file */
-    yy_endRead = yy_startRead;  /* invalidate buffer    */
-
-    if (yy_reader != null)
-      yy_reader.close();
-  }
-
-
-  /**
-   * Closes the current stream, and resets the
-   * scanner to read from a new input stream.
-   *
-   * All internal variables are reset, the old input stream 
-   * <b>cannot</b> be reused (internal buffer is discarded and lost).
-   * Lexical state is set to <tt>YY_INITIAL</tt>.
-   *
-   * @param reader   the new input stream 
-   */
-  final public void yyreset(java.io.Reader reader) throws java.io.IOException {
-    yyclose();
-    yy_reader = reader;
-    yy_atEOF  = false;
-    yy_endRead = yy_startRead = 0;
-    yy_currentPos = yy_markedPos = yy_pushbackPos = 0;
-    yyline = yychar = yycolumn = 0;
-    yy_lexical_state = YYINITIAL;
-  }
-
-
-  /**
-   * Returns the current lexical state.
-   */
-  final public int yystate() {
-    return yy_lexical_state;
-  }
-
-
-  /**
-   * Enters a new lexical state
-   *
-   * @param newState the new lexical state
-   */
-  final public void yybegin(int newState) {
-    yy_lexical_state = newState;
-  }
-
-
-  /**
-   * Returns the text matched by the current regular expression.
-   */
-  final public String yytext() {
-    return new String( yy_buffer, yy_startRead, yy_markedPos-yy_startRead );
-  }
-
-
-  /**
-   * Returns the character at position <tt>pos</tt> from the 
-   * matched text. 
-   * 
-   * It is equivalent to yytext().charAt(pos), but faster
-   *
-   * @param pos the position of the character to fetch. 
-   *            A value from 0 to yylength()-1.
-   *
-   * @return the character at position pos
-   */
-  final public char yycharat(int pos) {
-    return yy_buffer[yy_startRead+pos];
-  }
-
-
-  /**
-   * Returns the length of the matched text region.
-   */
-  final public int yylength() {
-    return yy_markedPos-yy_startRead;
-  }
-
-
-  /**
-   * Reports an error that occured while scanning.
-   *
-   * In a wellformed scanner (no or only correct usage of 
-   * yypushback(int) and a match-all fallback rule) this method 
-   * will only be called with things that "Can't Possibly Happen".
-   * If this method is called, something is seriously wrong
-   * (e.g. a JFlex bug producing a faulty scanner etc.).
-   *
-   * Usual syntax/scanner level error handling should be done
-   * in error fallback rules.
-   *
-   * @param   errorCode  the code of the errormessage to display
-   */
---- yy_ScanError declaration  
-    String message;
-    try {
-      message = YY_ERROR_MSG[errorCode];
-    }
-    catch (ArrayIndexOutOfBoundsException e) {
-      message = YY_ERROR_MSG[YY_UNKNOWN_ERROR];
-    }
-
---- throws clause
-  } 
-
-
-  /**
-   * Pushes the specified amount of characters back into the input stream.
-   *
-   * They will be read again by then next call of the scanning method
-   *
-   * @param number  the number of characters to be read again.
-   *                This number must not be greater than yylength()!
-   */
---- yypushback decl (contains yy_ScanError exception)
-    if ( number > yylength() )
-      yy_ScanError(YY_PUSHBACK_2BIG);
-
-    yy_markedPos -= number;
-  }
-
-
---- yy_doEof
-  /**
-   * Resumes scanning until the next regular expression is matched,
-   * the end of input is encountered or an I/O-Error occurs.
-   *
-   * @return      the next token
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
---- yylex declaration
-    int yy_input;
-    int yy_action;
-
-    // cached fields:
-    int yy_currentPos_l;
-    int yy_markedPos_l;
-    int yy_endRead_l = yy_endRead;
-    char [] yy_buffer_l = yy_buffer;
-    char [] yycmap_l = yycmap;
-
---- local declarations
-
-    while (true) {
-      yy_markedPos_l = yy_markedPos;
-
---- start admin (line, char, col count)
-      yy_action = -1;
-
-      yy_currentPos_l = yy_currentPos = 
-                       yy_startRead = yy_markedPos_l;
-  
---- start admin (lexstate etc)
-
-      yy_forAction: {
-        while (true) {
-    
---- next input, line, col, char count, next transition, isFinal action
-            yy_action = yy_state; 
-            yy_markedPos_l = yy_currentPos_l; 
---- line count update
-          }
-
-        }
-      }
-
-      // store back cached position
-      yy_markedPos = yy_markedPos_l;
---- char count update
-
-      switch (yy_action) {
-
---- actions
-        default: 
-          if (yy_input == YYEOF && yy_startRead == yy_currentPos) {
-            yy_atEOF = true;
---- eofvalue
-          } 
-          else {
---- no match
-          }
-      }
-    }
-  }
-
---- main
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDBatchNodeDelete.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDBatchNodeDelete.java
deleted file mode 100644
index ab4b9dc..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDBatchNodeDelete.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-
-
-public class DTDBatchNodeDelete {
-	protected DTDFile dtdFile;
-
-	protected List nodes = new ArrayList();
-
-	public DTDBatchNodeDelete(DTDFile dtdFile) {
-		this.dtdFile = dtdFile;
-	}
-
-	public void addNode(DTDNode node) {
-		// first check if the node is contained by anyone
-		for (int i = 0; i < nodes.size(); i++) {
-			DTDNode currentNode = (DTDNode) nodes.get(i);
-
-			if (currentNode.containsRange(node.getStartOffset(), node.getEndOffset())) {
-				// then no need to add the node to the list to be deleted
-				return;
-			}
-
-			if (node.getStartOffset() < currentNode.getStartOffset() && node.getEndOffset() <= currentNode.getStartOffset()) {
-				nodes.add(i, node);
-				return;
-			}
-		}
-		// if we get here, then add it to the end
-		nodes.add(node);
-	}
-
-	public void deleteNodes(Object requestor) {
-		for (int i = nodes.size() - 1; i >= 0; i--) {
-			DTDNode node = (DTDNode) nodes.get(i);
-			dtdFile.deleteNode(requestor, (DTDNode) nodes.get(i));
-		}
-		nodes.clear();
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDExternalReferenceRemover.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDExternalReferenceRemover.java
deleted file mode 100644
index c03d271..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDExternalReferenceRemover.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.dtd.core.internal.Attribute;
-import org.eclipse.wst.dtd.core.internal.AttributeList;
-import org.eclipse.wst.dtd.core.internal.CMBasicNode;
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.core.internal.Entity;
-
-
-/*
- * This class is responsible for updating the model when items are deleted or
- * so that items referenced by it are cleaned up note that top level nodes are
- * queued up for deletion so that iteration over the list of nodes from the
- * dtdfile is not messed up. Note that when an external parmeter entity
- * changes, the client of the model (e.g. editor) must be a DTDFileListener
- * implementing the listener's interface to keep the model's referential
- * integrity (See DTDModelImpl for example).
- */
-
-public class DTDExternalReferenceRemover extends DTDVisitor {
-
-	protected DTDBatchNodeDelete batchDelete;
-	protected List externalElementsAndParmEntities = new ArrayList();
-
-	protected boolean isParmEntity = false;
-
-	protected boolean isUpdating = false;
-	protected DTDNode nodeToDelete;
-	protected String oldRefName = ""; //$NON-NLS-1$
-	protected Object requestor;
-
-	public DTDExternalReferenceRemover() {
-
-	}
-
-	public synchronized void externalReferenceAboutToChange(Object requestor, Entity entity) {
-		if (isUpdating) {
-			return;
-		}
-		if (!entity.isParameterEntity() || !entity.isExternalEntity()) {
-			// if it is not an external parameter entity, ignore as well
-			return;
-		}
-
-		isUpdating = true;
-		this.requestor = requestor;
-
-		DTDFile dtdFile = entity.getDTDFile();
-		if (batchDelete == null) {
-			batchDelete = new DTDBatchNodeDelete(dtdFile);
-		}
-
-		// See the comment at the head of this file regarding
-		// external parameter entities.
-		// externalElementsAndParmEntities =
-		// dtdFile.getDTDModel().getExternalModels().getElementContentNames(entity.getPublicID(),
-		// dtdFile.getDTDModel().resolveID(entity.getPublicID(),
-		// entity.getSystemID()));
-
-		visit(dtdFile);
-
-		batchDelete.deleteNodes(requestor);
-
-		isUpdating = false;
-	}
-
-	public boolean isMatchingName(String name) {
-		return externalElementsAndParmEntities.contains(name);
-	}
-
-	public void visitAttribute(Attribute attr) {
-		super.visitAttribute(attr);
-		String attrName = attr.getName();
-		String attrType = attr.getType();
-
-		if (isParameterEntityRef(attrName)) {
-			if (isMatchingName(attrName)) {
-				attr.setName(requestor, "TempName"); //$NON-NLS-1$
-			}
-		}
-		if (isParameterEntityRef(attrType)) {
-			if (isMatchingName(attrType)) {
-				attr.setType(requestor, Attribute.CDATA);
-			}
-		}
-	}
-
-	public void visitAttributeList(AttributeList attList) {
-		super.visitAttributeList(attList);
-		String attListName = attList.getName();
-		if (isParameterEntityRef(attListName)) {
-			if (isMatchingName(attListName)) {
-				attList.setName(requestor, "TempName"); //$NON-NLS-1$
-			}
-		}
-	}
-
-	public void visitElement(Element element) {
-		String elementName = element.getName();
-		if (isParameterEntityRef(elementName)) {
-			if (isMatchingName(elementName)) {
-				element.setName(requestor, "TempName"); //$NON-NLS-1$
-			}
-		}
-		super.visitElement(element);
-	}
-
-	public void visitReference(CMBasicNode node) {
-		super.visitReference(node);
-		String refName = node.getName();
-		if (isMatchingName(refName)) {
-			DTDNode parent = (DTDNode) node.getParentNode();
-			batchDelete.addNode(node);
-			// parent.delete(requestor, node);
-		}
-	}
-
-	// public void
-	// visitExternalParameterEntityReference(ParameterEntityReference
-	// parmEntityRef)
-	// {
-	// super.visitExternalParameterEntityReference(parmEntityRef);
-	// if (isParmEntity && parmEntityRef.getName().equals(oldRefName))
-	// {
-	// nodesToDelete.add(parmEntityRef);
-	// }
-	// }
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDModelUpdater.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDModelUpdater.java
deleted file mode 100644
index 21bf476..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDModelUpdater.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.dtd.core.internal.Attribute;
-import org.eclipse.wst.dtd.core.internal.AttributeList;
-import org.eclipse.wst.dtd.core.internal.CMBasicNode;
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.core.internal.Entity;
-import org.eclipse.wst.dtd.core.internal.ParameterEntityReference;
-
-
-// this class is responsible for updating the model when items
-// are deleted or a external parm entity changes so that
-// items referenced by it are cleaned up
-// note that top level nodes are queued up for deletion so that
-// iteration over the list of nodes from the dtdfile is not messed up
-public class DTDModelUpdater extends DTDVisitor {
-
-	protected boolean isParmEntity = false;
-
-	protected boolean isUpdating = false;
-
-	protected List nodesToDelete = new ArrayList();
-	protected DTDNode nodeToDelete;
-	protected String oldRefName = ""; //$NON-NLS-1$
-	protected Object requestor;
-
-	public DTDModelUpdater() {
-
-	}
-
-	public synchronized void objectAboutToBeDeleted(Object requestor, DTDNode node) {
-		if (isUpdating) {
-			return;
-		}
-		if (!(node instanceof Entity || node instanceof Element)) {
-			// just ignore if it is not one of these
-			return;
-		}
-		if (node instanceof Entity && !((Entity) node).isParameterEntity()) {
-			// if it is not a parameter entity, ignore as well
-			return;
-		}
-
-
-		isUpdating = true;
-		this.requestor = requestor;
-		this.nodeToDelete = node;
-		oldRefName = node.getName();
-		isParmEntity = false;
-		nodesToDelete.clear();
-
-		if (node instanceof Entity) {
-			isParmEntity = true;
-			oldRefName = "%" + oldRefName + ";"; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		DTDFile dtdFile = node.getDTDFile();
-		visit(dtdFile);
-
-		for (int i = 0; i < nodesToDelete.size(); i++) {
-			dtdFile.deleteNode(requestor, (DTDNode) nodesToDelete.get(i));
-		}
-
-		isUpdating = false;
-	}
-
-	public void visitAttribute(Attribute attr) {
-		super.visitAttribute(attr);
-		if (isParmEntity) {
-			if (attr.getName().equals(oldRefName)) {
-				attr.setName(requestor, "TempName"); //$NON-NLS-1$
-			}
-			if (attr.getType().equals(oldRefName)) {
-				attr.setType(requestor, Attribute.CDATA);
-			}
-		}
-		// check the attr name and the attr type to see if it
-		// needs updating
-	}
-
-	public void visitAttributeList(AttributeList attList) {
-		super.visitAttributeList(attList);
-		if (attList.getName().equals(oldRefName)) {
-			if (isParmEntity) {
-				attList.setName(requestor, "TempName"); //$NON-NLS-1$
-			}
-			else {
-				// save up for later deletion
-				nodesToDelete.add(attList);
-			}
-		}
-	}
-
-	public void visitElement(Element element) {
-		if (isParmEntity) {
-			if (element.getName().equals(oldRefName)) {
-				element.setName(requestor, "TempName"); //$NON-NLS-1$
-			}
-		}
-		super.visitElement(element);
-	}
-
-	public void visitExternalParameterEntityReference(ParameterEntityReference parmEntityRef) {
-		super.visitExternalParameterEntityReference(parmEntityRef);
-		if (isParmEntity && parmEntityRef.getName().equals(oldRefName)) {
-			nodesToDelete.add(parmEntityRef);
-		}
-	}
-
-	public void visitReference(CMBasicNode node) {
-		super.visitReference(node);
-
-		if (node.getName().equals(oldRefName)) {
-			DTDNode parent = (DTDNode) node.getParentNode();
-			parent.delete(requestor, node);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDNotationReferenceRemover.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDNotationReferenceRemover.java
deleted file mode 100644
index 35cbf84..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDNotationReferenceRemover.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.dtd.core.internal.Attribute;
-import org.eclipse.wst.dtd.core.internal.AttributeEnumList;
-import org.eclipse.wst.dtd.core.internal.AttributeList;
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Entity;
-import org.eclipse.wst.dtd.core.internal.Notation;
-
-
-public class DTDNotationReferenceRemover {
-	protected Notation notation;
-	protected String notationName;
-
-	protected Object requestor;
-
-	public DTDNotationReferenceRemover() {
-
-	}
-
-	public void notationAboutToBeDeleted(Object requestor, Notation notation) {
-		this.requestor = requestor;
-		this.notation = notation;
-		notationName = notation.getName();
-
-		visit(notation.getDTDFile());
-	}
-
-	public void visit(DTDFile file) {
-		List nodes = file.getNodes();
-		for (int i = 0; i < nodes.size(); i++) {
-			DTDNode currentNode = (DTDNode) nodes.get(i);
-			if (currentNode instanceof Entity) {
-				visitEntity((Entity) currentNode);
-			}
-			else if (currentNode instanceof AttributeList) {
-				visitAttributeList((AttributeList) currentNode);
-			}
-		}
-	}
-
-	public void visitAttribute(Attribute attr) {
-		if (attr.getType().equals(Attribute.ENUMERATED_NOTATION)) {
-			AttributeEnumList enumList = attr.getEnumList();
-			List notationNames = enumList.getItems();
-			Iterator iter = notationNames.iterator();
-			boolean updateRequired = false;
-			while (iter.hasNext()) {
-				String notation = (String) iter.next();
-				if (notation.equals(notationName)) {
-					updateRequired = true;
-					iter.remove();
-				}
-			}
-			if (updateRequired) {
-				String[] newItems = new String[notationNames.size()];
-				notationNames.toArray(newItems);
-				enumList.setItems(requestor, newItems);
-			}
-		}
-	}
-
-	public void visitAttributeList(AttributeList attList) {
-		Attribute attr = (Attribute) attList.getFirstChild();
-		while (attr != null) {
-			visitAttribute(attr);
-			attr = (Attribute) attr.getNextSibling();
-		}
-	}
-
-	public void visitEntity(Entity entity) {
-		if (entity.getNotationName().equals(notationName)) {
-			entity.setNotationName(requestor, ""); //$NON-NLS-1$
-		}
-	}
-
-}// DTDNotationRemover
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDReferenceUpdater.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDReferenceUpdater.java
deleted file mode 100644
index 26931d8..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDReferenceUpdater.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.dtd.core.internal.Attribute;
-import org.eclipse.wst.dtd.core.internal.AttributeEnumList;
-import org.eclipse.wst.dtd.core.internal.AttributeList;
-import org.eclipse.wst.dtd.core.internal.CMBasicNode;
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.core.internal.Entity;
-import org.eclipse.wst.dtd.core.internal.Notation;
-import org.eclipse.wst.dtd.core.internal.ParameterEntityReference;
-
-
-// this class is responsible for updating any dtd node in
-// response to a change in the node that they reference
-public class DTDReferenceUpdater extends DTDVisitor {
-	protected boolean isNotation = false;
-
-	protected boolean isParmEntity = false;
-
-	protected boolean isUpdating = false;
-	protected String newName = ""; //$NON-NLS-1$
-	protected String oldRefName = "", newRefName = ""; //$NON-NLS-1$ //$NON-NLS-2$
-	protected DTDNode referencedNode = null;
-
-	// the references List is a cache of the DTDNodes that are changed
-	// as a result of a call to nameAboutToChange(). The idea is that
-	// if a subsequent call comes in that changes the name of the same
-	// object for which this cache exists for, then we optimize the
-	// path by just walking the cache
-	private List references = new ArrayList();
-	protected Object requestor;
-
-	public DTDReferenceUpdater() {
-
-	}
-
-	public void clearCache() {
-		referencedNode = null;
-		references.clear();
-	}
-
-	public synchronized void nameAboutToChange(Object requestor, DTDNode referencedNode, String newName) {
-		if (isUpdating) {
-			return;
-		}
-		if (!(referencedNode instanceof Entity || referencedNode instanceof Element || referencedNode instanceof Notation)) {
-			// just ignore if it is not one of these
-			return;
-		}
-		if (referencedNode instanceof Entity && !((Entity) referencedNode).isParameterEntity()) {
-			// if it is not a parameter entity, ignore as well
-			return;
-		}
-
-		isUpdating = true;
-		this.requestor = requestor;
-		oldRefName = referencedNode.getName();
-		this.newName = newRefName = newName;
-		isParmEntity = false;
-		isNotation = referencedNode instanceof Notation;
-
-		if (referencedNode instanceof Entity) {
-			isParmEntity = true;
-			oldRefName = "%" + oldRefName + ";"; //$NON-NLS-1$ //$NON-NLS-2$
-			newRefName = "%" + newRefName + ";"; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		if (this.referencedNode != null) {
-			// check if the previous referenced node that was changed
-			// is the same as the one that is coming in. if so, just
-			// change the previous regions
-			if (this.referencedNode == referencedNode) {
-				quickUpdate();
-				isUpdating = false;
-				return;
-			}
-		}
-
-		// clear the cache if we get here
-		this.referencedNode = referencedNode;
-		references.clear();
-		DTDFile dtdFile = referencedNode.getDTDFile();
-		visit(dtdFile);
-		isUpdating = false;
-	}
-
-	protected void quickUpdate() {
-		for (int i = 0; i < references.size(); i++) {
-			DTDNode node = (DTDNode) references.get(i);
-			if (node instanceof Element) {
-				visitElement((Element) node);
-			}
-			else if (node instanceof AttributeList) {
-				visitAttributeList((AttributeList) node);
-			}
-			else if (node instanceof Attribute) {
-				visitAttribute((Attribute) node);
-			}
-			else if (node instanceof CMBasicNode) {
-				visitReference((CMBasicNode) node);
-			}
-			else if (node instanceof ParameterEntityReference) {
-				visitExternalParameterEntityReference((ParameterEntityReference) node);
-			}
-		}
-	}
-
-	public void visitAttribute(Attribute attr) {
-		super.visitAttribute(attr);
-		if (isParmEntity) {
-			// check the attr name and the attr type to see if it
-			// needs updating
-			if (attr.getName().equals(oldRefName)) {
-				attr.setName(requestor, newRefName);
-				references.add(attr);
-			}
-			if (attr.getType().equals(oldRefName)) {
-				attr.setType(requestor, newRefName);
-				references.add(attr);
-			}
-		}
-		else if (isNotation && attr.getType().equals(Attribute.ENUMERATED_NOTATION)) {
-			AttributeEnumList enumList = attr.getEnumList();
-			List items = enumList.getItems();
-			boolean updateNeeded = false;
-			for (int i = 0; i < items.size(); i++) {
-				String notationName = (String) items.get(i);
-				if (notationName.equals(oldRefName)) {
-					updateNeeded = true;
-					items.set(i, newName);
-				}
-			}
-			if (updateNeeded) {
-				String[] newItems = new String[items.size()];
-
-				enumList.setItems((String[]) items.toArray(newItems));
-			}
-		}
-
-	}
-
-	public void visitAttributeList(AttributeList attList) {
-		if (!isNotation && attList.getName().equals(oldRefName)) {
-			attList.setName(requestor, newRefName);
-			references.add(attList);
-		}
-		super.visitAttributeList(attList);
-	}
-
-	public void visitElement(Element element) {
-		if (isParmEntity) {
-			if (element.getName().equals(oldRefName)) {
-				element.setName(requestor, newRefName);
-				references.add(element);
-			}
-		}
-		super.visitElement(element);
-	}
-
-	public void visitExternalParameterEntityReference(ParameterEntityReference parmEntityRef) {
-		super.visitExternalParameterEntityReference(parmEntityRef);
-		if (parmEntityRef.getName().equals(oldRefName)) {
-			parmEntityRef.setReferencedEntity(requestor, newName);
-			references.add(parmEntityRef);
-		}
-	}
-
-	public void visitReference(CMBasicNode node) {
-		super.visitReference(node);
-		if (isParameterEntityRef(oldRefName) && !isParmEntity) {
-			return;
-		}
-
-		if (node.getName().equals(oldRefName)) {
-			node.setName(requestor, newRefName);
-			references.add(node);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDSAXParser.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDSAXParser.java
deleted file mode 100644
index f758c71..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDSAXParser.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.SAXParser;
-
-import org.xml.sax.Parser;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.XMLReader;
-
-/**
- * TODO: Kihup and Nitin, reevaluate the use and implementation of this class
- */
-
-// import org.apache.xerces.parsers.SAXParser;
-// import org.apache.xerces.xni.Augmentations;
-// import org.apache.xerces.xni.XMLLocator;
-// import org.apache.xerces.xni.XMLString;
-// import org.apache.xerces.xni.XNIException;
-public class DTDSAXParser extends SAXParser {
-
-	private List ignoredEntityRefs = new ArrayList();
-
-	// private XMLLocator locator;
-	//
-	public List getIgnoredEntityRefs() {
-		return ignoredEntityRefs;
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.xml.parsers.SAXParser#getParser()
-	 */
-	public Parser getParser() throws SAXException {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.xml.parsers.SAXParser#getProperty(java.lang.String)
-	 */
-	public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.xml.parsers.SAXParser#getXMLReader()
-	 */
-	public XMLReader getXMLReader() throws SAXException {
-		return null;
-	}
-
-	boolean isEntityRef(String token) {
-		// Looking for the pattern "nnnn%nnnnn".
-		if (token.indexOf('%') != -1)
-			return true; // candidate for entity reference
-		else
-			return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.xml.parsers.SAXParser#isNamespaceAware()
-	 */
-	public boolean isNamespaceAware() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.xml.parsers.SAXParser#isValidating()
-	 */
-	public boolean isValidating() {
-		return false;
-	}
-
-	// TODO: never used
-	void registerEntityRef(String token) {
-		int index = token.lastIndexOf('%');
-		if (index == -1)
-			return;
-
-		String refName = token.substring(index, token.length());
-		// System.out.println("entity ref name is: " + refName);
-		if (refName.indexOf(' ') != -1 || refName.indexOf('\t') != -1 || refName.indexOf('\n') != -1)
-			return;
-		else
-			// we found entity reference
-			ignoredEntityRefs.add(refName + ";"); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.xml.parsers.SAXParser#setProperty(java.lang.String,
-	 *      java.lang.Object)
-	 */
-	public void setProperty(String name, Object value) throws SAXNotRecognizedException, SAXNotSupportedException {
-		// TODO maybe needs implementing?
-
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDUniqueNameHelper.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDUniqueNameHelper.java
deleted file mode 100644
index 9c339d8..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDUniqueNameHelper.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.dtd.core.internal.Attribute;
-import org.eclipse.wst.dtd.core.internal.CMBasicNode;
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.core.internal.Entity;
-import org.eclipse.wst.dtd.core.internal.Notation;
-
-
-public class DTDUniqueNameHelper {
-
-	static public String getName(Object obj) {
-		if (obj instanceof Element) {
-			return ((Element) obj).getName();
-		}
-		else if (obj instanceof Entity) {
-			return ((Entity) obj).getName();
-		}
-		else if (obj instanceof Notation) {
-			return ((Notation) obj).getName();
-		}
-		else if (obj instanceof Attribute) {
-			return ((Attribute) obj).getName();
-		}
-		else if (obj instanceof CMBasicNode) // Model Group Content
-		{
-			return ((CMBasicNode) obj).getName();
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	static public String getUniqueAttributeName(Element element) {
-		List attrs = element.getElementAttributes();
-		return getUniqueName(attrs, "NewAttribute"); //$NON-NLS-1$
-	}
-
-	static public String getUniqueElementName(DTDFile dtdFile) {
-		List elements = dtdFile.getElementsAndParameterEntityReferences().getNodes();
-		return getUniqueName(elements, "NewElement"); //$NON-NLS-1$
-	}
-
-	static public String getUniqueEntityName(DTDFile dtdFile) {
-		List entities = dtdFile.getEntities().getNodes();
-		return getUniqueName(entities, "NewEntity"); //$NON-NLS-1$
-	}
-
-	static public String getUniqueName(List objs, String token) {
-		int counter = 1;
-
-		boolean uniqueName = false;
-		while (!uniqueName) {
-			String newName = token + new Integer(counter++);
-			uniqueName = true;
-			Iterator iter = objs.iterator();
-			while (iter.hasNext()) {
-				Object obj = iter.next();
-				String objName = getName(obj);
-				if (objName.equals(newName)) {
-					uniqueName = false;
-					break;
-				}
-			}
-			if (uniqueName) {
-				return newName;
-			}
-		}
-		// we shouldn't get here
-		return "No Name found"; //$NON-NLS-1$
-	}
-
-	static public String getUniqueNotationName(DTDFile dtdFile) {
-		List notations = dtdFile.getNotations().getNodes();
-		return getUniqueName(notations, "NewNotation"); //$NON-NLS-1$
-	}
-
-	public DTDUniqueNameHelper() {
-	}
-
-} // DTDUniqueNameHelper
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDVisitor.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDVisitor.java
deleted file mode 100644
index d3e6d01..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/DTDVisitor.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.util;
-
-import java.util.List;
-
-import org.eclipse.wst.dtd.core.internal.Attribute;
-import org.eclipse.wst.dtd.core.internal.AttributeList;
-import org.eclipse.wst.dtd.core.internal.CMBasicNode;
-import org.eclipse.wst.dtd.core.internal.CMGroupNode;
-import org.eclipse.wst.dtd.core.internal.CMNode;
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.core.internal.ParameterEntityReference;
-
-
-public class DTDVisitor {
-
-	public DTDVisitor() {
-
-	}
-
-	// utility method
-	public boolean isParameterEntityRef(String reference) {
-		if (reference.length() > 0) {
-			return reference.charAt(0) == '%' && reference.charAt(reference.length() - 1) == ';';
-		}
-		return false;
-	}
-
-	public void visit(DTDFile file) {
-		List nodes = file.getNodes();
-		for (int i = 0; i < nodes.size(); i++) {
-			DTDNode currentNode = (DTDNode) nodes.get(i);
-			if (currentNode instanceof Element) {
-				visitElement((Element) currentNode);
-			}
-			else if (currentNode instanceof AttributeList) {
-				visitAttributeList((AttributeList) currentNode);
-			}
-			else if (currentNode instanceof ParameterEntityReference) {
-				visitExternalParameterEntityReference((ParameterEntityReference) currentNode);
-			}
-		}
-	}
-
-	public void visitAttribute(Attribute attr) {
-	}
-
-	public void visitAttributeList(AttributeList attList) {
-		// note that we don't visit attributes here because we
-		// want the element to visit them with it's consolidated list
-		// that it creates by gathering all attribute lists together
-	}
-
-	public void visitAttributes(List attributes) {
-		int size = attributes.size();
-		for (int i = 0; i < size; i++) {
-			Attribute attr = (Attribute) attributes.get(i);
-			visitAttribute(attr);
-		}
-	}
-
-	public void visitContentNode(CMNode content) {
-		if (content instanceof CMBasicNode) {
-			CMBasicNode basicNode = (CMBasicNode) content;
-			if (basicNode.isReference()) {
-				visitReference(basicNode);
-			}
-		}
-		else if (content instanceof CMGroupNode) {
-			visitGroupNode((CMGroupNode) content);
-		}
-	}
-
-	public void visitElement(Element element) {
-		CMNode content = element.getContentModel();
-		visitContentNode(content);
-		visitAttributes(element.getElementAttributes());
-	}
-
-	public void visitExternalParameterEntityReference(ParameterEntityReference parmEntityRef) {
-	}
-
-	public void visitGroupNode(CMGroupNode group) {
-		List children = group.getChildrenList();
-		int size = children.size();
-		for (int i = 0; i < size; i++) {
-			visitContentNode((CMNode) children.get(i));
-		}
-	}
-
-	public void visitReference(CMBasicNode node) {
-	}
-
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/LabelValuePair.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/LabelValuePair.java
deleted file mode 100644
index f51d872..0000000
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/util/LabelValuePair.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.internal.util;
-
-import org.eclipse.jface.util.Assert;
-
-public class LabelValuePair {
-
-	public String fLabel;
-	public Object fValue;
-
-	/**
-	 * Creates a new name/value item
-	 */
-	public LabelValuePair(String label, Object value) {
-		Assert.isTrue(label != null);
-		fLabel = label;
-		fValue = value;
-	}
-}
diff --git a/bundles/org.eclipse.wst.html.core/.classpath b/bundles/org.eclipse.wst.html.core/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.wst.html.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.html.core/.cvsignore b/bundles/org.eclipse.wst.html.core/.cvsignore
deleted file mode 100644
index fe4fb4d..0000000
--- a/bundles/org.eclipse.wst.html.core/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-htmlmodel.jar
-temp.folder
-dev.properties
-build.xml
-@dot
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/.options b/bundles/org.eclipse.wst.html.core/.options
deleted file mode 100644
index e66a59f..0000000
--- a/bundles/org.eclipse.wst.html.core/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-org.eclipse.wst.html.core/debug=true
-org.eclipse.wst.html.core/debug/tracefilter=
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/.project b/bundles/org.eclipse.wst.html.core/.project
deleted file mode 100644
index 13a9fac..0000000
--- a/bundles/org.eclipse.wst.html.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.html.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.html.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.html.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e015586..0000000
--- a/bundles/org.eclipse.wst.html.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Mon May 30 17:55:54 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.wst.html.core/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.html.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index c9a18d3..0000000
--- a/bundles/org.eclipse.wst.html.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,14 +0,0 @@
-#Fri May 27 23:56:32 EDT 2005

-compilers.p.deprecated=1

-compilers.p.illegal-att-value=0

-compilers.p.no-required-att=0

-compilers.p.not-externalized-att=1

-compilers.p.unknown-attribute=0

-compilers.p.unknown-class=0

-compilers.p.unknown-element=0

-compilers.p.unknown-resource=0

-compilers.p.unresolved-ex-points=0

-compilers.p.unresolved-import=0

-compilers.p.unused-element-or-attribute=0

-compilers.use-project=true

-eclipse.preferences.version=1

diff --git a/bundles/org.eclipse.wst.html.core/HTMLDocumentTypeAdapterFactory.java b/bundles/org.eclipse.wst.html.core/HTMLDocumentTypeAdapterFactory.java
deleted file mode 100644
index e69de29..0000000
--- a/bundles/org.eclipse.wst.html.core/HTMLDocumentTypeAdapterFactory.java
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 2e3aff8..0000000
--- a/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,35 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.html.core; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.wst.html.core.internal.HTMLCorePlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.html.core.internal,
- org.eclipse.wst.html.core.internal.cleanup,
- org.eclipse.wst.html.core.internal.commentelement.handlers,
- org.eclipse.wst.html.core.internal.contentmodel,
- org.eclipse.wst.html.core.internal.contentmodel.chtml,
- org.eclipse.wst.html.core.internal.contentmodel.ssi,
- org.eclipse.wst.html.core.internal.contenttype,
- org.eclipse.wst.html.core.internal.document,
- org.eclipse.wst.html.core.internal.encoding,
- org.eclipse.wst.html.core.internal.format,
- org.eclipse.wst.html.core.internal.htmlcss,
- org.eclipse.wst.html.core.internal.modelhandler,
- org.eclipse.wst.html.core.internal.modelquery,
- org.eclipse.wst.html.core.internal.preferences,
- org.eclipse.wst.html.core.internal.provisional,
- org.eclipse.wst.html.core.internal.provisional.contenttype,
- org.eclipse.wst.html.core.internal.provisional.text,
- org.eclipse.wst.html.core.internal.text,
- org.eclipse.wst.html.core.internal.validate
-Require-Bundle: org.eclipse.wst.css.core,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.core.resources,
- org.eclipse.core.runtime
-Eclipse-AutoStart: true; exceptions="org.eclipse.wst.html.core.internal.contenttype"
diff --git a/bundles/org.eclipse.wst.html.core/about.html b/bundles/org.eclipse.wst.html.core/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.wst.html.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/build.properties b/bundles/org.eclipse.wst.html.core/build.properties
deleted file mode 100644
index 82622b7..0000000
--- a/bundles/org.eclipse.wst.html.core/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               .options,\
-               data/,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               about.html
-bin.excludes = bin/**,\
-               @dot/**,\
-               temp.folder/**
-src.includes = component.xml,\
-               build.properties
-source.. = src/
diff --git a/bundles/org.eclipse.wst.html.core/component.xml b/bundles/org.eclipse.wst.html.core/component.xml
deleted file mode 100644
index 42bf72a..0000000
--- a/bundles/org.eclipse.wst.html.core/component.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model"
-        name="org.eclipse.wst.html">
-        <component-depends unrestricted="true"></component-depends>
-        <plugin id="org.eclipse.wst.html.core" />
-        <plugin id="org.eclipse.wst.html.ui" />
-
-</component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/data/htmref.properties b/bundles/org.eclipse.wst.html.core/data/htmref.properties
deleted file mode 100644
index 9cd460d..0000000
--- a/bundles/org.eclipse.wst.html.core/data/htmref.properties
+++ /dev/null
@@ -1,108 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-ATagInfo=A link if the href attribute is present, and the target for a link if the name attribute is present
-ABBRTagInfo=An abbreviation (for example, WWW, HTTP)
-ACRONYMTagInfo=An acronym (for example, SCUBA)
-ADDRESSTagInfo=Address information for the author of the page
-APPLETTagInfo=A Java applet
-AREATagInfo=Defines a client-side image map area
-BTagInfo=Displays contained text as bold
-BASETagInfo=The base URI for the page, to be used when calculating relative paths
-BASEFONTTagInfo=The base font size for the page
-BDOTagInfo=Overrides default bidirectional display. For use with bidirectional languages.
-BIGTagInfo=Displays contained text as large
-BGSOUNDTagInfo=Defines a sound file for the page. Not supported by W3C HTML 4.01.
-BLINKTagInfo=Displays text as blinking. Not supported by W3C HTML 4.01.
-BLOCKQUOTETagInfo=A long quotation
-BODYTagInfo=The document body. Contains all the content for the page.
-BRTagInfo=Forces a line break
-BUTTONTagInfo=Defines a push button
-CAPTIONTagInfo=Defines a table caption
-CENTERTagInfo=Displays contained text centered. Equivalent to DIV with align=center.
-CITETagInfo=A citation
-CODETagInfo=A computer code fragment
-COLTagInfo=A table column
-COLGROUPTagInfo=A group of table columns
-DDTagInfo=A definition or description in a definition or description list
-DELTagInfo=Displays text as deleted
-DFNTagInfo=A definition
-DIRTagInfo=A directory listing
-DIVTagInfo=A generic container, which can be used for defining language or style for the contents
-DLTagInfo=A definition or description list
-DTTagInfo=A term or subject in a definition or description list
-EMTagInfo=Displays text emphasized (generally italicized)
-EMBEDTagInfo=Defines an embedded plug-in. Not supported by W3C HTML 4.01.
-FIELDSETTagInfo=Defines a form control group
-FONTTagInfo=Displays text in the given font
-FORMTagInfo=Defines an interactive form
-FRAMETagInfo=Defines a frame within the current window
-FRAMESETTagInfo=Defines a frameset that divides the window into frames
-H1TagInfo=A top-level heading
-H2TagInfo=A second-level heading
-H3TagInfo=A third-level heading
-H4TagInfo=A fourth-level heading
-H5TagInfo=A fifth-level heading
-H6TagInfo=A sixth-level heading
-HEADTagInfo=Contains metadata and window title information for the document
-HRTagInfo=A horizontal rule
-HTMLTagInfo=The root element for the document.
-ITagInfo=Displays text as italic
-IFRAMETagInfo=Defines an inline subwindow
-IMGTagInfo=Displays the referenced image as embedded content
-INPUTTagInfo=Defines a form control for user input
-INSTagInfo=Defines inserted text
-ISINDEXTagInfo=Defines a single line prompt
-KBDTagInfo=Defines text to be entered by the user
-LABELTagInfo=Defines the label for a form field
-LEGENDTagInfo=Defines the label for a set of form fields
-LITagInfo=Defines a list item within a list
-LINKTagInfo=A media-independent link
-MAPTagInfo=Defines a client-side image map
-MARQUEETagInfo=Displays text as scrolling. Not supported by W3C HTML 4.01.
-MENUTagInfo=Defines a menu list
-METATagInfo=Defines metadata information for the document
-NOBRTagInfo=Overrides and prevents line breaks. Not supported by W3C HTML 4.01.
-NOFRAMESTagInfo=Provides information to display if the current browser does not support frames
-NOSCRIPTTagInfo=Provides information to display if the current browser does not support scripting
-OBJECTTagInfo=Defines a generic embedded object
-OLTagInfo=An ordered list
-OPTGROUPTagInfo=An option group
-OPTIONTagInfo=A selectable choice
-PTagInfo=A paragraph
-PARAMTagInfo=A named property value
-PRETagInfo=Preformatted text
-QTagInfo=A short inline quotation
-STagInfo=Display text in strike-through style
-SAMPTagInfo=Sample program output, scripts, etc. Displays in monospace font.
-SCRIPTTagInfo=Script statements
-SELECTTagInfo=An option selector
-SMALLTagInfo=Displays text as small
-SPANTagInfo=A generic container, which can be used for defining language or style for the contents
-STRIKETagInfo=Display text in strike-through style
-STRONGTagInfo=Displays text as strongly emphasized (generally bold)
-STYLETagInfo=Defines a style for the contained information
-SUBTagInfo=Display as subscript
-SUPTagInfo=Display as superscript
-TABLETagInfo=Defines a table
-TBODYTagInfo=The body of the table
-TDTagInfo=A cell within a table
-TEXTAREATagInfo=A multi-line text field
-TFOOTTagInfo=A table footer
-THTagInfo=A table header cell
-THEADTagInfo=A table header
-TITLETagInfo=The document title, displayed in the browser's title bar
-TRTagInfo=A table row
-TTTagInfo=Displays text in teletype or monospaced text style
-UTagInfo=Displays text as underlined
-ULTagInfo=An unordered list
-VARTagInfo=An instance of a variable or program argument
-WBRTagInfo=Allows a line break within <B>&lt;NOBR&gt;</B> tag. Not supported by W3C HTML 4.01.
diff --git a/bundles/org.eclipse.wst.html.core/data/htmref.xml b/bundles/org.eclipse.wst.html.core/data/htmref.xml
deleted file mode 100644
index 9a5b74c..0000000
--- a/bundles/org.eclipse.wst.html.core/data/htmref.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<abstractGrammarAnnotations propertiesLocation="htmref" caseSensitive="false">
-    <annotation spec="A">
-        <property name="tagInfo">%ATagInfo</property>
-    </annotation>
-    <annotation spec="ABBR">
-        <property name="tagInfo">%ABBRTagInfo</property>
-    </annotation>
-    <annotation spec="ACRONYM">
-        <property name="tagInfo">%ACRONYMTagInfo</property>
-    </annotation>
-    <annotation spec="ADDRESS">
-        <property name="tagInfo">%ADDRESSTagInfo</property>
-    </annotation>
-    <annotation spec="APPLET">
-        <property name="tagInfo">%APPLETTagInfo</property>
-    </annotation>
-    <annotation spec="AREA">
-        <property name="tagInfo">%AREATagInfo</property>
-    </annotation>
-    <annotation spec="B">
-        <property name="tagInfo">%BTagInfo</property>
-    </annotation>
-    <annotation spec="BASE">
-        <property name="tagInfo">%BASETagInfo</property>
-    </annotation>
-    <annotation spec="BASEFONT">
-        <property name="tagInfo">%BASEFONTTagInfo</property>
-    </annotation>
-    <annotation spec="BDO">
-        <property name="tagInfo">%BDOTagInfo</property>
-    </annotation>
-    <annotation spec="BGSOUND">
-        <property name="tagInfo">%BGSOUNDTagInfo</property>
-    </annotation>
-    <annotation spec="BIG">
-        <property name="tagInfo">%BIGTagInfo</property>
-    </annotation>
-    <annotation spec="BLINK">
-        <property name="tagInfo">%BLINKTagInfo</property>
-    </annotation>
-    <annotation spec="BLOCKQUOTE">
-        <property name="tagInfo">%BLOCKQUOTETagInfo</property>
-    </annotation>
-    <annotation spec="BODY">
-        <property name="tagInfo">%BODYTagInfo</property>
-    </annotation>
-    <annotation spec="BR">
-        <property name="tagInfo">%BRTagInfo</property>
-    </annotation>
-    <annotation spec="BUTTON">
-        <property name="tagInfo">%BUTTONTagInfo</property>
-    </annotation>
-    <annotation spec="CAPTION">
-        <property name="tagInfo">%CAPTIONTagInfo</property>
-    </annotation>
-    <annotation spec="CENTER">
-        <property name="tagInfo">%CENTERTagInfo</property>
-    </annotation>
-    <annotation spec="CITE">
-        <property name="tagInfo">%CITETagInfo</property>
-    </annotation>
-    <annotation spec="CODE">
-        <property name="tagInfo">%CODETagInfo</property>
-    </annotation>
-    <annotation spec="COL">
-        <property name="tagInfo">%COLTagInfo</property>
-    </annotation>
-    <annotation spec="COLGROUP">
-        <property name="tagInfo">%COLGROUPTagInfo</property>
-    </annotation>
-    <annotation spec="DD">
-        <property name="tagInfo">%DDTagInfo</property>
-    </annotation>
-    <annotation spec="DEL">
-        <property name="tagInfo">%DELTagInfo</property>
-    </annotation>
-    <annotation spec="DFN">
-        <property name="tagInfo">%DFNTagInfo</property>
-    </annotation>
-    <annotation spec="DIR">
-        <property name="tagInfo">%DIRTagInfo</property>
-    </annotation>
-    <annotation spec="DIV">
-        <property name="tagInfo">%DIVTagInfo</property>
-    </annotation>
-    <annotation spec="DL">
-        <property name="tagInfo">%DLTagInfo</property>
-    </annotation>
-    <annotation spec="DT">
-        <property name="tagInfo">%DTTagInfo</property>
-    </annotation>
-    <annotation spec="EM">
-        <property name="tagInfo">%EMTagInfo</property>
-    </annotation>
-    <annotation spec="EMBED">
-        <property name="tagInfo">%EMBEDTagInfo</property>
-    </annotation>
-    <annotation spec="FIELDSET">
-        <property name="tagInfo">%FIELDSETTagInfo</property>
-    </annotation>
-    <annotation spec="FONT">
-        <property name="tagInfo">%FONTTagInfo</property>
-    </annotation>
-    <annotation spec="FORM">
-        <property name="tagInfo">%FORMTagInfo</property>
-    </annotation>
-    <annotation spec="FRAME">
-        <property name="tagInfo">%FRAMETagInfo</property>
-    </annotation>
-    <annotation spec="FRAMESET">
-        <property name="tagInfo">%FRAMESETTagInfo</property>
-    </annotation>
-    <annotation spec="H1">
-        <property name="tagInfo">%H1TagInfo</property>
-    </annotation>
-    <annotation spec="H2">
-        <property name="tagInfo">%H2TagInfo</property>
-    </annotation>
-    <annotation spec="H3">
-        <property name="tagInfo">%H3TagInfo</property>
-    </annotation>
-    <annotation spec="H4">
-        <property name="tagInfo">%H4TagInfo</property>
-    </annotation>
-    <annotation spec="H5">
-        <property name="tagInfo">%H5TagInfo</property>
-    </annotation>
-    <annotation spec="H6">
-        <property name="tagInfo">%H6TagInfo</property>
-    </annotation>
-    <annotation spec="HEAD">
-        <property name="tagInfo">%HEADTagInfo</property>
-    </annotation>
-    <annotation spec="HR">
-        <property name="tagInfo">%HRTagInfo</property>
-    </annotation>
-    <annotation spec="HTML">
-        <property name="tagInfo">%HTMLTagInfo</property>
-    </annotation>
-    <annotation spec="I">
-        <property name="tagInfo">%ITagInfo</property>
-    </annotation>
-    <annotation spec="IFRAME">
-        <property name="tagInfo">%IFRAMETagInfo</property>
-    </annotation>
-    <annotation spec="IMG">
-        <property name="tagInfo">%IMGTagInfo</property>
-    </annotation>
-    <annotation spec="INPUT">
-        <property name="tagInfo">%INPUTTagInfo</property>
-    </annotation>
-    <annotation spec="INS">
-        <property name="tagInfo">%INSTagInfo</property>
-    </annotation>
-    <annotation spec="ISINDEX">
-        <property name="tagInfo">%ISINDEXTagInfo</property>
-    </annotation>
-    <annotation spec="KBD">
-        <property name="tagInfo">%KBDTagInfo</property>
-    </annotation>
-    <annotation spec="LABEL">
-        <property name="tagInfo">%LABELTagInfo</property>
-    </annotation>
-    <annotation spec="LEGEND">
-        <property name="tagInfo">%LEGENDTagInfo</property>
-    </annotation>
-    <annotation spec="LI">
-        <property name="tagInfo">%LITagInfo</property>
-    </annotation>
-    <annotation spec="LINK">
-        <property name="tagInfo">%LINKTagInfo</property>
-    </annotation>
-    <annotation spec="MAP">
-        <property name="tagInfo">%MAPTagInfo</property>
-    </annotation>
-    <annotation spec="MARQUEE">
-        <property name="tagInfo">%MARQUEETagInfo</property>
-    </annotation>
-    <annotation spec="MENU">
-        <property name="tagInfo">%MENUTagInfo</property>
-    </annotation>
-    <annotation spec="META">
-        <property name="tagInfo">%METATagInfo</property>
-    </annotation>
-    <annotation spec="NOBR">
-        <property name="tagInfo">%NOBRTagInfo</property>
-    </annotation>
-    <annotation spec="NOFRAMES">
-        <property name="tagInfo">%NOFRAMESTagInfo</property>
-    </annotation>
-    <annotation spec="NOSCRIPT">
-        <property name="tagInfo">%NOSCRIPTTagInfo</property>
-    </annotation>
-    <annotation spec="OBJECT">
-        <property name="tagInfo">%OBJECTTagInfo</property>
-    </annotation>
-    <annotation spec="OL">
-        <property name="tagInfo">%OLTagInfo</property>
-    </annotation>
-    <annotation spec="OPTGROUP">
-        <property name="tagInfo">%OPTGROUPTagInfo</property>
-    </annotation>
-    <annotation spec="OPTION">
-        <property name="tagInfo">%OPTIONTagInfo</property>
-    </annotation>
-    <annotation spec="P">
-        <property name="tagInfo">%PTagInfo</property>
-    </annotation>
-    <annotation spec="PARAM">
-        <property name="tagInfo">%PARAMTagInfo</property>
-    </annotation>
-    <annotation spec="PRE">
-        <property name="tagInfo">%PRETagInfo</property>
-    </annotation>
-    <annotation spec="Q">
-        <property name="tagInfo">%QTagInfo</property>
-    </annotation>
-    <annotation spec="S">
-        <property name="tagInfo">%STagInfo</property>
-    </annotation>
-    <annotation spec="SAMP">
-        <property name="tagInfo">%SAMPTagInfo</property>
-    </annotation>
-    <annotation spec="SCRIPT">
-        <property name="tagInfo">%SCRIPTTagInfo</property>
-    </annotation>
-    <annotation spec="SELECT">
-        <property name="tagInfo">%SELECTTagInfo</property>
-    </annotation>
-    <annotation spec="SMALL">
-        <property name="tagInfo">%SMALLTagInfo</property>
-    </annotation>
-    <annotation spec="SPAN">
-        <property name="tagInfo">%SPANTagInfo</property>
-    </annotation>
-    <annotation spec="STRIKE">
-        <property name="tagInfo">%STRIKETagInfo</property>
-    </annotation>
-    <annotation spec="STRONG">
-        <property name="tagInfo">%STRONGTagInfo</property>
-    </annotation>
-    <annotation spec="STYLE">
-        <property name="tagInfo">%STYLETagInfo</property>
-    </annotation>
-    <annotation spec="SUB">
-        <property name="tagInfo">%SUBTagInfo</property>
-    </annotation>
-    <annotation spec="SUP">
-        <property name="tagInfo">%SUPTagInfo</property>
-    </annotation>
-    <annotation spec="TABLE">
-        <property name="tagInfo">%TABLETagInfo</property>
-    </annotation>
-    <annotation spec="TBODY">
-        <property name="tagInfo">%TBODYTagInfo</property>
-    </annotation>
-    <annotation spec="TD">
-        <property name="tagInfo">%TDTagInfo</property>
-    </annotation>
-    <annotation spec="TEXTAREA">
-        <property name="tagInfo">%TEXTAREATagInfo</property>
-    </annotation>
-    <annotation spec="TFOOT">
-        <property name="tagInfo">%TFOOTTagInfo</property>
-    </annotation>
-    <annotation spec="TH">
-        <property name="tagInfo">%THTagInfo</property>
-    </annotation>
-    <annotation spec="THEAD">
-        <property name="tagInfo">%THEADTagInfo</property>
-    </annotation>
-    <annotation spec="TITLE">
-        <property name="tagInfo">%TITLETagInfo</property>
-    </annotation>
-    <annotation spec="TR">
-        <property name="tagInfo">%TRTagInfo</property>
-    </annotation>
-    <annotation spec="TT">
-        <property name="tagInfo">%TTTagInfo</property>
-    </annotation>
-    <annotation spec="U">
-        <property name="tagInfo">%UTagInfo</property>
-    </annotation>
-    <annotation spec="UL">
-        <property name="tagInfo">%ULTagInfo</property>
-    </annotation>
-    <annotation spec="VAR">
-        <property name="tagInfo">%VARTagInfo</property>
-    </annotation>
-    <annotation spec="WBR">
-        <property name="tagInfo">%WBRTagInfo</property>
-    </annotation>
-</abstractGrammarAnnotations>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/plugin.properties b/bundles/org.eclipse.wst.html.core/plugin.properties
deleted file mode 100644
index 3711dbf..0000000
--- a/bundles/org.eclipse.wst.html.core/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-providerName=Eclipse.org
-pluginName=Structured Source HTML Model
-nlFeatureName=Structured Source HTML Model NL Support
-Structured_HTML_Document_Factory_Extension.name=Structured HTML Document Factory Extension
-HTML_Content_Type_Extension_Element.name=HTML
diff --git a/bundles/org.eclipse.wst.html.core/plugin.xml b/bundles/org.eclipse.wst.html.core/plugin.xml
deleted file mode 100644
index 9d6fc2c..0000000
--- a/bundles/org.eclipse.wst.html.core/plugin.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension point="org.eclipse.wst.sse.core.modelHandler">
-		<modelHandler
-			default="no"
-			class="org.eclipse.wst.html.core.internal.modelhandler.ModelHandlerForHTML"
-			associatedContentTypeId="org.eclipse.wst.html.core.htmlsource"
-			id="org.eclipse.wst.html.core.internal.modelhandler">
-		</modelHandler>
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.core.embeddedTypeHandler">
-		<embeddedTypeHandler
-			class="org.eclipse.wst.html.core.internal.modelhandler.EmbeddedHTML">
-		</embeddedTypeHandler>
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.core.taskscanner">
-		<scanner
-			id="org.eclipse.wst.html.core.internal.tasks.HTMLFileTaskScanner"
-			class="org.eclipse.wst.xml.core.internal.tasks.XMLFileTaskScanner"
-			contentTypeIds="org.eclipse.wst.html.core.htmlsource" />
-	</extension>
-
-	<extension
-		point="org.eclipse.core.filebuffers.documentCreation"
-		id="org.eclipse.wst.html.core.documentfactories"
-		name="%Structured_HTML_Document_Factory_Extension.name">
-		<factory
-			contentTypeId="org.eclipse.wst.html.core.htmlsource"
-			class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory" />
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.core.commentElementHandler">
-		<handler-custom
-			commenttype="xml"
-			class="org.eclipse.wst.html.core.internal.commentelement.handlers.CommentElementHandlerForSSI">
-			<startwith prefix="#"></startwith>
-		</handler-custom>
-	</extension>
-
-	<extension point="org.eclipse.team.core.fileTypes">
-		<fileTypes
-			type="text"
-			extension="html">
-		</fileTypes>
-		<fileTypes
-			type="text"
-			extension="htm">
-		</fileTypes>
-		<fileTypes
-			type="text"
-			extension="xhtml">
-		</fileTypes>
-		<fileTypes
-			type="text"
-			extension="htpl">
-		</fileTypes>
-		<fileTypes
-			type="text"
-			extension="wml">
-		</fileTypes>
-		<fileTypes
-			type="text"
-			extension="shtml">
-		</fileTypes>
-		<fileTypes
-			type="text"
-			extension="shtm">
-		</fileTypes>
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.core.formatProcessors">
-		<processor
-			class="org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl"
-			contentTypeId="org.eclipse.wst.html.core.htmlsource">
-		</processor>
-	</extension>
-
-	<!-- Extension point for taghelp documentation -->
-	<extension point="org.eclipse.wst.xml.core.annotationFiles">
-		<annotationFile
-			location="data/htmref.xml"
-			publicId="-//W3C//DTD XHTML 1.0 Strict//EN">
-		</annotationFile>
-		<annotationFile
-			location="data/htmref.xml"
-			publicId="-//W3C//DTD XHTML 1.0 Transitional//EN">
-		</annotationFile>
-		<annotationFile
-			location="data/htmref.xml"
-			publicId="-//W3C//DTD XHTML 1.0 Frameset//EN">
-		</annotationFile>
-		<annotationFile
-			location="data/htmref.xml"
-			publicId="-//W3C//DTD XHTML Basic 1.0//EN">
-		</annotationFile>
-		<annotationFile
-			location="data/htmref.xml"
-			publicId="-//W3C//DTD XHTML 1.1//EN">
-		</annotationFile>
-		<annotationFile
-			location="data/htmref.xml"
-			publicId="-//WAPFORUM//DTD XHTML Mobile 1.0//EN">
-		</annotationFile>
-	</extension>
-
-	<extension point="org.eclipse.core.runtime.contentTypes">
-		<content-type
-			file-extensions="html,htm,xhtml,htpl,wml,shtml,shtm"
-			priority="high"
-			name="%HTML_Content_Type_Extension_Element.name"
-			id="htmlsource"
-			base-type="org.eclipse.core.runtime.text">
-			<!-- note: no default-charset for HTML, should use 'platform' -->
-			<describer
-				class="org.eclipse.wst.html.core.internal.contenttype.ContentDescriberForHTML" />
-		</content-type>
-	</extension>
-
-<!-- moved to where the dtd's are contributed
-
-	<extension point="org.eclipse.wst.sse.core.documentTypes">
-		<documentType
-			elementName="html"
-			displayName="XHTML 1.0 Strict"
-			namespaceURI="http://www.w3.org/1999/xhtml"
-			isXHTML="true"
-			hasFrameset="false"
-			publicID="-//W3C//DTD XHTML 1.0 Strict//EN"
-			systemID="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-		</documentType>
-		<documentType
-			elementName="html"
-			displayName="XHTML 1.0 Transitional"
-			namespaceURI="http://www.w3.org/1999/xhtml"
-			isXHTML="true"
-			hasFrameset="false"
-			publicID="-//W3C//DTD XHTML 1.0 Transitional//EN"
-			defaultXHTML="true"
-			systemID="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-		</documentType>
-		<documentType
-			elementName="html"
-			displayName="XHTML 1.0 Frameset"
-			namespaceURI="http://www.w3.org/1999/xhtml"
-			isXHTML="true"
-			hasFrameset="true"
-			publicID="-//W3C//DTD XHTML 1.0 Frameset//EN"
-			systemID="http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-		</documentType>
-		<documentType
-			elementName="html"
-			displayName="XHTML Basic 1.0"
-			namespaceURI="http://www.w3.org/1999/xhtml"
-			isXHTML="true"
-			hasFrameset="false"
-			publicID="-//W3C//DTD XHTML Basic 1.0//EN"
-			systemID="http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
-		</documentType>
-		<documentType
-			elementName="html"
-			displayName="XHTML 1.1"
-			namespaceURI="http://www.w3.org/1999/xhtml"
-			isXHTML="true"
-			hasFrameset="false"
-			publicID="-//W3C//DTD XHTML 1.1//EN"
-			systemID="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-		</documentType>
-		<documentType
-			elementName="html"
-			displayName="XHTML MP 1.0"
-			namespaceURI="http://www.w3.org/1999/xhtml"
-			isXHTML="true"
-			hasFrameset="false"
-			publicID="-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
-			systemID="http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
-		</documentType>
-		<documentType
-			elementName="wml"
-			displayName="WML 1.3"
-			namespaceURI=""
-			isWML="true"
-			hasFrameset="false"
-			publicID="-//WAPFORUM//DTD WML 1.3//EN"
-			defaultWML="true"
-			systemID="http://www.wapforum.org/DTD/wml13.dtd">
-		</documentType>
-	</extension>
--->
-	<!-- initialize html core preferences -->
-	<extension point="org.eclipse.core.runtime.preferences">
-		<initializer
-			class="org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceInitializer" />
-	</extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLContentBuilder.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLContentBuilder.java
deleted file mode 100644
index 7f612fb..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLContentBuilder.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal;
-
-
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilderImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-public class HTMLContentBuilder extends DOMContentBuilderImpl {
-
-	private int fTagCase;
-	private int fAttrCase;
-
-	/**
-	 * DOMContentBuilder constructor comment.
-	 * @param document org.w3c.dom.Document
-	 */
-	public HTMLContentBuilder(Document document) {
-		super(document);
-		Preferences prefs = HTMLCorePlugin.getDefault().getPluginPreferences();
-		fTagCase = prefs.getInt(HTMLCorePreferenceNames.TAG_NAME_CASE);
-		fAttrCase = prefs.getInt(HTMLCorePreferenceNames.ATTR_NAME_CASE);
-		//	Element caseSettings = HTMLPreferenceManager.getHTMLInstance().getElement(PreferenceNames.PREFERRED_CASE);
-		//	fTagCase = caseSettings.getAttribute(PreferenceNames.TAGNAME);
-		//	fAttrCase = caseSettings.getAttribute(PreferenceNames.ATTRIBUTENAME);
-	}
-
-	public String computeName(CMNode cmnode, Node parent) {
-		String name = super.computeName(cmnode, parent);
-		// don't change the case unless we're certain it is meaningless
-		//	if (cmnode instanceof HTMLCMNode && ((HTMLCMNode) cmnode).shouldIgnoreCase()) {
-		if (shouldIgnoreCase(cmnode)) {
-			if (cmnode.getNodeType() == CMNode.ELEMENT_DECLARATION) {
-				if (fTagCase == HTMLCorePreferenceNames.LOWER)
-					name = name.toLowerCase();
-				else if (fTagCase == HTMLCorePreferenceNames.UPPER)
-					name = name.toUpperCase();
-				// else do nothing
-			}
-			else if (cmnode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) {
-				if (fAttrCase == HTMLCorePreferenceNames.LOWER)
-					name = name.toLowerCase();
-				else if (fAttrCase == HTMLCorePreferenceNames.UPPER)
-					name = name.toUpperCase();
-				// else do nothing
-			}
-		}
-		return name;
-
-	}
-
-	private boolean shouldIgnoreCase(CMNode cmnode) {
-		if (!cmnode.supports(HTMLCMProperties.SHOULD_IGNORE_CASE))
-			return false;
-		return ((Boolean) cmnode.getProperty(HTMLCMProperties.SHOULD_IGNORE_CASE)).booleanValue();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCoreMessages.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCoreMessages.java
deleted file mode 100644
index 550c2f9..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCoreMessages.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 IBM Corporation and others. All rights reserved.   This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.wst.html.core.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by HTML Core
- * 
- * @plannedfor 1.0
- */
-public class HTMLCoreMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.html.core.internal.HTMLCorePluginResources";//$NON-NLS-1$
-
-	public static String No_error__UI_;
-	public static String Undefined_attribute_name___ERROR_;
-	public static String Undefined_attribute_value__ERROR_;
-	public static String Multiple_values_specified__ERROR_;
-	public static String Attribute_name___0___uses__ERROR_;
-	public static String Invalid_attribute_name___0_ERROR_;
-	public static String Invalid_attribute___0____ERROR_;
-	public static String Invalid_location_of_tag____ERROR_;
-	public static String Duplicate_tag___0____ERROR_;
-	public static String No_start_tag____0_____ERROR_;
-	public static String No_end_tag_____0_____ERROR_;
-	public static String End_tag_____0____not_neede_ERROR_;
-	public static String Unknown_tag___0____ERROR_;
-	public static String Tag_name___0___uses_wrong__ERROR_;
-	public static String Invalid_tag_name___0____ERROR_;
-	public static String Invalid_JSP_directive___0__ERROR_;
-	public static String Invalid_text_string___0____ERROR_;
-	public static String Invalid_character_used_in__ERROR_;
-	public static String Unknown_error__ERROR_;
-	public static String Start_tag____0____not_clos_ERROR_;
-	public static String End_tag_____0____not_close_ERROR_;
-	public static String Attribute_value___0___uses_ERROR_;
-	public static String Comment_not_closed__ERROR_;
-	public static String DOCTYPE_declaration_not_cl_ERROR_;
-	public static String Processing_instruction_not_ERROR_;
-	public static String CDATA_section_not_closed__ERROR_;
-	public static String _ERROR_Tag___0___should_be_an_empty_element_tag_1;
-	public static String _ERROR_Attribute_value___0___not_closed__1;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, HTMLCoreMessages.class);
-	}
-	
-	private HTMLCoreMessages() {
-		// cannot create new instance
-	}
-}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCorePlugin.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCorePlugin.java
deleted file mode 100644
index fc73123..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCorePlugin.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class HTMLCorePlugin extends Plugin {
-	//The shared instance.
-	private static HTMLCorePlugin plugin;	
-
-	/**
-	 * The constructor.
-	 */
-	public HTMLCorePlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static HTMLCorePlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCorePluginResources.properties b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCorePluginResources.properties
deleted file mode 100644
index 584ad91..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCorePluginResources.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-No_error__UI_=No error.
-Undefined_attribute_name___ERROR_=Undefined attribute name ({0}).
-Undefined_attribute_value__ERROR_=Undefined attribute value ({0}).
-Multiple_values_specified__ERROR_=Multiple values specified for an attribute ({0}).
-Attribute_name___0___uses__ERROR_=Attribute name ({0}) uses wrong case character.
-Invalid_attribute_name___0_ERROR_=Invalid attribute name ({0}).
-Invalid_attribute___0____ERROR_=Invalid attribute ({0}).
-Invalid_location_of_tag____ERROR_=Invalid location of tag ({0}).
-Duplicate_tag___0____ERROR_=Duplicate tag ({0}).
-No_start_tag____0_____ERROR_=No start tag (<{0}>).
-No_end_tag_____0_____ERROR_=No end tag (</{0}>).
-End_tag_____0____not_neede_ERROR_=End tag (</{0}>) not needed.
-Unknown_tag___0____ERROR_=Unknown tag ({0}).
-Tag_name___0___uses_wrong__ERROR_=Tag name ({0}) uses wrong case character.
-Invalid_tag_name___0____ERROR_=Invalid tag name ({0}).
-Invalid_JSP_directive___0__ERROR_=Invalid JSP directive ({0}).
-Invalid_text_string___0____ERROR_=Invalid text string ({0}).
-Invalid_character_used_in__ERROR_=Invalid character used in text string ({0}).
-Unknown_error__ERROR_=Unknown error.
-Start_tag____0____not_clos_ERROR_=Start tag (<{0}>) not closed.
-End_tag_____0____not_close_ERROR_=End tag (</{0}>) not closed.
-Attribute_value___0___uses_ERROR_=Attribute value ({0}) uses wrong case character.
-Comment_not_closed__ERROR_=Comment not closed.
-DOCTYPE_declaration_not_cl_ERROR_=DOCTYPE declaration not closed.
-Processing_instruction_not_ERROR_=Processing instruction not closed.
-CDATA_section_not_closed__ERROR_=CDATA section not closed.
-# From here, the new messages are added for V5
-_ERROR_Tag___0___should_be_an_empty_element_tag_1=Tag ({0}) should be an empty-element tag.
-_ERROR_Attribute_value___0___not_closed__1=Attribute value ({0}) not closed.
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/Logger.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/Logger.java
deleted file mode 100644
index fc6d82c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/Logger.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.html.core"; //$NON-NLS-1$
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
-	public static final int OK = IStatus.OK; // 0
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int ERROR = IStatus.ERROR; // 4
-
-	public static final int OK_DEBUG = 200 + OK;
-	public static final int INFO_DEBUG = 200 + INFO;
-	public static final int WARNING_DEBUG = 200 + WARNING;
-	public static final int ERROR_DEBUG = 200 + ERROR;
-
-	/**
-	 * Adds message to log.
-	 * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message text to add to the log
-	 * @param exception exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) 
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * @param message text to print
-	 * @param category category of the message, to be compared with /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) 
-				Platform.getLog(bundle).log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/AbstractNodeCleanupHandler.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/AbstractNodeCleanupHandler.java
deleted file mode 100644
index 37ff30a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/AbstractNodeCleanupHandler.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.cleanup;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
-import org.eclipse.wst.sse.core.internal.cleanup.StructuredCleanupPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-abstract class AbstractNodeCleanupHandler implements IStructuredCleanupHandler {
-
-	protected IStructuredCleanupPreferences fCleanupPreferences = null;
-	protected IProgressMonitor fProgressMonitor = null;
-
-	public void setCleanupPreferences(IStructuredCleanupPreferences cleanupPreferences) {
-
-		fCleanupPreferences = cleanupPreferences;
-	}
-
-
-	public IStructuredCleanupPreferences getCleanupPreferences() {
-		if (fCleanupPreferences == null) {
-			fCleanupPreferences = new StructuredCleanupPreferences();
-	
-			Preferences preferences = getModelPreferences();
-			if (preferences != null) {
-				fCleanupPreferences.setTagNameCase(preferences.getInt(HTMLCorePreferenceNames.CLEANUP_TAG_NAME_CASE));
-				fCleanupPreferences.setAttrNameCase(preferences.getInt(HTMLCorePreferenceNames.CLEANUP_ATTR_NAME_CASE));
-				fCleanupPreferences.setCompressEmptyElementTags(preferences.getBoolean(HTMLCorePreferenceNames.COMPRESS_EMPTY_ELEMENT_TAGS));
-				fCleanupPreferences.setInsertRequiredAttrs(preferences.getBoolean(HTMLCorePreferenceNames.INSERT_REQUIRED_ATTRS));
-				fCleanupPreferences.setInsertMissingTags(preferences.getBoolean(HTMLCorePreferenceNames.INSERT_MISSING_TAGS));
-				fCleanupPreferences.setQuoteAttrValues(preferences.getBoolean(HTMLCorePreferenceNames.QUOTE_ATTR_VALUES));
-				fCleanupPreferences.setFormatSource(preferences.getBoolean(HTMLCorePreferenceNames.FORMAT_SOURCE));
-				fCleanupPreferences.setConvertEOLCodes(preferences.getBoolean(HTMLCorePreferenceNames.CONVERT_EOL_CODES));
-				fCleanupPreferences.setEOLCode(preferences.getString(HTMLCorePreferenceNames.CLEANUP_EOL_CODE));
-			}
-		}
-
-		return fCleanupPreferences;
-	}
-
-
-	public void setProgressMonitor(IProgressMonitor progressMonitor) {
-
-		fProgressMonitor = progressMonitor;
-	}
-
-	static protected StructuredDocumentEvent replaceSource(IDOMModel model, Object requester, int offset, int length, String source) {
-
-		StructuredDocumentEvent result = null;
-		if (model == null)
-			return result;
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (structuredDocument == null)
-			return result;
-		if (source == null)
-			source = new String();
-		if (structuredDocument.containsReadOnly(offset, length))
-			return result;
-		if (requester == null) {
-			requester = structuredDocument;
-		}
-		return structuredDocument.replaceText(requester, offset, length, source);
-	}
-
-	protected Preferences getModelPreferences() {
-		return HTMLCorePlugin.getDefault().getPluginPreferences();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/CSSTextNodeCleanupHandler.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/CSSTextNodeCleanupHandler.java
deleted file mode 100644
index ff8006c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/CSSTextNodeCleanupHandler.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.cleanup;
-
-
-
-import org.eclipse.wst.css.core.internal.format.CSSSourceFormatter;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Node;
-
-// nakamori_TODO: check and remove
-
-public class CSSTextNodeCleanupHandler extends AbstractNodeCleanupHandler {
-
-	public Node cleanup(Node node) {
-		if (node == null)
-			return node;
-		IDOMModel model = ((IDOMNode) node).getModel();
-		if (model == null)
-			return node;
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (structuredDocument == null)
-			return node;
-
-		String content = getCSSContent(node);
-		if (content == null)
-			return node;
-
-		int offset = ((IDOMNode) node).getStartOffset();
-		int length = ((IDOMNode) node).getEndOffset() - offset;
-		replaceSource(model, this, offset, length, content);
-		return (IDOMNode) model.getIndexedRegion(offset);
-	}
-
-	/**
-	 */
-	private String getCSSContent(Node text) {
-		ICSSModel model = getCSSModel(text);
-		if (model == null)
-			return null;
-		ICSSNode document = model.getDocument();
-		if (document == null)
-			return null;
-		INodeNotifier notifier = (INodeNotifier) document;
-		INodeAdapter adapter = notifier.getAdapterFor(CSSSourceFormatter.class);
-		if (adapter == null)
-			return null;
-		CSSSourceFormatter formatter = (CSSSourceFormatter) adapter;
-		StringBuffer buffer = formatter.cleanup(document);
-		if (buffer == null)
-			return null;
-		return buffer.toString();
-	}
-
-	/**
-	 */
-	private ICSSModel getCSSModel(Node text) {
-		if (text == null)
-			return null;
-		INodeNotifier notifier = (INodeNotifier) text.getParentNode();
-		if (notifier == null)
-			return null;
-		INodeAdapter adapter = notifier.getAdapterFor(IStyleSheetAdapter.class);
-		if (adapter == null)
-			return null;
-		if (!(adapter instanceof IStyleSheetAdapter))
-			return null;
-		IStyleSheetAdapter styleAdapter = (IStyleSheetAdapter) adapter;
-		return styleAdapter.getModel();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java
deleted file mode 100644
index 37560b3..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java
+++ /dev/null
@@ -1,677 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.cleanup;
-
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.wst.css.core.internal.format.CSSSourceFormatter;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.document.ISourceGenerator;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-// nakamori_TODO: check and remove CSS formatting
-
-public class ElementNodeCleanupHandler extends AbstractNodeCleanupHandler {
-
-	/** Non-NLS strings */
-	protected static final String START_TAG_OPEN = "<"; //$NON-NLS-1$
-	protected static final String END_TAG_OPEN = "</"; //$NON-NLS-1$
-	protected static final String TAG_CLOSE = ">"; //$NON-NLS-1$
-	protected static final String EMPTY_TAG_CLOSE = "/>"; //$NON-NLS-1$
-	protected static final String SINGLE_QUOTES = "''"; //$NON-NLS-1$
-	protected static final String DOUBLE_QUOTES = "\"\""; //$NON-NLS-1$
-	protected static final char SINGLE_QUOTE = '\''; //$NON-NLS-1$
-	protected static final char DOUBLE_QUOTE = '\"'; //$NON-NLS-1$
-
-	public Node cleanup(Node node) {
-		IDOMNode renamedNode = (IDOMNode) cleanupChildren(node);
-
-		// call quoteAttrValue() first so it will close any unclosed attr
-		// quoteAttrValue() will return the new start tag if there is a
-		// structure change
-		renamedNode = quoteAttrValue(renamedNode);
-
-		// insert tag close if missing
-		// if node is not comment tag
-		// and not implicit tag
-		if (!((IDOMElement) renamedNode).isCommentTag() && (renamedNode.getStartStructuredDocumentRegion() != null)) {
-			IDOMModel structuredModel = renamedNode.getModel();
-
-			// save start offset before insertTagClose()
-			// or else renamedNode.getStartOffset() will be zero if
-			// renamedNode replaced by insertTagClose()
-			int startTagStartOffset = renamedNode.getStartOffset();
-
-			// for start tag
-			IStructuredDocumentRegion startTagStructuredDocumentRegion = renamedNode.getStartStructuredDocumentRegion();
-			insertTagClose(structuredModel, startTagStructuredDocumentRegion);
-
-			// update renamedNode and startTagStructuredDocumentRegion after
-			// insertTagClose()
-			renamedNode = (IDOMNode) structuredModel.getIndexedRegion(startTagStartOffset);
-			startTagStructuredDocumentRegion = renamedNode.getStartStructuredDocumentRegion();
-
-			// for end tag
-			IStructuredDocumentRegion endTagStructuredDocumentRegion = renamedNode.getEndStructuredDocumentRegion();
-			if (endTagStructuredDocumentRegion != startTagStructuredDocumentRegion)
-				insertTagClose(structuredModel, endTagStructuredDocumentRegion);
-		}
-
-		// call insertMissingTags() next, it will generate implicit tags if
-		// there are any
-		// insertMissingTags() will return the new missing start tag if one is
-		// missing
-		// applyTagNameCase() will return the renamed node.
-		// The renamed/new node will be saved and returned to caller when all
-		// cleanup is done.
-		renamedNode = insertMissingTags(renamedNode);
-		renamedNode = insertRequiredAttrs(renamedNode);
-		renamedNode = applyTagNameCase(renamedNode);
-		applyAttrNameCase(renamedNode);
-		cleanupCSSAttrValue(renamedNode);
-
-		return renamedNode;
-	}
-
-	/**
-	 * Checks if cleanup should modify case. Returns true case should be
-	 * preserved, false otherwise.
-	 * 
-	 * @param element
-	 * @return true if element is case sensitive, false otherwise
-	 */
-	private boolean shouldPreserveCase(IDOMElement element) {
-		// case option can be applied to no namespace tags
-		return !element.isGlobalTag();
-		/*
-		 * ModelQueryAdapter mqadapter = (ModelQueryAdapter)
-		 * element.getAdapterFor(ModelQueryAdapter.class); ModelQuery mq =
-		 * null; CMNode nodedecl = null; if (mqadapter != null) mq =
-		 * mqadapter.getModelQuery(); if (mq != null) nodedecl =
-		 * mq.getCMNode(node); // if a Node isn't recognized as HTML or is and
-		 * cares about case, do not alter it // if (nodedecl == null ||
-		 * (nodedecl instanceof HTMLCMNode && ((HTMLCMNode)
-		 * nodedecl).shouldIgnoreCase())) if (!
-		 * nodedecl.supports(HTMLCMProperties.SHOULD_IGNORE_CASE)) return
-		 * false; return
-		 * ((Boolean)cmnode.getProperty(HTMLCMProperties.SHOULD_IGNORE_CASE)).booleanValue();
-		 */
-	}
-
-	/**
-	 * Checks if cleanup should force modifying element name to all lowercase.
-	 * 
-	 * @param element
-	 * @return true if cleanup should lowercase element name, false otherwise
-	 */
-	private boolean isXMLTag(IDOMElement element) {
-		return element.isXMLTag();
-	}
-
-	protected void applyAttrNameCase(IDOMNode node) {
-		IDOMElement element = (IDOMElement) node;
-		if (element.isCommentTag())
-			return; // do nothing
-
-		int attrNameCase = HTMLCorePreferenceNames.ASIS;
-		if (!shouldPreserveCase(element)) {
-			if (isXMLTag(element))
-				attrNameCase = HTMLCorePreferenceNames.LOWER;
-			else
-				attrNameCase = getCleanupPreferences().getAttrNameCase();
-		}
-
-		NamedNodeMap attributes = node.getAttributes();
-		int attributesLength = attributes.getLength();
-
-		for (int i = 0; i < attributesLength; i++) {
-			IDOMNode eachAttr = (IDOMNode) attributes.item(i);
-			String oldAttrName = eachAttr.getNodeName();
-			String newAttrName = oldAttrName;
-			// 254961 - all HTML tag names and attribute names should be in English
-			//          even for HTML files in other languages like Japanese or Turkish.
-			//          English locale should be used to convert between uppercase and lowercase
-			//          (otherwise "link" would be converted to "L�NK" in Turkish, where '?' in "L�NK"
-			//          is the "I Overdot Capital" in Turkish).
-			if (attrNameCase == HTMLCorePreferenceNames.LOWER)
-				newAttrName = oldAttrName.toLowerCase(Locale.US);
-			else if (attrNameCase == HTMLCorePreferenceNames.UPPER)
-				newAttrName = oldAttrName.toUpperCase(Locale.US);
-
-			if (newAttrName.compareTo(oldAttrName) != 0) {
-				int attrNameStartOffset = eachAttr.getStartOffset();
-				int attrNameLength = oldAttrName.length();
-
-				IDOMModel structuredModel = node.getModel();
-				IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-				replaceSource(structuredModel, structuredDocument, attrNameStartOffset, attrNameLength, newAttrName);
-			}
-		}
-	}
-
-	protected IDOMNode applyTagNameCase(IDOMNode node) {
-		IDOMElement element = (IDOMElement) node;
-		if (element.isCommentTag())
-			return node; // do nothing
-
-		int tagNameCase = HTMLCorePreferenceNames.ASIS;
-
-		if (!shouldPreserveCase(element)) {
-			if (isXMLTag(element))
-				tagNameCase = HTMLCorePreferenceNames.LOWER;
-			else
-				tagNameCase = getCleanupPreferences().getTagNameCase();
-		}
-
-		String oldTagName = node.getNodeName();
-		String newTagName = oldTagName;
-		IDOMNode newNode = node;
-
-		// 254961 - all HTML tag names and attribute names should be in English
-		//          even for HTML files in other languages like Japanese or Turkish.
-		//          English locale should be used to convert between uppercase and lowercase
-		//          (otherwise "link" would be converted to "L�NK" in Turkish, where '?' in "L�NK"
-		//          is the "I Overdot Capital" in Turkish).
-		if (tagNameCase == HTMLCorePreferenceNames.LOWER)
-			newTagName = oldTagName.toLowerCase(Locale.US);
-		else if (tagNameCase == HTMLCorePreferenceNames.UPPER)
-			newTagName = oldTagName.toUpperCase(Locale.US);
-
-		IDOMModel structuredModel = node.getModel();
-		IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-
-		IStructuredDocumentRegion startTagStructuredDocumentRegion = node.getStartStructuredDocumentRegion();
-		if (startTagStructuredDocumentRegion != null) {
-			ITextRegionList regions = startTagStructuredDocumentRegion.getRegions();
-			if (regions != null && regions.size() > 0) {
-				ITextRegion startTagNameRegion = regions.get(1);
-				int startTagNameStartOffset = startTagStructuredDocumentRegion.getStartOffset(startTagNameRegion);
-				int startTagNameLength = startTagStructuredDocumentRegion.getTextEndOffset(startTagNameRegion) - startTagNameStartOffset;
-
-				replaceSource(structuredModel, structuredDocument, startTagNameStartOffset, startTagNameLength, newTagName);
-				newNode = (IDOMNode) structuredModel.getIndexedRegion(startTagNameStartOffset); // save
-				// new
-				// node
-			}
-		}
-
-		IStructuredDocumentRegion endTagStructuredDocumentRegion = node.getEndStructuredDocumentRegion();
-		if (endTagStructuredDocumentRegion != null) {
-			ITextRegionList regions = endTagStructuredDocumentRegion.getRegions();
-			if (regions != null && regions.size() > 0) {
-				ITextRegion endTagNameRegion = regions.get(1);
-				int endTagNameStartOffset = endTagStructuredDocumentRegion.getStartOffset(endTagNameRegion);
-				int endTagNameLength = endTagStructuredDocumentRegion.getTextEndOffset(endTagNameRegion) - endTagNameStartOffset;
-
-				if (startTagStructuredDocumentRegion != endTagStructuredDocumentRegion)
-					replaceSource(structuredModel, structuredDocument, endTagNameStartOffset, endTagNameLength, newTagName);
-			}
-		}
-
-		return newNode;
-	}
-
-	protected Node cleanupChildren(Node node) {
-		Node parentNode = node;
-
-		if (node != null) {
-			Node childNode = node.getFirstChild();
-			HTMLCleanupHandlerFactory factory = HTMLCleanupHandlerFactory.getInstance();
-			while (childNode != null) {
-				// cleanup this child node
-				IStructuredCleanupHandler cleanupHandler = factory.createHandler(childNode, getCleanupPreferences());
-				childNode = cleanupHandler.cleanup(childNode);
-
-				// get new parent node
-				parentNode = (IDOMNode) childNode.getParentNode();
-
-				// get next child node
-				childNode = (IDOMNode) childNode.getNextSibling();
-			}
-		}
-
-		return parentNode;
-	}
-
-	/**
-	 */
-	protected void cleanupCSSAttrValue(IDOMNode node) {
-		if (node == null || node.getNodeType() != Node.ELEMENT_NODE)
-			return;
-		IDOMElement element = (IDOMElement) node;
-		if (!element.isGlobalTag())
-			return;
-
-		Attr attr = element.getAttributeNode("style"); //$NON-NLS-1$
-		if (attr == null)
-			return;
-		String value = getCSSValue(attr);
-		if (value == null)
-			return;
-		String oldValue = ((IDOMNode) attr).getValueSource();
-		if (oldValue != null && value.equals(oldValue))
-			return;
-		attr.setValue(value);
-	}
-
-	/**
-	 */
-	private ICSSModel getCSSModel(Attr attr) {
-		if (attr == null)
-			return null;
-		INodeNotifier notifier = (INodeNotifier) attr.getOwnerElement();
-		if (notifier == null)
-			return null;
-		INodeAdapter adapter = notifier.getAdapterFor(IStyleDeclarationAdapter.class);
-		if (adapter == null)
-			return null;
-		if (!(adapter instanceof IStyleDeclarationAdapter))
-			return null;
-		IStyleDeclarationAdapter styleAdapter = (IStyleDeclarationAdapter) adapter;
-		return styleAdapter.getModel();
-	}
-
-	/**
-	 */
-	private String getCSSValue(Attr attr) {
-		ICSSModel model = getCSSModel(attr);
-		if (model == null)
-			return null;
-		ICSSNode document = model.getDocument();
-		if (document == null)
-			return null;
-		INodeNotifier notifier = (INodeNotifier) document;
-		INodeAdapter adapter = notifier.getAdapterFor(CSSSourceFormatter.class);
-		if (adapter == null)
-			return null;
-		CSSSourceFormatter formatter = (CSSSourceFormatter) adapter;
-		StringBuffer buffer = formatter.cleanup(document);
-		if (buffer == null)
-			return null;
-		return buffer.toString();
-	}
-
-	private boolean isEmptyElement(IDOMElement element) {
-		Document document = element.getOwnerDocument();
-		if (document == null)
-			// undefined tag, return default
-			return false;
-
-		ModelQuery modelQuery = ModelQueryUtil.getModelQuery(document);
-		if (modelQuery == null)
-			// undefined tag, return default
-			return false;
-
-		CMElementDeclaration decl = modelQuery.getCMElementDeclaration(element);
-		if (decl == null)
-			// undefined tag, return default
-			return false;
-
-		return (decl.getContentType() == CMElementDeclaration.EMPTY);
-	}
-
-	protected IDOMNode insertEndTag(IDOMNode node) {
-		IDOMElement element = (IDOMElement) node;
-
-		int startTagStartOffset = node.getStartOffset();
-		IDOMModel structuredModel = node.getModel();
-		IDOMNode newNode = null;
-
-		if (element.isCommentTag()) {
-			// do nothing
-		} else if (isEmptyElement(element)) {
-			IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-			IStructuredDocumentRegion startStructuredDocumentRegion = node.getStartStructuredDocumentRegion();
-			ITextRegionList regions = startStructuredDocumentRegion.getRegions();
-			ITextRegion lastRegion = regions.get(regions.size() - 1);
-			replaceSource(structuredModel, structuredDocument, startStructuredDocumentRegion.getStartOffset(lastRegion), lastRegion.getLength(), EMPTY_TAG_CLOSE);
-
-			if (regions.size() > 1) {
-				ITextRegion regionBeforeTagClose = regions.get(regions.size() - 1 - 1);
-
-				// insert a space separator before tag close if the previous
-				// region does not have extra spaces
-				if (regionBeforeTagClose.getTextLength() == regionBeforeTagClose.getLength())
-					replaceSource(structuredModel, structuredDocument, startStructuredDocumentRegion.getStartOffset(lastRegion), 0, " "); //$NON-NLS-1$
-			}
-		} else {
-			String tagName = node.getNodeName();
-			String endTag = END_TAG_OPEN.concat(tagName).concat(TAG_CLOSE);
-
-			IDOMNode lastChild = (IDOMNode) node.getLastChild();
-			int endTagStartOffset = 0;
-			if (lastChild != null)
-				// if this node has children, insert the end tag after the
-				// last child
-				endTagStartOffset = lastChild.getEndOffset();
-			else
-				// if this node does not has children, insert the end tag
-				// after the start tag
-				endTagStartOffset = node.getEndOffset();
-
-			IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-			replaceSource(structuredModel, structuredDocument, endTagStartOffset, 0, endTag);
-		}
-
-		newNode = (IDOMNode) structuredModel.getIndexedRegion(startTagStartOffset); // save
-		// new
-		// node
-
-		return newNode;
-	}
-
-	protected IDOMNode insertMissingTags(IDOMNode node) {
-		boolean insertMissingTags = getCleanupPreferences().getInsertMissingTags();
-		IDOMNode newNode = node;
-
-		if (insertMissingTags) {
-			IStructuredDocumentRegion startTagStructuredDocumentRegion = node.getStartStructuredDocumentRegion();
-			if (startTagStructuredDocumentRegion == null) {
-				// implicit start tag; generate tag for it
-				newNode = insertStartTag(node);
-				startTagStructuredDocumentRegion = newNode.getStartStructuredDocumentRegion();
-			}
-
-			IStructuredDocumentRegion endTagStructuredDocumentRegion = newNode.getEndStructuredDocumentRegion();
-
-			ITextRegionList regionList = startTagStructuredDocumentRegion.getRegions();
-			if (startTagStructuredDocumentRegion != null && regionList != null && regionList.get(regionList.size() - 1).getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) {
-
-			} else {
-				if (startTagStructuredDocumentRegion == null) {
-					// start tag missing
-					if (isStartTagRequired(newNode))
-						newNode = insertStartTag(newNode);
-				} else if (endTagStructuredDocumentRegion == null) {
-					// end tag missing
-					if (isEndTagRequired(newNode))
-						newNode = insertEndTag(newNode);
-				}
-			}
-		}
-
-		return newNode;
-	}
-
-	protected IDOMNode insertStartTag(IDOMNode node) {
-		IDOMElement element = (IDOMElement) node;
-		if (element.isCommentTag())
-			return node; // do nothing
-
-		IDOMNode newNode = null;
-
-		String tagName = node.getNodeName();
-		String startTag = START_TAG_OPEN.concat(tagName).concat(TAG_CLOSE);
-		int startTagStartOffset = node.getStartOffset();
-
-		IDOMModel structuredModel = node.getModel();
-		IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-		replaceSource(structuredModel, structuredDocument, startTagStartOffset, 0, startTag);
-		newNode = (IDOMNode) structuredModel.getIndexedRegion(startTagStartOffset); // save
-		// new
-		// node
-
-		return newNode;
-	}
-
-	protected void insertTagClose(IDOMModel structuredModel, IStructuredDocumentRegion flatNode) {
-		if ((flatNode != null) && (flatNode.getRegions() != null)) {
-			ITextRegionList regionList = flatNode.getRegions();
-			ITextRegion lastRegion = regionList.get(regionList.size() - 1);
-			if (lastRegion != null) {
-				String regionType = lastRegion.getType();
-				if ((regionType != DOMRegionContext.XML_EMPTY_TAG_CLOSE) && (regionType != DOMRegionContext.XML_TAG_CLOSE)) {
-					IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-
-					// insert ">" after lastRegion of flatNode
-					// as in "<a</a>" if flatNode is for start tag, or in
-					// "<a></a" if flatNode is for end tag
-					replaceSource(structuredModel, structuredDocument, flatNode.getTextEndOffset(lastRegion), 0, ">"); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	protected boolean isEndTagRequired(IDOMNode node) {
-		if (node == null)
-			return false;
-		return node.isContainer();
-	}
-
-	/**
-	 * The end tags of HTML EMPTY content type, such as IMG, and HTML
-	 * undefined tags are parsed separately from the start tags. So inserting
-	 * the missing start tag is useless and even harmful.
-	 */
-	protected boolean isStartTagRequired(IDOMNode node) {
-		if (node == null)
-			return false;
-		return node.isContainer();
-	}
-
-	protected boolean isXMLType(IDOMModel structuredModel) {
-		boolean result = false;
-
-		if (structuredModel != null && structuredModel != null) {
-			IDOMDocument document = structuredModel.getDocument();
-
-			if (document != null)
-				result = document.isXMLType();
-		}
-
-		return result;
-	}
-
-	protected IDOMNode quoteAttrValue(IDOMNode node) {
-		IDOMElement element = (IDOMElement) node;
-		if (element.isCommentTag())
-			return node; // do nothing
-
-		boolean quoteAttrValues = getCleanupPreferences().getQuoteAttrValues();
-		IDOMNode newNode = node;
-
-		if (quoteAttrValues) {
-			NamedNodeMap attributes = newNode.getAttributes();
-			int attributesLength = attributes.getLength();
-			ISourceGenerator generator = node.getModel().getGenerator();
-
-			for (int i = 0; i < attributesLength; i++) {
-				attributes = newNode.getAttributes();
-				attributesLength = attributes.getLength();
-				IDOMAttr eachAttr = (IDOMAttr) attributes.item(i);
-				// ITextRegion oldAttrValueRegion = eachAttr.getValueRegion();
-				String oldAttrValue = eachAttr.getValueRegionText();
-				if (oldAttrValue == null) {
-					IDOMModel structuredModel = node.getModel();
-					if (isXMLType(structuredModel)) {
-						// TODO: Kit, please check. Is there any way to not
-						// rely on getting regions from attributes?
-						String newAttrValue = "=\"" + eachAttr.getNameRegionText() + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-
-						IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-						replaceSource(structuredModel, structuredDocument, eachAttr.getNameRegionEndOffset(), 0, newAttrValue);
-						newNode = (IDOMNode) structuredModel.getIndexedRegion(node.getStartOffset()); // save
-						// new
-						// node
-					}
-				} else {
-
-					char quote = StringUtils.isQuoted(oldAttrValue) ? oldAttrValue.charAt(0) : DOUBLE_QUOTE;
-					String newAttrValue = generator.generateAttrValue(eachAttr, quote);
-
-					// There is a problem in
-					// StructuredDocumentRegionUtil.getAttrValue(ITextRegion)
-					// when the region is instanceof ContextRegion.
-					// Workaround for now...
-					if (oldAttrValue.length() == 1) {
-						char firstChar = oldAttrValue.charAt(0);
-						if (firstChar == SINGLE_QUOTE)
-							newAttrValue = SINGLE_QUOTES;
-						else if (firstChar == DOUBLE_QUOTE)
-							newAttrValue = DOUBLE_QUOTES;
-					}
-
-					if (newAttrValue != null) {
-						if (newAttrValue.compareTo(oldAttrValue) != 0) {
-							int attrValueStartOffset = eachAttr.getValueRegionStartOffset();
-							int attrValueLength = oldAttrValue.length();
-							int startTagStartOffset = node.getStartOffset();
-
-							IDOMModel structuredModel = node.getModel();
-							IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-							replaceSource(structuredModel, structuredDocument, attrValueStartOffset, attrValueLength, newAttrValue);
-							newNode = (IDOMNode) structuredModel.getIndexedRegion(startTagStartOffset); // save
-							// new
-							// node
-						}
-					}
-				}
-			}
-		}
-
-		return newNode;
-	}
-
-	private IDOMNode insertRequiredAttrs(IDOMNode node) {
-		boolean insertRequiredAttrs = getCleanupPreferences().getInsertRequiredAttrs();
-		IDOMNode newNode = node;
-
-		if (insertRequiredAttrs) {
-			List requiredAttrs = getRequiredAttrs(newNode);
-			if (requiredAttrs.size() > 0) {
-				NamedNodeMap currentAttrs = node.getAttributes();
-				List insertAttrs = new ArrayList();
-				if (currentAttrs.getLength() == 0)
-					insertAttrs.addAll(requiredAttrs);
-				else {
-					for (int i = 0; i < requiredAttrs.size(); i++) {
-						String requiredAttrName = ((CMAttributeDeclaration) requiredAttrs.get(i)).getAttrName();
-						boolean found = false;
-						for (int j = 0; j < currentAttrs.getLength(); j++) {
-							String currentAttrName = currentAttrs.item(j).getNodeName();
-							if (requiredAttrName.compareToIgnoreCase(currentAttrName) == 0) {
-								found = true;
-								break;
-							}
-						}
-						if (!found)
-							insertAttrs.add(requiredAttrs.get(i));
-					}
-				}
-				if (insertAttrs.size() > 0) {
-					IStructuredDocumentRegion startStructuredDocumentRegion = newNode.getStartStructuredDocumentRegion();
-					int index = startStructuredDocumentRegion.getEndOffset();
-					ITextRegion lastRegion = startStructuredDocumentRegion.getLastRegion();
-					if (lastRegion.getType() == DOMRegionContext.XML_TAG_CLOSE) {
-						index--;
-						lastRegion = startStructuredDocumentRegion.getRegionAtCharacterOffset(index - 1);
-					} else if (lastRegion.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) {
-						index = index - 2;
-						lastRegion = startStructuredDocumentRegion.getRegionAtCharacterOffset(index - 1);
-					}
-					MultiTextEdit multiTextEdit = new MultiTextEdit();
-					try {
-						for (int i = insertAttrs.size() - 1; i >= 0; i--) {
-							CMAttributeDeclaration attrDecl = (CMAttributeDeclaration) insertAttrs.get(i);
-							String requiredAttributeName = attrDecl.getAttrName();
-							String defaultValue = attrDecl.getDefaultValue();
-							if (defaultValue == null)
-								defaultValue = ""; //$NON-NLS-1$
-							String nameAndDefaultValue = " "; //$NON-NLS-1$
-							if (i == 0 && lastRegion.getLength() > lastRegion.getTextLength())
-								nameAndDefaultValue = ""; //$NON-NLS-1$
-							nameAndDefaultValue += requiredAttributeName + "=\"" + defaultValue + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-							multiTextEdit.addChild(new InsertEdit(index, nameAndDefaultValue));
-							// BUG3381: MultiTextEdit applies all child
-							// TextEdit's basing on offsets
-							// in the document before the first TextEdit, not
-							// after each
-							// child TextEdit. Therefore, do not need to
-							// advance the index.
-							// index += nameAndDefaultValue.length();
-						}
-						multiTextEdit.apply(newNode.getStructuredDocument());
-					} catch (BadLocationException e) {
-						throw new SourceEditingRuntimeException(e);
-					}
-				}
-			}
-		}
-
-		return newNode;
-	}
-
-
-	protected ModelQuery getModelQuery(Node node) {
-		if (node.getNodeType() == Node.DOCUMENT_NODE) {
-			return ModelQueryUtil.getModelQuery((Document) node);
-		} else {
-			return ModelQueryUtil.getModelQuery(node.getOwnerDocument());
-		}
-	}
-
-	protected List getRequiredAttrs(Node node) {
-		List result = new ArrayList();
-
-		ModelQuery modelQuery = getModelQuery(node);
-		if (modelQuery != null) {
-			CMElementDeclaration elementDecl = modelQuery.getCMElementDeclaration((Element) node);
-			if (elementDecl != null) {
-				CMNamedNodeMap attrMap = elementDecl.getAttributes();
-				Iterator it = attrMap.iterator();
-				CMAttributeDeclaration attr = null;
-				while (it.hasNext()) {
-					attr = (CMAttributeDeclaration) it.next();
-					if (attr.getUsage() == CMAttributeDeclaration.REQUIRED) {
-						result.add(attr);
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupHandlerFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupHandlerFactory.java
deleted file mode 100644
index 21ea68f..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupHandlerFactory.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.cleanup;
-
-
-
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Node;
-
-// nakamori_TODO: check and remove CSS formatting
-
-class HTMLCleanupHandlerFactory {
-
-
-
-	private static HTMLCleanupHandlerFactory fInstance = null;
-
-	static synchronized HTMLCleanupHandlerFactory getInstance() {
-		if (fInstance == null) {
-			fInstance = new HTMLCleanupHandlerFactory();
-		}
-		return fInstance;
-	}
-
-	private HTMLCleanupHandlerFactory() {
-		super();
-	}
-
-	IStructuredCleanupHandler createHandler(Node node, IStructuredCleanupPreferences cleanupPreferences) {
-		short nodeType = node.getNodeType();
-		IStructuredCleanupHandler handler = null;
-		switch (nodeType) {
-			case Node.ELEMENT_NODE : {
-				if (isJSPTag(node))
-					handler = new JSPElementNodeCleanupHandler();
-				else
-					handler = new ElementNodeCleanupHandler();
-				break;
-			}
-			case Node.TEXT_NODE : {
-				if (isParentStyleTag(node))
-					handler = new CSSTextNodeCleanupHandler();
-				else
-					handler = new NodeCleanupHandler();
-				break;
-			}
-			default : {
-				handler = new NodeCleanupHandler();
-			}
-		}
-
-		handler.setCleanupPreferences(cleanupPreferences);
-
-		return handler;
-	}
-
-	/**
-	 * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-	 * way for expedency. Should be evolved in future to depend on "nestedContext".
-	 */
-
-	private boolean isJSPTag(Node node) {
-
-		final String JSP_CLOSE = "JSP_CLOSE"; //$NON-NLS-1$
-		// final String JSP_COMMENT_CLOSE = "JSP_COMMENT_CLOSE"; //$NON-NLS-1$
-
-		// final String JSP_COMMENT_OPEN = "JSP_COMMENT_OPEN"; //$NON-NLS-1$
-		// final String JSP_COMMENT_TEXT = "JSP_COMMENT_TEXT"; //$NON-NLS-1$
-
-		final String JSP_CONTENT = "JSP_CONTENT"; //$NON-NLS-1$
-		final String JSP_DECLARATION_OPEN = "JSP_DECLARATION_OPEN"; //$NON-NLS-1$
-		final String JSP_DIRECTIVE_CLOSE = "JSP_DIRECTIVE_CLOSE"; //$NON-NLS-1$
-		final String JSP_DIRECTIVE_NAME = "JSP_DIRECTIVE_NAME"; //$NON-NLS-1$
-
-		final String JSP_DIRECTIVE_OPEN = "JSP_DIRECTIVE_OPEN"; //$NON-NLS-1$
-		final String JSP_EXPRESSION_OPEN = "JSP_EXPRESSION_OPEN"; //$NON-NLS-1$
-
-		// final String JSP_ROOT_TAG_NAME = "JSP_ROOT_TAG_NAME"; //$NON-NLS-1$
-
-		final String JSP_SCRIPTLET_OPEN = "JSP_SCRIPTLET_OPEN"; //$NON-NLS-1$
-
-		boolean result = false;
-
-		if (node instanceof IDOMNode) {
-			IStructuredDocumentRegion flatNode = ((IDOMNode) node).getFirstStructuredDocumentRegion();
-			// in some cases, the nodes exists, but hasn't been associated
-			// with
-			// a flatnode yet (the screen updates can be initiated on a
-			// different thread,
-			// so the request for a flatnode can come in before the node is
-			// fully formed.
-			// if the flatnode is null, we'll just allow the defaults to
-			// apply.
-			if (flatNode != null) {
-				String flatNodeType = flatNode.getType();
-				// should not be null, but just to be sure
-				if (flatNodeType != null) {
-					if ((flatNodeType.equals(JSP_CONTENT)) || (flatNodeType.equals(JSP_EXPRESSION_OPEN)) || (flatNodeType.equals(JSP_SCRIPTLET_OPEN)) || (flatNodeType.equals(JSP_DECLARATION_OPEN)) || (flatNodeType.equals(JSP_DIRECTIVE_CLOSE)) || (flatNodeType.equals(JSP_DIRECTIVE_NAME)) || (flatNodeType.equals(JSP_DIRECTIVE_OPEN)) || (flatNodeType.equals(JSP_CLOSE))) {
-						result = true;
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	private boolean isParentStyleTag(Node node) {
-		if (node == null)
-			return false;
-		if (node.getNodeType() != Node.TEXT_NODE)
-			return false;
-		if (!(node instanceof IDOMNode))
-			return false;
-		IStructuredDocumentRegion flatNode = ((IDOMNode) node).getFirstStructuredDocumentRegion();
-		if (flatNode == null)
-			return false;
-		if (flatNode.getType() != DOMRegionContext.BLOCK_TEXT)
-			return false;
-
-		// check if the parent is STYLE element
-		Node parent = node.getParentNode();
-		if (parent == null)
-			return false;
-		if (parent.getNodeType() != Node.ELEMENT_NODE)
-			return false;
-		String name = parent.getNodeName();
-		if (name == null)
-			return false;
-		if (!name.equalsIgnoreCase("STYLE"))//$NON-NLS-1$
-			return false;
-		return true;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupProcessorImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupProcessorImpl.java
deleted file mode 100644
index 5b765c4..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupProcessorImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.cleanup;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
-import org.eclipse.wst.sse.core.internal.cleanup.StructuredCleanupPreferences;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
-import org.w3c.dom.Node;
-
-public class HTMLCleanupProcessorImpl extends AbstractStructuredCleanupProcessor {
-	private IStructuredCleanupPreferences fCleanupPreferences = null;
-	
-	protected String getContentType() {
-		return ContentTypeIdForHTML.ContentTypeID_HTML;
-	}
-
-	protected IStructuredCleanupHandler getCleanupHandler(Node node) {
-		return HTMLCleanupHandlerFactory.getInstance().createHandler(node, getCleanupPreferences());
-	}
-
-	public IStructuredCleanupPreferences getCleanupPreferences() {
-		if (fCleanupPreferences == null) {
-			fCleanupPreferences = new StructuredCleanupPreferences();
-
-			Preferences preferences = getModelPreferences();
-			if (preferences != null) {
-				fCleanupPreferences.setTagNameCase(preferences.getInt(HTMLCorePreferenceNames.CLEANUP_TAG_NAME_CASE));
-				fCleanupPreferences.setAttrNameCase(preferences.getInt(HTMLCorePreferenceNames.CLEANUP_ATTR_NAME_CASE));
-				fCleanupPreferences.setCompressEmptyElementTags(preferences.getBoolean(HTMLCorePreferenceNames.COMPRESS_EMPTY_ELEMENT_TAGS));
-				fCleanupPreferences.setInsertRequiredAttrs(preferences.getBoolean(HTMLCorePreferenceNames.INSERT_REQUIRED_ATTRS));
-				fCleanupPreferences.setInsertMissingTags(preferences.getBoolean(HTMLCorePreferenceNames.INSERT_MISSING_TAGS));
-				fCleanupPreferences.setQuoteAttrValues(preferences.getBoolean(HTMLCorePreferenceNames.QUOTE_ATTR_VALUES));
-				fCleanupPreferences.setFormatSource(preferences.getBoolean(HTMLCorePreferenceNames.FORMAT_SOURCE));
-				fCleanupPreferences.setConvertEOLCodes(preferences.getBoolean(HTMLCorePreferenceNames.CONVERT_EOL_CODES));
-				fCleanupPreferences.setEOLCode(preferences.getString(HTMLCorePreferenceNames.CLEANUP_EOL_CODE));
-			}
-		}
-
-		return fCleanupPreferences;
-	}
-	
-	protected IStructuredFormatProcessor getFormatProcessor() {
-		return new HTMLFormatProcessorImpl();
-	}
-
-	protected Preferences getModelPreferences() {
-		return HTMLCorePlugin.getDefault().getPluginPreferences();
-	}
-	
-	protected void refreshCleanupPreferences() {
-		fCleanupPreferences = null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/JSPElementNodeCleanupHandler.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/JSPElementNodeCleanupHandler.java
deleted file mode 100644
index 4b0a783..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/JSPElementNodeCleanupHandler.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.cleanup;
-
-
-
-import org.w3c.dom.Node;
-
-public class JSPElementNodeCleanupHandler extends AbstractNodeCleanupHandler {
-
-	public Node cleanup(Node node) {
-		return node;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/NodeCleanupHandler.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/NodeCleanupHandler.java
deleted file mode 100644
index 9bb6109..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/NodeCleanupHandler.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.cleanup;
-
-
-
-import org.w3c.dom.Node;
-
-public class NodeCleanupHandler extends AbstractNodeCleanupHandler {
-
-	public Node cleanup(Node node) {
-		return node;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/commentelement/handlers/CommentElementHandlerForSSI.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/commentelement/handlers/CommentElementHandlerForSSI.java
deleted file mode 100644
index ac88325..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/commentelement/handlers/CommentElementHandlerForSSI.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.commentelement.handlers;
-
-
-
-import org.eclipse.wst.xml.core.internal.commentelement.CommentElementHandler;
-import org.eclipse.wst.xml.core.internal.commentelement.util.CommentElementFactory;
-import org.eclipse.wst.xml.core.internal.commentelement.util.TagScanner;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.ISourceGenerator;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-public class CommentElementHandlerForSSI implements CommentElementHandler {
-
-	public Element createElement(Document document, String data, boolean isJSPTag) {
-		ModelQuery modelQuery = ModelQueryUtil.getModelQuery(document);
-		if (modelQuery == null) {
-			return null;
-		}
-		CMDocument cm = modelQuery.getCorrespondingCMDocument(document);
-		if (cm == null) {
-			return null;
-		}
-		CMNamedNodeMap map = cm.getElements();
-		if (map == null) {
-			return null;
-		}
-
-		TagScanner scanner = new TagScanner(data, 1);
-		String name = scanner.nextName();
-		if (name == null) {
-			return null;
-		}
-		StringBuffer buffer = new StringBuffer(name.length() + 4);
-		buffer.append(SSI_PREFIX);
-		buffer.append(':');
-		buffer.append(name);
-		String tagName = buffer.toString();
-		// check if valid (defined) SSI tag or not
-		if (map.getNamedItem(tagName) == null) {
-			return null;
-		}
-
-		CommentElementFactory factory = new CommentElementFactory(document, isJSPTag, this);
-		Element element = factory.create(tagName, CommentElementFactory.IS_START);
-
-		// set attributes
-		String attrName = scanner.nextName();
-		while (attrName != null) {
-			String attrValue = scanner.nextValue();
-			Attr attr = document.createAttribute(attrName);
-			if (attr != null) {
-				if (attrValue != null)
-					attr.setValue(attrValue);
-				element.setAttributeNode(attr);
-			}
-			attrName = scanner.nextName();
-		}
-		return element;
-	}
-
-	public String generateStartTagContent(IDOMElement element) {
-		ISourceGenerator generator = element.getModel().getGenerator();
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append('#');
-		buffer.append(element.getLocalName());
-
-		NamedNodeMap attributes = element.getAttributes();
-		int length = attributes.getLength();
-		for (int i = 0; i < length; i++) {
-			Attr attr = (Attr) attributes.item(i);
-			if (attr == null) {
-				continue;
-			}
-			buffer.append(' ');
-			String attrName = generator.generateAttrName(attr);
-			if (attrName != null) {
-				buffer.append(attrName);
-			}
-			String attrValue = generator.generateAttrValue(attr);
-			if (attrValue != null) {
-				// attr name only for HTML boolean and JSP
-				buffer.append('=');
-				buffer.append(attrValue);
-			}
-		}
-
-		return buffer.toString();
-	}
-
-	public String generateEndTagContent(IDOMElement element) {
-		return null; // always empty
-	}
-
-	public boolean isEmpty() {
-		return true;
-	}
-
-	public boolean isCommentElement(IDOMElement element) {
-		if (element == null) {
-			return false;
-		}
-		Document document = element.getOwnerDocument();
-		ModelQuery modelQuery = ModelQueryUtil.getModelQuery(document);
-		if (modelQuery == null) {
-			return false;
-		}
-		CMDocument cm = modelQuery.getCorrespondingCMDocument(document);
-		if (cm == null) {
-			return false;
-		}
-		CMNamedNodeMap map = cm.getElements();
-		if (map == null) {
-			return false;
-		}
-		String prefix = element.getPrefix();
-		if (prefix == null || !prefix.equals(SSI_PREFIX)) {
-			return false;
-		}
-		String tagName = element.getTagName();
-		if (tagName.length() <= 4) {
-			return false;
-		}
-		if (map.getNamedItem(tagName) == null) {
-			return false;
-		}
-		else {
-			return true;
-		}
-	}
-
-	private static final String SSI_PREFIX = "ssi";//$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/AttributeCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/AttributeCollection.java
deleted file mode 100644
index 53d29b9..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/AttributeCollection.java
+++ /dev/null
@@ -1,1283 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Factory for attribute declarations.
- */
-final class AttributeCollection extends CMNamedNodeMapImpl implements HTML40Namespace {
-
-	/** bodycolors. */
-	private static final String[] BODYCOLORS = {ATTR_NAME_BGCOLOR, ATTR_NAME_TEXT, ATTR_NAME_LINK, ATTR_NAME_VLINK, HTML40Namespace.ATTR_NAME_ALINK};
-	/** coreattrs. */
-	private static final String[] CORE = {ATTR_NAME_ID, ATTR_NAME_CLASS, ATTR_NAME_STYLE, ATTR_NAME_TITLE};
-	/** events. */
-	private static final String[] EVENTS = {ATTR_NAME_ONCLICK, ATTR_NAME_ONDBLCLICK, ATTR_NAME_ONMOUSEDOWN, ATTR_NAME_ONMOUSEUP, ATTR_NAME_ONMOUSEOVER, ATTR_NAME_ONMOUSEMOVE, ATTR_NAME_ONMOUSEOUT, ATTR_NAME_ONKEYPRESS, ATTR_NAME_ONKEYDOWN, ATTR_NAME_ONKEYUP, ATTR_NAME_ONHELP};
-	/** i18n. lang, dir */
-	private static final String[] I18N = {ATTR_NAME_LANG, ATTR_NAME_DIR};
-	/** cellhaligh. */
-	private static final String[] CELLHALIGN = {ATTR_NAME_CHAR, ATTR_NAME_CHAROFF};
-
-	/**
-	 * constructor.
-	 */
-	public AttributeCollection() {
-		super();
-	}
-
-	/**
-	 * Create an attribute declaration.
-
-	 * @param attrName java.lang.String
-	 */
-	private HTMLAttrDeclImpl create(String attrName) {
-		HTMLAttrDeclImpl attr = null;
-		HTMLCMDataTypeImpl atype = null;
-
-		if (attrName.equalsIgnoreCase(ATTR_NAME_ABBR)) {
-			// (abbr %Text; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.TEXT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ABBR, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ACCEPT)) {
-			// (accept %ContentTypes; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.CONTENT_TYPE);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ACCEPT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ACCEPT_CHARSET)) {
-			// (accept-charset %Charsets;; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.CHARSETS);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ACCEPT_CHARSET, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ACTION)) {
-			// (action %URI #REQUIRED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ACTION, atype, CMAttributeDeclaration.REQUIRED);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ARCHIVE)) {
-			// (archive CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ARCHIVE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ACCESSKEY)) {
-			// (accesskey %Character; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.CHARACTER);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ACCESSKEY, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ALINK)) {
-			// (alink %Color; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.COLOR);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ALINK, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ALT)) {
-			// (alt %Text; #REQUIRED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.TEXT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ALT, atype, CMAttributeDeclaration.REQUIRED);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_AUTOSTART)) {
-			// (autostart (true|false) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_TRUE, ATTR_VALUE_FALSE};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_AUTOSTART, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_AUTOPLAY)) {
-			// (autoplay (true|false) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_TRUE, ATTR_VALUE_FALSE};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_AUTOPLAY, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_AUTOSIZE)) {
-			// (autosize (true|false) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_TRUE, ATTR_VALUE_FALSE};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_AUTOSIZE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_AXIS)) {
-			// (axis CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_AXIS, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_BACKGROUND)) {
-			// (background %URI; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_BACKGROUND, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_BEHAVIOR)) {
-			// (behavior (scroll|slide|alternate) scroll)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_SCROLL, ATTR_VALUE_SLIDE, ATTR_VALUE_ALTERNATE};
-			atype.setEnumValues(values);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_SCROLL);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_BEHAVIOR, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_BGCOLOR)) {
-			// (bgcolor %Color; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.COLOR);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_BGCOLOR, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_BORDER)) {
-			// (border %Pixels; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.PIXELS);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_BORDER, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CELLSPACING)) {
-			// (cellspacing %Length; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.LENGTH);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CELLSPACING, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CELLPADDING)) {
-			// (cellpadding %Length; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.LENGTH);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CELLPADDING, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CGI)) {
-			// (cgi %URI; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CGI, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CHAR)) {
-			// (char %Character; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.CHARACTER);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CHAR, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CHAROFF)) {
-			// (charoff %Length; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.LENGTH);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CHAROFF, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CHARSET)) {
-			// (charset %Charset; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.CHARSET);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CHARSET, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CITE)) {
-			// (cite %URI; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CITE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CLASS)) {
-			// (class CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CLASS, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CLASSID)) {
-			// (classid %URI #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CLASSID, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CMD)) {
-			// (cmd CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CMD, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CHECKED)) {
-			// (checked (checked) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_CHECKED};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CHECKED, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CLEAR)) {
-			// (clear (left | all | right | none) none)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_LEFT, ATTR_VALUE_ALL, ATTR_VALUE_RIGHT, ATTR_VALUE_NONE};
-			atype.setEnumValues(values);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_NONE);
-
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CLEAR, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CODE)) {
-			// (code CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CODE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CODEBASE)) {
-			// (codebase %URI; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CODEBASE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CODETYPE)) {
-			// (codetype %CotentType; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.CONTENT_TYPE);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CODETYPE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_COLOR)) {
-			// (color %Color; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.COLOR);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_COLOR, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_COMPACT)) {
-			// (compact (compact) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_COMPACT};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_COMPACT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_COLS)) {
-			// (cols NUMBER #REQUIRED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_COLS, atype, CMAttributeDeclaration.REQUIRED);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_COLSPAN)) {
-			// (colspan NUMBER 1)
-			atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_1);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_COLSPAN, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CONTENT)) {
-			// (content CDATA #REQUIRED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CONTENT, atype, CMAttributeDeclaration.REQUIRED);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CONTROLLER)) {
-			// (controller (true|false) true)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_TRUE, ATTR_VALUE_FALSE};
-			atype.setEnumValues(values);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_TRUE);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CONTROLLER, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_COORDS)) {
-			// (coords %Coords; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.COORDS);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_COORDS, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_DATA)) {
-			// (data %URI; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_DATA, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_DATETIME)) {
-			// (datetime %Datetime; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.DATETIME);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_DATETIME, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_DATAPAGESIZE)) {
-			// (datapagesize CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_DATAPAGESIZE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_DECLARE)) {
-			// (declare (declare) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_DECLARE};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_DECLARE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_DEFER)) {
-			// (defer (defer) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_DEFER};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_DEFER, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_DIR)) {
-			// (dir (ltr|rtl) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_LTR, ATTR_VALUE_RTL};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_DIR, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_DIRECTION)) {
-			// (direction (left|right|up|down) left)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_LEFT, ATTR_VALUE_RIGHT, ATTR_VALUE_UP, ATTR_VALUE_DOWN};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_DIRECTION, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_DIRECTKEY)) {
-			// (directkey %Character; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.CHARACTER);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_DIRECTKEY, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_DISABLED)) {
-			// (disabled (disabled) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			// boolean attribute must have the same value as its name.
-			String[] values = {ATTR_NAME_DISABLED};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_DISABLED, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ENCTYPE)) {
-			// (enctype %ContentType; "application/x-www-form-urlencoded")
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.CONTENT_TYPE);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_WWW_FORM_URLENCODED);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ENCTYPE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ERRMSG)) {
-			// (errmsg CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ERRMSG, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_EVENT)) {
-			// (event CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_EVENT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_FACE)) {
-			// (face CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_FACE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_FILE)) {
-			// (file %URI; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_FILE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_FOR)) {
-			// (for %URI; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_FOR, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_FRAME)) {
-			// (frame %TFrame; #IMPLIED)
-			// %TFrame; is (void|above|below|hsides|lhs|rhs|vsides|box|border).
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_VOID, ATTR_VALUE_ABOVE, ATTR_VALUE_BELOW, ATTR_VALUE_HSIDES, ATTR_VALUE_LHS, ATTR_VALUE_RHS, ATTR_VALUE_VSIDES, ATTR_VALUE_BOX, ATTR_VALUE_BORDER};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_FRAME, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_FRAMEBORDER)) {
-			// (frameborder (1|0) 1)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_1, ATTR_VALUE_0};
-			atype.setEnumValues(values);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_1);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_FRAMEBORDER, atype, CMAttributeDeclaration.OPTIONAL);
-
-			//<<D215684
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_FRAMESPACING)) {
-			// (framespacing CDATA; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_FRAMESPACING, atype, CMAttributeDeclaration.OPTIONAL);
-			//D215684
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_HEADERS)) {
-			// (HEADERS IDREFS; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.IDREFS);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_HEADERS, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_HEIGHT)) {
-			// (height %Length; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.LENGTH);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_HEIGHT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_HIDDEN)) {
-			// (hidden CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_HIDDEN, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_HREF)) {
-			// (href %URI; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_HREF, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_HREFLANG)) {
-			// (hreflang %LanguageCode; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.LANGUAGE_CODE);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_HREFLANG, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_HSPACE)) {
-			// (hspace %Pixels; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.PIXELS);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_HSPACE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_HTTP_EQUIV)) {
-			// (http-equiv NAME #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.NAME);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_HTTP_EQUIV, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ID)) {
-			// (id ID #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ID);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ID, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ISMAP)) {
-			// (ismap (ismap) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_ISMAP};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ISMAP, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ISTYLE)) {
-			// (istyle CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ISTYLE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_LABEL)) {
-			// (label %Text; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.TEXT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_LABEL, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_LANG)) {
-			// (lang %LanguageCode; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.LANGUAGE_CODE);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_LANG, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_LANGUAGE)) {
-			// (language %CDATA; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_LANGUAGE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_LINK)) {
-			// (link %Color; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.COLOR);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_LINK, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_LONGDESC)) {
-			// (longdesc %URI; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_LONGDESC, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_LOOP)) {
-			// (loop CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_LOOP, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_MACRO)) {
-			// (macro CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_MACRO, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_MAPFILE)) {
-			// (mapfile %URI; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_MAPFILE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_MARGINWIDTH)) {
-			// (marginwidth %Pixels; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.PIXELS);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_MARGINWIDTH, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_MARGINHEIGHT)) {
-			// (marginheight %Pixels; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.PIXELS);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_MARGINHEIGHT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_MAXLENGTH)) {
-			// (maxlength NUMBER #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_MAXLENGTH, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_MAYSCRIPT)) {
-			// (mayscript (mayscript) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_MAYSCRIPT};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_MAYSCRIPT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_MEDIA)) {
-			// (media %MediaDesc; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.MEDIA_DESC);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_MEDIA, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_METHOD)) {
-			// (method (GET|POST) GET)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_GET, ATTR_VALUE_POST};
-			atype.setEnumValues(values);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_GET);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_METHOD, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_MULTIPLE)) {
-			// (multiple (multiple) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_MULTIPLE};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_MULTIPLE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_NAME)) {
-			// (name CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_NAME, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_NOHREF)) {
-			// (nohref (nohref) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_NOHREF};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_NOHREF, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_NORESIZE)) {
-			// (noresize (noresize) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_NORESIZE};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_NORESIZE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_NOSHADE)) {
-			// (noshade (noshade) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_NOSHADE};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_NOSHADE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_NOWRAP)) {
-			// (nowrap (nowrap) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_NOWRAP};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_NOWRAP, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_OBJECT)) {
-			// (object CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_OBJECT};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_OBJECT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONBLUR)) {
-			// (onblur %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONBLUR, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONCLICK)) {
-			// (onclick %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONCLICK, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONCHANGE)) {
-			// (onchange %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONCHANGE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONDBLCLICK)) {
-			// (ondblclick %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONDBLCLICK, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONFOCUS)) {
-			//	(onfocus %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONFOCUS, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONHELP)) {
-			// (onhelp %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONHELP, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONKEYPRESS)) {
-			// (onkeypress %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONKEYPRESS, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONKEYDOWN)) {
-			// (onkeydown %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONKEYDOWN, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONKEYUP)) {
-			// (onkyeup %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONKEYUP, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONLOAD)) {
-			// (onload %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONLOAD, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONMOUSEDOWN)) {
-			// (onmousedown %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONMOUSEDOWN, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONMOUSEUP)) {
-			// (onmouseup %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONMOUSEUP, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONMOUSEOVER)) {
-			// (onmouseover %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONMOUSEOVER, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONMOUSEMOVE)) {
-			// (onmousemove %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONMOUSEMOVE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONMOUSEOUT)) {
-			// (onmouseout %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONMOUSEOUT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONRESET)) {
-			// (onreset %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONRESET, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONSELECT)) {
-			// (onselect %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONSELECT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONSUBMIT)) {
-			// (onsubmit %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONSUBMIT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ONUNLOAD)) {
-			// (onunload %Script; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.SCRIPT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ONUNLOAD, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_PALETTE)) {
-			// (palette CDATA; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_PALETTE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_PANEL)) {
-			// (panel CDATA; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_PANEL, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_PLAYCOUNT)) {
-			// (playcount NUMBER; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_PLAYCOUNT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_PROFILE)) {
-			// (profile %URI; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_PROFILE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_PROMPT)) {
-			// (prompt %Text; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.TEXT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_PROMPT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_READONLY)) {
-			// (readonly (readonly) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_READONLY};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_READONLY, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_REPEAT)) {
-			// (repeat CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_REPEAT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_REL)) {
-			// (rel %LinkTypes; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.LINK_TYPES);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_REL, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_REV)) {
-			// (rev %LinkTypes; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.LINK_TYPES);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_REV, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ROWS)) {
-			// (rows NUMBER #REQUIRED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ROWS, atype, CMAttributeDeclaration.REQUIRED);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ROWSPAN)) {
-			// (rowspan NUMBER 1)
-			atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_1);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ROWSPAN, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_RULES)) {
-			// (rules %TRules; #IMPLIED)
-			// %TRules; is (none | groups | rows | cols | all).
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_NONE, ATTR_VALUE_GROUPS, ATTR_VALUE_ROWS, ATTR_VALUE_COLS, ATTR_VALUE_ALL};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_RULES, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SCALE)) {
-			// (scale CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SCALE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SCHEME)) {
-			// (scheme CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SCHEME, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SELECTED)) {
-			// (selected (selected) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_SELECTED};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SELECTED, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SCOPE)) {
-			// (SCOPE %Scope; #IMPLIED)
-			// %Scope; is (row|col|rowgroup|colgroup)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_ROW, ATTR_VALUE_COL, ATTR_VALUE_ROWGROUP, ATTR_VALUE_COLGROUP};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SCOPE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SCROLLAMOUNT)) {
-			// (scrollamount NUMBER #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SCROLLAMOUNT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SCROLLDELAY)) {
-			// (scrolldelay NUMBER #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SCROLLDELAY, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SCROLLING)) {
-			// (scrolling (yes|no|auto) auto)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_YES, ATTR_VALUE_NO, ATTR_VALUE_AUTO};
-			atype.setEnumValues(values);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_AUTO);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SCROLLING, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SHAPE)) {
-			// (shape %Shape; rect): %Shape; is (rect|circle|poly|default).
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_RECT, ATTR_VALUE_CIRCLE, ATTR_VALUE_POLY, ATTR_VALUE_DEFAULT};
-			atype.setEnumValues(values);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_RECT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SHAPE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SHOWCONTROLS)) {
-			// (showcontrols (true|false) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_TRUE, ATTR_VALUE_FALSE};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SHOWCONTROLS, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SIZE)) {
-			// (size %Pixels; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.PIXELS);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SIZE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SIZEFMT)) {
-			// (sizefmt CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SIZEFMT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SPAN)) {
-			// (span NUMBER 1)
-			atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_1);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SPAN, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SRC)) {
-			// (src %URI; #IMPLIED)
-			// NOTE: "src" attributes are defined in several elements.
-			//		 The definition of IMG is different from others.
-			//		 So, it should be locally defined.
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SRC, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_START)) {
-			// (start NUMBER #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_START, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_STANDBY)) {
-			// (standby %Text; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.TEXT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_STANDBY, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_STYLE)) {
-			// (style %StyleSheet; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.STYLE_SHEET);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_STYLE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SUMMARY)) {
-			// (summary %Text; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.TEXT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SUMMARY, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_TABINDEX)) {
-			// (tabindex NUMBER #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_TABINDEX, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_TARGET)) {
-			// (target %FrameTarget; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.FRAME_TARGET);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_TARGET, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_TEXT)) {
-			// (text CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_TEXT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_TEXTFOCUS)) {
-			// (textfocus CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_TEXTFOCUS, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_TITLE)) {
-			// (title %Text; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.TEXT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_TITLE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_TIMEFMT)) {
-			// (timefmt CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_TIMEFMT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_TRUESPEED)) {
-			// (truespeed (truespeed) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_TRUESPEED};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_TRUESPEED, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_TYPE)) {
-			// (type %CotentType; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.CONTENT_TYPE);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_TYPE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_USEMAP)) {
-			// (usemap %URI; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_USEMAP, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_VALIGN)) {
-			// (valign (top|middle|bottom|baseline) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_TOP, ATTR_VALUE_MIDDLE, ATTR_VALUE_BOTTOM, ATTR_VALUE_BASELINE};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_VALIGN, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_VALUE)) {
-			// (value CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_VALUE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_VALUETYPE)) {
-			// (valuetype (DATA|REF|OBJECT) DATA)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_DATA, ATTR_VALUE_REF, ATTR_VALUE_OBJECT};
-			atype.setEnumValues(values);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_DATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_VALUETYPE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_VAR)) {
-			// (var CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_VAR, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_VERSION)) {
-			// (version CDATA #FIXED '%HTML.Version;)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_FIXED, ATTR_VALUE_VERSION_TRANSITIONAL);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_VERSION, atype, CMAttributeDeclaration.FIXED);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_VIRTUAL)) {
-			// (virtual %URI; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_VIRTUAL, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_VLINK)) {
-			// (vlink %Color; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.COLOR);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_VLINK, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_VOLUME)) {
-			// (volume CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_VOLUME, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_WIDTH)) {
-			// (width %Length; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.LENGTH);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_WIDTH, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_VSPACE)) {
-			// (vspace %Pixels; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.PIXELS);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_VSPACE, atype, CMAttributeDeclaration.OPTIONAL);
-
-			// <<D205514
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_TOPMARGIN)) {
-			// (topmargin, CDATA, #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_TOPMARGIN, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_BOTTOMMARGIN)) {
-			// (bottommargin, CDATA, #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_BOTTOMMARGIN, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_LEFTMARGIN)) {
-			// (leftmargin, CDATA, #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_LEFTMARGIN, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_RIGHTMARGIN)) {
-			// (rightmargin, CDATA, #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_RIGHTMARGIN, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_BORDERCOLOR)) {
-			// (bordercolor, %Color; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.COLOR);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_BORDERCOLOR, atype, CMAttributeDeclaration.OPTIONAL);
-			// D205514
-
-		}
-		else {
-			// unknown attribute; maybe error.
-			// should warn.
-			attr = null;
-		}
-
-		return attr;
-	}
-
-	/**
-	 * Get align attribute which has %CAlign; as values..
-	 * At this time (4/19/2001), it is identical to %LAlign;.
-	 *
-	 */
-	public static final HTMLAttrDeclImpl createAlignForCaption() {
-		// align (local)
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		// set enum values
-		String[] values = {ATTR_VALUE_TOP, ATTR_VALUE_BOTTOM, ATTR_VALUE_LEFT, ATTR_VALUE_RIGHT};
-		atype.setEnumValues(values);
-
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(ATTR_NAME_ALIGN, atype, CMAttributeDeclaration.OPTIONAL);
-		return attr;
-	}
-
-	/**
-	 * Get align attribute which has %IAlign; as values..
-	 */
-	public static final HTMLAttrDeclImpl createAlignForImage() {
-		// align (local)
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		// set enum values
-		String[] values = {ATTR_VALUE_TOP, ATTR_VALUE_MIDDLE, ATTR_VALUE_BOTTOM, ATTR_VALUE_LEFT, ATTR_VALUE_RIGHT};
-		atype.setEnumValues(values);
-
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(ATTR_NAME_ALIGN, atype, CMAttributeDeclaration.OPTIONAL);
-		return attr;
-	}
-
-	/**
-	 * Get align attribute which has %LAlign; as values..
-	 */
-	public static final HTMLAttrDeclImpl createAlignForLegend() {
-		// align (local)
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		// set enum values
-		String[] values = {ATTR_VALUE_TOP, ATTR_VALUE_BOTTOM, ATTR_VALUE_LEFT, ATTR_VALUE_RIGHT};
-		atype.setEnumValues(values);
-
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(ATTR_NAME_ALIGN, atype, CMAttributeDeclaration.OPTIONAL);
-		return attr;
-	}
-
-	/**
-	 * Create an attribute declaration for <code>align</code>
-	 * in several elements, like <code>P</code>, <code>DIV</code>.
-	 * The values are different from attributes those have the same name
-	 * in other elements (<code>IMG</code> and <code>TABLE</code>).
-	 * So, it can't treat as global attributes.
-	 * <strong>NOTE: These attribute declaration has
-	 * no owner CMDocument instance.</strong>
-	 */
-	public static final HTMLAttrDeclImpl createAlignForParagraph() {
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		// set enum values: left|center|right|justify
-		String[] values = {ATTR_VALUE_LEFT, ATTR_VALUE_CENTER, ATTR_VALUE_RIGHT, ATTR_VALUE_JUSTIFY};
-		atype.setEnumValues(values);
-
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(ATTR_NAME_ALIGN, atype, CMAttributeDeclaration.OPTIONAL);
-		return attr;
-	}
-
-	/**
-	 * Get %attrs; declarations.
-	 * %attrs; consists of %coreattrs;, %i18n, and %events;.
-	 */
-	public void getAttrs(CMNamedNodeMapImpl declarations) {
-		// %coreattrs;
-		Iterator names = Arrays.asList(CORE).iterator();
-		getDeclarations(declarations, names);
-		// %i18n;
-		names = Arrays.asList(I18N).iterator();
-		getDeclarations(declarations, names);
-		// %events;
-		names = Arrays.asList(EVENTS).iterator();
-		getDeclarations(declarations, names);
-	}
-
-	/**
-	 * Get %bodycolors; declarations.
-	 */
-	public void getBodycolors(CMNamedNodeMapImpl declarations) {
-		Iterator names = Arrays.asList(BODYCOLORS).iterator();
-		getDeclarations(declarations, names);
-	}
-
-	/**
-	 * Get %cellhalign; declarations.
-	 * %cellhaligh; consists of:
-	 *  - (align (left|center|right|justify|char) #IMPLIED)
-	 *  - (char %Character; #IMPLIED)
-	 *  - (charoff %Length; #IMPLIED)
-	 */
-	public void getCellhalign(CMNamedNodeMapImpl declarations) {
-		// (align (left|center|right|justify|char) #IMPLIED) should be defined
-		// locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		// set enum values
-		String[] values = {ATTR_VALUE_LEFT, ATTR_VALUE_CENTER, ATTR_VALUE_RIGHT, ATTR_VALUE_JUSTIFY, ATTR_VALUE_CHAR};
-		atype.setEnumValues(values);
-
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(ATTR_NAME_ALIGN, atype, CMAttributeDeclaration.OPTIONAL);
-		declarations.putNamedItem(HTML40Namespace.ATTR_NAME_ALIGN, attr);
-
-		// the rest.
-		Iterator names = Arrays.asList(CELLHALIGN).iterator();
-		getDeclarations(declarations, names);
-	}
-
-	/**
-	 * Get %cellvalign; declarations.
-	 * %cellhaligh; is:
-	 *  - (valign (top|middle|bottom|baseline) #IMPLIED)
-	 */
-	public void getCellvalign(CMNamedNodeMapImpl declarations) {
-		HTMLAttributeDeclaration dec = getDeclaration(HTML40Namespace.ATTR_NAME_VALIGN);
-		if (dec != null)
-			declarations.putNamedItem(HTML40Namespace.ATTR_NAME_VALIGN, dec);
-	}
-
-	/**
-	 * Get %coreattrs; declarations.
-	 */
-	public void getCore(CMNamedNodeMapImpl declarations) {
-		Iterator names = Arrays.asList(CORE).iterator();
-		getDeclarations(declarations, names);
-	}
-
-	/**
-	 * Get a global attribute declaration.
-	 * @param attrName java.lang.String
-	 */
-	public HTMLAttributeDeclaration getDeclaration(String attrName) {
-		CMNode cmnode = getNamedItem(attrName);
-		if (cmnode != null)
-			return (HTMLAttributeDeclaration) cmnode; // already exists.
-
-		HTMLAttrDeclImpl dec = create(attrName);
-		if (dec != null)
-			putNamedItem(attrName, dec);
-
-		return dec;
-	}
-
-	/**
-	 * Get declarations which are specified by names.
-	 * @param names java.util.Iterator
-	 */
-	public void getDeclarations(CMNamedNodeMapImpl declarations, Iterator names) {
-		while (names.hasNext()) {
-			String attrName = (String) names.next();
-			HTMLAttributeDeclaration dec = getDeclaration(attrName);
-			if (dec != null)
-				declarations.putNamedItem(attrName, dec);
-		}
-	}
-
-	/**
-	 * Get %events; declarations.
-	 */
-	public void getEvents(CMNamedNodeMapImpl declarations) {
-		Iterator names = Arrays.asList(EVENTS).iterator();
-		getDeclarations(declarations, names);
-	}
-
-	/**
-	 * Get %i18n; declarations.
-	 */
-	public void getI18n(CMNamedNodeMapImpl declarations) {
-		Iterator names = Arrays.asList(I18N).iterator();
-		getDeclarations(declarations, names);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMContentImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMContentImpl.java
deleted file mode 100644
index dac7c81..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMContentImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-
-
-
-/**
- * Implementation of CMContent for HTML CM.
- */
-abstract class CMContentImpl extends CMNodeImpl implements CMContent {
-
-	public static final int UNBOUNDED = -1;
-	/**  -1: it's UNBOUNDED. */
-	private int maxOccur = UNBOUNDED;
-	/**  0: it's OPTIONAL, 1, it's REQUIRED. */
-	private int minOccur = 0;
-
-	/**
-	 * The primary consturctor.
-	 * Use this one for usual cases.<br>
-	 */
-	public CMContentImpl(String name, int min, int max) {
-		super(name);
-		minOccur = min;
-		maxOccur = max;
-	}
-
-	/**
-	 * getMaxOccur method
-	 * @return int
-	 *
-	 * If -1, it's UNBOUNDED.
-	 */
-	public int getMaxOccur() {
-		return maxOccur;
-	}
-
-	/**
-	 * getMinOccur method
-	 * @return int
-	 *
-	 * If 0, it's OPTIONAL.
-	 * If 1, it's REQUIRED.
-	 */
-	public int getMinOccur() {
-		return minOccur;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMGroupImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMGroupImpl.java
deleted file mode 100644
index a8ab34c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMGroupImpl.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-
-/**
- */
-class CMGroupImpl extends CMContentImpl implements CMGroup {
-
-	private int operator = CMGroup.SEQUENCE;
-	private CMNodeListImpl children = null;
-
-	/**
-	 * CMGroupImpl constructor comment.
-	 */
-	public CMGroupImpl(int op, int minOccur, int maxOccur) {
-		super(null, minOccur, maxOccur);
-		switch (op) {
-			case CMGroup.ALL :
-			case CMGroup.CHOICE :
-			case CMGroup.SEQUENCE :
-				operator = op;
-				break;
-			default :
-				// should warn.
-				break;
-		}
-	}
-
-	/**
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 * @param org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 */
-	protected CMNode appendChild(CMNode child) {
-		if (child == null)
-			return null;
-		if (children == null)
-			children = new CMNodeListImpl();
-		return children.appendNode(child);
-	}
-
-	/**
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList
-	 */
-	public CMNodeList getChildNodes() {
-		return children;
-	}
-
-	/**
-	 * getNodeType method
-	 * @return int
-	 *
-	 * Returns one of :
-	 * ELEMENT_DECLARATION, ATTRIBUTE_DECLARATION, GROUP, ENTITY_DECLARATION.
-	 */
-	public int getNodeType() {
-		return CMNode.GROUP;
-	}
-
-	/**
-	 * getOperation method
-	 * @return int
-	 *
-	 * Returns one of :
-	 * ALONE (a), SEQUENCE (a,b), CHOICE (a|b), ALL (a&b).
-	 */
-	public int getOperator() {
-		return operator;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNamedNodeMapImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNamedNodeMapImpl.java
deleted file mode 100644
index 21ce1b2..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNamedNodeMapImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * An implementation of the CMNamedNodeMap interface.
- * This class is intented to be used as a container of attribute declarations.
- * If someone wants to use this class for other purpose, he must pay attention
- * to the fact that this class is tolerant of the key name case.  That is, this
- * class does not distinguish "name", "NAME", and "Name" as a key name.
- */
-class CMNamedNodeMapImpl implements CMNamedNodeMap {
-
-	private Hashtable items = null;
-
-	/**
-	 */
-	public CMNamedNodeMapImpl() {
-		super();
-		items = new Hashtable();
-	}
-
-	/**
-	 * getLength method
-	 * @return int
-	 */
-	public int getLength() {
-		return items.size();
-	}
-
-	/**
-	 * getNamedItem method
-	 * @return CMNode <code>null</code> for unknown keys.
-	 * @param name java.lang.String
-	 */
-	public CMNode getNamedItem(String name) {
-		String cookedName = makeCanonicalForm(name);
-		if (!items.containsKey(cookedName))
-			return null;
-		return (CMNode) items.get(cookedName);
-	}
-
-	/**
-	 * item method
-	 * @return CMNode
-	 * @param index int
-	 */
-	public CMNode item(int index) {
-		Iterator iter = iterator();
-		while (iter.hasNext()) {
-			CMNode node = (CMNode) iter.next();
-			if (--index < 0)
-				return node;
-		}
-		return null;
-	}
-
-	/**
-	 * @return java.util.Iterator
-	 */
-	public Iterator iterator() {
-		return items.values().iterator();
-	}
-
-	/**
-	 * @return java.lang.String
-	 * @param rawForm java.lang.String
-	 */
-	private String makeCanonicalForm(String rawForm) {
-		return rawForm.toUpperCase();
-	}
-
-	/**
-	 * @param key java.lang.String
-	 * @param item java.lang.String
-	 */
-	void putNamedItem(String name, CMNode item) {
-		String cookedName = makeCanonicalForm(name);
-		if (items.containsKey(cookedName))
-			return; // already registered.
-		items.put(cookedName, item);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNamespaceImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNamespaceImpl.java
deleted file mode 100644
index 20f4c28..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNamespaceImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * CMNamespace implementation.
- */
-class CMNamespaceImpl extends CMNodeImpl implements CMNamespace {
-
-	private java.lang.String prefix = null;
-
-	/**
-	 * CMNamespaceImpl constructor comment.
-	 */
-	public CMNamespaceImpl(String uri, String pfx) {
-		super(uri);
-		prefix = pfx;
-	}
-
-	/**
-	 * getNodeType method
-	 * @return int
-	 *
-	 * Returns one of :
-	 *
-	 */
-	public int getNodeType() {
-		return CMNode.NAME_SPACE;
-	}
-
-	/**
-	 * getPrefix method
-	 * @return java.lang.String
-	 */
-	public String getPrefix() {
-		return prefix;
-	}
-
-	/**
-	 * getURI method
-	 * @return java.lang.String
-	 */
-	public String getURI() {
-		return getNodeName();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNodeImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNodeImpl.java
deleted file mode 100644
index 263d75a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNodeImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-
-
-/**
- */
-abstract class CMNodeImpl implements CMNode {
-
-	private java.lang.String name = null;
-
-	/**
-	 * CMNodeImpl constructor comment.
-	 */
-	public CMNodeImpl(String nm) {
-		super();
-		name = nm;
-	}
-
-	/**
-	 * getNodeName method
-	 * @return java.lang.String
-	 */
-	public String getNodeName() {
-		return name;
-	}
-
-	/**
-	 * getProperty method
-	 * @return java.lang.Object
-	 *
-	 * Returns the object property desciped by the propertyName
-	 *
-	 */
-	public Object getProperty(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.IS_XHTML))
-			return new Boolean(false);
-		return null;
-	}
-
-	/**
-	 * supports method
-	 * @return boolean
-	 *
-	 * Returns true if the CMNode supports a specified property
-	 *
-	 */
-	public boolean supports(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.IS_XHTML))
-			return true;
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNodeListImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNodeListImpl.java
deleted file mode 100644
index ddcdb1c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNodeListImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-
-/**
- * Analog of dom.NodeList for CM.
- * So, the implementation is very similar to
- * NodeListImpl<br>
- */
-class CMNodeListImpl implements CMNodeList {
-
-	private java.util.Vector nodes = null;
-
-	/**
-	 * CMNodeListImpl constructor comment.
-	 */
-	public CMNodeListImpl() {
-		super();
-		nodes = new java.util.Vector();
-	}
-
-	/**
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 * @param node org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 */
-	protected CMNode appendNode(CMNode node) {
-		nodes.addElement(node);
-		return node;
-	}
-
-	/**
-	 * getLength method
-	 * @return int
-	 */
-	public int getLength() {
-		return nodes.size();
-	}
-
-	/**
-	 * item method
-	 * @return CMNode
-	 * @param index int
-	 */
-	public CMNode item(int index) {
-		if (index < 0 || index >= nodes.size())
-			return null;
-		return (CMNode) nodes.elementAt(index);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ComplexTypeDefinition.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ComplexTypeDefinition.java
deleted file mode 100644
index 0ab6652..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ComplexTypeDefinition.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-
-/**
- * This class is intended to represent a complex type definition
- * in XML Schema.<br>
- */
-abstract class ComplexTypeDefinition {
-
-	protected CMGroupImpl content = null;
-	protected ElementCollection collection = null;
-	protected String primaryCandidateName = null;
-
-	/**
-	 * ComplexTypeDefinition constructor comment.
-	 */
-	public ComplexTypeDefinition(ElementCollection elementCollection) {
-		super();
-		collection = elementCollection;
-		createContent();
-	}
-
-	/**
-	 * Create an actual content model.
-	 * This method should be called once and only once in the constructor.<br>
-	 */
-	protected abstract void createContent();
-
-	/**
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMGroup
-	 */
-	public CMGroup getContent() {
-		return content;
-	}
-
-	/**
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	/* NOTE: Do we need LOGICAL type?
-	 * -- 3/7/2001
-	 */
-	public abstract int getContentType();
-
-	/**
-	 * Get content hint.
-	 */
-	public HTMLElementDeclaration getPrimaryCandidate() {
-		if (primaryCandidateName == null)
-			return null;
-		return (HTMLElementDeclaration) collection.getNamedItem(primaryCandidateName);
-	}
-
-	/**
-	 * Name of complex type definition.
-	 * Each singleton must know its own name.
-	 * All names should be defined in
-	 * {@link <code>ComplexTypeDefinitionFactory</code>} as constants.<br>
-	 * @return java.lang.String
-	 */
-	public abstract String getTypeName();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ComplexTypeDefinitionFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ComplexTypeDefinitionFactory.java
deleted file mode 100644
index 60fdef1..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ComplexTypeDefinitionFactory.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-/**
- * Factory of ComplexTypeDefinition.
- */
-final class ComplexTypeDefinitionFactory {
-
-	private static ComplexTypeDefinitionFactory instance = null;
-	private java.util.Hashtable definitions = null;
-	// constants for complex type name
-	/** for ADDRESS. */
-	public final static String CTYPE_ADDRESS = "CTYPE_ADDRESS";//$NON-NLS-1$
-	/** CDATA content. No ComplexTypeDefinition instance shuld be created. */
-	public final static String CTYPE_CDATA = "CTYPE_CDATA";//$NON-NLS-1$
-	/** col group content. COL* */
-	public final static String CTYPE_COLUMN_GROUP = "CTYPE_COLUMN_GROUP";//$NON-NLS-1$
-	/** for DL. */
-	public final static String CTYPE_DEFINITION_LIST = "CTYPE_DEFINITION_LIST";//$NON-NLS-1$
-	/** for EMBED. */
-	public final static String CTYPE_EMBED = "CTYPE_EMBED";//$NON-NLS-1$
-	/** empty content. No ComplexTypeDefinition instance should be created. */
-	public final static String CTYPE_EMPTY = "CTYPE_EMPTY";//$NON-NLS-1$
-	/** for FIELDSET. */
-	public final static String CTYPE_FIELDSET = "CTYPE_FIELDSET";//$NON-NLS-1$
-	/** for FRAMESET. */
-	public final static String CTYPE_FRAMESET = "CTYPE_FRAMESET";//$NON-NLS-1$
-	/** flow content. (%flow;)* */
-	public final static String CTYPE_FLOW_CONTAINER = "CTYPE_FLOW_CONTAINER";//$NON-NLS-1$
-	/** html content. HEAD, (FRAMESET|BODY) */
-	public final static String CTYPE_HTML = "CTYPE_HTML";//$NON-NLS-1$
-	/** head content. TITLE & ISINDEX? & BASE? */
-	public final static String CTYPE_HEAD = "CTYPE_HEAD";//$NON-NLS-1$
-	/** inline content. (%inline;)* */
-	public final static String CTYPE_INLINE_CONTAINER = "CTYPE_INLINE_CONTAINER";//$NON-NLS-1$
-	/** list item container. (LI)+ */
-	public final static String CTYPE_LI_CONTAINER = "CTYPE_LI_CONTAINER";//$NON-NLS-1$
-	/** for MAP. */
-	public final static String CTYPE_MAP = "CTYPE_MAP";//$NON-NLS-1$
-	/** noframes content. */
-	public final static String CTYPE_NOFRAMES_CONTENT = "CTYPE_NOFRAMES_CONTENT";//$NON-NLS-1$
-	/** for OPTGROUP. */
-	public final static String CTYPE_OPTION_CONTAINER = "CTYPE_OPTION_CONTAINER";//$NON-NLS-1$
-	/** param container. For OBJECT/APPLET. */
-	public final static String CTYPE_PARAM_CONTAINER = "CTYPE_PARAM_CONTAINER";//$NON-NLS-1$
-	/** PCDATA content. No ComplexTypeDefinition instance shuld be created. */
-	public final static String CTYPE_PCDATA = "CTYPE_PCDATA";//$NON-NLS-1$
-	/** for SELECT. */
-	public final static String CTYPE_SELECT = "CTYPE_SELECT";//$NON-NLS-1$
-	/** table content. CAPTION?, (COL*|COLGROUP*), THEAD?, TFOOT?, TBODY+ */
-	public final static String CTYPE_TABLE = "CTYPE_TABLE";//$NON-NLS-1$
-	/** table cell contaier. (TH|TD)+ */
-	public final static String CTYPE_TCELL_CONTAINER = "CTYPE_TCELL_CONTAINER";//$NON-NLS-1$
-	/** table record container. (TR)+ */
-	public final static String CTYPE_TR_CONTAINER = "CTYPE_TR_CONTAINER";//$NON-NLS-1$
-
-	/**
-	 * ComplexTypeDefinitionFactory constructor comment.
-	 */
-	private ComplexTypeDefinitionFactory() {
-		super();
-		definitions = new java.util.Hashtable();
-	}
-
-	/**
-	 * Factory method for ComplexTypeDefinition.
-	 * Each instance created in this method must be registered into
-	 * the map with its name.
-	 * @param definitionName java.lang.String
-	 * @param elementCollection ElementCollection
-	 */
-	public ComplexTypeDefinition createTypeDefinition(String definitionName, ElementCollection elementCollection) {
-		if (definitions.containsKey(definitionName)) {
-			return (ComplexTypeDefinition) definitions.get(definitionName);
-		}
-
-		ComplexTypeDefinition def = null;
-		if (definitionName == CTYPE_ADDRESS) {
-			def = new CtdAddress(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_COLUMN_GROUP) {
-			def = new CtdColumnGroup(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_DEFINITION_LIST) {
-			def = new CtdDl(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_EMBED) {
-			def = new CtdEmbed(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_FIELDSET) {
-			def = new CtdFieldset(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_FLOW_CONTAINER) {
-			def = new CtdFlowContainer(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_FRAMESET) {
-			def = new CtdFrameset(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_HEAD) {
-			def = new CtdHead(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_HTML) {
-			def = new CtdHtml(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_INLINE_CONTAINER) {
-			def = new CtdInlineContainer(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_LI_CONTAINER) {
-			def = new CtdLiContainer(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_MAP) {
-			def = new CtdMap(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_NOFRAMES_CONTENT) {
-			def = new CtdNoframesContent(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_OPTION_CONTAINER) {
-			def = new CtdOptionContainer(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_PARAM_CONTAINER) {
-			def = new CtdParamContainer(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_SELECT) {
-			def = new CtdSelect(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_TABLE) {
-			def = new CtdTable(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_TCELL_CONTAINER) {
-			def = new CtdTableCellContainer(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_TR_CONTAINER) {
-			def = new CtdTrContainer(elementCollection);
-
-		}
-		else {
-			def = null;
-		}
-		if (def == null)
-			return null; // fail to create.
-		definitions.put(definitionName, def);
-		return def;
-	}
-
-	/**
-	 * For singleton.
-	 */
-	public synchronized static ComplexTypeDefinitionFactory getInstance() {
-		if (instance != null)
-			return instance;
-		instance = new ComplexTypeDefinitionFactory();
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdAddress.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdAddress.java
deleted file mode 100644
index f6e8ddd..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdAddress.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * for ADDRESS.
- */
-final class CtdAddress extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdAddress(ElementCollection elementCollection) {
-		super(elementCollection);
-	}
-
-	/**
-	 * ((%inline) | P)*.
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( | )*
-		content = new CMGroupImpl(CMGroup.CHOICE, 0, CMContentImpl.UNBOUNDED);
-		// (%inline)
-		CMGroupImpl inlines = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		if (inlines == null)
-			return;
-		collection.getInline(inlines);
-		content.appendChild(inlines);
-		// P
-		CMNode p = collection.getNamedItem(HTML40Namespace.ElementName.P);
-		if (p != null)
-			content.appendChild(p);
-	}
-
-	/**
-	 * ((%inline) | P)*.
-	 * Because %inline; contains #PCDATA, the type is MIXED.
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.MIXED;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_ADDRESS;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdColumnGroup.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdColumnGroup.java
deleted file mode 100644
index d617708..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdColumnGroup.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * COL group.
- * (COL)*
- */
-final class CtdColumnGroup extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdColumnGroup(ElementCollection elementCollection) {
-		super(elementCollection);
-	}
-
-	/**
-	 * (COL)*
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( )*
-		content = new CMGroupImpl(CMGroup.SEQUENCE, 0, CMContentImpl.UNBOUNDED);
-		// COL
-		CMNode dec = collection.getNamedItem(HTML40Namespace.ElementName.COL);
-		if (dec != null)
-			content.appendChild(dec);
-	}
-
-	/**
-	 * (COL)*
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * Name of complex type definition.
-	 * Each singleton must know its own name.
-	 * All names should be defined in
-	 * {@link <code>ComplexTypeDefinitionFactory</code>} as constants.<br>
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_COLUMN_GROUP;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdDl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdDl.java
deleted file mode 100644
index 9e4a3e6..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdDl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * for DL.
- */
-final class CtdDl extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdDl(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = HTML40Namespace.ElementName.DT;
-	}
-
-	/**
-	 * (DT | DD)+
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( | )+
-		content = new CMGroupImpl(CMGroup.CHOICE, 1, CMContentImpl.UNBOUNDED);
-		// DT
-		CMNode dec = collection.getNamedItem(HTML40Namespace.ElementName.DT);
-		if (dec != null)
-			content.appendChild(dec);
-		// DD
-		dec = collection.getNamedItem(HTML40Namespace.ElementName.DD);
-		if (dec != null)
-			content.appendChild(dec);
-	}
-
-	/**
-	 * (DT | DD)+.
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_DEFINITION_LIST;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdEmbed.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdEmbed.java
deleted file mode 100644
index 86e9186..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdEmbed.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * for EMBED.
- */
-final class CtdEmbed extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdEmbed(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = HTML40Namespace.ElementName.NOEMBED;
-	}
-
-	/**
-	 * (NOEMBED).
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( )
-		content = new CMGroupImpl(CMGroup.SEQUENCE, 1, 1);
-		// NOEMBED
-		CMNode noembed = collection.getNamedItem(HTML40Namespace.ElementName.NOEMBED);
-		if (noembed != null)
-			content.appendChild(noembed);
-	}
-
-	/**
-	 * (NOEMBED).
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_EMBED;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFieldset.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFieldset.java
deleted file mode 100644
index bc9ed04..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFieldset.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * for FIELDSET.
- */
-final class CtdFieldset extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdFieldset(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = HTML40Namespace.ElementName.LEGEND;
-	}
-
-	/**
-	 * (#PCDATA, LEGEND, (%flow;)*)
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( , , )
-		content = new CMGroupImpl(CMGroup.SEQUENCE, 1, 1);
-		// #PCDATA
-		// ...??
-
-		// LEGEND
-		CMNode dec = collection.getNamedItem(HTML40Namespace.ElementName.LEGEND);
-		if (dec != null)
-			content.appendChild(dec);
-		// (%flow;)*
-		CMGroupImpl flows = new CMGroupImpl(CMGroup.CHOICE, 0, CMContentImpl.UNBOUNDED);
-		if (flows == null)
-			return;
-		collection.getFlow(flows);
-		content.appendChild(flows);
-	}
-
-	/**
-	 * (#PCDATA, LEGEND, (%flow;)*)
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.MIXED;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_FIELDSET;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFlowContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFlowContainer.java
deleted file mode 100644
index b131398..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFlowContainer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-
-/**
- * Complex type definition for containers of <code>%flow;</code>.
- */
-final class CtdFlowContainer extends ComplexTypeDefinition {
-
-	/**
-	 */
-	public CtdFlowContainer(ElementCollection elementCollection) {
-		super(elementCollection);
-	}
-
-	/**
-	 * (%flow;)*
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		content = new CMGroupImpl(CMGroup.CHOICE, 0, CMContentImpl.UNBOUNDED);
-		collection.getFlow(content);
-	}
-
-	public int getContentType() {
-		return CMElementDeclaration.MIXED;
-	}
-
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_FLOW_CONTAINER;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFrameset.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFrameset.java
deleted file mode 100644
index 7bd1076..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFrameset.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * for FRAMESET.
- * ((FRAMESET | FRAME)+ & NOFRAMES?)
- */
-final class CtdFrameset extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdFrameset(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = HTML40Namespace.ElementName.FRAME;
-	}
-
-	/**
-	 * ((FRAMESET | FRAME)+ & NOFRAMES?).
-	 * --> ((FRAMESET | FRAME)+ & (NOFRAMES)?)
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( & )
-		content = new CMGroupImpl(CMGroup.ALL, 1, 1);
-
-		// ( | )+
-		CMGroupImpl group = new CMGroupImpl(CMGroup.CHOICE, 1, CMContentImpl.UNBOUNDED);
-		if (group == null)
-			return;
-		content.appendChild(group);
-
-		// FRAMESET
-		CMNode dec = collection.getNamedItem(HTML40Namespace.ElementName.FRAMESET);
-		if (dec != null)
-			group.appendChild(dec);
-		// FRAME
-		dec = collection.getNamedItem(HTML40Namespace.ElementName.FRAME);
-		if (dec != null)
-			group.appendChild(dec);
-
-		// ( )?
-		group = new CMGroupImpl(CMGroup.SEQUENCE, 0, 1);
-		if (group == null)
-			return;
-		content.appendChild(group);
-
-		// NOFRAMES
-		dec = collection.getNamedItem(HTML40Namespace.ElementName.NOFRAMES);
-		if (dec != null)
-			group.appendChild(dec);
-	}
-
-	/**
-	 * ((FRAMESET | FRAME)+ & NOFRAMES?)
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * Name of complex type definition.
-	 * Each singleton must know its own name.
-	 * All names should be defined in
-	 * {@link <code>ComplexTypeDefinitionFactory</code>} as constants.<br>
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_FRAMESET;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHead.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHead.java
deleted file mode 100644
index 8a68177..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHead.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Complex type definition for the head content.
- * Content Model: (TITLE & ISINDEX? & BASE?)
- */
-final class CtdHead extends ComplexTypeDefinition {
-
-	/**
-	 */
-	public CtdHead(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = HTML40Namespace.ElementName.TITLE;
-	}
-
-	/**
-	 * for HEAD.
-	 * To avoid using inclusion, the content model comes from the XHTML 1.0.
-	 *
-	 * (%head.misc;, ((title, %head.misc;, (base, %head.misc;)?) | (base, %head.misc;, (title, %head.misc;))))
-	 * And %head.misc; is:
-	 * (script|style|meta|link|object|isindex)*
-	 *
-	 * 0: (%head.misc, A)
-	 * A: (B | C)
-	 * B: (title, %head.misc;, D)
-	 * C: (base, %head.misc;, E)
-	 * D: (base, %head.misc;)?
-	 * E: (title, %head.misc;)
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// At 1st, create %head.misc; content.
-		// %head.misc;
-		//   ( | )*
-		CMGroupImpl misc = new CMGroupImpl(CMGroup.CHOICE, 0, CMContentImpl.UNBOUNDED);
-		if (misc == null)
-			return;
-		String[] names = {HTML40Namespace.ElementName.SCRIPT, HTML40Namespace.ElementName.STYLE, HTML40Namespace.ElementName.META, HTML40Namespace.ElementName.LINK, HTML40Namespace.ElementName.OBJECT, HTML40Namespace.ElementName.ISINDEX};
-		collection.getDeclarations(misc, Arrays.asList(names).iterator());
-		// 2nd, get a title
-		CMNode title = collection.getNamedItem(HTML40Namespace.ElementName.TITLE);
-		// 3rd, get a base
-		CMNode base = collection.getNamedItem(HTML40Namespace.ElementName.BASE);
-		if (title == null || base == null)
-			return;
-
-		// Top level content is a sequence of %head.misc; and A.
-		// 0: (%head.misc;, A)
-		//   create a sequence
-		content = new CMGroupImpl(CMGroup.SEQUENCE, 1, 1);
-		if (content == null)
-			return;
-		//   append %head.misc;
-		content.appendChild(misc);
-		//   create A and append it to the top level.
-		{
-			// A is a choice of B and C.
-			// A: (B | C)
-			//   create a choice
-			CMGroupImpl gA = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-			if (gA == null)
-				return;
-			//   append A to the top level.
-			content.appendChild(gA);
-
-			// create B and append it to A
-			{
-				// B is a sequence of title, %head.misc;, and D.
-				// B: (title, %head.misc;, D)
-				//   create a sequence
-				CMGroupImpl gB = new CMGroupImpl(CMGroup.SEQUENCE, 1, 1);
-				if (gB == null)
-					return;
-				//   append B to A.
-				gA.appendChild(gB);
-
-				//   append title to B
-				gB.appendChild(title);
-				//   append %head.misc; to B
-				gB.appendChild(misc);
-				//   create D and append it to B.
-				{
-					// D is a sequence of base, %head.misc;.
-					// D: (base, %head.misc;)?
-					//   create a sequence
-					CMGroupImpl gD = new CMGroupImpl(CMGroup.SEQUENCE, 0, 1);
-					if (gD == null)
-						return;
-					//   append D to B.
-					gB.appendChild(gD);
-
-					//   append base to D
-					gD.appendChild(base);
-					//   append %head.misc; to D.
-					gD.appendChild(misc);
-				}
-			}
-			// create C and append it to A
-			{
-				// C is a sequence of base, %head.misc;, and E
-				// C: (base, %head.misc;, E)
-				//   create a sequence
-				CMGroupImpl gC = new CMGroupImpl(CMGroup.SEQUENCE, 1, 1);
-				if (gC == null)
-					return;
-				//   append C to A.
-				gA.appendChild(gC);
-
-				//   append base to C
-				gC.appendChild(base);
-				//   append %head.misc; to C
-				gC.appendChild(misc);
-
-				//   create E and append it to C.
-				{
-					// E is a sequence of title and %head.misc;.
-					// E: (title, %head.misc;)
-					//   create a sequence
-					CMGroupImpl gE = new CMGroupImpl(CMGroup.SEQUENCE, 1, 1);
-					if (gE == null)
-						return;
-					//   append E to C.
-					gC.appendChild(gE);
-
-					//   append title to E
-					gE.appendChild(title);
-					//   append %head.misc; to E.
-					gE.appendChild(misc);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Element content.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * Name of complex type definition.
-	 * Each singleton must know its own name.
-	 * All names should be defined in
-	 * {@link <code>ComplexTypeDefinitionFactory</code>} as constants.<br>
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_HEAD;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHtml.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHtml.java
deleted file mode 100644
index 2cceaad..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHtml.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Complex type definition for <code>HTML</code>.<br>
- * Content Model:
- * HEAD, (FRAMESET|BODY)<br>
- */
-final class CtdHtml extends ComplexTypeDefinition {
-
-	/**
-	 */
-	public CtdHtml(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = HTML40Namespace.ElementName.HEAD;
-	}
-
-	/**
-	 * (%html.content;).
-	 * %html.content; is HEAD, (FRAMESET | BODY).
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( )
-		content = new CMGroupImpl(CMGroup.SEQUENCE, 1, 1);
-		if (content == null)
-			return;
-
-		// HEAD
-		CMNode edec = collection.getNamedItem(HTML40Namespace.ElementName.HEAD);
-		if (edec != null)
-			content.appendChild(edec);
-
-		// ( | )
-		CMGroupImpl group = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		content.appendChild(group);
-
-		// FRAMESET, BODY
-		String[] names = {HTML40Namespace.ElementName.FRAMESET, HTML40Namespace.ElementName.BODY};
-		collection.getDeclarations(group, Arrays.asList(names).iterator());
-
-		// since BODY start and end are omissable
-		// adding valid children of BODY here under HTML
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=97342
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.MAP);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.PRE);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.BDO);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.INPUT);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.P);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.NOSCRIPT);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.I);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.BUTTON);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.LABEL);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.U);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.H6);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.CENTER);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.BASEFONT);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.S);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.BLOCKQUOTE);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.H3);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.UL);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.B);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.SELECT);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.Q);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.STRIKE);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.SCRIPT);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.ABBR);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.BIG);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.H1);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.IMG);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.ACRONYM);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.DEL);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.NOFRAMES);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.TEXTAREA);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.H2);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.FONT);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.OBJECT);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.KBD);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.IFRAME);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.HR);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.H4);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.DIR);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.SAMP);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.INS);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.H5);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.SUP);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.A);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.DFN);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.ISINDEX);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.DL);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.VAR);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.FIELDSET);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.TABLE);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.BR);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.TT);
-		if (edec != null)
-			content.appendChild(edec);
-
-		edec = collection.getNamedItem(HTML40Namespace.ElementName.APPLET);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.OL);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.SMALL);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.CITE);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.FORM);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.DIV);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.CODE);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.SPAN);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.SUB);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.EM);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.MENU);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.ADDRESS);
-		if (edec != null)
-			content.appendChild(edec);
-
-	    edec = collection.getNamedItem(HTML40Namespace.ElementName.STRONG);
-		if (edec != null)
-			content.appendChild(edec);
-	}
-
-	/**
-	 * Element content.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_HTML;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdInlineContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdInlineContainer.java
deleted file mode 100644
index ad52c8b..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdInlineContainer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-
-/**
- * Complex type definition for (%inline;)*.
- */
-final class CtdInlineContainer extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdInlineContainer(ElementCollection elementCollection) {
-		super(elementCollection);
-	}
-
-	/**
-	 * (%inline)*.
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		content = new CMGroupImpl(CMGroup.CHOICE, 0, CMContentImpl.UNBOUNDED);
-		collection.getInline(content);
-	}
-
-	public int getContentType() {
-		return CMElementDeclaration.MIXED;
-	}
-
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_INLINE_CONTAINER;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdLiContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdLiContainer.java
deleted file mode 100644
index aae68af..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdLiContainer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * List item container.
- * (LI)+
- */
-final class CtdLiContainer extends ComplexTypeDefinition {
-
-	/**
-	 * @param elemenCollection ElementCollection
-	 */
-	public CtdLiContainer(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = HTML40Namespace.ElementName.LI;
-	}
-
-	/**
-	 * (LI)+.
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// (LI)+
-		content = new CMGroupImpl(CMGroup.SEQUENCE, 1, CMContentImpl.UNBOUNDED);
-		CMNode li = collection.getNamedItem(HTML40Namespace.ElementName.LI);
-		if (li != null)
-			content.appendChild(li);
-	}
-
-	/**
-	 * ELEMENT content.<br>
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * Name of complex type definition.
-	 * Each singleton must know its own name.
-	 * All names should be defined in
-	 * {@link <code>ComplexTypeDefinitionFactory</code>} as constants.<br>
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_LI_CONTAINER;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdMap.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdMap.java
deleted file mode 100644
index 83f9b72..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdMap.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * for MAP.
- */
-final class CtdMap extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdMap(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = HTML40Namespace.ElementName.AREA;
-	}
-
-	/**
-	 * ((%block;) | AREA)+.
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( | )+
-		content = new CMGroupImpl(CMGroup.CHOICE, 1, CMContentImpl.UNBOUNDED);
-		// (%block;)
-		CMGroupImpl blocks = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		if (blocks == null)
-			return;
-		collection.getBlock(blocks);
-		content.appendChild(blocks);
-		// AREA
-		CMNode area = collection.getNamedItem(HTML40Namespace.ElementName.AREA);
-		if (area != null)
-			content.appendChild(area);
-	}
-
-	/**
-	 * ((%block;) | AREA)+.
-	 * Because %block; consists of elements only, the type is ELEMENT.
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_MAP;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdNoframesContent.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdNoframesContent.java
deleted file mode 100644
index f7ac09b..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdNoframesContent.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * for NOFRAMES.
- */
-final class CtdNoframesContent extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdNoframesContent(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = HTML40Namespace.ElementName.BODY;
-	}
-
-	/**
-	 * (BODY).
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( )
-		content = new CMGroupImpl(CMGroup.SEQUENCE, 1, 1);
-		// BODY
-		CMNode dec = collection.getNamedItem(HTML40Namespace.ElementName.BODY);
-		if (dec != null)
-			content.appendChild(dec);
-	}
-
-	/**
-	 * (BODY)
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_NOFRAMES_CONTENT;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdOptionContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdOptionContainer.java
deleted file mode 100644
index a772f17..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdOptionContainer.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * OPTION container.
- * (OPTION)+
- */
-final class CtdOptionContainer extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdOptionContainer(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = HTML40Namespace.ElementName.OPTION;
-	}
-
-	/**
-	 * (OPTION)+.
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( )+
-		content = new CMGroupImpl(CMGroup.SEQUENCE, 1, CMContentImpl.UNBOUNDED);
-		// OPTION
-		CMNode dec = collection.getNamedItem(HTML40Namespace.ElementName.OPTION);
-		if (dec != null)
-			content.appendChild(dec);
-	}
-
-	/**
-	 * (OPTION)+
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * Name of complex type definition.
-	 * Each singleton must know its own name.
-	 * All names should be defined in
-	 * {@link <code>ComplexTypeDefinitionFactory</code>} as constants.<br>
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_OPTION_CONTAINER;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdParamContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdParamContainer.java
deleted file mode 100644
index a82afb8..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdParamContainer.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * PARAM container.  For OBJECT and APPLET.
- */
-final class CtdParamContainer extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdParamContainer(ElementCollection elementCollection) {
-		super(elementCollection);
-	}
-
-	/**
-	 * (PARAM | %flow;)*.
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( | )*
-		content = new CMGroupImpl(CMGroup.CHOICE, 0, CMContentImpl.UNBOUNDED);
-		// PARAM
-		CMNode param = collection.getNamedItem(HTML40Namespace.ElementName.PARAM);
-		if (param != null)
-			content.appendChild(param);
-		// %flow;
-		CMGroupImpl flows = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		if (flows == null)
-			return;
-		collection.getInline(flows);
-		content.appendChild(flows);
-	}
-
-	/**
-	 * (PARAM | %flow;)*.
-	 * Because %flow; contains #PCDATA, the type is MIXED.
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.MIXED;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_PARAM_CONTAINER;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdSelect.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdSelect.java
deleted file mode 100644
index b7f6c09..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdSelect.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * for SELECT.
- */
-final class CtdSelect extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdSelect(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = HTML40Namespace.ElementName.OPTION;
-	}
-
-	/**
-	 * (OPTGROUP | OPTION)+.
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( | )+
-		content = new CMGroupImpl(CMGroup.CHOICE, 1, CMContentImpl.UNBOUNDED);
-		// OPTGROUP
-		CMNode dec = collection.getNamedItem(HTML40Namespace.ElementName.OPTGROUP);
-		if (dec != null)
-			content.appendChild(dec);
-		// OPTION
-		dec = collection.getNamedItem(HTML40Namespace.ElementName.OPTION);
-		if (dec != null)
-			content.appendChild(dec);
-	}
-
-	/**
-	 * (OPTGROUP | OPTION)+.
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_SELECT;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTable.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTable.java
deleted file mode 100644
index d056c8e..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTable.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * for TABLE.
- * (CAPTION?, (COL*|COLGROUP*), THEAD?, TFOOT?, TBODY+, TR+)
- */
-final class CtdTable extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdTable(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = HTML40Namespace.ElementName.TBODY;
-	}
-
-	/**
-	 * (CAPTION?, (COL*|COLGROUP*), THEAD?, TFOOT?, TBODY+)
-	 * --> ((CAPTION)?, ((COL)* | (COLGROUP)*), (THEAD)?, (TFOOT)?, (TBODY)+, (TR)+)
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( , , , ,)
-		content = new CMGroupImpl(CMGroup.SEQUENCE, 1, 1);
-
-		// (CAPTION)?
-		//     ( )?
-		CMGroupImpl wrap = new CMGroupImpl(CMGroup.SEQUENCE, 0, 1);
-		if (wrap == null)
-			return;
-		content.appendChild(wrap);
-		//     CAPTION
-		CMNode dec = collection.getNamedItem(HTML40Namespace.ElementName.CAPTION);
-		if (dec != null)
-			wrap.appendChild(dec);
-
-		// ((COL)* | (COLGROUP)*)
-		//     ( | )
-		CMGroupImpl group = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		if (group == null)
-			return;
-		content.appendChild(group);
-		//         (COL)*
-		wrap = new CMGroupImpl(CMGroup.SEQUENCE, 0, CMContentImpl.UNBOUNDED);
-		if (wrap == null)
-			return;
-		group.appendChild(wrap);
-		dec = collection.getNamedItem(HTML40Namespace.ElementName.COL);
-		if (dec != null)
-			wrap.appendChild(dec);
-		//         (COLGROUP)*
-		wrap = new CMGroupImpl(CMGroup.SEQUENCE, 0, CMContentImpl.UNBOUNDED);
-		if (wrap == null)
-			return;
-		group.appendChild(wrap);
-		dec = collection.getNamedItem(HTML40Namespace.ElementName.COLGROUP);
-		if (dec != null)
-			wrap.appendChild(dec);
-
-		// (THEAD)?
-		wrap = new CMGroupImpl(CMGroup.SEQUENCE, 0, 1);
-		if (wrap == null)
-			return;
-		content.appendChild(wrap);
-		dec = collection.getNamedItem(HTML40Namespace.ElementName.THEAD);
-		if (dec != null)
-			wrap.appendChild(dec);
-
-		// (TFOOT)?
-		wrap = new CMGroupImpl(CMGroup.SEQUENCE, 0, 1);
-		if (wrap == null)
-			return;
-		content.appendChild(wrap);
-		dec = collection.getNamedItem(HTML40Namespace.ElementName.TFOOT);
-		if (dec != null)
-			wrap.appendChild(dec);
-
-		// (TBODY)+
-		// TBODY has optional start and end tags
-		wrap = new CMGroupImpl(CMGroup.SEQUENCE, 0, CMContentImpl.UNBOUNDED);
-		if (wrap == null)
-			return;
-		content.appendChild(wrap);
-		dec = collection.getNamedItem(HTML40Namespace.ElementName.TBODY);
-		if (dec != null)
-			wrap.appendChild(dec);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=96101
-		// TBODY start and end tag are optional, so TR should be allowed here
-		// (TR)+
-		wrap = new CMGroupImpl(CMGroup.SEQUENCE, 1, CMContentImpl.UNBOUNDED);
-		if (wrap == null)
-			return;
-		content.appendChild(wrap);
-		dec = collection.getNamedItem(HTML40Namespace.ElementName.TR);
-		if (dec != null)
-			wrap.appendChild(dec);
-	}
-
-	/**
-	 * ((FRAMESET | FRAME)+ & NOFRAMES?)
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * Name of complex type definition.
-	 * Each singleton must know its own name.
-	 * All names should be defined in
-	 * {@link <code>ComplexTypeDefinitionFactory</code>} as constants.<br>
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_TABLE;
-	}
-}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTableCellContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTableCellContainer.java
deleted file mode 100644
index 40ddbc5..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTableCellContainer.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Table cell container.
- * (TH | TD)+
- */
-final class CtdTableCellContainer extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdTableCellContainer(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = HTML40Namespace.ElementName.TD;
-	}
-
-	/**
-	 * (TH | TD)+.
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( )+
-		content = new CMGroupImpl(CMGroup.CHOICE, 1, CMContentImpl.UNBOUNDED);
-		// TH
-		CMNode dec = collection.getNamedItem(HTML40Namespace.ElementName.TH);
-		if (dec != null)
-			content.appendChild(dec);
-		// TD
-		dec = collection.getNamedItem(HTML40Namespace.ElementName.TD);
-		if (dec != null)
-			content.appendChild(dec);
-	}
-
-	/**
-	 * (TH | TD)+
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * Name of complex type definition.
-	 * Each singleton must know its own name.
-	 * All names should be defined in
-	 * {@link <code>ComplexTypeDefinitionFactory</code>} as constants.<br>
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_TCELL_CONTAINER;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTrContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTrContainer.java
deleted file mode 100644
index 53adfc6..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTrContainer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Table record container.
- * (TR)+
- */
-final class CtdTrContainer extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdTrContainer(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = HTML40Namespace.ElementName.TR;
-	}
-
-	/**
-	 * (TR)+.
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// (TR)+
-		content = new CMGroupImpl(CMGroup.SEQUENCE, 1, CMContentImpl.UNBOUNDED);
-		CMNode tr = collection.getNamedItem(HTML40Namespace.ElementName.TR);
-		if (tr != null)
-			content.appendChild(tr);
-	}
-
-	/**
-	 * ELEMENT content.<br>
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * Name of complex type definition.
-	 * Each singleton must know its own name.
-	 * All names should be defined in
-	 * {@link <code>ComplexTypeDefinitionFactory</code>} as constants.<br>
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_TR_CONTAINER;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/DeclCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/DeclCollection.java
deleted file mode 100644
index e7ddee7..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/DeclCollection.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- */
-abstract class DeclCollection implements CMNamedNodeMap {
-
-
-	protected class DualMap {
-		public DualMap() {
-			super();
-		}
-
-		public DualMap(Object[] objects) {
-			super();
-			initialize(objects);
-		}
-
-		public int size() {
-			return table.length;
-		}
-
-		public Object getValue(int key) {
-			if (!isValidIndex(key))
-				return null;
-			return table[key];
-		}
-
-		public int getKey(Object value) {
-			Integer keyObj = (Integer) map.get(value);
-			if (keyObj == null)
-				return ID_UNKNOWN;
-			return keyObj.intValue();
-		}
-
-		protected void initialize(Object[] objects) {
-			if (objects == null)
-				return;
-			table = objects;
-			map = new HashMap();
-			for (int key = 0; key < objects.length; key++) {
-				Object value = table[key];
-				map.put(value, new Integer(key));
-			}
-		}
-
-		private Object[] table = null;
-		private HashMap map = null;
-
-		private boolean isValidIndex(int index) {
-			return index >= 0 && index < table.length;
-		}
-	}
-
-	protected class TolerantStringDualMap extends DualMap {
-		public TolerantStringDualMap(String[] names) {
-			super();
-			Object[] objects = new Object[names.length];
-			for (int i = 0; i < names.length; i++) {
-				objects[i] = makeCanonicalForm(names[i]);
-			}
-			initialize(objects);
-		}
-
-		public int getKey(Object value) {
-			try {
-				String name = (String) value;
-				return super.getKey(makeCanonicalForm(name));
-			}
-			catch (ClassCastException e) {
-				return ID_UNKNOWN;
-			}
-		}
-
-		private String makeCanonicalForm(String raw) {
-			return raw.toUpperCase();
-		}
-	}
-
-	private class DeclIterator implements Iterator {
-		public DeclIterator() {
-			maxid = fDecls.length - 1;
-		}
-
-		public boolean hasNext() {
-			return id < maxid;
-		}
-
-		public Object next() {
-			if (!hasNext())
-				return null;
-			return item(++id);
-		}
-
-		public void remove() { /* nothing should be done. */
-		}
-
-		private int id = -1;
-		private int maxid = -1;
-	}
-
-	CMNode[] fDecls = null;
-	protected final static boolean STRICT_CASE = false;
-	protected final static boolean TOLERANT_CASE = true;
-	protected final static int ID_UNKNOWN = -1;
-	private DualMap fMap = null;
-
-	/**
-	 */
-	public DeclCollection(String[] names, boolean tolerant) {
-		super();
-		fDecls = new CMNode[names.length];
-		if (tolerant) {
-			fMap = new TolerantStringDualMap(names);
-		}
-		else {
-			fMap = new DualMap(names);
-		}
-	}
-
-	/**
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 * @param id int
-	 */
-	protected abstract CMNode create(String name);
-
-	/**
-	 */
-	public CMNamedNodeMap getDeclarations(String[] names) {
-		CMNamedNodeMapImpl map = new CMNamedNodeMapImpl();
-		for (int i = 0; i < names.length; i++) {
-			String name = names[i];
-			CMNode node = getNamedItem(name);
-			if (node == null)
-				continue;
-			map.putNamedItem(name, node);
-		}
-		return map;
-	}
-
-	/**
-	 * @param names java.util.Iterator
-	 */
-	public void getDeclarations(CMGroupImpl group, Iterator names) {
-		while (names.hasNext()) {
-			String entityName = (String) names.next();
-			CMNode dec = getNamedItem(entityName);
-			if (dec != null)
-				group.appendChild(dec);
-		}
-	}
-
-	/**
-	 * Map name to id.
-	 * @return int
-	 * @param name java.lang.String
-	 */
-	protected int getID(String name) {
-		return fMap.getKey(name);
-	}
-
-	/**
-	 * getLength method
-	 * @return int
-	 */
-	public int getLength() {
-		return fDecls.length;
-	}
-
-	/**
-	 * @return java.lang.String
-	 * @param id int
-	 */
-	protected String getName(int id) {
-		return (String) fMap.getValue(id);
-	}
-
-	/**
-	 * getNamedItem method
-	 * @return CMNode
-	 * @param name java.lang.String
-	 */
-	public CMNode getNamedItem(String name) {
-		int id = getID(name);
-		if (!isValidID(id))
-			return null;
-		return item(id);
-	}
-
-	/**
-	 * @return boolean
-	 * @param id int
-	 */
-	private boolean isValidID(int id) {
-		return id >= 0 && id < fDecls.length;
-	}
-
-	/**
-	 * item method
-	 * @return CMNode
-	 * @param index int
-	 */
-	public CMNode item(int index) {
-		if (!isValidID(index))
-			return null;
-		CMNode decl = fDecls[index];
-		if (decl != null)
-			return decl; // already exist.
-
-		decl = create(getName(index));
-		fDecls[index] = decl;
-		return decl;
-	}
-
-	/**
-	 */
-	public Iterator iterator() {
-		return new DeclIterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ElementCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ElementCollection.java
deleted file mode 100644
index 680bd39..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ElementCollection.java
+++ /dev/null
@@ -1,881 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Factory for element declarations.
- */
-final class ElementCollection extends DeclCollection implements org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.ElementName {
-
-
-	// Element IDs
-	private static class Ids {
-		public static final int ID_A = 0;
-		public static final int ID_ABBR = 1;
-		public static final int ID_ACRONYM = 2;
-		public static final int ID_ADDRESS = 3;
-		public static final int ID_APPLET = 4;
-		public static final int ID_AREA = 5;
-		public static final int ID_B = 6;
-		public static final int ID_BASE = 7;
-		public static final int ID_BASEFONT = 8;
-		public static final int ID_BDO = 9;
-		public static final int ID_BIG = 10;
-		public static final int ID_BLINK = 11;
-		public static final int ID_BLOCKQUOTE = 12;
-		public static final int ID_BODY = 13;
-		public static final int ID_BR = 14;
-		public static final int ID_BUTTON = 15;
-		public static final int ID_CAPTION = 16;
-		public static final int ID_CENTER = 17;
-		public static final int ID_CITE = 18;
-		public static final int ID_CODE = 19;
-		public static final int ID_COL = 20;
-		public static final int ID_COLGROUP = 21;
-		public static final int ID_DD = 22;
-		public static final int ID_DEL = 23;
-		public static final int ID_DFN = 24;
-		public static final int ID_DIR = 25;
-		public static final int ID_DIV = 26;
-		public static final int ID_DL = 27;
-		public static final int ID_DT = 28;
-		public static final int ID_EM = 29;
-		public static final int ID_EMBED = 30;
-		public static final int ID_FIELDSET = 31;
-		public static final int ID_FONT = 32;
-		public static final int ID_FORM = 33;
-		public static final int ID_FRAME = 34;
-		public static final int ID_FRAMESET = 35;
-		public static final int ID_H1 = 36;
-		public static final int ID_H2 = 37;
-		public static final int ID_H3 = 38;
-		public static final int ID_H4 = 39;
-		public static final int ID_H5 = 40;
-		public static final int ID_H6 = 41;
-		public static final int ID_HEAD = 42;
-		public static final int ID_HR = 43;
-		public static final int ID_HTML = 44;
-		public static final int ID_I = 45;
-		public static final int ID_IFRAME = 46;
-		public static final int ID_IMG = 47;
-		public static final int ID_INPUT = 48;
-		public static final int ID_INS = 49;
-		public static final int ID_ISINDEX = 50;
-		public static final int ID_KBD = 51;
-		public static final int ID_LABEL = 52;
-		public static final int ID_LEGEND = 53;
-		public static final int ID_LI = 54;
-		public static final int ID_LINK = 55;
-		public static final int ID_MAP = 56;
-		public static final int ID_MENU = 57;
-		public static final int ID_META = 58;
-		public static final int ID_NOEMBED = 59;
-		public static final int ID_NOFRAMES = 60;
-		public static final int ID_NOSCRIPT = 61;
-		public static final int ID_OBJECT = 62;
-		public static final int ID_OL = 63;
-		public static final int ID_OPTGROUP = 64;
-		public static final int ID_OPTION = 65;
-		public static final int ID_P = 66;
-		public static final int ID_PARAM = 67;
-		public static final int ID_PRE = 68;
-		public static final int ID_Q = 69;
-		public static final int ID_S = 70;
-		public static final int ID_SAMP = 71;
-		public static final int ID_SCRIPT = 72;
-		public static final int ID_SELECT = 73;
-		public static final int ID_SMALL = 74;
-		public static final int ID_SPAN = 75;
-		public static final int ID_STRIKE = 76;
-		public static final int ID_STRONG = 77;
-		public static final int ID_STYLE = 78;
-		public static final int ID_SUB = 79;
-		public static final int ID_SUP = 80;
-		public static final int ID_TABLE = 81;
-		public static final int ID_TBODY = 82;
-		public static final int ID_TD = 83;
-		public static final int ID_TEXTAREA = 84;
-		public static final int ID_TFOOT = 85;
-		public static final int ID_TH = 86;
-		public static final int ID_THEAD = 87;
-		public static final int ID_TITLE = 88;
-		public static final int ID_TR = 89;
-		public static final int ID_TT = 90;
-		public static final int ID_U = 91;
-		public static final int ID_UL = 92;
-		public static final int ID_VAR = 93;
-		public static final int ID_MARQUEE = 94;
-		public static final int ID_SSI_CONFIG = 95;
-		public static final int ID_SSI_ECHO = 96;
-		public static final int ID_SSI_EXEC = 97;
-		public static final int ID_SSI_FSIZE = 98;
-		public static final int ID_SSI_FLASTMOD = 99;
-		public static final int ID_SSI_INCLUDE = 100;
-		public static final int ID_SSI_PRINTENV = 101;
-		public static final int ID_SSI_SET = 102;
-		// <<D205513
-		public static final int ID_BGSOUND = 103;
-		public static final int ID_NOBR = 104;
-		public static final int ID_WBR = 105;
-
-		// D205513
-
-		public static int getNumOfIds() {
-			if (numofids != -1)
-				return numofids;
-
-			// NOTE: If the reflection is too slow, this method should
-			// just return the literal value, like 105.
-			// -- 5/25/2001
-			Class clazz = Ids.class;
-			Field[] fields = clazz.getFields();
-			numofids = 0;
-			for (int i = 0; i < fields.length; i++) {
-				String name = fields[i].getName();
-				if (name.startsWith("ID_"))//$NON-NLS-1$
-					numofids++;
-			}
-			return numofids;
-		}
-
-		// chache the result of the reflection.
-		private static int numofids = -1;
-	}
-
-	/** %fontstyle;. TT | I | B | U | S | STRIKE | BIG | SMALL | BLINK */
-	private static final String[] FONTSTYLE = {TT, I, B, U, S, STRIKE, BIG, SMALL, BLINK};
-	/** %formctl;. INPUT | SELECT | TEXTAREA | LABEL | BUTTON */
-	private static final String[] FORMCTL = {INPUT, SELECT, TEXTAREA, LABEL, BUTTON};
-	/** %phrase;.
-	 * EM | STRONG | DFN | CODE | SAMP | KBD | VAR | CITE | ABBR | ACRONYM
-	 */
-	private static final String[] PHRASE = {EM, STRONG, DFN, CODE, SAMP, KBD, VAR, CITE, ABBR, ACRONYM};
-	/** %special;.
-	 * A | IMG | APPLET | OBJECT | FONT | BASEFONT | BR | SCRIPT |
-	 * MAP | Q | SUB | SUP | SPAN | BDO | IFRAME | EMBED | MARQUEE |
-	 * D2W | SUBMIT
-	 * WBR | NOBR | BGSOUND
-	 */
-	private static final String[] SPECIAL = {A, IMG, APPLET, OBJECT, FONT, BASEFONT, BR, WBR, // D205513
-				SCRIPT, MAP, Q, SUB, SUP, SPAN, BDO, IFRAME, EMBED, BGSOUND, // D205513
-				MARQUEE, NOBR // D205513
-	};
-	/** %heading;. H[1-6] */
-	private static final String[] HEADING = {H1, H2, H3, H4, H5, H6};
-	/** %list;. UL | OL | DIR | MENU */
-	private static final String[] LIST = {UL, OL, DIR, MENU};
-	/** %preformatted;. PRE */
-	private static final String[] PREFORMATTED = {PRE};
-	private AttributeCollection attributeCollection = null;
-	private static String[] fNames = null;
-
-	static {
-		fNames = new String[Ids.getNumOfIds()];
-		fNames[Ids.ID_A] = A;
-		fNames[Ids.ID_ABBR] = ABBR;
-		fNames[Ids.ID_ACRONYM] = ACRONYM;
-		fNames[Ids.ID_ADDRESS] = ADDRESS;
-		fNames[Ids.ID_APPLET] = APPLET;
-		fNames[Ids.ID_AREA] = AREA;
-		fNames[Ids.ID_B] = B;
-		fNames[Ids.ID_BASE] = BASE;
-		fNames[Ids.ID_BASEFONT] = BASEFONT;
-		fNames[Ids.ID_BDO] = BDO;
-		fNames[Ids.ID_BIG] = BIG;
-		fNames[Ids.ID_BLINK] = BLINK;
-		fNames[Ids.ID_BLOCKQUOTE] = BLOCKQUOTE;
-		fNames[Ids.ID_BODY] = BODY;
-		fNames[Ids.ID_BR] = BR;
-		fNames[Ids.ID_BUTTON] = BUTTON;
-		fNames[Ids.ID_CAPTION] = CAPTION;
-		fNames[Ids.ID_CENTER] = CENTER;
-		fNames[Ids.ID_CITE] = CITE;
-		fNames[Ids.ID_CODE] = CODE;
-		fNames[Ids.ID_COL] = COL;
-		fNames[Ids.ID_COLGROUP] = COLGROUP;
-		fNames[Ids.ID_DD] = DD;
-		fNames[Ids.ID_DEL] = DEL;
-		fNames[Ids.ID_DFN] = DFN;
-		fNames[Ids.ID_DIR] = DIR;
-		fNames[Ids.ID_DIV] = DIV;
-		fNames[Ids.ID_DL] = DL;
-		fNames[Ids.ID_DT] = DT;
-		fNames[Ids.ID_EM] = EM;
-		fNames[Ids.ID_EMBED] = EMBED;
-		fNames[Ids.ID_FIELDSET] = FIELDSET;
-		fNames[Ids.ID_FONT] = FONT;
-		fNames[Ids.ID_FORM] = FORM;
-		fNames[Ids.ID_FRAME] = FRAME;
-		fNames[Ids.ID_FRAMESET] = FRAMESET;
-		fNames[Ids.ID_H1] = H1;
-		fNames[Ids.ID_H2] = H2;
-		fNames[Ids.ID_H3] = H3;
-		fNames[Ids.ID_H4] = H4;
-		fNames[Ids.ID_H5] = H5;
-		fNames[Ids.ID_H6] = H6;
-		fNames[Ids.ID_HEAD] = HEAD;
-		fNames[Ids.ID_HR] = HR;
-		fNames[Ids.ID_HTML] = HTML;
-		fNames[Ids.ID_I] = I;
-		fNames[Ids.ID_IFRAME] = IFRAME;
-		fNames[Ids.ID_IMG] = IMG;
-		fNames[Ids.ID_INPUT] = INPUT;
-		fNames[Ids.ID_INS] = INS;
-		fNames[Ids.ID_ISINDEX] = ISINDEX;
-		fNames[Ids.ID_KBD] = KBD;
-		fNames[Ids.ID_LABEL] = LABEL;
-		fNames[Ids.ID_LEGEND] = LEGEND;
-		fNames[Ids.ID_LI] = LI;
-		fNames[Ids.ID_LINK] = LINK;
-		fNames[Ids.ID_MAP] = MAP;
-		fNames[Ids.ID_MENU] = MENU;
-		fNames[Ids.ID_META] = META;
-		fNames[Ids.ID_NOEMBED] = NOEMBED;
-		fNames[Ids.ID_NOFRAMES] = NOFRAMES;
-		fNames[Ids.ID_NOSCRIPT] = NOSCRIPT;
-		fNames[Ids.ID_OBJECT] = OBJECT;
-		fNames[Ids.ID_OL] = OL;
-		fNames[Ids.ID_OPTGROUP] = OPTGROUP;
-		fNames[Ids.ID_OPTION] = OPTION;
-		fNames[Ids.ID_P] = P;
-		fNames[Ids.ID_PARAM] = PARAM;
-		fNames[Ids.ID_PRE] = PRE;
-		fNames[Ids.ID_Q] = Q;
-		fNames[Ids.ID_S] = S;
-		fNames[Ids.ID_SAMP] = SAMP;
-		fNames[Ids.ID_SCRIPT] = SCRIPT;
-		fNames[Ids.ID_SELECT] = SELECT;
-		fNames[Ids.ID_SMALL] = SMALL;
-		fNames[Ids.ID_SPAN] = SPAN;
-		fNames[Ids.ID_STRIKE] = STRIKE;
-		fNames[Ids.ID_STRONG] = STRONG;
-		fNames[Ids.ID_STYLE] = STYLE;
-		fNames[Ids.ID_SUB] = SUB;
-		fNames[Ids.ID_SUP] = SUP;
-		fNames[Ids.ID_TABLE] = TABLE;
-		fNames[Ids.ID_TBODY] = TBODY;
-		fNames[Ids.ID_TD] = TD;
-		fNames[Ids.ID_TEXTAREA] = TEXTAREA;
-		fNames[Ids.ID_TFOOT] = TFOOT;
-		fNames[Ids.ID_TH] = TH;
-		fNames[Ids.ID_THEAD] = THEAD;
-		fNames[Ids.ID_TITLE] = TITLE;
-		fNames[Ids.ID_TR] = TR;
-		fNames[Ids.ID_TT] = TT;
-		fNames[Ids.ID_U] = U;
-		fNames[Ids.ID_UL] = UL;
-		fNames[Ids.ID_VAR] = VAR;
-		fNames[Ids.ID_MARQUEE] = MARQUEE;
-		fNames[Ids.ID_SSI_CONFIG] = SSI_CONFIG;
-		fNames[Ids.ID_SSI_ECHO] = SSI_ECHO;
-		fNames[Ids.ID_SSI_EXEC] = SSI_EXEC;
-		fNames[Ids.ID_SSI_FSIZE] = SSI_FSIZE;
-		fNames[Ids.ID_SSI_FLASTMOD] = SSI_FLASTMOD;
-		fNames[Ids.ID_SSI_INCLUDE] = SSI_INCLUDE;
-		fNames[Ids.ID_SSI_PRINTENV] = SSI_PRINTENV;
-		fNames[Ids.ID_SSI_SET] = SSI_SET;
-		fNames[Ids.ID_BGSOUND] = BGSOUND;
-		fNames[Ids.ID_NOBR] = NOBR;
-		fNames[Ids.ID_WBR] = WBR;
-	}
-
-	/**
-	 */
-	public ElementCollection(AttributeCollection collection) {
-		super(fNames, TOLERANT_CASE);
-		attributeCollection = collection;
-	}
-
-	/**
-	 * Actually creates HTMLElementDeclaration instance.
-	 * @return HTMLElementDeclaration
-	 */
-	protected CMNode create(String elementName) {
-		HTMLElemDeclImpl edec = null;
-
-		if (elementName.equalsIgnoreCase(A)) {
-			edec = new HedA(this);
-		}
-		else if (elementName.equalsIgnoreCase(ABBR)) {
-			edec = new HedPhrase(ABBR, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(ACRONYM)) {
-			edec = new HedPhrase(ACRONYM, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(ADDRESS)) {
-			edec = new HedADDRESS(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(APPLET)) {
-			edec = new HedAPPLET(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(AREA)) {
-			edec = new HedAREA(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(B)) {
-			edec = new HedFontStyle(B, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(BASE)) {
-			edec = new HedBASE(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(BASEFONT)) {
-			edec = new HedBASEFONT(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(BDO)) {
-			edec = new HedBDO(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(BIG)) {
-			edec = new HedFontStyle(BIG, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(BLINK)) {
-			edec = new HedFontStyle(BLINK, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(BLOCKQUOTE)) {
-			edec = new HedBLOCKQUOTE(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(BODY)) {
-			edec = new HedBODY(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(BR)) {
-			edec = new HedBR(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(BUTTON)) {
-			edec = new HedBUTTON(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(CAPTION)) {
-			edec = new HedCAPTION(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(CENTER)) {
-			edec = new HedCENTER(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(CITE)) {
-			edec = new HedPhrase(CITE, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(CODE)) {
-			edec = new HedPhrase(CODE, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(COL)) {
-			edec = new HedCOL(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(COLGROUP)) {
-			edec = new HedCOLGROUP(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(DD)) {
-			edec = new HedDD(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(DEL)) {
-			edec = new HedMarkChanges(DEL, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(DFN)) {
-			edec = new HedPhrase(DFN, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(DIR)) {
-			edec = new HedMENU(DIR, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(DIV)) {
-			edec = new HedDIV(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(DL)) {
-			edec = new HedDL(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(DT)) {
-			edec = new HedDT(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(EM)) {
-			edec = new HedPhrase(EM, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(EMBED)) {
-			edec = new HedEMBED(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(FIELDSET)) {
-			edec = new HedFIELDSET(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(FONT)) {
-			edec = new HedFONT(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(FORM)) {
-			edec = new HedFORM(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(FRAME)) {
-			edec = new HedFRAME(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(FRAMESET)) {
-			edec = new HedFRAMESET(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(H1)) {
-			edec = new HedHeading(H1, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(H2)) {
-			edec = new HedHeading(H2, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(H3)) {
-			edec = new HedHeading(H3, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(H4)) {
-			edec = new HedHeading(H4, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(H5)) {
-			edec = new HedHeading(H5, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(H6)) {
-			edec = new HedHeading(H6, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(HEAD)) {
-			edec = new HedHEAD(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(HR)) {
-			edec = new HedHR(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(HTML)) {
-			edec = new HedHTML(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(I)) {
-			edec = new HedFontStyle(I, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(IFRAME)) {
-			edec = new HedIFRAME(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(IMG)) {
-			edec = new HedIMG(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(INPUT)) {
-			edec = new HedINPUT(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(INS)) {
-			edec = new HedMarkChanges(INS, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(ISINDEX)) {
-			edec = new HedISINDEX(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(KBD)) {
-			edec = new HedPhrase(KBD, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(LABEL)) {
-			edec = new HedLABEL(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(LEGEND)) {
-			edec = new HedLEGEND(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(LI)) {
-			edec = new HedLI(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(LINK)) {
-			edec = new HedLINK(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(MAP)) {
-			edec = new HedMAP(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(MARQUEE)) {
-			edec = new HedMARQUEE(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(MENU)) {
-			edec = new HedMENU(MENU, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(META)) {
-			edec = new HedMETA(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(NOEMBED)) {
-			edec = new HedNOEMBED(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(NOFRAMES)) {
-			edec = new HedNOFRAMES(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(NOSCRIPT)) {
-			edec = new HedNOSCRIPT(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(OBJECT)) {
-			edec = new HedOBJECT(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(OL)) {
-			edec = new HedOL(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(OPTGROUP)) {
-			edec = new HedOPTGROUP(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(OPTION)) {
-			edec = new HedOPTION(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(P)) {
-			edec = new HedP(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(PARAM)) {
-			edec = new HedPARAM(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(PRE)) {
-			edec = new HedPRE(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(Q)) {
-			edec = new HedQ(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(S)) {
-			edec = new HedFontStyle(S, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SAMP)) {
-			edec = new HedPhrase(SAMP, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SCRIPT)) {
-			edec = new HedSCRIPT(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SELECT)) {
-			edec = new HedSELECT(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SMALL)) {
-			edec = new HedFontStyle(SMALL, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SPAN)) {
-			edec = new HedSPAN(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(STRIKE)) {
-			edec = new HedFontStyle(STRIKE, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(STRONG)) {
-			edec = new HedPhrase(STRONG, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(STYLE)) {
-			edec = new HedSTYLE(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SUB)) {
-			edec = new HedScripts(SUB, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SUP)) {
-			edec = new HedScripts(SUP, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(TABLE)) {
-			edec = new HedTABLE(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(TBODY)) {
-			edec = new HedTableBody(TBODY, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(TD)) {
-			edec = new HedTableCell(TD, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(TEXTAREA)) {
-			edec = new HedTEXTAREA(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(TFOOT)) {
-			edec = new HedTableBody(TFOOT, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(TH)) {
-			edec = new HedTableCell(TH, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(THEAD)) {
-			edec = new HedTableBody(THEAD, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(TITLE)) {
-			edec = new HedTITLE(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(TR)) {
-			edec = new HedTR(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(TT)) {
-			edec = new HedFontStyle(TT, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(U)) {
-			edec = new HedFontStyle(U, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(UL)) {
-			edec = new HedUL(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(VAR)) {
-			edec = new HedPhrase(VAR, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_CONFIG)) {
-			edec = new HedSSIConfig(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_ECHO)) {
-			edec = new HedSSIEcho(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_EXEC)) {
-			edec = new HedSSIExec(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_FSIZE)) {
-			edec = new HedSSIFsize(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_FLASTMOD)) {
-			edec = new HedSSIFlastmod(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_INCLUDE)) {
-			edec = new HedSSIInclude(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_PRINTENV)) {
-			edec = new HedSSIPrintenv(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_SET)) {
-			edec = new HedSSISet(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(BGSOUND)) {
-			edec = new HedBGSOUND(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(NOBR)) {
-			edec = new HedNOBR(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(WBR)) {
-			edec = new HedWBR(this);
-
-		} // unknown
-		else {
-			// NOTE: We don't define the UNKNOWN element declaration.
-			// <code>null</code> for a declaration is a sign of
-			// the target element is unknown.
-			// -- 3/9/2001
-			edec = null;
-		}
-		return edec;
-	}
-
-	public AttributeCollection getAttributeCollection() {
-		return attributeCollection;
-	}
-
-	public final Collection getNamesOfBlock() {
-		// P, DL, DIV, CENTER, NOSCRIPT, NOFRAMES, BLOCKQUOTE, FORM, ISINDEX, HR,
-		// TABLE, FIELDSET, ADDRESS
-		String[] blockMisc = {P, DL, DIV, CENTER, NOSCRIPT, NOFRAMES, BLOCKQUOTE, FORM, ISINDEX, HR, TABLE, FIELDSET, ADDRESS};
-		Vector names = new Vector(Arrays.asList(blockMisc));
-		// %heading;
-		names.addAll(Arrays.asList(HEADING));
-		// %list;
-		names.addAll(Arrays.asList(LIST));
-		// %preformatted;
-		names.addAll(Arrays.asList(PREFORMATTED));
-
-		return names;
-	}
-
-	/**
-	 * %block;.
-	 * %block; is:
-	 * P | %heading; | %list; | %preformatted; | DL | DIV | CENTER |
-	 * NOSCRIPT | NOFRAMES | BLOCKQUOTE | FORM | ISINDEX | HR |
-	 * TABLE | FIELDSET | ADDRESS.<br>
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getBlock(CMGroupImpl group) {
-		if (group == null)
-			return;
-		getDeclarations(group, getNamesOfBlock().iterator());
-	}
-
-	/**
-	 * Create element declarations and store them
-	 * into a <code>CMGroupImpl</code> instance.
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getFlow(CMGroupImpl group) {
-		if (group == null)
-			return;
-		getBlock(group);
-		getInline(group);
-	}
-
-	/**
-	 * Create element declarations and store them into a <code>CMGroupImpl</code>
-	 * instance.<br>
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getFontstyle(CMGroupImpl group) {
-		if (group == null)
-			return;
-		getDeclarations(group, Arrays.asList(FONTSTYLE).iterator());
-	}
-
-	/**
-	 * Create element declarations and store them into a <code>CMGroupImpl</code>
-	 * instance.<br>
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getFormctrl(CMGroupImpl group) {
-		if (group == null)
-			return;
-		getDeclarations(group, Arrays.asList(FORMCTL).iterator());
-	}
-
-	/**
-	 * %heading;.
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getHeading(CMGroupImpl group) {
-		if (group == null)
-			return;
-
-		getDeclarations(group, Arrays.asList(HEADING).iterator());
-	}
-
-	/**
-	 * Create element declarations and store them
-	 * into a <code>CMGroupImpl</code> instance.
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getInline(CMGroupImpl group) {
-		if (group == null)
-			return;
-		getFontstyle(group);
-		getPhrase(group);
-		getSpecial(group);
-		getFormctrl(group);
-	}
-
-	/**
-	 * %list;.
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getList(CMGroupImpl group) {
-		if (group == null)
-			return;
-
-		getDeclarations(group, Arrays.asList(LIST).iterator());
-	}
-
-	/**
-	 * Create element declarations and store them into a <code>CMGroupImpl</code>
-	 * instance.<br>
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getPhrase(CMGroupImpl group) {
-		if (group == null)
-			return;
-		getDeclarations(group, Arrays.asList(PHRASE).iterator());
-	}
-
-	/**
-	 * %preformatted;
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getPreformatted(CMGroupImpl group) {
-		if (group == null)
-			return;
-
-		getDeclarations(group, Arrays.asList(PREFORMATTED).iterator());
-	}
-
-	/**
-	 * Create element declarations and store them into a <code>CMGroupImpl</code>
-	 * instance.<br>
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getSpecial(CMGroupImpl group) {
-		if (group == null)
-			return;
-		getDeclarations(group, Arrays.asList(SPECIAL).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/EntityCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/EntityCollection.java
deleted file mode 100644
index 350594f..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/EntityCollection.java
+++ /dev/null
@@ -1,837 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.lang.reflect.Field;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Factory for entity declarations.
- */
-final class EntityCollection extends DeclCollection implements org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.EntityName {
-
-
-	private static class Ids {
-		public static final int ID_AACUTE_L = 0;
-		public static final int ID_AACUTE_U = 1;
-		public static final int ID_ACIRC_L = 2;
-		public static final int ID_ACIRC_U = 3;
-		public static final int ID_ACUTE = 4;
-		public static final int ID_AELIG_L = 5;
-		public static final int ID_AELIG_U = 6;
-		public static final int ID_AGRAVE_L = 7;
-		public static final int ID_AGRAVE_U = 8;
-		public static final int ID_ALEFSYM = 9;
-		public static final int ID_ALPHA_L = 10;
-		public static final int ID_ALPHA_U = 11;
-		public static final int ID_AMP = 12;
-		public static final int ID_AND = 13;
-		public static final int ID_ANG = 14;
-		public static final int ID_ARING_L = 15;
-		public static final int ID_ARING_U = 16;
-		public static final int ID_ASYMP = 17;
-		public static final int ID_ATILDE_L = 18;
-		public static final int ID_ATILDE_U = 19;
-		public static final int ID_AUML_L = 20;
-		public static final int ID_AUML_U = 21;
-		public static final int ID_BDQUO = 22;
-		public static final int ID_BETA_L = 23;
-		public static final int ID_BETA_U = 24;
-		public static final int ID_BRVBAR = 25;
-		public static final int ID_BULL = 26;
-		public static final int ID_CAP = 27;
-		public static final int ID_CCEDIL_L = 28;
-		public static final int ID_CCEDIL_U = 29;
-		public static final int ID_CEDIL = 30;
-		public static final int ID_CENT = 31;
-		public static final int ID_CHI_L = 32;
-		public static final int ID_CHI_U = 33;
-		public static final int ID_CIRC = 34;
-		public static final int ID_CLUBS = 35;
-		public static final int ID_CONG = 36;
-		public static final int ID_COPY = 37;
-		public static final int ID_CRARR = 38;
-		public static final int ID_CUP = 39;
-		public static final int ID_CURREN = 40;
-		public static final int ID_DAGGER_L = 41;
-		public static final int ID_DAGGER_U = 42;
-		public static final int ID_DARR_L = 43;
-		public static final int ID_DARR_U = 44;
-		public static final int ID_DEG = 45;
-		public static final int ID_DELTA_L = 46;
-		public static final int ID_DELTA_U = 47;
-		public static final int ID_DIAMS = 48;
-		public static final int ID_DIVIDE = 49;
-		public static final int ID_EACUTE_L = 50;
-		public static final int ID_EACUTE_U = 51;
-		public static final int ID_ECIRC_L = 52;
-		public static final int ID_ECIRC_U = 53;
-		public static final int ID_EGRAVE_L = 54;
-		public static final int ID_EGRAVE_U = 55;
-		public static final int ID_EMPTY = 56;
-		public static final int ID_EMSP = 57;
-		public static final int ID_ENSP = 58;
-		public static final int ID_EPSILON_L = 59;
-		public static final int ID_EPSILON_U = 60;
-		public static final int ID_EQUIV = 61;
-		public static final int ID_ETA_L = 62;
-		public static final int ID_ETA_U = 63;
-		public static final int ID_ETH_L = 64;
-		public static final int ID_ETH_U = 65;
-		public static final int ID_EUML_L = 66;
-		public static final int ID_EUML_U = 67;
-		public static final int ID_EURO = 68;
-		public static final int ID_EXIST = 69;
-		public static final int ID_FNOF = 70;
-		public static final int ID_FORALL = 71;
-		public static final int ID_FRAC12 = 72;
-		public static final int ID_FRAC14 = 73;
-		public static final int ID_FRAC34 = 74;
-		public static final int ID_FRASL = 75;
-		public static final int ID_GAMMA_L = 76;
-		public static final int ID_GAMMA_U = 77;
-		public static final int ID_GE = 78;
-		public static final int ID_GT = 79;
-		public static final int ID_HARR_L = 80;
-		public static final int ID_HARR_U = 81;
-		public static final int ID_HEARTS = 82;
-		public static final int ID_HELLIP = 83;
-		public static final int ID_IACUTE_L = 84;
-		public static final int ID_IACUTE_U = 85;
-		public static final int ID_ICIRC_L = 86;
-		public static final int ID_ICIRC_U = 87;
-		public static final int ID_IEXCL = 88;
-		public static final int ID_IGRAVE_L = 89;
-		public static final int ID_IGRAVE_U = 90;
-		public static final int ID_IMAGE = 91;
-		public static final int ID_INFIN = 92;
-		public static final int ID_INT = 93;
-		public static final int ID_IOTA_L = 94;
-		public static final int ID_IOTA_U = 95;
-		public static final int ID_IQUEST = 96;
-		public static final int ID_ISIN = 97;
-		public static final int ID_IUML_L = 98;
-		public static final int ID_IUML_U = 99;
-		public static final int ID_KAPPA_L = 100;
-		public static final int ID_KAPPA_U = 101;
-		public static final int ID_LAMBDA_L = 102;
-		public static final int ID_LAMBDA_U = 103;
-		public static final int ID_LANG = 104;
-		public static final int ID_LAQUO = 105;
-		public static final int ID_LARR_L = 106;
-		public static final int ID_LARR_U = 107;
-		public static final int ID_LCEIL = 108;
-		public static final int ID_LDQUO = 109;
-		public static final int ID_LE = 110;
-		public static final int ID_LFLOOR = 111;
-		public static final int ID_LOWAST = 112;
-		public static final int ID_LOZ = 113;
-		public static final int ID_LRM = 114;
-		public static final int ID_LSAQUO = 115;
-		public static final int ID_LSQUO = 116;
-		public static final int ID_LT = 117;
-		public static final int ID_MACR = 118;
-		public static final int ID_MDASH = 119;
-		public static final int ID_MICRO = 120;
-		public static final int ID_MIDDOT = 121;
-		public static final int ID_MINUS = 122;
-		public static final int ID_MU_L = 123;
-		public static final int ID_MU_U = 124;
-		public static final int ID_NABLA = 125;
-		public static final int ID_NBSP = 126;
-		public static final int ID_NDASH = 127;
-		public static final int ID_NE = 128;
-		public static final int ID_NI = 129;
-		public static final int ID_NOT = 130;
-		public static final int ID_NOTIN = 131;
-		public static final int ID_NSUB = 132;
-		public static final int ID_NTILDE_L = 133;
-		public static final int ID_NTILDE_U = 134;
-		public static final int ID_NU_L = 135;
-		public static final int ID_NU_U = 136;
-		public static final int ID_OACUTE_L = 137;
-		public static final int ID_OACUTE_U = 138;
-		public static final int ID_OCIRC_L = 139;
-		public static final int ID_OCIRC_U = 140;
-		public static final int ID_OELIG_L = 141;
-		public static final int ID_OELIG_U = 142;
-		public static final int ID_OGRAVE_L = 143;
-		public static final int ID_OGRAVE_U = 144;
-		public static final int ID_OLINE = 145;
-		public static final int ID_OMEGA_L = 146;
-		public static final int ID_OMEGA_U = 147;
-		public static final int ID_OMICRON_L = 148;
-		public static final int ID_OMICRON_U = 149;
-		public static final int ID_OPLUS = 150;
-		public static final int ID_OR = 151;
-		public static final int ID_ORDF = 152;
-		public static final int ID_ORDM = 153;
-		public static final int ID_OSLASH_L = 154;
-		public static final int ID_OSLASH_U = 155;
-		public static final int ID_OTILDE_L = 156;
-		public static final int ID_OTILDE_U = 157;
-		public static final int ID_OTIMES = 158;
-		public static final int ID_OUML_L = 159;
-		public static final int ID_OUML_U = 160;
-		public static final int ID_PARA = 161;
-		public static final int ID_PART = 162;
-		public static final int ID_PERMIL = 163;
-		public static final int ID_PERP = 164;
-		public static final int ID_PHI_L = 165;
-		public static final int ID_PHI_U = 166;
-		public static final int ID_PIV = 167;
-		public static final int ID_PI_L = 168;
-		public static final int ID_PI_U = 169;
-		public static final int ID_PLUSMN = 170;
-		public static final int ID_POUND = 171;
-		public static final int ID_PRIME_L = 172;
-		public static final int ID_PRIME_U = 173;
-		public static final int ID_PROD = 174;
-		public static final int ID_PROP = 175;
-		public static final int ID_PSI_L = 176;
-		public static final int ID_PSI_U = 177;
-		public static final int ID_QUOT = 178;
-		public static final int ID_RADIC = 179;
-		public static final int ID_RANG = 180;
-		public static final int ID_RAQUO = 181;
-		public static final int ID_RARR_L = 182;
-		public static final int ID_RARR_U = 183;
-		public static final int ID_RCEIL = 184;
-		public static final int ID_RDQUO = 185;
-		public static final int ID_REAL = 186;
-		public static final int ID_REG = 187;
-		public static final int ID_RFLOOR = 188;
-		public static final int ID_RHO_L = 189;
-		public static final int ID_RHO_U = 190;
-		public static final int ID_RLM = 191;
-		public static final int ID_RSAQUO = 192;
-		public static final int ID_RSQUO = 193;
-		public static final int ID_SBQUO = 194;
-		public static final int ID_SCARON_L = 195;
-		public static final int ID_SCARON_U = 196;
-		public static final int ID_SDOT = 197;
-		public static final int ID_SECT = 198;
-		public static final int ID_SHY = 199;
-		public static final int ID_SIGMAF = 200;
-		public static final int ID_SIGMA_L = 201;
-		public static final int ID_SIGMA_U = 202;
-		public static final int ID_SIM = 203;
-		public static final int ID_SPADES = 204;
-		public static final int ID_SUB = 205;
-		public static final int ID_SUBE = 206;
-		public static final int ID_SUM = 207;
-		public static final int ID_SUP = 208;
-		public static final int ID_SUP1 = 209;
-		public static final int ID_SUP2 = 210;
-		public static final int ID_SUP3 = 211;
-		public static final int ID_SUPE = 212;
-		public static final int ID_SZLIG = 213;
-		public static final int ID_TAU_L = 214;
-		public static final int ID_TAU_U = 215;
-		public static final int ID_THERE4 = 216;
-		public static final int ID_THETASYM = 217;
-		public static final int ID_THETA_L = 218;
-		public static final int ID_THETA_U = 219;
-		public static final int ID_THINSP = 220;
-		public static final int ID_THORN_L = 221;
-		public static final int ID_THORN_U = 222;
-		public static final int ID_TILDE = 223;
-		public static final int ID_TIMES = 224;
-		public static final int ID_TRADE = 225;
-		public static final int ID_UACUTE_L = 226;
-		public static final int ID_UACUTE_U = 227;
-		public static final int ID_UARR_L = 228;
-		public static final int ID_UARR_U = 229;
-		public static final int ID_UCIRC_L = 230;
-		public static final int ID_UCIRC_U = 231;
-		public static final int ID_UGRAVE_L = 232;
-		public static final int ID_UGRAVE_U = 233;
-		public static final int ID_UML = 234;
-		public static final int ID_UPSIH = 235;
-		public static final int ID_UPSILON_L = 236;
-		public static final int ID_UPSILON_U = 237;
-		public static final int ID_UUML_L = 238;
-		public static final int ID_UUML_U = 239;
-		public static final int ID_WEIERP = 240;
-		public static final int ID_XI_L = 241;
-		public static final int ID_XI_U = 242;
-		public static final int ID_YACUTE_L = 243;
-		public static final int ID_YACUTE_U = 244;
-		public static final int ID_YEN = 245;
-		public static final int ID_YUML_L = 246;
-		public static final int ID_YUML_U = 247;
-		public static final int ID_ZETA_L = 248;
-		public static final int ID_ZETA_U = 249;
-		public static final int ID_ZWJ = 250;
-		public static final int ID_ZWNJ = 251;
-
-		public static int getNumOfIds() {
-			if (numofids != -1)
-				return numofids;
-
-			// NOTE: If the reflection is too slow, this method should
-			// just return the literal value, like 252.
-			// -- 5/24/2001
-			Class clazz = Ids.class;
-			Field[] fields = clazz.getFields();
-			numofids = 0;
-			for (int i = 0; i < fields.length; i++) {
-				String name = fields[i].getName();
-				if (name.startsWith("ID_"))//$NON-NLS-1$
-					numofids++;
-			}
-			return numofids;
-		}
-
-		// chache the result of the reflection.
-		private static int numofids = -1;
-	}
-
-	private static String[] names = null;
-
-	static {
-		names = new String[Ids.getNumOfIds()];
-		names[Ids.ID_AACUTE_L] = AACUTE_L;
-		names[Ids.ID_AACUTE_U] = AACUTE_U;
-		names[Ids.ID_ACIRC_L] = ACIRC_L;
-		names[Ids.ID_ACIRC_U] = ACIRC_U;
-		names[Ids.ID_ACUTE] = ACUTE;
-		names[Ids.ID_AELIG_L] = AELIG_L;
-		names[Ids.ID_AELIG_U] = AELIG_U;
-		names[Ids.ID_AGRAVE_L] = AGRAVE_L;
-		names[Ids.ID_AGRAVE_U] = AGRAVE_U;
-		names[Ids.ID_ALEFSYM] = ALEFSYM;
-		names[Ids.ID_ALPHA_L] = ALPHA_L;
-		names[Ids.ID_ALPHA_U] = ALPHA_U;
-		names[Ids.ID_AMP] = AMP;
-		names[Ids.ID_AND] = AND;
-		names[Ids.ID_ANG] = ANG;
-		names[Ids.ID_ARING_L] = ARING_L;
-		names[Ids.ID_ARING_U] = ARING_U;
-		names[Ids.ID_ASYMP] = ASYMP;
-		names[Ids.ID_ATILDE_L] = ATILDE_L;
-		names[Ids.ID_ATILDE_U] = ATILDE_U;
-		names[Ids.ID_AUML_L] = AUML_L;
-		names[Ids.ID_AUML_U] = AUML_U;
-		names[Ids.ID_BDQUO] = BDQUO;
-		names[Ids.ID_BETA_L] = BETA_L;
-		names[Ids.ID_BETA_U] = BETA_U;
-		names[Ids.ID_BRVBAR] = BRVBAR;
-		names[Ids.ID_BULL] = BULL;
-		names[Ids.ID_CAP] = CAP;
-		names[Ids.ID_CCEDIL_L] = CCEDIL_L;
-		names[Ids.ID_CCEDIL_U] = CCEDIL_U;
-		names[Ids.ID_CEDIL] = CEDIL;
-		names[Ids.ID_CENT] = CENT;
-		names[Ids.ID_CHI_L] = CHI_L;
-		names[Ids.ID_CHI_U] = CHI_U;
-		names[Ids.ID_CIRC] = CIRC;
-		names[Ids.ID_CLUBS] = CLUBS;
-		names[Ids.ID_CONG] = CONG;
-		names[Ids.ID_COPY] = COPY;
-		names[Ids.ID_CRARR] = CRARR;
-		names[Ids.ID_CUP] = CUP;
-		names[Ids.ID_CURREN] = CURREN;
-		names[Ids.ID_DAGGER_L] = DAGGER_L;
-		names[Ids.ID_DAGGER_U] = DAGGER_U;
-		names[Ids.ID_DARR_L] = DARR_L;
-		names[Ids.ID_DARR_U] = DARR_U;
-		names[Ids.ID_DEG] = DEG;
-		names[Ids.ID_DELTA_L] = DELTA_L;
-		names[Ids.ID_DELTA_U] = DELTA_U;
-		names[Ids.ID_DIAMS] = DIAMS;
-		names[Ids.ID_DIVIDE] = DIVIDE;
-		names[Ids.ID_EACUTE_L] = EACUTE_L;
-		names[Ids.ID_EACUTE_U] = EACUTE_U;
-		names[Ids.ID_ECIRC_L] = ECIRC_L;
-		names[Ids.ID_ECIRC_U] = ECIRC_U;
-		names[Ids.ID_EGRAVE_L] = EGRAVE_L;
-		names[Ids.ID_EGRAVE_U] = EGRAVE_U;
-		names[Ids.ID_EMPTY] = EMPTY;
-		names[Ids.ID_EMSP] = EMSP;
-		names[Ids.ID_ENSP] = ENSP;
-		names[Ids.ID_EPSILON_L] = EPSILON_L;
-		names[Ids.ID_EPSILON_U] = EPSILON_U;
-		names[Ids.ID_EQUIV] = EQUIV;
-		names[Ids.ID_ETA_L] = ETA_L;
-		names[Ids.ID_ETA_U] = ETA_U;
-		names[Ids.ID_ETH_L] = ETH_L;
-		names[Ids.ID_ETH_U] = ETH_U;
-		names[Ids.ID_EUML_L] = EUML_L;
-		names[Ids.ID_EUML_U] = EUML_U;
-		names[Ids.ID_EURO] = EURO;
-		names[Ids.ID_EXIST] = EXIST;
-		names[Ids.ID_FNOF] = FNOF;
-		names[Ids.ID_FORALL] = FORALL;
-		names[Ids.ID_FRAC12] = FRAC12;
-		names[Ids.ID_FRAC14] = FRAC14;
-		names[Ids.ID_FRAC34] = FRAC34;
-		names[Ids.ID_FRASL] = FRASL;
-		names[Ids.ID_GAMMA_L] = GAMMA_L;
-		names[Ids.ID_GAMMA_U] = GAMMA_U;
-		names[Ids.ID_GE] = GE;
-		names[Ids.ID_GT] = GT;
-		names[Ids.ID_HARR_L] = HARR_L;
-		names[Ids.ID_HARR_U] = HARR_U;
-		names[Ids.ID_HEARTS] = HEARTS;
-		names[Ids.ID_HELLIP] = HELLIP;
-		names[Ids.ID_IACUTE_L] = IACUTE_L;
-		names[Ids.ID_IACUTE_U] = IACUTE_U;
-		names[Ids.ID_ICIRC_L] = ICIRC_L;
-		names[Ids.ID_ICIRC_U] = ICIRC_U;
-		names[Ids.ID_IEXCL] = IEXCL;
-		names[Ids.ID_IGRAVE_L] = IGRAVE_L;
-		names[Ids.ID_IGRAVE_U] = IGRAVE_U;
-		names[Ids.ID_IMAGE] = IMAGE;
-		names[Ids.ID_INFIN] = INFIN;
-		names[Ids.ID_INT] = INT;
-		names[Ids.ID_IOTA_L] = IOTA_L;
-		names[Ids.ID_IOTA_U] = IOTA_U;
-		names[Ids.ID_IQUEST] = IQUEST;
-		names[Ids.ID_ISIN] = ISIN;
-		names[Ids.ID_IUML_L] = IUML_L;
-		names[Ids.ID_IUML_U] = IUML_U;
-		names[Ids.ID_KAPPA_L] = KAPPA_L;
-		names[Ids.ID_KAPPA_U] = KAPPA_U;
-		names[Ids.ID_LAMBDA_L] = LAMBDA_L;
-		names[Ids.ID_LAMBDA_U] = LAMBDA_U;
-		names[Ids.ID_LANG] = LANG;
-		names[Ids.ID_LAQUO] = LAQUO;
-		names[Ids.ID_LARR_L] = LARR_L;
-		names[Ids.ID_LARR_U] = LARR_U;
-		names[Ids.ID_LCEIL] = LCEIL;
-		names[Ids.ID_LDQUO] = LDQUO;
-		names[Ids.ID_LE] = LE;
-		names[Ids.ID_LFLOOR] = LFLOOR;
-		names[Ids.ID_LOWAST] = LOWAST;
-		names[Ids.ID_LOZ] = LOZ;
-		names[Ids.ID_LRM] = LRM;
-		names[Ids.ID_LSAQUO] = LSAQUO;
-		names[Ids.ID_LSQUO] = LSQUO;
-		names[Ids.ID_LT] = LT;
-		names[Ids.ID_MACR] = MACR;
-		names[Ids.ID_MDASH] = MDASH;
-		names[Ids.ID_MICRO] = MICRO;
-		names[Ids.ID_MIDDOT] = MIDDOT;
-		names[Ids.ID_MINUS] = MINUS;
-		names[Ids.ID_MU_L] = MU_L;
-		names[Ids.ID_MU_U] = MU_U;
-		names[Ids.ID_NABLA] = NABLA;
-		names[Ids.ID_NBSP] = NBSP;
-		names[Ids.ID_NDASH] = NDASH;
-		names[Ids.ID_NE] = NE;
-		names[Ids.ID_NI] = NI;
-		names[Ids.ID_NOT] = NOT;
-		names[Ids.ID_NOTIN] = NOTIN;
-		names[Ids.ID_NSUB] = NSUB;
-		names[Ids.ID_NTILDE_L] = NTILDE_L;
-		names[Ids.ID_NTILDE_U] = NTILDE_U;
-		names[Ids.ID_NU_L] = NU_L;
-		names[Ids.ID_NU_U] = NU_U;
-		names[Ids.ID_OACUTE_L] = OACUTE_L;
-		names[Ids.ID_OACUTE_U] = OACUTE_U;
-		names[Ids.ID_OCIRC_L] = OCIRC_L;
-		names[Ids.ID_OCIRC_U] = OCIRC_U;
-		names[Ids.ID_OELIG_L] = OELIG_L;
-		names[Ids.ID_OELIG_U] = OELIG_U;
-		names[Ids.ID_OGRAVE_L] = OGRAVE_L;
-		names[Ids.ID_OGRAVE_U] = OGRAVE_U;
-		names[Ids.ID_OLINE] = OLINE;
-		names[Ids.ID_OMEGA_L] = OMEGA_L;
-		names[Ids.ID_OMEGA_U] = OMEGA_U;
-		names[Ids.ID_OMICRON_L] = OMICRON_L;
-		names[Ids.ID_OMICRON_U] = OMICRON_U;
-		names[Ids.ID_OPLUS] = OPLUS;
-		names[Ids.ID_OR] = OR;
-		names[Ids.ID_ORDF] = ORDF;
-		names[Ids.ID_ORDM] = ORDM;
-		names[Ids.ID_OSLASH_L] = OSLASH_L;
-		names[Ids.ID_OSLASH_U] = OSLASH_U;
-		names[Ids.ID_OTILDE_L] = OTILDE_L;
-		names[Ids.ID_OTILDE_U] = OTILDE_U;
-		names[Ids.ID_OTIMES] = OTIMES;
-		names[Ids.ID_OUML_L] = OUML_L;
-		names[Ids.ID_OUML_U] = OUML_U;
-		names[Ids.ID_PARA] = PARA;
-		names[Ids.ID_PART] = PART;
-		names[Ids.ID_PERMIL] = PERMIL;
-		names[Ids.ID_PERP] = PERP;
-		names[Ids.ID_PHI_L] = PHI_L;
-		names[Ids.ID_PHI_U] = PHI_U;
-		names[Ids.ID_PIV] = PIV;
-		names[Ids.ID_PI_L] = PI_L;
-		names[Ids.ID_PI_U] = PI_U;
-		names[Ids.ID_PLUSMN] = PLUSMN;
-		names[Ids.ID_POUND] = POUND;
-		names[Ids.ID_PRIME_L] = PRIME_L;
-		names[Ids.ID_PRIME_U] = PRIME_U;
-		names[Ids.ID_PROD] = PROD;
-		names[Ids.ID_PROP] = PROP;
-		names[Ids.ID_PSI_L] = PSI_L;
-		names[Ids.ID_PSI_U] = PSI_U;
-		names[Ids.ID_QUOT] = QUOT;
-		names[Ids.ID_RADIC] = RADIC;
-		names[Ids.ID_RANG] = RANG;
-		names[Ids.ID_RAQUO] = RAQUO;
-		names[Ids.ID_RARR_L] = RARR_L;
-		names[Ids.ID_RARR_U] = RARR_U;
-		names[Ids.ID_RCEIL] = RCEIL;
-		names[Ids.ID_RDQUO] = RDQUO;
-		names[Ids.ID_REAL] = REAL;
-		names[Ids.ID_REG] = REG;
-		names[Ids.ID_RFLOOR] = RFLOOR;
-		names[Ids.ID_RHO_L] = RHO_L;
-		names[Ids.ID_RHO_U] = RHO_U;
-		names[Ids.ID_RLM] = RLM;
-		names[Ids.ID_RSAQUO] = RSAQUO;
-		names[Ids.ID_RSQUO] = RSQUO;
-		names[Ids.ID_SBQUO] = SBQUO;
-		names[Ids.ID_SCARON_L] = SCARON_L;
-		names[Ids.ID_SCARON_U] = SCARON_U;
-		names[Ids.ID_SDOT] = SDOT;
-		names[Ids.ID_SECT] = SECT;
-		names[Ids.ID_SHY] = SHY;
-		names[Ids.ID_SIGMAF] = SIGMAF;
-		names[Ids.ID_SIGMA_L] = SIGMA_L;
-		names[Ids.ID_SIGMA_U] = SIGMA_U;
-		names[Ids.ID_SIM] = SIM;
-		names[Ids.ID_SPADES] = SPADES;
-		names[Ids.ID_SUB] = SUB;
-		names[Ids.ID_SUBE] = SUBE;
-		names[Ids.ID_SUM] = SUM;
-		names[Ids.ID_SUP] = SUP;
-		names[Ids.ID_SUP1] = SUP1;
-		names[Ids.ID_SUP2] = SUP2;
-		names[Ids.ID_SUP3] = SUP3;
-		names[Ids.ID_SUPE] = SUPE;
-		names[Ids.ID_SZLIG] = SZLIG;
-		names[Ids.ID_TAU_L] = TAU_L;
-		names[Ids.ID_TAU_U] = TAU_U;
-		names[Ids.ID_THERE4] = THERE4;
-		names[Ids.ID_THETASYM] = THETASYM;
-		names[Ids.ID_THETA_L] = THETA_L;
-		names[Ids.ID_THETA_U] = THETA_U;
-		names[Ids.ID_THINSP] = THINSP;
-		names[Ids.ID_THORN_L] = THORN_L;
-		names[Ids.ID_THORN_U] = THORN_U;
-		names[Ids.ID_TILDE] = TILDE;
-		names[Ids.ID_TIMES] = TIMES;
-		names[Ids.ID_TRADE] = TRADE;
-		names[Ids.ID_UACUTE_L] = UACUTE_L;
-		names[Ids.ID_UACUTE_U] = UACUTE_U;
-		names[Ids.ID_UARR_L] = UARR_L;
-		names[Ids.ID_UARR_U] = UARR_U;
-		names[Ids.ID_UCIRC_L] = UCIRC_L;
-		names[Ids.ID_UCIRC_U] = UCIRC_U;
-		names[Ids.ID_UGRAVE_L] = UGRAVE_L;
-		names[Ids.ID_UGRAVE_U] = UGRAVE_U;
-		names[Ids.ID_UML] = UML;
-		names[Ids.ID_UPSIH] = UPSIH;
-		names[Ids.ID_UPSILON_L] = UPSILON_L;
-		names[Ids.ID_UPSILON_U] = UPSILON_U;
-		names[Ids.ID_UUML_L] = UUML_L;
-		names[Ids.ID_UUML_U] = UUML_U;
-		names[Ids.ID_WEIERP] = WEIERP;
-		names[Ids.ID_XI_L] = XI_L;
-		names[Ids.ID_XI_U] = XI_U;
-		names[Ids.ID_YACUTE_L] = YACUTE_L;
-		names[Ids.ID_YACUTE_U] = YACUTE_U;
-		names[Ids.ID_YEN] = YEN;
-		names[Ids.ID_YUML_L] = YUML_L;
-		names[Ids.ID_YUML_U] = YUML_U;
-		names[Ids.ID_ZETA_L] = ZETA_L;
-		names[Ids.ID_ZETA_U] = ZETA_U;
-		names[Ids.ID_ZWJ] = ZWJ;
-		names[Ids.ID_ZWNJ] = ZWNJ;
-	}
-	private static char[] values = null;
-
-	static {
-		values = new char[Ids.getNumOfIds()];
-		values[Ids.ID_AACUTE_L] = 225;
-		values[Ids.ID_AACUTE_U] = 193;
-		values[Ids.ID_ACIRC_L] = 226;
-		values[Ids.ID_ACIRC_U] = 194;
-		values[Ids.ID_ACUTE] = 180;
-		values[Ids.ID_AELIG_L] = 230;
-		values[Ids.ID_AELIG_U] = 198;
-		values[Ids.ID_AGRAVE_L] = 224;
-		values[Ids.ID_AGRAVE_U] = 192;
-		values[Ids.ID_ALEFSYM] = 8501;
-		values[Ids.ID_ALPHA_L] = 945;
-		values[Ids.ID_ALPHA_U] = 913;
-		values[Ids.ID_AMP] = 38;
-		values[Ids.ID_AND] = 8743;
-		values[Ids.ID_ANG] = 8736;
-		values[Ids.ID_ARING_L] = 229;
-		values[Ids.ID_ARING_U] = 197;
-		values[Ids.ID_ASYMP] = 8776;
-		values[Ids.ID_ATILDE_L] = 227;
-		values[Ids.ID_ATILDE_U] = 195;
-		values[Ids.ID_AUML_L] = 228;
-		values[Ids.ID_AUML_U] = 196;
-		values[Ids.ID_BDQUO] = 8222;
-		values[Ids.ID_BETA_L] = 946;
-		values[Ids.ID_BETA_U] = 914;
-		values[Ids.ID_BRVBAR] = 166;
-		values[Ids.ID_BULL] = 8226;
-		values[Ids.ID_CAP] = 8745;
-		values[Ids.ID_CCEDIL_L] = 231;
-		values[Ids.ID_CCEDIL_U] = 199;
-		values[Ids.ID_CEDIL] = 184;
-		values[Ids.ID_CENT] = 162;
-		values[Ids.ID_CHI_L] = 967;
-		values[Ids.ID_CHI_U] = 935;
-		values[Ids.ID_CIRC] = 710;
-		values[Ids.ID_CLUBS] = 9827;
-		values[Ids.ID_CONG] = 8773;
-		values[Ids.ID_COPY] = 169;
-		values[Ids.ID_CRARR] = 8629;
-		values[Ids.ID_CUP] = 8746;
-		values[Ids.ID_CURREN] = 164;
-		values[Ids.ID_DAGGER_L] = 8224;
-		values[Ids.ID_DAGGER_U] = 8225;
-		values[Ids.ID_DARR_L] = 8595;
-		values[Ids.ID_DARR_U] = 8659;
-		values[Ids.ID_DEG] = 176;
-		values[Ids.ID_DELTA_L] = 948;
-		values[Ids.ID_DELTA_U] = 916;
-		values[Ids.ID_DIAMS] = 9830;
-		values[Ids.ID_DIVIDE] = 247;
-		values[Ids.ID_EACUTE_L] = 233;
-		values[Ids.ID_EACUTE_U] = 201;
-		values[Ids.ID_ECIRC_L] = 234;
-		values[Ids.ID_ECIRC_U] = 202;
-		values[Ids.ID_EGRAVE_L] = 232;
-		values[Ids.ID_EGRAVE_U] = 200;
-		values[Ids.ID_EMPTY] = 8709;
-		values[Ids.ID_EMSP] = 8195;
-		values[Ids.ID_ENSP] = 8194;
-		values[Ids.ID_EPSILON_L] = 949;
-		values[Ids.ID_EPSILON_U] = 917;
-		values[Ids.ID_EQUIV] = 8801;
-		values[Ids.ID_ETA_L] = 951;
-		values[Ids.ID_ETA_U] = 919;
-		values[Ids.ID_ETH_L] = 240;
-		values[Ids.ID_ETH_U] = 208;
-		values[Ids.ID_EUML_L] = 235;
-		values[Ids.ID_EUML_U] = 203;
-		values[Ids.ID_EURO] = 8364;
-		values[Ids.ID_EXIST] = 8707;
-		values[Ids.ID_FNOF] = 402;
-		values[Ids.ID_FORALL] = 8704;
-		values[Ids.ID_FRAC12] = 189;
-		values[Ids.ID_FRAC14] = 188;
-		values[Ids.ID_FRAC34] = 190;
-		values[Ids.ID_FRASL] = 8260;
-		values[Ids.ID_GAMMA_L] = 947;
-		values[Ids.ID_GAMMA_U] = 915;
-		values[Ids.ID_GE] = 8805;
-		values[Ids.ID_GT] = 62;
-		values[Ids.ID_HARR_L] = 8596;
-		values[Ids.ID_HARR_U] = 8660;
-		values[Ids.ID_HEARTS] = 9829;
-		values[Ids.ID_HELLIP] = 8230;
-		values[Ids.ID_IACUTE_L] = 237;
-		values[Ids.ID_IACUTE_U] = 205;
-		values[Ids.ID_ICIRC_L] = 238;
-		values[Ids.ID_ICIRC_U] = 206;
-		values[Ids.ID_IEXCL] = 161;
-		values[Ids.ID_IGRAVE_L] = 236;
-		values[Ids.ID_IGRAVE_U] = 204;
-		values[Ids.ID_IMAGE] = 8465;
-		values[Ids.ID_INFIN] = 8734;
-		values[Ids.ID_INT] = 8747;
-		values[Ids.ID_IOTA_L] = 953;
-		values[Ids.ID_IOTA_U] = 921;
-		values[Ids.ID_IQUEST] = 191;
-		values[Ids.ID_ISIN] = 8712;
-		values[Ids.ID_IUML_L] = 239;
-		values[Ids.ID_IUML_U] = 207;
-		values[Ids.ID_KAPPA_L] = 954;
-		values[Ids.ID_KAPPA_U] = 922;
-		values[Ids.ID_LAMBDA_L] = 955;
-		values[Ids.ID_LAMBDA_U] = 923;
-		values[Ids.ID_LANG] = 9001;
-		values[Ids.ID_LAQUO] = 171;
-		values[Ids.ID_LARR_L] = 8592;
-		values[Ids.ID_LARR_U] = 8656;
-		values[Ids.ID_LCEIL] = 8968;
-		values[Ids.ID_LDQUO] = 8220;
-		values[Ids.ID_LE] = 8804;
-		values[Ids.ID_LFLOOR] = 8970;
-		values[Ids.ID_LOWAST] = 8727;
-		values[Ids.ID_LOZ] = 9674;
-		values[Ids.ID_LRM] = 8206;
-		values[Ids.ID_LSAQUO] = 8249;
-		values[Ids.ID_LSQUO] = 8216;
-		values[Ids.ID_LT] = 60;
-		values[Ids.ID_MACR] = 175;
-		values[Ids.ID_MDASH] = 8212;
-		values[Ids.ID_MICRO] = 181;
-		values[Ids.ID_MIDDOT] = 183;
-		values[Ids.ID_MINUS] = 8722;
-		values[Ids.ID_MU_L] = 956;
-		values[Ids.ID_MU_U] = 924;
-		values[Ids.ID_NABLA] = 8711;
-		values[Ids.ID_NBSP] = 160;
-		values[Ids.ID_NDASH] = 8211;
-		values[Ids.ID_NE] = 8800;
-		values[Ids.ID_NI] = 8715;
-		values[Ids.ID_NOT] = 172;
-		values[Ids.ID_NOTIN] = 8713;
-		values[Ids.ID_NSUB] = 8836;
-		values[Ids.ID_NTILDE_L] = 241;
-		values[Ids.ID_NTILDE_U] = 209;
-		values[Ids.ID_NU_L] = 957;
-		values[Ids.ID_NU_U] = 925;
-		values[Ids.ID_OACUTE_L] = 243;
-		values[Ids.ID_OACUTE_U] = 211;
-		values[Ids.ID_OCIRC_L] = 244;
-		values[Ids.ID_OCIRC_U] = 212;
-		values[Ids.ID_OELIG_L] = 339;
-		values[Ids.ID_OELIG_U] = 338;
-		values[Ids.ID_OGRAVE_L] = 242;
-		values[Ids.ID_OGRAVE_U] = 210;
-		values[Ids.ID_OLINE] = 8254;
-		values[Ids.ID_OMEGA_L] = 969;
-		values[Ids.ID_OMEGA_U] = 937;
-		values[Ids.ID_OMICRON_L] = 959;
-		values[Ids.ID_OMICRON_U] = 927;
-		values[Ids.ID_OPLUS] = 8853;
-		values[Ids.ID_OR] = 8744;
-		values[Ids.ID_ORDF] = 170;
-		values[Ids.ID_ORDM] = 186;
-		values[Ids.ID_OSLASH_L] = 248;
-		values[Ids.ID_OSLASH_U] = 216;
-		values[Ids.ID_OTILDE_L] = 245;
-		values[Ids.ID_OTILDE_U] = 213;
-		values[Ids.ID_OTIMES] = 8855;
-		values[Ids.ID_OUML_L] = 246;
-		values[Ids.ID_OUML_U] = 214;
-		values[Ids.ID_PARA] = 182;
-		values[Ids.ID_PART] = 8706;
-		values[Ids.ID_PERMIL] = 8240;
-		values[Ids.ID_PERP] = 8869;
-		values[Ids.ID_PHI_L] = 966;
-		values[Ids.ID_PHI_U] = 934;
-		values[Ids.ID_PIV] = 982;
-		values[Ids.ID_PI_L] = 960;
-		values[Ids.ID_PI_U] = 928;
-		values[Ids.ID_PLUSMN] = 177;
-		values[Ids.ID_POUND] = 163;
-		values[Ids.ID_PRIME_L] = 8242;
-		values[Ids.ID_PRIME_U] = 8243;
-		values[Ids.ID_PROD] = 8719;
-		values[Ids.ID_PROP] = 8733;
-		values[Ids.ID_PSI_L] = 968;
-		values[Ids.ID_PSI_U] = 936;
-		values[Ids.ID_QUOT] = 34;
-		values[Ids.ID_RADIC] = 8730;
-		values[Ids.ID_RANG] = 9002;
-		values[Ids.ID_RAQUO] = 187;
-		values[Ids.ID_RARR_L] = 8594;
-		values[Ids.ID_RARR_U] = 8658;
-		values[Ids.ID_RCEIL] = 8969;
-		values[Ids.ID_RDQUO] = 8221;
-		values[Ids.ID_REAL] = 8476;
-		values[Ids.ID_REG] = 174;
-		values[Ids.ID_RFLOOR] = 8971;
-		values[Ids.ID_RHO_L] = 961;
-		values[Ids.ID_RHO_U] = 929;
-		values[Ids.ID_RLM] = 8207;
-		values[Ids.ID_RSAQUO] = 8250;
-		values[Ids.ID_RSQUO] = 8217;
-		values[Ids.ID_SBQUO] = 8218;
-		values[Ids.ID_SCARON_L] = 353;
-		values[Ids.ID_SCARON_U] = 352;
-		values[Ids.ID_SDOT] = 8901;
-		values[Ids.ID_SECT] = 167;
-		values[Ids.ID_SHY] = 173;
-		values[Ids.ID_SIGMAF] = 962;
-		values[Ids.ID_SIGMA_L] = 963;
-		values[Ids.ID_SIGMA_U] = 931;
-		values[Ids.ID_SIM] = 8764;
-		values[Ids.ID_SPADES] = 9824;
-		values[Ids.ID_SUB] = 8834;
-		values[Ids.ID_SUBE] = 8838;
-		values[Ids.ID_SUM] = 8721;
-		values[Ids.ID_SUP] = 8835;
-		values[Ids.ID_SUP1] = 185;
-		values[Ids.ID_SUP2] = 178;
-		values[Ids.ID_SUP3] = 179;
-		values[Ids.ID_SUPE] = 8839;
-		values[Ids.ID_SZLIG] = 223;
-		values[Ids.ID_TAU_L] = 964;
-		values[Ids.ID_TAU_U] = 932;
-		values[Ids.ID_THERE4] = 8756;
-		values[Ids.ID_THETASYM] = 977;
-		values[Ids.ID_THETA_L] = 952;
-		values[Ids.ID_THETA_U] = 920;
-		values[Ids.ID_THINSP] = 8201;
-		values[Ids.ID_THORN_L] = 254;
-		values[Ids.ID_THORN_U] = 222;
-		values[Ids.ID_TILDE] = 732;
-		values[Ids.ID_TIMES] = 215;
-		values[Ids.ID_TRADE] = 8482;
-		values[Ids.ID_UACUTE_L] = 250;
-		values[Ids.ID_UACUTE_U] = 218;
-		values[Ids.ID_UARR_L] = 8593;
-		values[Ids.ID_UARR_U] = 8657;
-		values[Ids.ID_UCIRC_L] = 251;
-		values[Ids.ID_UCIRC_U] = 219;
-		values[Ids.ID_UGRAVE_L] = 249;
-		values[Ids.ID_UGRAVE_U] = 217;
-		values[Ids.ID_UML] = 168;
-		values[Ids.ID_UPSIH] = 978;
-		values[Ids.ID_UPSILON_L] = 965;
-		values[Ids.ID_UPSILON_U] = 933;
-		values[Ids.ID_UUML_L] = 252;
-		values[Ids.ID_UUML_U] = 220;
-		values[Ids.ID_WEIERP] = 8472;
-		values[Ids.ID_XI_L] = 958;
-		values[Ids.ID_XI_U] = 926;
-		values[Ids.ID_YACUTE_L] = 253;
-		values[Ids.ID_YACUTE_U] = 221;
-		values[Ids.ID_YEN] = 165;
-		values[Ids.ID_YUML_L] = 255;
-		values[Ids.ID_YUML_U] = 376;
-		values[Ids.ID_ZETA_L] = 950;
-		values[Ids.ID_ZETA_U] = 918;
-		values[Ids.ID_ZWJ] = 8205;
-		values[Ids.ID_ZWNJ] = 8204;
-	}
-
-	/**
-	 */
-	public EntityCollection() {
-		super(names, STRICT_CASE);
-	}
-
-	/**
-	 * Create an entity declaration.
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 * @param attrName java.lang.String
-	 */
-	protected CMNode create(String entityName) {
-		int id = getID(entityName);
-		if (id == ID_UNKNOWN)
-			return null;
-
-		String value = String.valueOf(values[id]);
-		HTMLEntityDeclImpl dec = new HTMLEntityDeclImpl(entityName, value);
-
-		return dec;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HCMDocImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HCMDocImpl.java
deleted file mode 100644
index daef5ce..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HCMDocImpl.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * CMDocument implementation for the HTML.
- */
-class HCMDocImpl extends CMNodeImpl implements HTMLCMDocument {
-
-	/** Namespace for all names of elements, entities and attributes. */
-	private CMNamespaceImpl namespace = null;
-	private ElementCollection elements = null;
-	private EntityCollection entities = null;
-	private AttributeCollection attributes = null;
-
-	/**
-	 */
-	public HCMDocImpl(String docTypeName, CMNamespaceImpl targetNamespace) {
-		super(docTypeName);
-		namespace = targetNamespace;
-		attributes = new AttributeCollection();
-		elements = new ElementCollection(attributes);
-		entities = new EntityCollection();
-	}
-
-	AttributeCollection getAttributes() {
-		return attributes;
-	}
-
-	public HTMLElementDeclaration getElementDeclaration(String elementName) {
-		if (elements == null)
-			return null;
-		return (HTMLElementDeclaration) elements.getNamedItem(elementName);
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMDocument
-	 */
-	public CMNamedNodeMap getElements() {
-		return elements;
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMDocument
-	 */
-	public CMNamedNodeMap getEntities() {
-		return entities;
-	}
-
-	public HTMLEntityDeclaration getEntityDeclaration(String entityName) {
-		if (entities == null)
-			return null;
-		return (HTMLEntityDeclaration) entities.getNamedItem(entityName);
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMDocument
-	 */
-	public CMNamespace getNamespace() {
-		return namespace;
-	}
-
-	/**
-	 * @see CMNode
-	 */
-	public int getNodeType() {
-		return CMNode.DOCUMENT;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLAttrDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLAttrDeclImpl.java
deleted file mode 100644
index c03b2ec..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLAttrDeclImpl.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Implementation class of {@link <code>HTMLAttributeDeclaration</code>} interface.<br>
- */
-class HTMLAttrDeclImpl extends CMNodeImpl implements HTMLAttributeDeclaration {
-
-	private HTMLCMDataTypeImpl type = null;
-	private int usage = 0;
-
-	/**
-	 */
-	public HTMLAttrDeclImpl(String attrName, HTMLCMDataTypeImpl valueType, int valueUsage) {
-		super(attrName);
-		this.type = valueType;
-
-		switch (valueUsage) {
-			case OPTIONAL :
-			case REQUIRED :
-			case FIXED :
-			case PROHIBITED :
-				this.usage = valueUsage;
-				break;
-			default :
-				// should warn...
-				this.usage = OPTIONAL; // fall back
-				break;
-		}
-	}
-
-	/**
-	 * getAttrName method
-	 * @return java.lang.String
-	 */
-	public String getAttrName() {
-		return getNodeName();
-	}
-
-	/**
-	 * getAttrType method
-	 * @return CMDataType
-	 */
-	public CMDataType getAttrType() {
-		return type;
-	}
-
-	/**
-	 * @deprecated by superinterface
-	 */
-	public String getDefaultValue() {
-		if (type.getImpliedValueKind() != CMDataType.IMPLIED_VALUE_DEFAULT)
-			return null;
-		return type.getImpliedValue();
-	}
-
-	/**
-	 * @deprecated by superinterface
-	 */
-	public Enumeration getEnumAttr() {
-		Vector v = new Vector(Arrays.asList(type.getEnumeratedValues()));
-		return v.elements();
-	}
-
-	/**
-	 * getNodeType method
-	 * @return int
-	 *
-	 * Returns one of :
-	 * ELEMENT_DECLARATION, ATTRIBUTE_DECLARATION, GROUP, ENTITY_DECLARATION.
-	 */
-	public int getNodeType() {
-		return CMNode.ATTRIBUTE_DECLARATION;
-	}
-
-	/**
-	 * @return int
-	 */
-	public int getUsage() {
-		return usage;
-	}
-
-	/**
-	 */
-	public boolean supports(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE))
-			return true;
-		else if (propertyName.equals(HTMLCMProperties.IS_SCRIPTABLE))
-			return true;
-		return super.supports(propertyName);
-	}
-
-	/**
-	 */
-	public Object getProperty(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE))
-			return new Boolean(true);
-		else if (propertyName.equals(HTMLCMProperties.IS_SCRIPTABLE)) {
-			return getAttrType().getDataTypeName() == HTMLCMDataType.SCRIPT ? new Boolean(true) : new Boolean(false);
-		}
-		return super.getProperty(propertyName);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLAttributeDeclaration.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLAttributeDeclaration.java
deleted file mode 100644
index 1bff6f6..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLAttributeDeclaration.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-
-
-
-/**
- * This interface is intended to be a public interface which has
- * interfaces defined in both of {@link <code>CMAttributeDeclaration</code>}
- * and {@link <code>HTMLCMNode</code>}.<br>
- */
-public interface HTMLAttributeDeclaration extends CMAttributeDeclaration {
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDataType.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDataType.java
deleted file mode 100644
index 34361dd..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDataType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-
-/**
- * HTML extension for data types.
- */
-public interface HTMLCMDataType extends CMDataType {
-
-	/** Boolean; it should be defined in CMDataType. */
-	public static final String BOOLEAN = "BOOLEAN"; //$NON-NLS-1$
-	public static final String COLOR = "COLOR"; //$NON-NLS-1$
-	public static final String EVENT = "EVENT"; //$NON-NLS-1$
-	public static final String IDREFS = "IDREFS"; //$NON-NLS-1$
-	/** Name; it should be defined in CMDataType. */
-	public static final String NAME = "NAME"; //$NON-NLS-1$
-	// Following types are just aliases.
-	/** %Character; == CDATA */
-	public static final String CHARACTER = CMDataType.CDATA;
-	/** %Charset; == CDATA */
-	public static final String CHARSET = CMDataType.CDATA;
-	/** %Charsets; == CDATA */
-	public static final String CHARSETS = CMDataType.CDATA;
-	/** %ContentType; == CDATA */
-	public static final String CONTENT_TYPE = CMDataType.CDATA;
-	/** %Coords; == CDATA */
-	public static final String COORDS = CMDataType.CDATA;
-	/** %Datetime; == CDATA */
-	public static final String DATETIME = CMDataType.CDATA;
-	/** %FrameTarget; == CDATA */
-	public static final String FRAME_TARGET = CMDataType.CDATA;
-	/** %LanguageCode; == NAME */
-	public static final String LANGUAGE_CODE = NAME;
-	/** %Length; == CDATA */
-	public static final String LENGTH = CMDataType.CDATA;
-	/** %LinkTypes; == CDATA */
-	public static final String LINK_TYPES = CMDataType.CDATA;
-	/** %LIStyle; == CDATA */
-	public static final String LI_STYLE = CMDataType.CDATA;
-	/** %MediaDesc; == CDATA */
-	public static final String MEDIA_DESC = CMDataType.CDATA;
-	/** %MultiLength; == CDATA */
-	public static final String MULTI_LENGTH = CMDataType.CDATA;
-	/** %OLStyle; == CDATA */
-	public static final String OL_STYLE = CMDataType.CDATA;
-	/** %Pixles; == CDATA */
-	public static final String PIXELS = CMDataType.CDATA;
-	/** %Script; == EVENT */
-	public static final String SCRIPT = EVENT;
-	/** %StyleSheet; == EVENT */
-	public static final String STYLE_SHEET = CMDataType.CDATA;
-	/** %Text; == CDATA */
-	public static final String TEXT = CMDataType.CDATA;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDataTypeImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDataTypeImpl.java
deleted file mode 100644
index fe6e688..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDataTypeImpl.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-
-
-/**
- */
-class HTMLCMDataTypeImpl extends CMNodeImpl implements HTMLCMDataType {
-
-	private int impliedValueKind = IMPLIED_VALUE_NONE;
-	private String impliedValue = null;
-	private final static String[] emptyArray = new String[0];
-	private String[] enumValues = emptyArray;
-	private String instanceValue = null;
-
-	/**
-	 * HTMLCMDataTypeImpl constructor comment.
-	 * @param nm java.lang.String
-	 */
-	public HTMLCMDataTypeImpl(String typeName) {
-		super(typeName);
-	}
-
-	/**
-	 * HTMLCMDataTypeImpl constructor comment.
-	 * @param nm java.lang.String
-	 */
-	public HTMLCMDataTypeImpl(String typeName, String instanceValue) {
-		super(typeName);
-		this.instanceValue = instanceValue;
-	}
-
-	/**
-	 * getTypeName method
-	 * @return java.lang.String
-	 *
-	 * This method returns a suitable default value that can be used when an instance of the data type is created.
-	 * This returns null of a suitable default is not available.
-	 */
-	public String generateInstanceValue() {
-		return instanceValue;
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMDataType
-	 */
-	public String getDataTypeName() {
-		return getNodeName();
-	}
-
-	/**
-	 * getTypeName method
-	 * @return java.lang.String[]
-	 *
-	 */
-	public String[] getEnumeratedValues() {
-		return enumValues;
-	}
-
-	/**
-	 * getTypeName method
-	 * @return java.lang.String  
-	 *
-	 * Returns the implied value or null if none exists.
-	 */
-	public String getImpliedValue() {
-		return impliedValue;
-	}
-
-	/**
-	 * getImpliedValueKind method
-	 * @return int
-	 *
-	 * Returns one of :
-	 * IMPLIED_VALUE_NONE, IMPLIED_VALUE_FIXED, IMPLIED_VALUE_DEFAULT.
-	 */
-	public int getImpliedValueKind() {
-		return impliedValueKind;
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 */
-	public int getNodeType() {
-		return CMNode.DATA_TYPE;
-	}
-
-	/**
-	 */
-	void setEnumValues(String[] values) {
-		enumValues = new String[values.length];
-		for (int i = 0; i < values.length; i++) {
-			enumValues[i] = values[i];
-		}
-	}
-
-	/**
-	 * package scope.
-	 */
-	void setImpliedValue(int kind, String value) {
-		switch (kind) {
-			case IMPLIED_VALUE_FIXED :
-			case IMPLIED_VALUE_DEFAULT :
-				impliedValueKind = kind;
-				impliedValue = value;
-				break;
-			case IMPLIED_VALUE_NONE :
-			default :
-				impliedValueKind = IMPLIED_VALUE_NONE;
-				impliedValue = null; // maybe a null string?
-				break;
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDocument.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDocument.java
deleted file mode 100644
index 1af5fa2..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDocument.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-
-
-
-/**
- * HTML extension for CMDocument.
- * This interface provides some short hand methods to get declarations
- * by a name.
- */
-public interface HTMLCMDocument extends CMDocument {
-
-	/**
-	 * A short hand method to get a element declaration for a HTML element.<br>
-	 * @param elementName java.lang.String
-	 */
-	HTMLElementDeclaration getElementDeclaration(String elementName);
-
-	/**
-	 * A short hand method to get a entity declaration of HTML documents.<br>
-	 * @param entityName java.lang.String
-	 */
-	HTMLEntityDeclaration getEntityDeclaration(String entityName);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDocumentFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDocumentFactory.java
deleted file mode 100644
index 18e901e..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDocumentFactory.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Hashtable;
-
-import org.eclipse.wst.html.core.internal.contentmodel.chtml.CHCMDocImpl;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType;
-
-/**
- * INodeAdapter factory for HTML and JSP documents.
- */
-public final class HTMLCMDocumentFactory {
-
-	private static Hashtable cmdocs = new Hashtable();
-
-	static {
-		CMNamespaceImpl h40ns = new CMNamespaceImpl(HTML40Namespace.HTML40_URI, HTML40Namespace.HTML40_TAG_PREFIX);
-		CMNamespaceImpl j11ns = new CMNamespaceImpl(JSP11Namespace.JSP11_URI, JSP11Namespace.JSP_TAG_PREFIX);
-
-		HCMDocImpl html40doc = new HCMDocImpl(CMDocType.HTML_DOC_TYPE, h40ns);
-		CHCMDocImpl chtmldoc = new CHCMDocImpl(CMDocType.CHTML_DOC_TYPE, h40ns);
-		JCMDocImpl jsp11doc = new JCMDocImpl(CMDocType.JSP11_DOC_TYPE, j11ns);
-
-		cmdocs.put(CMDocType.HTML_DOC_TYPE, html40doc);
-		cmdocs.put(CMDocType.CHTML_DOC_TYPE, chtmldoc);
-		cmdocs.put(CMDocType.JSP11_DOC_TYPE, jsp11doc);
-	}
-
-	/**
-	 * HTMLCMAdapterFactory constructor.
-	 */
-	private HTMLCMDocumentFactory() {
-		super();
-	}
-
-	/**
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMDocument
-	 * @param cmtype java.lang.String
-	 */
-	public static CMDocument getCMDocument(String cmtype) {
-		Object obj = cmdocs.get(cmtype);
-		if (obj == null)
-			return null;
-
-		return (CMDocument) obj;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMNode.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMNode.java
deleted file mode 100644
index 8538731..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMNode.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-/**
- * In HTML Documents, name and value of an attribute/element/entity
- * should be treated ignoring theirs case.  However, in XML documents,
- * they should be distinguished with sensitiveness of their case.
- * CMNode is basically designed to represent DTDs or Schemas for XML
- * documents.  So, it doesn't have interfaces to retrieve such information.
- * However, declarations in the HTML CM should provide such information.
- * This intermediate interface is intended to provide whether ignore cases
- * or not.<br>
- */
-interface HTMLCMNode extends org.eclipse.wst.xml.core.internal.contentmodel.CMNode {
-
-	/**
-	 * Returns <code>true</code>, if declaration is for HTML attribute/element/entity.
-	 * Otherwise, returns <code>false</code>.
-	 * @return boolean
-	 */
-	boolean shouldIgnoreCase();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLElemDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLElemDeclImpl.java
deleted file mode 100644
index 893c7d8..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLElemDeclImpl.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Base class for all Hed???? classes.
- */
-abstract class HTMLElemDeclImpl extends CMContentImpl implements HTMLElementDeclaration, HTMLPropertyDeclaration {
-
-	// DTD
-	protected CMNamedNodeMapImpl attributes = null;
-	protected String typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_EMPTY;
-	/** Never access this field directly.  Instead, use getComplexTypeDefinition method. */
-	private ComplexTypeDefinition typeDefinition = null;
-	protected CMGroupImpl inclusion = null;
-	protected CMGroupImpl exclusion = null;
-	// advanced information
-	protected CMNamedNodeMap prohibitedAncestors = null;
-	protected int correctionType = CORRECT_NONE;
-	protected int formatType = FORMAT_HTML;
-	protected int layoutType = LAYOUT_NONE;
-	protected int omitType = OMIT_NONE;
-	protected boolean keepSpaces = false;
-	protected boolean indentChild = false;
-	protected ElementCollection elementCollection = null;
-	protected AttributeCollection attributeCollection = null;
-	protected final static CMNamedNodeMap EMPTY_MAP = new CMNamedNodeMap() {
-		public int getLength() {
-			return 0;
-		}
-
-		public CMNode getNamedItem(String name) {
-			return null;
-		}
-
-		public CMNode item(int index) {
-			return null;
-		}
-
-		public Iterator iterator() {
-			return new Iterator() {
-				public boolean hasNext() {
-					return false;
-				}
-
-				public Object next() {
-					return null;
-				}
-
-				public void remove() {
-				}
-			};
-		}
-	};
-
-	/**
-	 * HTMLElemDeclImpl constructor.
-	 * In the HTML DTD, an element declaration has no specification
-	 * for its occurrence.  Occurrence is specifed in content model, like
-	 * <code>(LI)+</code>.  To avoid confusion (and complexity),
-	 * occurrence of an element declaration is always 1 (it means, min = 1 and
-	 * max = 1).  Instead, occurrence of CMGroup represents actual occurrence
-	 * of the content.
-	 * <br>
-	 * @param name java.lang.String
-	 */
-	public HTMLElemDeclImpl(String elementName, ElementCollection collection) {
-		super(elementName, 1, 1);
-		elementCollection = collection;
-		attributeCollection = collection.getAttributeCollection();
-	}
-
-	/**
-	 */
-	protected abstract void createAttributeDeclarations();
-
-	private ComplexTypeDefinition createComplexTypeDefinition() {
-		if (typeDefinitionName.equals(ComplexTypeDefinitionFactory.CTYPE_CDATA) || typeDefinitionName.equals(ComplexTypeDefinitionFactory.CTYPE_EMPTY) || typeDefinitionName.equals(ComplexTypeDefinitionFactory.CTYPE_PCDATA))
-			return null;
-
-		ComplexTypeDefinitionFactory factory = ComplexTypeDefinitionFactory.getInstance();
-		if (factory == null)
-			return null; // fatal error.
-
-		ComplexTypeDefinition def = factory.createTypeDefinition(typeDefinitionName, elementCollection);
-		return def;
-	}
-
-	/**
-	 * Get an attribute declaration.
-	 */
-	public HTMLAttributeDeclaration getAttributeDeclaration(String attrName) {
-		if (attributes == null) {
-			createAttributeDeclarations();
-			if (attributes == null)
-				return null; // fail to create
-		}
-
-		CMNode cmnode = attributes.getNamedItem(attrName);
-		if (cmnode == null) {
-			return null;
-		}
-		else {
-			return (HTMLAttributeDeclaration) cmnode; // already exists.
-		}
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public CMNamedNodeMap getAttributes() {
-		if (attributes == null)
-			createAttributeDeclarations(); // lazy eval.
-		return attributes;
-	}
-
-	/**
-	 * Get an instance of complex type definition.
-	 */
-	private ComplexTypeDefinition getComplexTypeDefinition() {
-		if (typeDefinition == null)
-			typeDefinition = createComplexTypeDefinition();
-		return typeDefinition;
-	}
-
-	/**
-	 * Content.<br>
-	 * Element declarations which type is EMPTY or CDATA (maybe PCDATA)
-	 * <strong>MUST</strong> override this method and always return null.
-	 * This default implementation always tries to create a complex type definition
-	 * instance and access to it.
-	 * <br>
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public CMContent getContent() {
-		ComplexTypeDefinition def = getComplexTypeDefinition(); // lazy eval.
-		return (def != null) ? def.getContent() : null;
-	}
-
-	/**
-	 * Content type.<br>
-	 * Element declarations which type is EMPTY or CDATA (maybe PCDATA)
-	 * <strong>MUST</strong> override this method and return an appropriate type.
-	 * This default implementation always tries to create a complex type definition
-	 * instance and access to it.
-	 * <br>
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public int getContentType() {
-		ComplexTypeDefinition def = getComplexTypeDefinition(); // lazy eval.
-		return (def != null) ? def.getContentType() : CMElementDeclaration.CDATA;
-	}
-
-	/**
-	 * @see HTMLElementDeclaration#getCorrectionType
-	 */
-	public int getCorrectionType() {
-		return correctionType;
-	}
-
-	/**
-	 * HTML element doesn't have any data type.  So, this method always
-	 * returns <code>null</code>.<br>
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public CMDataType getDataType() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public String getElementName() {
-		return getNodeName();
-	}
-
-	/**
-	 * Exclusion.
-	 * Almost elements don't have a exclusion.
-	 * Only classes those have exclusion should override this method.
-	 */
-	public CMContent getExclusion() {
-		return null;
-	}
-
-	/**
-	 * Default format type is <code>FORMAT_HTML</code>.<br>
-	 */
-	public int getFormatType() {
-		return formatType;
-	}
-
-	/**
-	 * Inclusion.
-	 * Almost elements don't have a inclusion.
-	 * Only classes those have inclusion should override this method.
-	 */
-	public CMContent getInclusion() {
-		return null;
-	}
-
-	/**
-	 */
-	public int getLayoutType() {
-		return layoutType;
-	}
-
-	/**
-	 * Line break hint is strongly related to layout type.
-	 * Indeed, in the C++DOM, it is determined from layout type only.
-	 * So, this implementation, as the default implementation for all declarations,
-	 * also determines from layout type only.<br>
-	 * @return int
-	 */
-	public int getLineBreakHint() {
-		switch (getLayoutType()) {
-			case HTMLElementDeclaration.LAYOUT_BLOCK :
-				return HTMLElementDeclaration.BREAK_BEFORE_START_AND_AFTER_END;
-			case HTMLElementDeclaration.LAYOUT_BREAK :
-				return HTMLElementDeclaration.BREAK_AFTER_START;
-			case HTMLElementDeclaration.LAYOUT_HIDDEN :
-				return HTMLElementDeclaration.BREAK_BEFORE_START_AND_AFTER_END;
-			default :
-				return HTMLElementDeclaration.BREAK_NONE;
-		}
-	}
-
-	/**
-	 * No HTML element has local elements.  So, this method always
-	 * returns an empty map.
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public CMNamedNodeMap getLocalElements() {
-		return EMPTY_MAP;
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 */
-	public int getNodeType() {
-		return CMNode.ELEMENT_DECLARATION;
-	}
-
-	/**
-	 */
-	public int getOmitType() {
-		return omitType;
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		return EMPTY_MAP;
-	}
-
-	/**
-	 */
-	public boolean supports(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE)) {
-			return true;
-		}
-		else if (propertyName.equals(HTMLCMProperties.CONTENT_HINT)) {
-			ComplexTypeDefinition def = getComplexTypeDefinition();
-			return (def != null);
-		}
-		else {
-			PropertyProvider pp = PropertyProviderFactory.getProvider(propertyName);
-			if (pp == null)
-				return false;
-			return pp.supports(this);
-		}
-
-	}
-
-	/**
-	 */
-	public Object getProperty(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE)) {
-			return new Boolean(true);
-		}
-		else if (propertyName.equals(HTMLCMProperties.CONTENT_HINT)) {
-			ComplexTypeDefinition def = getComplexTypeDefinition();
-			return (def != null) ? def.getPrimaryCandidate() : null;
-		}
-		else {
-			PropertyProvider pp = PropertyProviderFactory.getProvider(propertyName);
-			if (pp == null)
-				return null;
-			return pp.get(this);
-		}
-	}
-
-	/**
-	 * Return element names which terminates this element.<br>
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return null;
-	}
-
-	/**
-	 * return true when the element is a JSP element.
-	 */
-	public boolean isJSP() {
-		return false;
-	}
-
-	/**
-	 * In some elements, such as APPLET, a source generator should indent child
-	 * elements that their parents.  That is, a source generator should generate
-	 * source  of APPLET and PARAMS like this:
-	 * <PRE>
-	 *   &lt;APPLET ...&gt;
-	 *     &lt;PARAM ... &gt;
-	 *     &lt;PARAM ... &gt;
-	 *   &lt;/APPLET&gt;
-	 * <PRE>
-	 * @return boolean
-	 */
-	public boolean shouldIndentChildSource() {
-		return indentChild;
-	}
-
-	/**
-	 * Most of elements can compact spaces in their child text nodes.
-	 * Some special elements should keep them in their source.
-	 * @return boolean
-	 */
-	public boolean shouldKeepSpaces() {
-		return keepSpaces;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public boolean shouldTerminateAt(HTMLElementDeclaration nextElement) {
-		Iterator i = getTerminators();
-		if (i == null)
-			return false;
-		String nextName = nextElement.getElementName();
-		while (i.hasNext()) {
-			if (nextName.equals(i.next()))
-				return true;
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLElementDeclaration.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLElementDeclaration.java
deleted file mode 100644
index 7fe71f3..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLElementDeclaration.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-
-/**
- * This interface is intended to be a public interface which has
- * interfaces defined in both of {@link <code>CMElementDeclaration</code>}
- * and {@link <code>HTMLCMNode</code>}.<br>
- * In addition to this, some interfaces are added to this interface,
- * those are specially to HTML elements.<br>
- */
-public interface HTMLElementDeclaration extends CMElementDeclaration {
-
-	/** Tag ommission; Not ommisible. */
-	int OMIT_NONE = 0;
-	/** Tag ommission; Both tags are ommisible. */
-	int OMIT_BOTH = 1;
-	/** Tag ommission; The end tag is ommisible. */
-	int OMIT_END = 2;
-	/** Tag ommission; The end tag is ommitted when created. */
-	int OMIT_END_DEFAULT = 3;
-	/** Tag ommission; The end tag must be omitted. */
-	int OMIT_END_MUST = 4;
-	/** Line Break; No break. */
-	int BREAK_NONE = 10;
-	/** Line Break; Break after the start tag. */
-	int BREAK_AFTER_START = 11;
-	/** Line Break; Break both before the start tagn and after the end tag. */
-	int BREAK_BEFORE_START_AND_AFTER_END = 12;
-	/* Layout */
-	/** initial value; the value should never returns to client programs. */
-	int LAYOUT_NONE = 100;
-	int LAYOUT_BLOCK = 101;
-	int LAYOUT_WRAP = 102;
-	/** No wrap object; like IMG, APPLET,... */
-	int LAYOUT_OBJECT = 103;
-	/** BR */
-	int LAYOUT_BREAK = 104;
-	/** Hidden object; like HTML or HEAD */
-	int LAYOUT_HIDDEN = 105;
-	/* Correction */
-	/** Correct; No correct. */
-	int CORRECT_NONE = 1000;
-	/** Correct; Meaningless when the content is empty. */
-	int CORRECT_EMPTY = 1001;
-	/** Correct; Meaningless when no attribut is set. */
-	int CORRECT_NEUTRAL = 1002;
-	/** Correct; Meaningless when same element is nested. */
-	int CORRECT_DUPLICATED = 1003;
-	/** Format; HTML */
-	int FORMAT_HTML = 10000;
-	/** Format; SSI */
-	int FORMAT_SSI = 10001;
-	/** Format; JSP script */
-	int FORMAT_JSP_SCRIPT = 10002;
-	/** Format; JSP directive */
-	int FORMAT_JSP_DIRECTIVE = 10003;
-	/** Format; XML */
-	int FORMAT_XML = 10004;
-	/** Format; MW */
-	int FORMAT_MW = 10005;
-
-	/**
-	 * A short hand method to get an attribute declaration of a HTML element.
-	 * @param attrName java.lang.String
-	 */
-	HTMLAttributeDeclaration getAttributeDeclaration(String attrName);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLEntityDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLEntityDeclImpl.java
deleted file mode 100644
index 137647e..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLEntityDeclImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-
-
-/**
- */
-class HTMLEntityDeclImpl extends CMNodeImpl implements HTMLEntityDeclaration {
-
-	private java.lang.String value = null;
-
-	/**
-	 * CMEntityDeclImpl constructor comment.
-	 * @param entityName java.lang.String; Entity name.
-	 * @param entityValue java.lang.String; Value string.
-	 */
-	public HTMLEntityDeclImpl(String entityName, String entityValue) {
-		super(entityName);
-		value = entityValue;
-	}
-
-	/**
-	 * getName method
-	 * @return java.lang.String
-	 */
-	public String getName() {
-		return getNodeName();
-	}
-
-	/**
-	 * Get CMNode type.<br>
-	 * @return int; Always return ENTITY_DECLARATION.
-	 */
-	public int getNodeType() {
-		return CMNode.ENTITY_DECLARATION;
-	}
-
-	/**
-	 * getValue method
-	 * @return java.lang.String
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 */
-	public boolean supports(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE))
-			return true;
-		return super.supports(propertyName);
-	}
-
-	/**
-	 * Entities in HTML documents are always treated with ignoring cases.
-	 * Because no special entities are defined in JSP 1.0, this method
-	 * can always return <code>true</code>.<br>
-	 */
-	public Object getProperty(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE))
-			return new Boolean(true);
-		return super.getProperty(propertyName);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLEntityDeclaration.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLEntityDeclaration.java
deleted file mode 100644
index 2663e23..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLEntityDeclaration.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-/**
- * This interface is intended to be a public interface which has
- * interfaces defined in both of {@link <code>CMEntityDeclaration</code>}
- * and {@link <code>HTMLCMNode</code>}.<br>
- */
-public interface HTMLEntityDeclaration extends org.eclipse.wst.xml.core.internal.contentmodel.CMEntityDeclaration {
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLPropertyDeclaration.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLPropertyDeclaration.java
deleted file mode 100644
index 3553507..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLPropertyDeclaration.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * This interface is commonly used in declaration implementation, and internal use.
- * Use getProperty() method for public use.
- */
-public interface HTMLPropertyDeclaration {
-	/**
-	 * To determin the type, look up the following keywords in C++DOM/DTDParser.cpp:
-	 * <ul>
-	 *   <li>CORRECT_DUPLICATED - <code>GROUP_NODUP</code></li>
-	 *   <li>CORRECT_EMPTY - <code>GROUP_COMPACT</code></li>
-	 *   <li>CORRECT_NEUTRAL - <code>GROUP_NEUTRAL</code></li>
-	 *   <li>CORRECT_NONE - <code>(N/A)</code></li>
-	 * </ul>
-	 * @return int
-	 */
-	int getCorrectionType();
-	/**
-	 * Get the list of declarations those should be excluded from the content.<br>
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMContent
-	 */
-	CMContent getExclusion();
-	/**
-	 * To determin the type, see the following files in the C++DOM:
-	 *   ElementType.cpp - ElementType#setGroup().
-	 *   Element.cpp - Element#getStartTag().
-	 * @return int
-	 */
-	int getFormatType();
-	/**
-	 * Get the list of declarations those should be included into the content.<br>
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMContent
-	 */
-	CMContent getInclusion();
-	/**
-	 * To determin the type, look up the following keywords in C++DOM/DTDParser.cpp:
-	 * <ul>
-	 *   <li>LAYOUT_BLOCK - <code>GROUP_BLOCK</code></li>
-	 *   <li>LAYOUT_BREAK - <code>GROUP_BREAK</code></li>
-	 *   <li>LAYOUT_HIDDEN - <code>GROUP_HIDDEN</code></li>
-	 *   <li>LAYOUT_NONE - <code>(N/A)</code></li>
-	 *   <li>LAYOUT_OBJECT - <code>GROUP_NOWRAP</code></li>
-	 *   <li>LAYOUT_WRAP - <code>(N/A)</code></li>
-	 * </ul>
-	 * @return int
-	 */
-	int getLayoutType();
-	/**
-	 * To determine the type, see <code>Element::isBreakingBeforeElement()</code>
-	 * and <code>Element::isBreakingAfterElement()</code> defined in C++DOM/Element.cpp.<br>
-	 * @return int
-	 */
-	int getLineBreakHint();
-	/**
-	 * To determine the type, Check the HTML DTD.
-	 * And look up <code>GROUP_NOEND</code> in C++DOM/DTDParser.cpp.<br>
-	 * @return int
-	 */
-	int getOmitType();
-	/**
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap
-	 */
-	CMNamedNodeMap getProhibitedAncestors();
-	/**
-	 * return true when the element is a JSP element.
-	 */
-	boolean isJSP();
-	/**
-	 * @return boolean
-	 */
-	boolean shouldIndentChildSource();
-	/**
-	 * Some elements should keep spaces in its child text nodes.
-	 * For example, PRE and TEXTAREA.  This method returns true,
-	 * if a target element is one of such elements.
-	 * @return boolean
-	 */
-	boolean shouldKeepSpaces();
-	/**
-	 * Returns <code>true</code>, if <code>nextElement</code> terminates
-	 * the current element.
-	 * Some elements like <code>P</code> terminates other <code>P</code>.
-	 * That is, when <code>&lt;P&gt;</code> appears at the next to <code>P</code>,
-	 * which end tags is omitted, it represents not only the beginning of the
-	 * new <code>P</code> element but also the end of the previous <code>P</code>.
-	 */
-	boolean shouldTerminateAt(HTMLElementDeclaration nextElement);
-}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedA.java
deleted file mode 100644
index 9ce421f..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedA.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * A.
- */
-final class HedA extends HedInlineContainer {
-
-	/**
-	 */
-	public HedA(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.A, collection);
-		// CORRECT_EMPTY - GROUP_COMPACT
-		correctionType = CORRECT_EMPTY;
-	}
-
-	/**
-	 * %attrs;
-	 * (charset %Charset; #IMPLIED)
-	 * (type %ContentType; #IMPLIED)
-	 * (name CDATA #IMPLIED)
-	 * (href %URI; #IMPLIED)
-	 * (hreflang %LanguageCode; #IMPLIED)
-	 * (target %FrameTarget; #IMPLIED)
-	 * (rel %LinkTypes; #IMPLIED)
-	 * (rev %LinkTypes; #IMPLIED)
-	 * (accesskey %Character; #IMPLIED)
-	 * (directkey %Character; #IMPLIED)
-	 * (shape %Shape; rect)
-	 * (coords %Coords; #IMPLIED)
-	 * (tabindex NUMBER #IMPLIED)
-	 * (onfocus %Script; #IMPLIED)
-	 * (onblur %Script; #IMPLIED) 
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_CHARSET, HTML40Namespace.ATTR_NAME_TYPE, HTML40Namespace.ATTR_NAME_NAME, HTML40Namespace.ATTR_NAME_HREF, HTML40Namespace.ATTR_NAME_HREFLANG, HTML40Namespace.ATTR_NAME_TARGET, HTML40Namespace.ATTR_NAME_REL, HTML40Namespace.ATTR_NAME_REV, HTML40Namespace.ATTR_NAME_ACCESSKEY, HTML40Namespace.ATTR_NAME_DIRECTKEY, HTML40Namespace.ATTR_NAME_SHAPE, HTML40Namespace.ATTR_NAME_COORDS, HTML40Namespace.ATTR_NAME_TABINDEX, HTML40Namespace.ATTR_NAME_ONFOCUS, HTML40Namespace.ATTR_NAME_ONBLUR};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 * Exclusion.
-	 * <code>A</code> has the exclusion.
-	 * It is <code>A</code> itself.
-	 */
-	public CMContent getExclusion() {
-		if (exclusion != null)
-			return exclusion; // already created.
-		if (elementCollection == null)
-			return null;
-
-		exclusion = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		CMNode a = elementCollection.getNamedItem(HTML40Namespace.ElementName.A);
-		if (a != null)
-			exclusion.appendChild(a);
-
-		return exclusion;
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.A, HTML40Namespace.ElementName.BUTTON};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedADDRESS.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedADDRESS.java
deleted file mode 100644
index 4f9b73c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedADDRESS.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * ADDRESS.
- */
-final class HedADDRESS extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedADDRESS(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.ADDRESS, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_ADDRESS;
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAPPLET.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAPPLET.java
deleted file mode 100644
index d8244cd..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAPPLET.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * APPLET.
- */
-final class HedAPPLET extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedAPPLET(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.APPLET, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_PARAM_CONTAINER;
-		layoutType = LAYOUT_OBJECT;
-		indentChild = true;
-	}
-
-	/**
-	 * %coreattrs;
-	 * (codebase %URI; #IMPLIED)
-	 * (archive CDATA #IMPLIED)
-	 * (code CDATA #IMPLIED)
-	 * (object CDATA #IMPLIED)
-	 * (alt %Text; #IMPLIED) ... should be defined locally.
-	 * (name CDATA #IMPLIED)
-	 * (width %Length; #REQUIRED)
-	 * (height %Length; #REQUIRED)
-	 * (align %IAlign; #IMPLIED)
-	 * (hspace %Pixels; #IMPLIED)
-	 * (vspace %Pixels; #IMPLIED)
-	 * (mayscript (mayscript) #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %coreattrs;
-		attributeCollection.getCore(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_CODEBASE, HTML40Namespace.ATTR_NAME_ARCHIVE, HTML40Namespace.ATTR_NAME_CODE, HTML40Namespace.ATTR_NAME_OBJECT, HTML40Namespace.ATTR_NAME_ALT, HTML40Namespace.ATTR_NAME_NAME, HTML40Namespace.ATTR_NAME_WIDTH, HTML40Namespace.ATTR_NAME_HEIGHT, HTML40Namespace.ATTR_NAME_HSPACE, HTML40Namespace.ATTR_NAME_VSPACE, HTML40Namespace.ATTR_NAME_MAYSCRIPT};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		// %align; ... should be defined locally.
-		HTMLAttrDeclImpl attr = AttributeCollection.createAlignForImage();
-		if (attr != null)
-			attributes.putNamedItem(HTML40Namespace.ATTR_NAME_ALIGN, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAREA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAREA.java
deleted file mode 100644
index 567e6ce..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAREA.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * AREA.
- */
-final class HedAREA extends HedEmpty {
-
-	/**
-	 */
-	public HedAREA(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.AREA, collection);
-		// LAYOUT_HIDDEN.
-		// Because, AREA is GROUP_HIDDEN in the C++DOM/DTDParser.cpp.
-		layoutType = LAYOUT_HIDDEN;
-	}
-
-	/**
-	 * AREA.
-	 * %attrs;
-	 * (shape %Shape; rect)
-	 * (coords %Coords; #IMPLIED)
-	 * (href %URI; #IMPLIED)
-	 * (target %FrameTarget; #IMPLIED)
-	 * (nohref (nohref) #IMPLIED)
-	 * (alt %Text; #REQUIRED)
-	 * (tabindex NUMBER #IMPLIED)
-	 * (accesskey %Character; #IMPLIED)
-	 * (onfocus %Script; #IMPLIED)
-	 * (onblur %Script; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_SHAPE, HTML40Namespace.ATTR_NAME_COORDS, HTML40Namespace.ATTR_NAME_HREF, HTML40Namespace.ATTR_NAME_TARGET, HTML40Namespace.ATTR_NAME_NOHREF, HTML40Namespace.ATTR_NAME_ALT, HTML40Namespace.ATTR_NAME_TABINDEX, HTML40Namespace.ATTR_NAME_ACCESSKEY, HTML40Namespace.ATTR_NAME_ONFOCUS, HTML40Namespace.ATTR_NAME_ONBLUR};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASE.java
deleted file mode 100644
index 7417dae..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASE.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * BASE.
- */
-final class HedBASE extends HedEmpty {
-
-	/**
-	 */
-	public HedBASE(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.BASE, collection);
-		// LAYOUT_HIDDEN.
-		// Because, BASE is GROUP_HIDDEN in the C++DOM/DTDParser.cpp.
-		layoutType = LAYOUT_HIDDEN;
-	}
-
-	/**
-	 * BASE.
-	 * (href %URI; #IMPLIED)
-	 * (target %FrameTarget; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {HTML40Namespace.ATTR_NAME_HREF, HTML40Namespace.ATTR_NAME_TARGET};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASEFONT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASEFONT.java
deleted file mode 100644
index 01ccce0..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASEFONT.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-
-/**
- * BASEFONT.
- */
-final class HedBASEFONT extends HedEmpty {
-
-	/**
-	 */
-	public HedBASEFONT(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.BASEFONT, collection);
-		// LAYOUT_OBJECT - GROUP_NOWRAP.
-		layoutType = LAYOUT_OBJECT;
-	}
-
-	/**
-	 * BASEFONT.
-	 * (id ID #IMPLIED)
-	 * (size CDATA #REQUIRED) ... should be localy defined.
-	 * (color %Color; #IMPLIED)
-	 * (face CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {HTML40Namespace.ATTR_NAME_ID, HTML40Namespace.ATTR_NAME_COLOR, HTML40Namespace.ATTR_NAME_FACE};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		// (size CDATA #REQUIRED) ... should be localy defined.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_SIZE, atype, CMAttributeDeclaration.REQUIRED);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_SIZE, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBDO.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBDO.java
deleted file mode 100644
index 67c2609..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBDO.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-
-/**
- * BDO.
- */
-final class HedBDO extends HedInlineContainer {
-
-	/**
-	 */
-	public HedBDO(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.BDO, collection);
-		// CORRECT_EMPTY - GROUP_COMPACT
-		correctionType = CORRECT_EMPTY;
-	}
-
-	/**
-	 * %coreattrs;
-	 * (lang %LanguageCode; #IMPLIED)
-	 * (dir (ltr|rtl) #REQUIRED) ... should be defined locally.
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %coreattrs;
-		attributeCollection.getCore(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_LANG};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		//  (dir (ltr|rtl) #REQUIRED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		String[] values = {HTML40Namespace.ATTR_VALUE_LTR, HTML40Namespace.ATTR_VALUE_RTL};
-		atype.setEnumValues(values);
-
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_DIR, atype, CMAttributeDeclaration.REQUIRED);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_DIR, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBGSOUND.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBGSOUND.java
deleted file mode 100644
index 03b0881..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBGSOUND.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-
-
-
-final class HedBGSOUND extends HedEmpty {
-
-	public HedBGSOUND(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.BGSOUND, collection);
-		layoutType = LAYOUT_OBJECT;
-	}
-
-	/**
-	 * (src, CDATA, #IMPLIED)
-	 * (loop, CDATA, #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return;
-		if (attributeCollection == null)
-			return; // fatal
-		attributes = new CMNamedNodeMapImpl();
-		// src
-		HTMLAttributeDeclaration attr = attributeCollection.getDeclaration(HTML40Namespace.ATTR_NAME_SRC);
-		if (attr != null)
-			attributes.putNamedItem(HTML40Namespace.ATTR_NAME_SRC, attr);
-		// loop
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-		atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, HTML40Namespace.ATTR_VALUE_INFINITE);
-		attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_LOOP, atype, CMAttributeDeclaration.OPTIONAL);
-		if (attr != null)
-			attributes.putNamedItem(HTML40Namespace.ATTR_NAME_LOOP, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBLOCKQUOTE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBLOCKQUOTE.java
deleted file mode 100644
index b587b23..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBLOCKQUOTE.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * BLOCKQUOTE.
- */
-final class HedBLOCKQUOTE extends HedFlowContainer {
-
-	/**
-	 */
-	public HedBLOCKQUOTE(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.BLOCKQUOTE, collection);
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs;
-	 * (cite %URI; #IMPLIED) 
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_CITE};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBODY.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBODY.java
deleted file mode 100644
index ad52960..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBODY.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-
-/**
- * BODY.
- */
-final class HedBODY extends HedFlowContainer {
-
-	private static String[] terminators = {HTML40Namespace.ElementName.HEAD, HTML40Namespace.ElementName.BODY, HTML40Namespace.ElementName.FRAMESET, HTML40Namespace.ElementName.HTML};
-
-	/**
-	 */
-	public HedBODY(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.BODY, collection);
-		layoutType = LAYOUT_BLOCK;
-		omitType = OMIT_BOTH;
-	}
-
-	/**
-	 * %attrs;
-	 * %bodycolors;
-	 * (onload %Script; #IMPLIED)
-	 * (onunload %Script; #IMPLIED)
-	 * (background %URI; #IMPLIED)
-	 * (marginwidth %Pixels; #IMPLIED) ... D205514
-	 * (marginheight %Pixels; #IMPLIED) .. D205514
-	 * (topmargin, CDATA, #IMPLIED) ...... D205514
-	 * (bottommargin, CDATA, #IMPLIED) ... D205514
-	 * (leftmargin, CDATA, #IMPLIED) ..... D205514
-	 * (rightmargin, CDATA, #IMPLIED) .... D205514
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// %bodycolors;
-		attributeCollection.getBodycolors(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_ONLOAD, HTML40Namespace.ATTR_NAME_ONUNLOAD, HTML40Namespace.ATTR_NAME_BACKGROUND,
-		// <<D205514
-					HTML40Namespace.ATTR_NAME_MARGINWIDTH, HTML40Namespace.ATTR_NAME_MARGINHEIGHT, HTML40Namespace.ATTR_NAME_TOPMARGIN, HTML40Namespace.ATTR_NAME_BOTTOMMARGIN, HTML40Namespace.ATTR_NAME_LEFTMARGIN, HTML40Namespace.ATTR_NAME_RIGHTMARGIN
-		// D205514
-		};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 * Inclusion.
-	 * "Lazy eval."<br>
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMContent
-	 */
-	public CMContent getInclusion() {
-		if (inclusion != null)
-			return inclusion; // already created.
-		if (elementCollection == null)
-			return null;
-
-		// (INS|DEL)
-		inclusion = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		String[] names = {HTML40Namespace.ElementName.INS, HTML40Namespace.ElementName.DEL};
-		elementCollection.getDeclarations(inclusion, Arrays.asList(names).iterator());
-		return inclusion;
-	}
-
-	/**
-	 * BODY has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBR.java
deleted file mode 100644
index 39749a5..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBR.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-
-/**
- * BR.
- */
-final class HedBR extends HedEmpty {
-
-	/**
-	 */
-	public HedBR(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.BR, collection);
-		// LAYOUT_BREAK.
-		// Because, BR is GROUP_BREAK in the C++DOM/DTDParser.cpp.
-		layoutType = LAYOUT_BREAK;
-	}
-
-	/**
-	 * BR.
-	 * %coreattrs;
-	 * (clear (left | all | right | none) none)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %coreattrs;
-		attributeCollection.getCore(attributes);
-		// clear
-		HTMLAttributeDeclaration attr = attributeCollection.getDeclaration(HTML40Namespace.ATTR_NAME_CLEAR);
-		if (attr != null)
-			attributes.putNamedItem(HTML40Namespace.ATTR_NAME_CLEAR, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBUTTON.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBUTTON.java
deleted file mode 100644
index 6112d25..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBUTTON.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * BUTTON.
- */
-final class HedBUTTON extends HedFlowContainer {
-
-	/**
-	 */
-	public HedBUTTON(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.BUTTON, collection);
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs;
-	 * %reserved; ... empty.
-	 * (name CDATA #IMPLIED)
-	 * (value CDATA #IMPLIED)
-	 * (type (button|submit|reset) submit) ... should be defined locally.
-	 * (disabled (disabled) #IMPLIED)
-	 * (tabindex NUMBER #IMPLIED)
-	 * (accesskey %Character; #IMPLIED)
-	 * (onfocus %Script; #IMPLIED)
-	 * (onblur %Script; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_NAME, HTML40Namespace.ATTR_NAME_VALUE, HTML40Namespace.ATTR_NAME_DISABLED, HTML40Namespace.ATTR_NAME_TABINDEX, HTML40Namespace.ATTR_NAME_ACCESSKEY, HTML40Namespace.ATTR_NAME_ONFOCUS, HTML40Namespace.ATTR_NAME_ONBLUR};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		// (type (button|submit|reset) submit) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		String[] values = {HTML40Namespace.ATTR_VALUE_BUTTON, HTML40Namespace.ATTR_VALUE_SUBMIT, HTML40Namespace.ATTR_VALUE_RESET};
-		atype.setEnumValues(values);
-
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_TYPE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_TYPE, attr);
-	}
-
-	/**
-	 * Exclusion.
-	 * <code>FORM</code> has the exclusion.
-	 * It is <code>FORM</code> itself.
-	 */
-	public CMContent getExclusion() {
-		if (exclusion != null)
-			return exclusion; // already created.
-		if (elementCollection == null)
-			return null; // fatal
-
-		exclusion = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		String[] names = {HTML40Namespace.ElementName.A, HTML40Namespace.ElementName.FORM, HTML40Namespace.ElementName.ISINDEX, HTML40Namespace.ElementName.FIELDSET, HTML40Namespace.ElementName.IFRAME};
-		elementCollection.getDeclarations(exclusion, Arrays.asList(names).iterator());
-		elementCollection.getFormctrl(exclusion);
-
-		return exclusion;
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.BUTTON};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCAPTION.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCAPTION.java
deleted file mode 100644
index 167086c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCAPTION.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-
-/**
- * CAPTION.
- */
-final class HedCAPTION extends HedInlineContainer {
-
-	/**
-	 */
-	public HedCAPTION(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.CAPTION, collection);
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs;
-	 * (align %CAlign; #IMPLIED) ... should be defined locally.
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		HTMLAttrDeclImpl attr = AttributeCollection.createAlignForCaption();
-		if (attr != null)
-			attributes.putNamedItem(HTML40Namespace.ATTR_NAME_ALIGN, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCENTER.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCENTER.java
deleted file mode 100644
index 310a875..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCENTER.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * CENTER.
- */
-final class HedCENTER extends HedFlowContainer {
-
-	/**
-	 */
-	public HedCENTER(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.CENTER, collection);
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOL.java
deleted file mode 100644
index e381ed3..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOL.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-
-/**
- * COL.
- */
-final class HedCOL extends HedEmpty {
-
-	/**
-	 */
-	public HedCOL(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.COL, collection);
-		// LAYOUT_BLOCK.
-		// Because, COL is GROUP_BLOCK in the C++DOM/DTDParser.cpp.
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * COL.
-	 * %attrs;
-	 * (span NUMBER 1)
-	 * (width %MultiLength; #IMPLIED) ... should be defined locally.
-	 * %cellhalign;
-	 * %cellvalign;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		// (span NUMBER 1)
-		String[] names = {HTML40Namespace.ATTR_NAME_SPAN};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		// (width %MultiLength; #IMPLIED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(HTMLCMDataType.MULTI_LENGTH);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_WIDTH, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_WIDTH, attr);
-
-		// %cellhalign;
-		attributeCollection.getCellhalign(attributes);
-		// %cellvalign;
-		attributeCollection.getCellvalign(attributes);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOLGROUP.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOLGROUP.java
deleted file mode 100644
index 7bf229c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOLGROUP.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-
-/**
- * COLGROUP.
- */
-final class HedCOLGROUP extends HTMLElemDeclImpl {
-
-	private static String[] terminators = {HTML40Namespace.ElementName.COLGROUP, HTML40Namespace.ElementName.CAPTION, HTML40Namespace.ElementName.THEAD, HTML40Namespace.ElementName.TBODY, HTML40Namespace.ElementName.TFOOT, HTML40Namespace.ElementName.TR};
-
-	public HedCOLGROUP(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.COLGROUP, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_COLUMN_GROUP;
-		layoutType = LAYOUT_BLOCK;
-		omitType = OMIT_END;
-		indentChild = true;
-	}
-
-	/**
-	 * %attrs;
-	 * (span NUMBER 1)
-	 * (width %MultiLength; #IMPLIED) ... should be defined locally.
-	 * %cellhalign;
-	 * %cellvalign;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// %cellhalign;
-		attributeCollection.getCellhalign(attributes);
-		// %cellvalign;
-		attributeCollection.getCellvalign(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_SPAN};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		// (width %MultiLength; #IMPLIED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(HTMLCMDataType.MULTI_LENGTH);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_WIDTH, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_WIDTH, attr);
-	}
-
-	/**
-	 * LI has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDD.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDD.java
deleted file mode 100644
index a200227..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDD.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * DD.
- */
-final class HedDD extends HedFlowContainer {
-
-	private static String[] terminators = {HTML40Namespace.ElementName.DT, HTML40Namespace.ElementName.DD};
-
-	/**
-	 */
-	public HedDD(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.DD, collection);
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-		omitType = OMIT_END_DEFAULT;
-	}
-
-	/**
-	 * %attrs;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-
-	/**
-	 * DD has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDIV.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDIV.java
deleted file mode 100644
index 54aa19d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDIV.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * DIV.
- */
-final class HedDIV extends HedFlowContainer {
-
-	/**
-	 */
-	public HedDIV(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.DIV, collection);
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs;
-	 * %align;
-	 * %reserved;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// %align;
-		HTMLAttrDeclImpl attr = AttributeCollection.createAlignForParagraph();
-		if (attr != null)
-			attributes.putNamedItem(HTML40Namespace.ATTR_NAME_ALIGN, attr);
-		// %reserved; ... empty
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDL.java
deleted file mode 100644
index ec67ee9..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDL.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * DL.
- */
-final class HedDL extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedDL(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.DL, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_DEFINITION_LIST;
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-		indentChild = true;
-	}
-
-	/**
-	 * %arrays;
-	 * (compact (compact) #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_COMPACT};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDT.java
deleted file mode 100644
index 7ace822..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDT.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * DT.
- */
-final class HedDT extends HedInlineContainer {
-
-	private static String[] terminators = {HTML40Namespace.ElementName.DT, HTML40Namespace.ElementName.DD};
-
-	/**
-	 */
-	public HedDT(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.DT, collection);
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-		omitType = OMIT_END_DEFAULT;
-	}
-
-	/**
-	 * %attrs;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-
-	/**
-	 * DT has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedEMBED.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedEMBED.java
deleted file mode 100644
index 558a3d7..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedEMBED.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-
-/**
- * EMBED.
- */
-final class HedEMBED extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedEMBED(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.EMBED, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_EMBED;
-		layoutType = LAYOUT_OBJECT;
-		omitType = OMIT_END_DEFAULT;
-	}
-
-	/**
-	 * %coreattrs;
-	 * %events;
-	 * (src %URI; #REQUIRED) ... should be defined locally.
-	 * (height %Length; #IMPLIED)
-	 * (width %Length; #IMPLIED)
-	 * (align %IAlign; #IMPLIED) ... should be defined locally.
-	 * (hspace %Pixels; #IMPLIED)
-	 * (vspace %Pixels; #IMPLIED)
-	 * (loop CDATA #IMPLIED)
-	 * (hidden CDATA #IMPLIED)
-	 * (volume CDATA #IMPLIED)
-	 * (autostart (true|false) #IMPLIED)
-	 * (autoplay (true|false) #IMPLIED)
-	 * (autosize (true|false) #IMPLIED)
-	 * (controller (true|false) true)
-	 * (scale CDATA #IMPLIED)
-	 * (showcontrols (true|false) #IMPLIED)
-	 * (playcount NUMBER #IMPLIED)
-	 * (repeat CDATA #IMPLIED)
-	 * (panel CDATA #IMPLIED)
-	 * (text CDATA #IMPLIED)
-	 * (palette CDATA #IMPLIED)
-	 * (textfocus CDATA #IMPLIED)
-	 * (type CDATA #IMPLIED) ... should be defined locally.
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %coreattrs;
-		attributeCollection.getCore(attributes);
-		// %events;
-		attributeCollection.getEvents(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_HEIGHT, HTML40Namespace.ATTR_NAME_WIDTH, HTML40Namespace.ATTR_NAME_HSPACE, HTML40Namespace.ATTR_NAME_VSPACE, HTML40Namespace.ATTR_NAME_LOOP, HTML40Namespace.ATTR_NAME_HIDDEN, HTML40Namespace.ATTR_NAME_VOLUME, HTML40Namespace.ATTR_NAME_AUTOSTART, HTML40Namespace.ATTR_NAME_AUTOPLAY, HTML40Namespace.ATTR_NAME_AUTOSIZE, HTML40Namespace.ATTR_NAME_CONTROLLER, HTML40Namespace.ATTR_NAME_SCALE, HTML40Namespace.ATTR_NAME_SHOWCONTROLS, HTML40Namespace.ATTR_NAME_PLAYCOUNT, HTML40Namespace.ATTR_NAME_REPEAT, HTML40Namespace.ATTR_NAME_PANEL, HTML40Namespace.ATTR_NAME_TEXT, HTML40Namespace.ATTR_NAME_PALETTE, HTML40Namespace.ATTR_NAME_TEXTFOCUS};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		HTMLCMDataTypeImpl atype = null;
-		HTMLAttrDeclImpl attr = null;
-		// (src %URI; #REQUIRED) ... should be defined locally.
-		atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-		attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_SRC, atype, CMAttributeDeclaration.REQUIRED);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_SRC, attr);
-
-		// (align %IAlign; #IMPLIED) ... should be defined locally.
-		attr = AttributeCollection.createAlignForImage();
-		if (attr != null)
-			attributes.putNamedItem(HTML40Namespace.ATTR_NAME_ALIGN, attr);
-
-		// (type CDATA #IMPLIED) ... should be defined locally.
-		atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-		attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_TYPE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_TYPE, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedEmpty.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedEmpty.java
deleted file mode 100644
index 8f5898a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedEmpty.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-
-/**
- * Base class for EMPTY type element declarations.
- */
-abstract class HedEmpty extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedEmpty(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_EMPTY;
-		// EMPTY type has no end tag.
-		omitType = OMIT_END_MUST;
-	}
-
-	/**
-	 * Content.<br>
-	 * EMPTY type always returns <code>null</code>.
-	 * <br>
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMContent
-	 */
-	public CMContent getContent() {
-		return null;
-	}
-
-	/**
-	 * Content type.<br>
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.EMPTY;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFIELDSET.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFIELDSET.java
deleted file mode 100644
index 2db5e0d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFIELDSET.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * FIELDSET.
- */
-final class HedFIELDSET extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedFIELDSET(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.FIELDSET, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_FIELDSET;
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.BUTTON, HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFONT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFONT.java
deleted file mode 100644
index fc610b5..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFONT.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-
-/**
- * FONT.
- */
-final class HedFONT extends HedInlineContainer {
-
-	/**
-	 */
-	public HedFONT(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.FONT, collection);
-		// CORRECT_EMPTY - GROUP_COMPACT
-		correctionType = CORRECT_EMPTY;
-	}
-
-	/**
-	 * %coreattrs;
-	 * %i18n;
-	 * (size CDATA #IMPLIED) ... should be defined locally.
-	 * (color %Color; #IMPLIED)
-	 * (face CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %coreattrs;
-		attributeCollection.getCore(attributes);
-		// %i18n;
-		attributeCollection.getI18n(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_COLOR, HTML40Namespace.ATTR_NAME_FACE};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		// (size CDATA #IMPLIED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_SIZE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_SIZE, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFORM.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFORM.java
deleted file mode 100644
index d7c60ae..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFORM.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * FORM.
- */
-final class HedFORM extends HedFlowContainer {
-
-	/**
-	 */
-	public HedFORM(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.FORM, collection);
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs;
-	 * (action %URI; #REQUIRED)
-	 * (method (GET|POST) GET)
-	 * (enctype %ContentType; "application/x-www-form-urlencoded")
-	 * (accept %ContentTypes; #IMPLIED)
-	 * (name CDATA #IMPLIED)
-	 * (onsubmit %Script; #IMPLIED)
-	 * (onreset %Script; #IMPLIED)
-	 * (target %FrameTarget; #IMPLIED)
-	 * (accept-charset %Charsets; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_ACTION, HTML40Namespace.ATTR_NAME_METHOD, HTML40Namespace.ATTR_NAME_ENCTYPE, HTML40Namespace.ATTR_NAME_ACCEPT, HTML40Namespace.ATTR_NAME_NAME, HTML40Namespace.ATTR_NAME_ONSUBMIT, HTML40Namespace.ATTR_NAME_ONRESET, HTML40Namespace.ATTR_NAME_TARGET, HTML40Namespace.ATTR_NAME_ACCEPT_CHARSET};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 * Exclusion.
-	 * <code>FORM</code> has the exclusion.
-	 * It is <code>FORM</code> itself.
-	 */
-	public CMContent getExclusion() {
-		if (exclusion != null)
-			return exclusion; // already created.
-		if (elementCollection == null)
-			return null; // fatal
-
-		exclusion = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		CMNode form = elementCollection.getNamedItem(HTML40Namespace.ElementName.FORM);
-		if (form != null)
-			exclusion.appendChild(form);
-
-		return exclusion;
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.BUTTON, HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.FORM, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAME.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAME.java
deleted file mode 100644
index bb844cd..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAME.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * FRAME.
- */
-final class HedFRAME extends HedEmpty {
-
-	/**
-	 */
-	public HedFRAME(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.FRAME, collection);
-		// LAYOUT_HIDDEN.
-		// Because, FRAME is GROUP_HIDDEN in the C++DOM/DTDParser.cpp.
-		layoutType = LAYOUT_HIDDEN;
-	}
-
-	/**
-	 * FRAME.
-	 * %coreattrs;
-	 * (longdesc %URI; #IMPLIED)
-	 * (name CDATA #IMPLIED)
-	 * (src %URI; #IMPLIED)
-	 * (frameborder (1|0) 1)
-	 * (marginwidth %Pixels; #IMPLIED)
-	 * (marginheight %Pixels; #IMPLIED)
-	 * (noresize (noresize) #IMPLIED)
-	 * (scrolling (yes|no|auto) auto)
-	 * (bordercolor %Color #IMPLIED) ... D205514
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %coreattrs;
-		attributeCollection.getCore(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_LONGDESC, HTML40Namespace.ATTR_NAME_NAME, HTML40Namespace.ATTR_NAME_SRC, HTML40Namespace.ATTR_NAME_FRAMEBORDER, HTML40Namespace.ATTR_NAME_MARGINWIDTH, HTML40Namespace.ATTR_NAME_MARGINHEIGHT, HTML40Namespace.ATTR_NAME_NORESIZE, HTML40Namespace.ATTR_NAME_SCROLLING, HTML40Namespace.ATTR_NAME_BORDERCOLOR // D20554
-		};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAMESET.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAMESET.java
deleted file mode 100644
index 0f38961..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAMESET.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-
-/**
- * FRAMESET.
- */
-final class HedFRAMESET extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedFRAMESET(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.FRAMESET, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_FRAMESET;
-		layoutType = LAYOUT_HIDDEN;
-		indentChild = true;
-	}
-
-	/**
-	 * %coreattrs;
-	 * (rows %MultiLengths; #IMPLIED) ... should be defined locally.
-	 * (cols %MultiLengths; #IMPLIED) ... should be defined locally.
-	 * (onload %Script; #IMPLIED)
-	 * (onunload %Script; #IMPLIED)
-	 * (frameborder (yes|no) #IMPLIED) ... should be defined locally.
-	 * (border %Pixels; #IMPLIED)
-	 * (bordercolor %Color #IMPLIED) ... D205514
-	 * (framespacing CDATA #IMPLIED) ... D215684
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getCore(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_ONLOAD, HTML40Namespace.ATTR_NAME_ONUNLOAD, HTML40Namespace.ATTR_NAME_BORDER, HTML40Namespace.ATTR_NAME_BORDERCOLOR, // D205514
-					HTML40Namespace.ATTR_NAME_FRAMESPACING // D215684
-		};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		HTMLCMDataTypeImpl atype = null;
-		HTMLAttrDeclImpl attr = null;
-		// (rows %MultiLengths; #IMPLIED) ... should be defined locally.
-		atype = new HTMLCMDataTypeImpl(HTMLCMDataType.MULTI_LENGTH);
-		attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_ROWS, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_ROWS, attr);
-
-		// (cols %MultiLengths; #IMPLIED) ... should be defined locally.
-		attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_COLS, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_COLS, attr);
-
-		// (frameborder (yes|no) #IMPLIED) ... should be defined locally.
-		atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		String[] values = {HTML40Namespace.ATTR_VALUE_YES, HTML40Namespace.ATTR_VALUE_NO};
-		atype.setEnumValues(values);
-		attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_FRAMEBORDER, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_FRAMEBORDER, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFlowContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFlowContainer.java
deleted file mode 100644
index 96d47e2..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFlowContainer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-/**
- * Base class for (%flow;)* containers.
- */
-abstract class HedFlowContainer extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedFlowContainer(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_FLOW_CONTAINER;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFontStyle.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFontStyle.java
deleted file mode 100644
index 9b787c0..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFontStyle.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * %fontstyle;
- */
-final class HedFontStyle extends HedInlineContainer {
-
-	/**
-	 */
-	public HedFontStyle(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		if (elementName.equalsIgnoreCase(HTML40Namespace.ElementName.BIG) || elementName.equalsIgnoreCase(HTML40Namespace.ElementName.SMALL)) {
-			correctionType = CORRECT_EMPTY;
-		}
-		else { // B, I, U, ...
-			correctionType = CORRECT_DUPLICATED;
-		}
-	}
-
-	/**
-	 * %attrs;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		String myName = getElementName();
-		if (!myName.equalsIgnoreCase(HTML40Namespace.ElementName.BIG) && !myName.equalsIgnoreCase(HTML40Namespace.ElementName.SMALL))
-			return EMPTY_MAP;
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.PRE};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHEAD.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHEAD.java
deleted file mode 100644
index d2c2e8a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHEAD.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * HTML.
- */
-final class HedHEAD extends HTMLElemDeclImpl {
-
-	private static String[] terminators = {HTML40Namespace.ElementName.HEAD, HTML40Namespace.ElementName.BODY, HTML40Namespace.ElementName.FRAMESET, HTML40Namespace.ElementName.HTML};
-
-	/**
-	 */
-	public HedHEAD(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.HEAD, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_HEAD;
-		layoutType = LAYOUT_HIDDEN;
-		omitType = OMIT_BOTH;
-	}
-
-	/**
-	 * Create all attribute declarations.
-	 * This method is called once in the constructor of the super class.
-	 * The <code>HEAD</code> element may have the following attributes:
-	 * <table>
-	 * <tbody>
-	 *   <tr>
-	 *     <th>NAME</th><th>TYPE</th><th>USAGE</th><th>DEFAULT (INITIAL) VALUE</th><th>MEMO</th>
-	 *   </tr>
-	 *   <tr>
-	 *     <td>%i18n;</td><td>-</td><td>-</td><td>-</td><td>-</td>
-	 *   </tr>
-	 *   <tr>
-	 *     <td>profile</td><td>URI</td><td>#IMPLIED</td><td>N/A</td><td>-</td>
-	 *   </tr>
-	 * </tbody>
-	 * </table>
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %i18n;
-		attributeCollection.getI18n(attributes);
-		// profile
-		HTMLAttributeDeclaration adec = attributeCollection.getDeclaration(HTML40Namespace.ATTR_NAME_PROFILE);
-		if (adec != null)
-			attributes.putNamedItem(HTML40Namespace.ATTR_NAME_PROFILE, adec);
-	}
-
-	/**
-	 * HEAD has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHR.java
deleted file mode 100644
index bf7155e..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHR.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * HR.
- */
-final class HedHR extends HedEmpty {
-
-	/**
-	 */
-	public HedHR(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.HR, collection);
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs
-	 * (align (left|center|right) #IMPLIED) ... should be defined locally.
-	 * (noshade (noshade) #IMPLIED)
-	 * (size %Pixels; #IMPLIED)
-	 * (width %Length; #IMPLIED)
-	 * (color %Color; #IMPLIED) ... D205514
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		// (align (left|center|right) #IMPLIED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		String[] values = {HTML40Namespace.ATTR_VALUE_LEFT, HTML40Namespace.ATTR_VALUE_CENTER, HTML40Namespace.ATTR_VALUE_RIGHT};
-		atype.setEnumValues(values);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_ALIGN, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_ALIGN, attr);
-
-		// the rest.
-		String[] names = {HTML40Namespace.ATTR_NAME_NOSHADE, HTML40Namespace.ATTR_NAME_SIZE, HTML40Namespace.ATTR_NAME_WIDTH, HTML40Namespace.ATTR_NAME_COLOR // D205514
-		};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHTML.java
deleted file mode 100644
index 1522395..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHTML.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * HTML.
- */
-final class HedHTML extends HTMLElemDeclImpl {
-
-	private static String[] terminators = {HTML40Namespace.ElementName.HTML};
-
-	/**
-	 */
-	public HedHTML(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.HTML, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_HTML;
-		layoutType = LAYOUT_HIDDEN;
-		omitType = OMIT_BOTH;
-	}
-
-	/**
-	 * Create all attribute declarations.
-	 * This method is called once in the constructor of the super class.
-	 * The <code>HTML</code> element may have the following attributes:
-	 * <table>
-	 * <tbody>
-	 *   <tr>
-	 *     <th>NAME</th><th>TYPE</th><th>USAGE</th><th>DEFAULT (INITIAL) VALUE</th><th>MEMO</th>
-	 *   </tr>
-	 *   <tr>
-	 *     <td><code>%i18n;</code></td><td>-</td><td>-</td><td>-</td>
-	 *     <td>{@link PDCMDocImpl#getAttrDeclarationsI18n}</td>
-	 *   </tr>
-	 *   <tr>
-	 *     <td>version</td><td>CDATA</td><td>#FIXED</td>
-	 *     <td>{@link HTML_VERSION_TRANSITIONAL}</td><td>deplecated in HTML4.01</td>
-	 *   </tr>
-	 * </tbody>
-	 * </table>
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %i18n;
-		attributeCollection.getI18n(attributes);
-		// version
-		HTMLAttributeDeclaration adec = attributeCollection.getDeclaration(HTML40Namespace.ATTR_NAME_VERSION);
-		if (adec != null)
-			attributes.putNamedItem(HTML40Namespace.ATTR_NAME_VERSION, adec);
-	}
-
-	/**
-	 * HTML has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHeading.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHeading.java
deleted file mode 100644
index 3123cec..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHeading.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * H[1-6].
- */
-final class HedHeading extends HedInlineContainer {
-
-	/**
-	 */
-	public HedHeading(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * Create all attribute declarations.
-	 * This method is called once in the constructor of the super class.
-	 * The <code>H1</code> element may have the following attributes:
-	 * <table>
-	 * <tbody>
-	 *   <tr>
-	 *     <th>NAME</th><th>TYPE</th><th>USAGE</th><th>DEFAULT (INITIAL) VALUE</th><th>MEMO</th>
-	 *   </tr>
-	 *   <tr>
-	 *     <td>%attrs;</td><td>-</td><td>-</td><td>-</td><td>-</td>
-	 *   </tr>
-	 *   <tr>
-	 *     <td>%align;</td><td>-</td><td>-</td><td>-</td><td>-</td>
-	 *   </tr>
-	 * </tbody>
-	 * </table>
-	 * <p><b>%align;</b> means <code>align (left|center|right|justify) #IMPLIED</code>.
-	 * Unfortunately, this <code>align</code> is different from one in
-	 * <code>IMG</code> or <code>TABLE</code>.  So, the attribute declaration
-	 * of <code>align</code> should be localy created and it shouldn't be registered
-	 * in a <code>HCMDocImpl</code> instance.</p>
-	 * <p>However, %align is used in sevaral times.  I wouldn't write same code
-	 * in many times.  So, I add a new utility method into <code>CMUtil</code>
-	 * to create the attribute declaration.</p>
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// align
-		HTMLAttrDeclImpl attr = AttributeCollection.createAlignForParagraph();
-		if (attr != null)
-			attributes.putNamedItem(HTML40Namespace.ATTR_NAME_ALIGN, attr);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIFRAME.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIFRAME.java
deleted file mode 100644
index 6036741..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIFRAME.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * IFRAME.
- */
-final class HedIFRAME extends HedFlowContainer {
-
-	/**
-	 */
-	public HedIFRAME(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.IFRAME, collection);
-		layoutType = LAYOUT_OBJECT;
-	}
-
-	/**
-	 * %coreattrs;
-	 * (longdesc %URI; #IMPLIED)
-	 * (name CDATA #IMPLIED)
-	 * (src %URI; #IMPLIED)
-	 * (frameborder (1|0) 1)
-	 * (marginwidth %Pixels; #IMPLIED)
-	 * (marginheight %Pixels; #IMPLIED)
-	 * (scrolling (yes|no|auto) auto)
-	 * (align %IAlign; #IMPLIED) ... should be defined locally.
-	 * (height %Length; #IMPLIED)
-	 * (width %Length; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %coreattrs;
-		attributeCollection.getCore(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_LONGDESC, HTML40Namespace.ATTR_NAME_NAME, HTML40Namespace.ATTR_NAME_SRC, HTML40Namespace.ATTR_NAME_FRAMEBORDER, HTML40Namespace.ATTR_NAME_MARGINWIDTH, HTML40Namespace.ATTR_NAME_MARGINHEIGHT, HTML40Namespace.ATTR_NAME_SCROLLING, HTML40Namespace.ATTR_NAME_HEIGHT, HTML40Namespace.ATTR_NAME_WIDTH};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		// align
-		HTMLAttrDeclImpl attr = AttributeCollection.createAlignForImage();
-		if (attr != null)
-			attributes.putNamedItem(HTML40Namespace.ATTR_NAME_ALIGN, attr);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.BUTTON};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIMG.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIMG.java
deleted file mode 100644
index ae1296b..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIMG.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * IMG.
- */
-final class HedIMG extends HedEmpty {
-
-	/**
-	 */
-	public HedIMG(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.IMG, collection);
-		layoutType = LAYOUT_OBJECT;
-	}
-
-	/**
-	 * IMG.
-	 * %attrs;
-	 * (src %URI; #REQUIRED): should be defined locally.
-	 * (alt %Text; #REQUIRED)
-	 * (longdesc %URI; #IMPLIED)
-	 * (name CDATA #IMPLIED)
-	 * (height %Length; #IMPLIED)
-	 * (width %Length; #IMPLIED)
-	 * (usemap %URI; #IMPLIED)
-	 * (ismap (ismap) #IMPLIED)
-	 * (align %IAlign; #IMPLIED): should be defined locally.
-	 * (border %Pixels; #IMPLIED)
-	 * (hspace %Pixels; #IMPLIED)
-	 * (vspace %Pixels; #IMPLIED)
-	 * (mapfile %URI; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		// (src %URI; #REQUIRED): should be defined locally.
-		HTMLCMDataTypeImpl atype = null;
-		HTMLAttrDeclImpl attr = null;
-		atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-		attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_SRC, atype, CMAttributeDeclaration.REQUIRED);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_SRC, attr);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_ALT, HTML40Namespace.ATTR_NAME_LONGDESC, HTML40Namespace.ATTR_NAME_NAME, HTML40Namespace.ATTR_NAME_HEIGHT, HTML40Namespace.ATTR_NAME_WIDTH, HTML40Namespace.ATTR_NAME_USEMAP, HTML40Namespace.ATTR_NAME_ISMAP, HTML40Namespace.ATTR_NAME_BORDER, HTML40Namespace.ATTR_NAME_HSPACE, HTML40Namespace.ATTR_NAME_VSPACE, HTML40Namespace.ATTR_NAME_MAPFILE};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		// align (local); should be defined locally.
-		attr = AttributeCollection.createAlignForImage();
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_ALIGN, attr);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.PRE};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedINPUT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedINPUT.java
deleted file mode 100644
index ecf5aae..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedINPUT.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * INPUT.
- */
-final class HedINPUT extends HedEmpty {
-
-	/**
-	 */
-	public HedINPUT(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.INPUT, collection);
-		layoutType = LAYOUT_OBJECT;
-	}
-
-	/**
-	 * INPUT.
-	 * %attrs;
-	 * (type %InputType; TEXT) ... should be defined locally.
-	 * (name CDATA #IMPLIED)
-	 * (value CDATA #IMPLIED)
-	 * (checked (checked) #IMPLIED)
-	 * (disabled (disabled) #IMPLIED)
-	 * (readonly (readonly) #IMPLIED)
-	 * (size CDATA #IMPLIED) ... should be defined locally.
-	 * (maxlength NUMBER #IMPLIED)
-	 * (src %URI; #IMPLIED)
-	 * (alt CDATA #IMPLIED) ... should be defined locally.
-	 * (usemap %URI; #IMPLIED)
-	 * (ismap (ismap) #IMPLIED)
-	 * (tabindex NUMBER #IMPLIED)
-	 * (accesskey %Character; #IMPLIED)
-	 * (onfocus %Script; #IMPLIED)
-	 * (onblur %Script; #IMPLIED)
-	 * (onselect %Script; #IMPLIED)
-	 * (onchange %Script; #IMPLIED)
-	 * (accept %ContentTypes; #IMPLIED)
-	 * (align %IAlign; #IMPLIED) ... should be defined locally.
-	 * (istyle CDATA #IMPLIED)
-	 * <<D215684
-	 * (width CDATA; #IMPLIED)
-	 * (height CDATA; #IMPLIED)
-	 * (border CDATA; #IMPLIED)
-	 * D215684
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		HTMLCMDataTypeImpl atype = null;
-		HTMLAttrDeclImpl attr = null;
-		// (type %InputType; TEXT) ... should be defined locally.
-		// NOTE: %InputType is ENUM;
-		// (text | password | checkbox | radio | submit | reset |
-		//  file | hidden | image | button)
-		atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		String[] values = {HTML40Namespace.ATTR_VALUE_TEXT, HTML40Namespace.ATTR_VALUE_PASSWORD, HTML40Namespace.ATTR_VALUE_CHECKBOX, HTML40Namespace.ATTR_VALUE_RADIO, HTML40Namespace.ATTR_VALUE_SUBMIT, HTML40Namespace.ATTR_VALUE_RESET, HTML40Namespace.ATTR_VALUE_FILE, HTML40Namespace.ATTR_VALUE_HIDDEN, HTML40Namespace.ATTR_VALUE_IMAGE, HTML40Namespace.ATTR_VALUE_BUTTON};
-		atype.setEnumValues(values);
-		atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, HTML40Namespace.ATTR_VALUE_TEXT);
-		attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_TYPE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_TYPE, attr);
-
-		// (size CDATA #IMPLIED) ... should be defined locally.
-		atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-		attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_SIZE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_SIZE, attr);
-
-		// (alt CDATA #IMPLIED) ... should be defined locally.
-		atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-		attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_ALT, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_ALT, attr);
-
-		// (align %IAlign; #IMPLIED) ... should be defined locally.
-		attr = AttributeCollection.createAlignForImage();
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_ALIGN, attr);
-
-		// the rest.
-		String[] names = {HTML40Namespace.ATTR_NAME_NAME, HTML40Namespace.ATTR_NAME_VALUE, HTML40Namespace.ATTR_NAME_CHECKED, HTML40Namespace.ATTR_NAME_DISABLED, HTML40Namespace.ATTR_NAME_READONLY, HTML40Namespace.ATTR_NAME_SIZE, HTML40Namespace.ATTR_NAME_MAXLENGTH, HTML40Namespace.ATTR_NAME_SRC, HTML40Namespace.ATTR_NAME_ALT, HTML40Namespace.ATTR_NAME_USEMAP, HTML40Namespace.ATTR_NAME_ISMAP, HTML40Namespace.ATTR_NAME_TABINDEX, HTML40Namespace.ATTR_NAME_ACCESSKEY, HTML40Namespace.ATTR_NAME_ONFOCUS, HTML40Namespace.ATTR_NAME_ONBLUR, HTML40Namespace.ATTR_NAME_ONSELECT, HTML40Namespace.ATTR_NAME_ONCHANGE, HTML40Namespace.ATTR_NAME_ACCEPT, HTML40Namespace.ATTR_NAME_ALIGN, HTML40Namespace.ATTR_NAME_ISTYLE,
-		//<<D215684
-					HTML40Namespace.ATTR_NAME_WIDTH, HTML40Namespace.ATTR_NAME_HEIGHT, HTML40Namespace.ATTR_NAME_BORDER
-		//<D215684
-		};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.BUTTON};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedISINDEX.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedISINDEX.java
deleted file mode 100644
index c3ec75d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedISINDEX.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * ISINDEX.
- */
-final class HedISINDEX extends HedEmpty {
-
-	/**
-	 */
-	public HedISINDEX(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.ISINDEX, collection);
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * ISINDEX.
-	 * %coreattrs;
-	 * %i18n;
-	 * (prompt %Text; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %coreattrs;
-		attributeCollection.getCore(attributes);
-		// %i18n;
-		attributeCollection.getI18n(attributes);
-
-		HTMLAttributeDeclaration attr = attributeCollection.getDeclaration(HTML40Namespace.ATTR_NAME_PROMPT);
-		if (attr != null)
-			attributes.putNamedItem(HTML40Namespace.ATTR_NAME_PROMPT, attr);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.BUTTON, HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedInlineContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedInlineContainer.java
deleted file mode 100644
index 08812aa..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedInlineContainer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-/**
- * Base class for (%inline;)* containers.
- */
-abstract class HedInlineContainer extends HTMLElemDeclImpl {
-
-	/**
-	 * HedInlineContainer.
-	 * @param elementName java.lang.String
-	 * @param collection ElementCollection
-	 */
-	public HedInlineContainer(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_INLINE_CONTAINER;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLABEL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLABEL.java
deleted file mode 100644
index aecb7b3..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLABEL.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * LABEL.
- */
-final class HedLABEL extends HedInlineContainer {
-
-	/**
-	 */
-	public HedLABEL(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.LABEL, collection);
-	}
-
-	/**
-	 * %attrs;
-	 * (for IDREF #IMPLIED) ... should be defined locally.
-	 * (accesskey %Character; #IMPLIED)
-	 * (onfocus %Script; #IMPLIED)
-	 * (onblur %Script; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		// (for IDREF #IMPLIED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.IDREF);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_FOR, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_FOR, attr);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_ACCESSKEY, HTML40Namespace.ATTR_NAME_ONFOCUS, HTML40Namespace.ATTR_NAME_ONBLUR};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 * Exclusion.
-	 * <code>LABEL</code> has the exclusion.
-	 * It is <code>LABEL</code> itself.
-	 */
-	public CMContent getExclusion() {
-		if (exclusion != null)
-			return exclusion; // already created.
-		if (elementCollection == null)
-			return null;
-
-		exclusion = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		CMNode label = elementCollection.getNamedItem(HTML40Namespace.ElementName.LABEL);
-		if (label != null)
-			exclusion.appendChild(label);
-
-		return exclusion;
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.BUTTON, HTML40Namespace.ElementName.LABEL};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLEGEND.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLEGEND.java
deleted file mode 100644
index f66d866..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLEGEND.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * LEGEND.
- */
-final class HedLEGEND extends HedInlineContainer {
-
-	/**
-	 */
-	public HedLEGEND(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.LEGEND, collection);
-	}
-
-	/**
-	 * (accesskey %Character; #IMPLIED)
-	 * (align %LAlign; #IMPLIED) ... shuld be defined locally.
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_ACCESSKEY};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		// align
-		HTMLAttrDeclImpl attr = AttributeCollection.createAlignForLegend();
-		if (attr != null)
-			attributes.putNamedItem(HTML40Namespace.ATTR_NAME_ALIGN, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLI.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLI.java
deleted file mode 100644
index 9012dab..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLI.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-
-/**
- * LI.
- */
-final class HedLI extends HedFlowContainer {
-
-	private static String[] terminators = {HTML40Namespace.ElementName.LI};
-
-	/**
-	 */
-	public HedLI(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.LI, collection);
-		layoutType = LAYOUT_BLOCK;
-		omitType = OMIT_END_DEFAULT;
-	}
-
-	/**
-	 * %attrs;
-	 * (type %LIStyle; #IMPLIED) ... should be defined locally.
-	 * (value NUMBER #IMPLIED) ... should be defined locally.
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		// (type %LIStyle; #IMPLIED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(HTMLCMDataType.LI_STYLE);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_TYPE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_TYPE, attr);
-
-		// (value NUMBER #IMPLIED) ... should be defined locally.
-		atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-		attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_VALUE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_VALUE, attr);
-	}
-
-	/**
-	 * LI has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLINK.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLINK.java
deleted file mode 100644
index 5fe5269..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLINK.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-
-/**
- * LINK.
- */
-final class HedLINK extends HedEmpty {
-
-	/**
-	 */
-	public HedLINK(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.LINK, collection);
-		layoutType = LAYOUT_HIDDEN;
-	}
-
-	/**
-	 * LINK.
-	 * %attrs;
-	 * (charset %Charset; #IMPLIED)
-	 * (href %URI; #IMPLIED)
-	 * (hreflang %LanguageCode; #IMPLIED)
-	 * (type %ContentType; #IMPLIED): should be defined locally.
-	 * (rel %LinkTypes; #IMPLIED)
-	 * (rev %LinkTypes; #IMPLIED)
-	 * (media %MediaDesc; #IMPLIED)
-	 * (target %FrameTarget; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_CHARSET, HTML40Namespace.ATTR_NAME_HREF, HTML40Namespace.ATTR_NAME_HREFLANG, HTML40Namespace.ATTR_NAME_REL, HTML40Namespace.ATTR_NAME_REV, HTML40Namespace.ATTR_NAME_MEDIA, HTML40Namespace.ATTR_NAME_TARGET};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		// (type %ContentType; #IMPLIED)
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(HTMLCMDataType.CONTENT_TYPE);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_TYPE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_TYPE, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedListItemContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedListItemContainer.java
deleted file mode 100644
index ca49717..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedListItemContainer.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-/**
- * Base class for list item container declarations.
- * - OL, UL, MENU, DIR.
- */
-abstract class HedListItemContainer extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedListItemContainer(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_LI_CONTAINER;
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-		indentChild = true;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMAP.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMAP.java
deleted file mode 100644
index 4e1036f..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMAP.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-
-
-
-/**
- * MAP.
- */
-final class HedMAP extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedMAP(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.MAP, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_MAP;
-		layoutType = LAYOUT_OBJECT;
-		indentChild = true;
-	}
-
-	/**
-	 * %attrs;
-	 * (name CDATA #REQUIRED) ... should be defined locally
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		// (name CDATA #REQUIRED) ... should be defined locally
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_NAME, atype, CMAttributeDeclaration.REQUIRED);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_NAME, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMARQUEE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMARQUEE.java
deleted file mode 100644
index c9cadcb..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMARQUEE.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-
-/**
- * MARQUEE.
- */
-final class HedMARQUEE extends HedFlowContainer {
-
-	/**
-	 */
-	public HedMARQUEE(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.MARQUEE, collection);
-		layoutType = LAYOUT_OBJECT;
-	}
-
-	/**
-	 * %attrs;
-	 * (behavior (scroll|slide|alternate) scroll)
-	 * (bgcolor %Color; #IMPLIED)
-	 * (direction (left|right|up|down) left)
-	 * (height CDATA #IMPLIED) ... should be defined locally.
-	 * (hspace NUMBER #IMPLIED) ... should be defined locally.
-	 * (loop CDATA #IMPLIED)
-	 * (scrollamount NUMBER #IMPLIED)
-	 * (scrolldelay NUMBER #IMPLIED)
-	 * (vspace NUMBER #IMPLIED) ... should be defined locally.
-	 * (width CDATA #IMPLIED) ... should be defined locally.
-	 * (truespeed (truespeed) #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_BEHAVIOR, HTML40Namespace.ATTR_NAME_BGCOLOR, HTML40Namespace.ATTR_NAME_DIRECTION, HTML40Namespace.ATTR_NAME_LOOP, HTML40Namespace.ATTR_NAME_SCROLLAMOUNT, HTML40Namespace.ATTR_NAME_SCROLLDELAY, HTML40Namespace.ATTR_NAME_TRUESPEED};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		HTMLCMDataTypeImpl atype = null;
-		HTMLAttrDeclImpl attr = null;
-		// (height CDATA #IMPLIED) ... should be defined locally.
-		atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-		attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_HEIGHT, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_HEIGHT, attr);
-
-		// (width CDATA #IMPLIED) ... should be defined locally.
-		attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_WIDTH, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_WIDTH, attr);
-
-		// (hspace NUMBER #IMPLIED) ... should be defined locally.
-		atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-		attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_HSPACE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_HSPACE, attr);
-
-		// (vspace NUMBER #IMPLIED) ... should be defined locally.
-		attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_VSPACE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_VSPACE, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMENU.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMENU.java
deleted file mode 100644
index 1957036..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMENU.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * MENU/DIR.
- */
-final class HedMENU extends HedListItemContainer {
-
-	/**
-	 */
-	public HedMENU(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-	}
-
-	/**
-	 * MENU/DIR.
-	 * (compact (compact) #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_COMPACT};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 * Exclusion.
-	 * <code>MENU/DIR</code> has the exclusion.
-	 * It is <code>%block;</code>.
-	 * %block; is:
-	 * P | %heading; | %list; | %preformatted; | DL | DIV | CENTER |
-	 * NOSCRIPT | NOFRAMES | BLOCKQUOTE | FORM | ISINDEX | HR |
-	 * TABLE | FIELDSET | ADDRESS.
-	 * %heading; is: H1 | H2 | H3 | H4 | H5 | H6.
-	 * %list; is : UL | OL | DIR | MENU.
-	 * %preformatted; is PRE.
-	 */
-	public CMContent getExclusion() {
-		if (exclusion != null)
-			return exclusion; // already created.
-		if (elementCollection == null)
-			return null;
-
-		// %block;
-		exclusion = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		String[] names = {HTML40Namespace.ElementName.P, HTML40Namespace.ElementName.H1, HTML40Namespace.ElementName.H2, HTML40Namespace.ElementName.H3, HTML40Namespace.ElementName.H4, HTML40Namespace.ElementName.H5, HTML40Namespace.ElementName.H6, HTML40Namespace.ElementName.UL, HTML40Namespace.ElementName.OL, HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU, HTML40Namespace.ElementName.PRE, HTML40Namespace.ElementName.DL, HTML40Namespace.ElementName.DIV, HTML40Namespace.ElementName.CENTER, HTML40Namespace.ElementName.NOSCRIPT, HTML40Namespace.ElementName.NOFRAMES, HTML40Namespace.ElementName.BLOCKQUOTE, HTML40Namespace.ElementName.FORM, HTML40Namespace.ElementName.ISINDEX, HTML40Namespace.ElementName.HR, HTML40Namespace.ElementName.TABLE, HTML40Namespace.ElementName.FIELDSET, HTML40Namespace.ElementName.ADDRESS};
-		elementCollection.getDeclarations(exclusion, Arrays.asList(names).iterator());
-		return exclusion;
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMETA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMETA.java
deleted file mode 100644
index 3b7e008..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMETA.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-
-/**
- * META.
- */
-final class HedMETA extends HedEmpty {
-
-	/**
-	 */
-	public HedMETA(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.META, collection);
-		layoutType = LAYOUT_HIDDEN;
-	}
-
-	/**
-	 * META.
-	 * %i18n;
-	 * (http-equiv NAME #IMPLIED)
-	 * (name NAME #IMPLIED) ... should be defined locally.
-	 * (content CDATA #REQUIRED)
-	 * (scheme CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %i18n;
-		attributeCollection.getI18n(attributes);
-
-		// (name NAME #IMPLIED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(HTMLCMDataType.NAME);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_NAME, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_NAME, attr);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_HTTP_EQUIV, HTML40Namespace.ATTR_NAME_CONTENT, HTML40Namespace.ATTR_NAME_SCHEME};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMarkChanges.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMarkChanges.java
deleted file mode 100644
index 3cff404..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMarkChanges.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * (INS|DEL)
- */
-final class HedMarkChanges extends HedFlowContainer {
-
-	/**
-	 */
-	public HedMarkChanges(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-	}
-
-	/**
-	 * %attrs;
-	 * (cite %URI; #IMPLIED)
-	 * (datetime %Datetime; #IMPLIED) 
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_CITE, HTML40Namespace.ATTR_NAME_DATETIME};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOBR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOBR.java
deleted file mode 100644
index 4e3a1a2..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOBR.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * NOBR -- not standard tag but it is commonly used.
- */
-final class HedNOBR extends HedInlineContainer {
-
-
-	public HedNOBR(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.NOBR, collection);
-		correctionType = HTMLElementDeclaration.CORRECT_DUPLICATED;
-	}
-
-	protected void createAttributeDeclarations() {
-		// No attributes is defined.
-		if (attributes != null)
-			return;
-		attributes = new CMNamedNodeMapImpl();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOEMBED.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOEMBED.java
deleted file mode 100644
index 3d5d5fd..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOEMBED.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-
-/**
- * NOEMBED.
- */
-final class HedNOEMBED extends HedFlowContainer {
-
-	/**
-	 */
-	public HedNOEMBED(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.NOEMBED, collection);
-	}
-
-	/**
-	 * %coreattrs;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %coreattrs;
-		attributeCollection.getCore(attributes);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOFRAMES.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOFRAMES.java
deleted file mode 100644
index 3d2d044..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOFRAMES.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * NOFRAMES.
- */
-final class HedNOFRAMES extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedNOFRAMES(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.NOFRAMES, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_NOFRAMES_CONTENT;
-		layoutType = LAYOUT_HIDDEN;
-	}
-
-	/**
-	 * %attrs;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-
-	/**
-	 * Exclusion.
-	 * <code>NOFRAMES</code> has the exclusion.
-	 * It is <code>NOFRAMES</code> itself.
-	 */
-	public CMContent getExclusion() {
-		if (exclusion != null)
-			return exclusion; // already created.
-		if (elementCollection == null)
-			return null;
-
-		exclusion = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		CMNode label = elementCollection.getNamedItem(HTML40Namespace.ElementName.NOFRAMES);
-		if (label != null)
-			exclusion.appendChild(label);
-
-		return exclusion;
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU, HTML40Namespace.ElementName.NOFRAMES};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOSCRIPT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOSCRIPT.java
deleted file mode 100644
index df9a403..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOSCRIPT.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * NOSCRIPT.
- */
-final class HedNOSCRIPT extends HedFlowContainer {
-
-	/**
-	 */
-	public HedNOSCRIPT(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.NOSCRIPT, collection);
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOBJECT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOBJECT.java
deleted file mode 100644
index f229abb..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOBJECT.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * OBJECT.
- */
-final class HedOBJECT extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedOBJECT(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.OBJECT, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_PARAM_CONTAINER;
-		layoutType = LAYOUT_OBJECT;
-		indentChild = true;
-	}
-
-	/**
-	 * %attrs;
-	 * %reserved; ... empty.
-	 * (declare (declare) #IMPLIED)
-	 * (classid %URI; #IMPLIED)
-	 * (codebase %URI; #IMPLIED)
-	 * (data %URI; #IMPLIED)
-	 * (type %ContentType; #IMPLIED)
-	 * (codetype %ContentType; #IMPLIED)
-	 * (archive CDATA #IMPLIED)
-	 * (standby %Text; #IMPLIED)
-	 * (height %Length; #IMPLIED)
-	 * (width %Length; #IMPLIED)
-	 * (usemap %URI; #IMPLIED)
-	 * (name CDATA #IMPLIED)
-	 * (tabindex NUMBER #IMPLIED)
-	 * (align %IAlign; #IMPLIED) ... should be defined locally.
-	 * (border %Pixels; #IMPLIED)
-	 * (hspace %Pixels; #IMPLIED)
-	 * (vspace %Pixels; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// %reserved; ... empty.
-
-		String[] names = {HTML40Namespace.ATTR_NAME_DECLARE, HTML40Namespace.ATTR_NAME_CLASSID, HTML40Namespace.ATTR_NAME_CODEBASE, HTML40Namespace.ATTR_NAME_DATA, HTML40Namespace.ATTR_NAME_TYPE, HTML40Namespace.ATTR_NAME_CODETYPE, HTML40Namespace.ATTR_NAME_ARCHIVE, HTML40Namespace.ATTR_NAME_STANDBY, HTML40Namespace.ATTR_NAME_HEIGHT, HTML40Namespace.ATTR_NAME_WIDTH, HTML40Namespace.ATTR_NAME_USEMAP, HTML40Namespace.ATTR_NAME_NAME, HTML40Namespace.ATTR_NAME_TABINDEX, HTML40Namespace.ATTR_NAME_BORDER, HTML40Namespace.ATTR_NAME_HSPACE, HTML40Namespace.ATTR_NAME_VSPACE};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-		// %align; ... should be defined locally.
-		HTMLAttrDeclImpl attr = AttributeCollection.createAlignForImage();
-		if (attr != null)
-			attributes.putNamedItem(HTML40Namespace.ATTR_NAME_ALIGN, attr);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.PRE};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOL.java
deleted file mode 100644
index ad26f3a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOL.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * OL.
- */
-final class HedOL extends HedListItemContainer {
-
-	/**
-	 */
-	public HedOL(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.OL, collection);
-	}
-
-	/**
-	 * OL.
-	 * (type %OLStyle; #IMPLIED) ... should be defined locally.
-	 * (compact (compact) #IMPLIED)
-	 * (start NUMBER #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		// (type %OLStyle; #IMPLIED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(HTMLCMDataType.OL_STYLE);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_TYPE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_TYPE, attr);
-
-		// the rest.
-		String[] names = {HTML40Namespace.ATTR_NAME_COMPACT, HTML40Namespace.ATTR_NAME_START};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTGROUP.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTGROUP.java
deleted file mode 100644
index 1367344..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTGROUP.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-
-/**
- * OPTGROUP.
- */
-final class HedOPTGROUP extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedOPTGROUP(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.OPTGROUP, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_OPTION_CONTAINER;
-		layoutType = LAYOUT_HIDDEN;
-		indentChild = true;
-	}
-
-	/**
-	 * %attrs;
-	 * (disabled (disabled) #IMPLIED)
-	 * (label %Text; #REQUIRED) ... should be defined locally.
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// (disabled (disabled) #IMPLIED)
-		String[] names = {HTML40Namespace.ATTR_NAME_DISABLED};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		// (label %Text; #REQUIRED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(HTMLCMDataType.TEXT);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_LABEL, atype, CMAttributeDeclaration.REQUIRED);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_LABEL, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTION.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTION.java
deleted file mode 100644
index 0568bd7..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTION.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * OPTION.
- */
-final class HedOPTION extends HedPcdata {
-
-	private static String[] terminators = {HTML40Namespace.ElementName.OPTION};
-
-	/**
-	 */
-	public HedOPTION(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.OPTION, collection);
-		layoutType = LAYOUT_HIDDEN;
-		omitType = OMIT_END;
-	}
-
-	/**
-	 * OPTION.
-	 * %attrs;
-	 * (selected (selected) #IMPLIED)
-	 * (disabled (disabled) #IMPLIED)
-	 * (label %Text; #IMPLIED)
-	 * (value CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_SELECTED, HTML40Namespace.ATTR_NAME_DISABLED, HTML40Namespace.ATTR_NAME_LABEL, HTML40Namespace.ATTR_NAME_VALUE};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 * OPTION has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedP.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedP.java
deleted file mode 100644
index 3ee637c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedP.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * P.
- */
-final class HedP extends HedInlineContainer {
-
-	private static Collection terminators = null;
-
-	/**
-	 */
-	public HedP(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.P, collection);
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-		omitType = OMIT_END;
-	}
-
-	/**
-	 * Create all attribute declarations.
-	 * This method is called once in the constructor of the super class.
-	 * The <code>P</code> element may have the following attributes:
-	 * <table>
-	 * <tbody>
-	 *   <tr>
-	 *     <th>NAME</th><th>TYPE</th><th>USAGE</th><th>DEFAULT (INITIAL) VALUE</th><th>MEMO</th>
-	 *   </tr>
-	 *   <tr>
-	 *     <td>%attrs;</td><td>-</td><td>-</td><td>-</td><td>-</td>
-	 *   </tr>
-	 *   <tr>
-	 *     <td>%align;</td><td>-</td><td>-</td><td>-</td><td>-</td>
-	 *   </tr>
-	 * </tbody>
-	 * </table>
-	 * <p><b>%align;</b> means <code>align (left|center|right|justify) #IMPLIED</code>.
-	 * Unfortunately, this <code>align</code> is different from one in
-	 * <code>IMG</code> or <code>TABLE</code>.  So, the attribute declaration
-	 * of <code>align</code> should be localy created and it shouldn't be registered
-	 * in a <code>HCMDocImpl</code> instance.</p>
-	 * <p>However, %align is used in sevaral times.  I wouldn't write same code
-	 * in many times.  So, I add a new utility method into <code>CMUtil</code>
-	 * to create the attribute declaration.</p>
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-		attributes = new CMNamedNodeMapImpl();
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// align
-		HTMLAttrDeclImpl adec = AttributeCollection.createAlignForParagraph();
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_ALIGN, adec);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-		String[] names = {HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-		return prohibitedAncestors;
-	}
-
-	/**
-	 * Return names of terminators.
-	 * <code>P</code> has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		if (terminators != null)
-			return terminators.iterator();
-		//<<D217982
-		terminators = new Vector();
-		terminators.addAll(elementCollection.getNamesOfBlock());
-		terminators.add(HTML40Namespace.ElementName.LI);
-		terminators.add(HTML40Namespace.ElementName.DT);
-		terminators.add(HTML40Namespace.ElementName.DD);
-		//D217982
-		return terminators.iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPARAM.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPARAM.java
deleted file mode 100644
index bb44fe5..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPARAM.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-
-/**
- * PARAM.
- */
-final class HedPARAM extends HedEmpty {
-
-	/**
-	 */
-	public HedPARAM(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.PARAM, collection);
-		layoutType = LAYOUT_HIDDEN;
-	}
-
-	/**
-	 * PARAM.
-	 * (id ID #IMPLIED)
-	 * (name CDATA #REQUIRED) ... should be defined locally.
-	 * (value CDATA #IMPLIED)
-	 * (valuetype (DATA|REF|OBJECT) DATA)
-	 * (type %ContentType; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {HTML40Namespace.ATTR_NAME_ID, HTML40Namespace.ATTR_NAME_VALUE, HTML40Namespace.ATTR_NAME_VALUETYPE, HTML40Namespace.ATTR_NAME_TYPE};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		// (name CDATA #REQUIRED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_NAME, atype, CMAttributeDeclaration.REQUIRED);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_NAME, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPRE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPRE.java
deleted file mode 100644
index 4e6b228..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPRE.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * PRE.
- */
-final class HedPRE extends HedInlineContainer {
-
-	/**
-	 * PRE element should keep spaces in its source.
-	 */
-	public HedPRE(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.PRE, collection);
-		// CORRECT_EMPTY - GROUP_COMPACT
-		correctionType = CORRECT_EMPTY;
-
-		keepSpaces = true;
-	}
-
-	/**
-	 * %attrs;
-	 * (width NUMBER #IMPLIED) ... should be defined locally.
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// (width NUMBER #IMPLIED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_WIDTH, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_WIDTH, attr);
-	}
-
-	/**
-	 * Exclusion.
-	 * <code>PRE</code> has the exclusion.
-	 * It is <code>%pre.exclusion;</code>.
-	 * %pre.exclusion is:
-	 * IMG | OBJECT | APPLET | BIG | SMALL | SUB | SUP | FONT | BASEFONT
-	 */
-	public CMContent getExclusion() {
-		if (exclusion != null)
-			return exclusion; // already created.
-		if (elementCollection == null)
-			return null;
-
-		exclusion = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		String[] names = {HTML40Namespace.ElementName.IMG, HTML40Namespace.ElementName.OBJECT, HTML40Namespace.ElementName.APPLET, HTML40Namespace.ElementName.BIG, HTML40Namespace.ElementName.SMALL, HTML40Namespace.ElementName.SUB, HTML40Namespace.ElementName.SUP, HTML40Namespace.ElementName.FONT, HTML40Namespace.ElementName.BASEFONT};
-		elementCollection.getDeclarations(exclusion, Arrays.asList(names).iterator());
-
-		return exclusion;
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPcdata.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPcdata.java
deleted file mode 100644
index 7e14c31..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPcdata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-
-/**
- * Base class for PCDATA type element declarations.<br>
- */
-abstract class HedPcdata extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedPcdata(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_PCDATA;
-	}
-
-	/**
-	 * Content.<br>
-	 * PCDATA type always returns <code>null</code>.
-	 * <br>
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMContent
-	 */
-	public CMContent getContent() {
-		return null;
-	}
-
-	/**
-	 * Content type.<br>
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.PCDATA;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPhrase.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPhrase.java
deleted file mode 100644
index 7561e1e..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPhrase.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-/**
- * %phrase;
- */
-final class HedPhrase extends HedInlineContainer {
-
-	/**
-	 */
-	public HedPhrase(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		correctionType = HTMLElementDeclaration.CORRECT_DUPLICATED;
-	}
-
-	/**
-	 * %attrs;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedQ.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedQ.java
deleted file mode 100644
index 018232f..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedQ.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * Q.
- */
-final class HedQ extends HedInlineContainer {
-
-	/**
-	 */
-	public HedQ(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.Q, collection);
-		correctionType = CORRECT_DUPLICATED;
-	}
-
-	/**
-	 * %attrs;
-	 * (cite %URI; #IMPLIED) 
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_CITE};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSCRIPT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSCRIPT.java
deleted file mode 100644
index a279a0d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSCRIPT.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-
-/**
- * SCRIPT.
- */
-final class HedSCRIPT extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedSCRIPT(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.SCRIPT, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_CDATA;
-		layoutType = LAYOUT_OBJECT;
-	}
-
-	/**
-	 * SCRIPT.
-	 * (charset %Charset; #IMPLIED)
-	 * (type %ContentType; #REQUIRED) ... should be defined locally.
-	 * (language CDATA #IMPLIED)
-	 * (src %URI; #IMPLIED)
-	 * (defer (defer) #IMPLIED)
-	 * (event CDATA #IMPLIED)
-	 * (for %URI; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {HTML40Namespace.ATTR_NAME_CHARSET, HTML40Namespace.ATTR_NAME_LANGUAGE, HTML40Namespace.ATTR_NAME_SRC, HTML40Namespace.ATTR_NAME_DEFER, HTML40Namespace.ATTR_NAME_EVENT, HTML40Namespace.ATTR_NAME_FOR};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		// (type %ContentType; #REQUIRED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(HTMLCMDataType.CONTENT_TYPE);
-		atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, "text/javascript"); //$NON-NLS-1$
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_TYPE, atype, CMAttributeDeclaration.REQUIRED);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_TYPE, attr);
-	}
-
-	/**
-	 * <code>SCRIPT</code> is CDATA type.
-	 * So, the method always returns <code>null</code>.
-	 * <br>
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMContent
-	 */
-	public CMContent getContent() {
-		return null;
-	}
-
-	/**
-	 * CDATA content.<br>
-	 * @return int
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.CDATA;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSELECT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSELECT.java
deleted file mode 100644
index 8e3c3f4..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSELECT.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * SELECT.
- */
-final class HedSELECT extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedSELECT(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.SELECT, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_SELECT;
-		layoutType = LAYOUT_OBJECT;
-		indentChild = true;
-	}
-
-	/**
-	 * %attrs;
-	 * %reserved;
-	 * (name CDATA #IMPLIED)
-	 * (size NUMBER #IMPLIED) ... should be defined locally.
-	 * (multiple (multiple) #IMPLIED)
-	 * (disabled (disabled) #IMPLIED)
-	 * (tabindex NUMBER #IMPLIED)
-	 * (onfocus %Script; #IMPLIED)
-	 * (onblur %Script; #IMPLIED)
-	 * (onchange %Script; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		// (size NUMBER #IMPLIED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_SIZE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_SIZE, attr);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_NAME, HTML40Namespace.ATTR_NAME_MULTIPLE, HTML40Namespace.ATTR_NAME_DISABLED, HTML40Namespace.ATTR_NAME_TABINDEX, HTML40Namespace.ATTR_NAME_ONFOCUS, HTML40Namespace.ATTR_NAME_ONBLUR, HTML40Namespace.ATTR_NAME_ONCHANGE};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.BUTTON};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSPAN.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSPAN.java
deleted file mode 100644
index b5aaa17..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSPAN.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-
-/**
- * SPAN.
- */
-final class HedSPAN extends HedInlineContainer {
-
-	/**
-	 * SPAN.
-	 */
-	public HedSPAN(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.SPAN, collection);
-	}
-
-	/**
-	 * %attrs;
-	 * %reserved; ... empty.
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIBase.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIBase.java
deleted file mode 100644
index 6638be7..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIBase.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-
-
-
-/**
- * Base class for SSI declarations.
- */
-abstract class HedSSIBase extends HedEmpty {
-
-	/**
-	 */
-	public HedSSIBase(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		layoutType = LAYOUT_OBJECT;
-	}
-
-	/**
-	 */
-	public int getFormatType() {
-		return HTMLElementDeclaration.FORMAT_SSI;
-	}
-
-	/**
-	 */
-	public boolean supports(String propName) {
-		if (propName.equals(HTMLCMProperties.IS_SSI))
-			return true;
-		return super.supports(propName);
-	}
-
-	/*
-	 */
-	public Object getProperty(String propName) {
-		if (propName.equals(HTMLCMProperties.IS_SSI))
-			return new Boolean(true);
-		return super.getProperty(propName);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIConfig.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIConfig.java
deleted file mode 100644
index 71d292c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIConfig.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * SSI:CONFIG.
- */
-final class HedSSIConfig extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSIConfig(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.SSI_CONFIG, collection);
-	}
-
-	/**
-	 * SSI:CONFIG.
-	 * (errmsg CDATA #IMPLIED)
-	 * (sizefmt CDATA #IMPLIED)
-	 * (timefmt CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {HTML40Namespace.ATTR_NAME_ERRMSG, HTML40Namespace.ATTR_NAME_SIZEFMT, HTML40Namespace.ATTR_NAME_TIMEFMT};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIEcho.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIEcho.java
deleted file mode 100644
index 38c5e6d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIEcho.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * SSI:ECHO.
- */
-final class HedSSIEcho extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSIEcho(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.SSI_ECHO, collection);
-	}
-
-	/**
-	 * SSI:ECHO
-	 * (var CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {HTML40Namespace.ATTR_NAME_VAR};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIExec.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIExec.java
deleted file mode 100644
index b2c3c85..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIExec.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * SSI:EXEC.
- */
-final class HedSSIExec extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSIExec(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.SSI_EXEC, collection);
-	}
-
-	/**
-	 * SSI:EXEC
-	 * (cgi %URI; #IMPLIED)
-	 * (cmd CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {HTML40Namespace.ATTR_NAME_CGI, HTML40Namespace.ATTR_NAME_CMD};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFlastmod.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFlastmod.java
deleted file mode 100644
index 4a83941..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFlastmod.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * SSI:FLASTMOD.
- */
-final class HedSSIFlastmod extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSIFlastmod(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.SSI_FLASTMOD, collection);
-	}
-
-	/**
-	 * SSI:FLASTMOD
-	 * (file %URI; #IMPLIED)
-	 * (virtual %URI #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {HTML40Namespace.ATTR_NAME_FILE, HTML40Namespace.ATTR_NAME_VIRTUAL};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFsize.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFsize.java
deleted file mode 100644
index 93f7541..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFsize.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * SSI:FSIZE.
- */
-final class HedSSIFsize extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSIFsize(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.SSI_FSIZE, collection);
-	}
-
-	/**
-	 * SSI:FSIZE
-	 * (file %URI; #IMPLIED)
-	 * (virtual %URI #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {HTML40Namespace.ATTR_NAME_FILE, HTML40Namespace.ATTR_NAME_VIRTUAL};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIInclude.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIInclude.java
deleted file mode 100644
index d28a553..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIInclude.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * SSI:INCLUDE.
- */
-final class HedSSIInclude extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSIInclude(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.SSI_INCLUDE, collection);
-	}
-
-	/**
-	 * SSI:INCLUDE
-	 * (file %URI; #IMPLIED)
-	 * (virtual %URI #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {HTML40Namespace.ATTR_NAME_FILE, HTML40Namespace.ATTR_NAME_VIRTUAL};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIPrintenv.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIPrintenv.java
deleted file mode 100644
index 05c303d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIPrintenv.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * SSI:PRINTENV.
- */
-final class HedSSIPrintenv extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSIPrintenv(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.SSI_PRINTENV, collection);
-	}
-
-	/**
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-	}
-
-	/**
-	 * SSI:PRINTENV has no attributes.  So, this method should
-	 * always return <code>null</code>.
-	 * Note: Since somebody doesn't expect null is returned, return the empty attribute
-	 * like a custom tag which doesn't have attributes
-	 */
-	public CMNamedNodeMap getAttributes() {
-		return super.getAttributes();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSISet.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSISet.java
deleted file mode 100644
index ed8c41a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSISet.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * SSI:SET.
- */
-final class HedSSISet extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSISet(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.SSI_SET, collection);
-	}
-
-	/**
-	 * SSI:SET
-	 * (var CDATA #IMPLIED)
-	 * (value CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {HTML40Namespace.ATTR_NAME_VAR, HTML40Namespace.ATTR_NAME_VALUE};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSTYLE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSTYLE.java
deleted file mode 100644
index 3782d5b..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSTYLE.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-
-/**
- * STYLE.
- */
-final class HedSTYLE extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedSTYLE(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.STYLE, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_CDATA;
-		layoutType = LAYOUT_HIDDEN;
-	}
-
-	/**
-	 * STYLE
-	 * %i18n;
-	 * (type %ContentType; #REQUIRED) ... should be defined locally.
-	 * (media %MediaDesc; #IMPLIED)
-	 * (title %Text; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %i18n;
-		attributeCollection.getI18n(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_MEDIA, HTML40Namespace.ATTR_NAME_TITLE};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-		// (type %ContentType; #REQUIRED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(HTMLCMDataType.CONTENT_TYPE);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_TYPE, atype, CMAttributeDeclaration.REQUIRED);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_TYPE, attr);
-	}
-
-	/**
-	 * Content.<br>
-	 * <code>STYLE</code> is CDATA content type.  So, it always returns <code>null</code>.
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMContent
-	 */
-	public CMContent getContent() {
-		return null;
-	}
-
-	/**
-	 * CDATA content.<br>
-	 * @return int
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.CDATA;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedScripts.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedScripts.java
deleted file mode 100644
index dab20e1..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedScripts.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * SUB and SUP.
- */
-final class HedScripts extends HedInlineContainer {
-
-	/**
-	 */
-	public HedScripts(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		correctionType = CORRECT_EMPTY;
-	}
-
-	/**
-	 * %attrs;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.PRE};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTABLE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTABLE.java
deleted file mode 100644
index 77aea58..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTABLE.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * TABLE.
- */
-final class HedTABLE extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedTABLE(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.TABLE, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_TABLE;
-		layoutType = LAYOUT_BLOCK;
-		indentChild = true;
-	}
-
-	/**
-	 * TABLE.
-	 * %attrs;
-	 * %reserved;
-	 * (summary %Text; #IMPLIED)
-	 * (width %Length; #IMPLIED)
-	 * (border %Pixels; #IMPLIED)
-	 * (frame %TFrame; #IMPLIED)
-	 * (rules %TRules; #IMPLIED)
-	 * (cellspacing %Length; #IMPLIED)
-	 * (cellpadding %Length; #IMPLIED)
-	 * (align %TAlign; #IMPLIED)
-	 * (bgcolor %Color; #IMPLIED)
-	 * (datapagesize CDATA #IMPLIED)
-	 * (height %Pixels; #IMPLIED)
-	 * (background %URI; #IMPLIED)
-	 * (bordercolor %Color #IMPLIED) ... D205514
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// %reserved;
-		// ... %reserved; is empty in the current DTD.
-
-		String[] names = {HTML40Namespace.ATTR_NAME_SUMMARY, HTML40Namespace.ATTR_NAME_WIDTH, HTML40Namespace.ATTR_NAME_BORDER, HTML40Namespace.ATTR_NAME_FRAME, HTML40Namespace.ATTR_NAME_RULES, HTML40Namespace.ATTR_NAME_CELLSPACING, HTML40Namespace.ATTR_NAME_CELLPADDING, HTML40Namespace.ATTR_NAME_BGCOLOR, HTML40Namespace.ATTR_NAME_DATAPAGESIZE, HTML40Namespace.ATTR_NAME_HEIGHT, HTML40Namespace.ATTR_NAME_BACKGROUND, HTML40Namespace.ATTR_NAME_BORDERCOLOR // D205514
-		};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		// align (local)
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		String[] alignValues = {HTML40Namespace.ATTR_VALUE_LEFT, HTML40Namespace.ATTR_VALUE_CENTER, HTML40Namespace.ATTR_VALUE_RIGHT};
-		atype.setEnumValues(alignValues);
-		HTMLAttrDeclImpl adec = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_ALIGN, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_ALIGN, adec);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTEXTAREA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTEXTAREA.java
deleted file mode 100644
index 4fb0f5e..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTEXTAREA.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * TEXTAREA.
- */
-final class HedTEXTAREA extends HedPcdata {
-
-	/**
-	 * TEXTAREA should keep spaces in its source.
-	 */
-	public HedTEXTAREA(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.TEXTAREA, collection);
-		layoutType = LAYOUT_OBJECT;
-
-		keepSpaces = true;
-	}
-
-	/**
-	 * TEXTAREA.
-	 * %attrs;
-	 * %reserved; ... empty
-	 * (name CDATA #IMPLIED)
-	 * (rows NUMBER #REQUIRED)
-	 * (cols NUMBER #REQUIRED)
-	 * (disabled (disabled) #IMPLIED)
-	 * (readonly (readonly) #IMPLIED)
-	 * (tabindex NUMBER #IMPLIED)
-	 * (accesskey %Character; #IMPLIED)
-	 * (onfocus %Script; #IMPLIED)
-	 * (onblur %Script; #IMPLIED)
-	 * (onselect %Script; #IMPLIED)
-	 * (onchange %Script; #IMPLIED)
-	 * (istyle CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_NAME, HTML40Namespace.ATTR_NAME_ROWS, HTML40Namespace.ATTR_NAME_COLS, HTML40Namespace.ATTR_NAME_DISABLED, HTML40Namespace.ATTR_NAME_READONLY, HTML40Namespace.ATTR_NAME_TABINDEX, HTML40Namespace.ATTR_NAME_ACCESSKEY, HTML40Namespace.ATTR_NAME_ONFOCUS, HTML40Namespace.ATTR_NAME_ONBLUR, HTML40Namespace.ATTR_NAME_ONSELECT, HTML40Namespace.ATTR_NAME_ONCHANGE, HTML40Namespace.ATTR_NAME_ISTYLE};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.BUTTON};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTITLE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTITLE.java
deleted file mode 100644
index ae8cf19..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTITLE.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-
-/**
- * TITLE.
- */
-final class HedTITLE extends HedPcdata {
-
-	/**
-	 */
-	public HedTITLE(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.TITLE, collection);
-		layoutType = LAYOUT_HIDDEN;
-	}
-
-	/**
-	 * TITLE.
-	 * %i18n;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %i18n;
-		attributeCollection.getI18n(attributes);
-	}
-
-	/**
-	 * Exclusion.
-	 * <code>TITLE</code> has the exclusion.
-	 * It is <code>%head.misc;</code>.
-	 * %head.misc; is <code>SCRIPT|STYLE|META|LINK|OBJECT</code>.
-	 */
-	public CMContent getExclusion() {
-		if (exclusion != null)
-			return exclusion; // already created.
-		if (elementCollection == null)
-			return null;
-
-		// (SCRIPT|STYLE|META|LINK|OBJECT)
-		exclusion = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-
-		String[] names = {HTML40Namespace.ElementName.SCRIPT, HTML40Namespace.ElementName.STYLE, HTML40Namespace.ElementName.META, HTML40Namespace.ElementName.LINK, HTML40Namespace.ElementName.OBJECT};
-		elementCollection.getDeclarations(exclusion, Arrays.asList(names).iterator());
-		return exclusion;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTR.java
deleted file mode 100644
index cf15cf0..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTR.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * TR.
- */
-final class HedTR extends HTMLElemDeclImpl {
-
-	private static String[] terminators = {HTML40Namespace.ElementName.TR};
-
-	/**
-	 */
-	public HedTR(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.TR, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_TCELL_CONTAINER;
-		layoutType = LAYOUT_BLOCK;
-		omitType = OMIT_END;
-		indentChild = true;
-	}
-
-	/**
-	 * %attrs;
-	 * %cellhalign;
-	 * %cellvalign;
-	 * (bgcolor %Color; #IMPLIED)
-	 * (background %URI; #IMPLIED)
-	 * (bordercolor %Color #IMPLIED) ... D205514
-	 * (height %Length #IMPLIED) bug2246
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// %cellhalign;
-		attributeCollection.getCellhalign(attributes);
-		// %cellvalign;
-		attributeCollection.getCellvalign(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_BGCOLOR, HTML40Namespace.ATTR_NAME_BACKGROUND, HTML40Namespace.ATTR_NAME_BORDERCOLOR, HTML40Namespace.ATTR_NAME_HEIGHT // D205514
-		};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 * TR has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableBody.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableBody.java
deleted file mode 100644
index ad2e6a7..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableBody.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * THEAD/TFOOT/TBODY
- */
-final class HedTableBody extends HTMLElemDeclImpl {
-
-	private static String[] terminators = {HTML40Namespace.ElementName.CAPTION, HTML40Namespace.ElementName.COL, HTML40Namespace.ElementName.COLGROUP, HTML40Namespace.ElementName.THEAD, HTML40Namespace.ElementName.TBODY, HTML40Namespace.ElementName.TFOOT};
-
-	/**
-	 */
-	public HedTableBody(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_TR_CONTAINER;
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-		if (elementName == HTML40Namespace.ElementName.TBODY) {
-			omitType = OMIT_BOTH;
-		}
-		else {
-			omitType = OMIT_END;
-		}
-		indentChild = true;
-	}
-
-	/**
-	 * TBODY/TFOOT/THEAD
-	 * %attrs;
-	 * %cellhalign;
-	 * %cellvalign;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// %cellhalign;
-		attributeCollection.getCellhalign(attributes);
-		// %cellvalign;
-		attributeCollection.getCellvalign(attributes);
-	}
-
-	/**
-	 * THEAD, TFOOT and TBODY have terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableCell.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableCell.java
deleted file mode 100644
index 5a791e6..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableCell.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-/**
- * (TH | TD).
- */
-final class HedTableCell extends HedFlowContainer {
-
-	private static String[] terminators = {HTML40Namespace.ElementName.TR, HTML40Namespace.ElementName.TH, HTML40Namespace.ElementName.TD};
-
-	/**
-	 */
-	public HedTableCell(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		layoutType = LAYOUT_BLOCK;
-		omitType = OMIT_END;
-	}
-
-	/**
-	 * %attrs;
-	 * (abbr %Text; #IMPLIED)
-	 * (axis CDATA #IMPLIED)
-	 * (headers IDREFS #IMPLIED)
-	 * (scope %Scope; #IMPLIED)
-	 * (rowspan NUMBER 1)
-	 * (colspan NUMBER 1)
-	 * %cellhalign;
-	 * %cellvalign;
-	 * (nowrap (nowrap) #IMPLIED)
-	 * (bgcolor %Color; #IMPLIED)
-	 * (width %Length; #IMPLIED)
-	 * (height %Length; #IMPLIED)
-	 * (background %URI; #IMPLIED)
-	 * (bordercolor %Color #IMPLIED) ... D205514
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// %cellhalign;
-		attributeCollection.getCellhalign(attributes);
-		// %cellvalign;
-		attributeCollection.getCellvalign(attributes);
-
-		String[] names = {HTML40Namespace.ATTR_NAME_ABBR, HTML40Namespace.ATTR_NAME_AXIS, HTML40Namespace.ATTR_NAME_HEADERS, HTML40Namespace.ATTR_NAME_SCOPE, HTML40Namespace.ATTR_NAME_ROWSPAN, HTML40Namespace.ATTR_NAME_COLSPAN, HTML40Namespace.ATTR_NAME_NOWRAP, HTML40Namespace.ATTR_NAME_BGCOLOR, HTML40Namespace.ATTR_NAME_WIDTH, HTML40Namespace.ATTR_NAME_HEIGHT, HTML40Namespace.ATTR_NAME_BACKGROUND, HTML40Namespace.ATTR_NAME_BORDERCOLOR // D205514
-		};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 * TH and TD have terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedUL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedUL.java
deleted file mode 100644
index 2244e67..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedUL.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * UL.
- */
-final class HedUL extends HedListItemContainer {
-
-	/**
-	 */
-	public HedUL(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.UL, collection);
-	}
-
-	/**
-	 * UL.
-	 * (type %ULStyle; #IMPLIED) ... should be defined locally.
-	 * (compact (compact) #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		// (type %ULStyle; #IMPLIED) ... should be defined locally.
-		// %ULStyle; is (disc|square|circle).
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		String[] values = {HTML40Namespace.ATTR_VALUE_DISC, HTML40Namespace.ATTR_VALUE_SQUARE, HTML40Namespace.ATTR_VALUE_CIRCLE};
-		atype.setEnumValues(values);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(HTML40Namespace.ATTR_NAME_TYPE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(HTML40Namespace.ATTR_NAME_TYPE, attr);
-
-		// the rest.
-		String[] names = {HTML40Namespace.ATTR_NAME_COMPACT};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {HTML40Namespace.ElementName.DIR, HTML40Namespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedWBR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedWBR.java
deleted file mode 100644
index 2e4e54d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedWBR.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-
-final class HedWBR extends HedEmpty {
-
-	public HedWBR(ElementCollection collection) {
-		super(HTML40Namespace.ElementName.WBR, collection);
-		// LAYOUT_BREAK.
-		// same as BR.
-		layoutType = LAYOUT_BREAK;
-	}
-
-	protected void createAttributeDeclarations() {
-		// No attributes is defined.
-		if (attributes != null)
-			return;
-		attributes = new CMNamedNodeMapImpl();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JCMDocImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JCMDocImpl.java
deleted file mode 100644
index 0d60d50..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JCMDocImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Implementation of CMDocument for the JSP 1.1.
- */
-class JCMDocImpl extends CMNodeImpl implements JSPCMDocument {
-
-	/** Namespace for all names of elements, entities and attributes. */
-	private CMNamespaceImpl namespace = null;
-	private JSPElementCollection elements = null;
-
-	/**
-	 * HCMDocImpl constructor comment.
-	 */
-	public JCMDocImpl(String docTypeName, CMNamespaceImpl targetNamespace) {
-		super(docTypeName);
-		namespace = targetNamespace;
-		elements = new JSPElementCollection();
-	}
-
-	public HTMLElementDeclaration getElementDeclaration(String elementName) {
-		if (elements == null)
-			return null;
-		return (HTMLElementDeclaration) elements.getNamedItem(elementName);
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMDocument
-	 */
-	public CMNamedNodeMap getElements() {
-		return elements;
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMDocument
-	 */
-	public CMNamedNodeMap getEntities() {
-		return null;
-	}
-
-	public HTMLEntityDeclaration getEntityDeclaration(String entityName) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMDocument
-	 */
-	public org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace getNamespace() {
-		return namespace;
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 */
-	public int getNodeType() {
-		return CMNode.DOCUMENT;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSP11Namespace.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSP11Namespace.java
deleted file mode 100644
index acfff3b..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSP11Namespace.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-/**
- * JSP 1.1 Namespace. Note, this interface was 
- * copied form JSP core packages. One implication 
- * is that extra care is needed in using '==' instead 
- * of '.equals'.
- */
-public interface JSP11Namespace {
-
-	public static interface ElementName {
-		// Element names
-		public static final String SCRIPTLET = "jsp:scriptlet"; //$NON-NLS-1$
-		public static final String EXPRESSION = "jsp:expression"; //$NON-NLS-1$
-		public static final String DECLARATION = "jsp:declaration"; //$NON-NLS-1$
-		public static final String DIRECTIVE_PAGE = "jsp:directive.page"; //$NON-NLS-1$
-		public static final String DIRECTIVE_INCLUDE = "jsp:directive.include"; //$NON-NLS-1$
-		public static final String DIRECTIVE_TAGLIB = "jsp:directive.taglib"; //$NON-NLS-1$
-		public static final String USEBEAN = "jsp:useBean"; //$NON-NLS-1$
-		public static final String SETPROPERTY = "jsp:setProperty"; //$NON-NLS-1$
-		public static final String GETPROPERTY = "jsp:getProperty"; //$NON-NLS-1$
-		public static final String INCLUDE = "jsp:include"; //$NON-NLS-1$
-		public static final String FORWARD = "jsp:forward"; //$NON-NLS-1$
-		public static final String PLUGIN = "jsp:plugin"; //$NON-NLS-1$
-		public static final String PARAMS = "jsp:params"; //$NON-NLS-1$
-		public static final String FALLBACK = "jsp:fallback"; //$NON-NLS-1$
-		public static final String PARAM = "jsp:param"; //$NON-NLS-1$
-		public static final String ROOT = "jsp:root"; //$NON-NLS-1$
-		public static final String TEXT = "jsp:text"; //$NON-NLS-1$
-	}
-
-	public static final String JSP11_URI = ""; //$NON-NLS-1$
-	public static final String JSP_TAG_PREFIX = "jsp"; //$NON-NLS-1$
-	// attribute names
-	//   directive.page
-	public static final String ATTR_NAME_LANGUAGE = "language"; //$NON-NLS-1$
-	public static final String ATTR_NAME_EXTENDS = "extends"; //$NON-NLS-1$
-	public static final String ATTR_NAME_CONTENT_TYPE = "contentType"; //$NON-NLS-1$
-	public static final String ATTR_NAME_IMPORT = "import"; //$NON-NLS-1$
-	public static final String ATTR_NAME_SESSION = "session"; //$NON-NLS-1$
-	public static final String ATTR_NAME_BUFFER = "buffer"; //$NON-NLS-1$
-	public static final String ATTR_NAME_AUTOFLUSH = "autoFlush"; //$NON-NLS-1$
-	public static final String ATTR_NAME_IS_THREAD_SAFE = "isThreadSafe"; //$NON-NLS-1$
-	public static final String ATTR_NAME_INFO = "info"; //$NON-NLS-1$
-	public static final String ATTR_NAME_ERROR_PAGE = "errorPage"; //$NON-NLS-1$
-	public static final String ATTR_NAME_IS_ERROR_PAGE = "isErrorPage"; //$NON-NLS-1$
-	public static final String ATTR_NAME_PAGE_ENCODING = "pageEncoding"; //$NON-NLS-1$
-	//   directive.include
-	public static final String ATTR_NAME_FILE = "file"; //$NON-NLS-1$
-	//   directive.taglib
-	public static final String ATTR_NAME_URI = "uri"; //$NON-NLS-1$
-	public static final String ATTR_NAME_PREFIX = "prefix"; //$NON-NLS-1$
-	//   useBean
-	public static final String ATTR_NAME_ID = "id"; //$NON-NLS-1$
-	public static final String ATTR_NAME_SCOPE = "scope"; //$NON-NLS-1$
-	public static final String ATTR_NAME_CLASS = "class"; //$NON-NLS-1$
-	public static final String ATTR_NAME_BEAN_NAME = "beanName"; //$NON-NLS-1$
-	public static final String ATTR_NAME_TYPE = "type"; //$NON-NLS-1$
-	//   setProperty
-	public static final String ATTR_NAME_NAME = "name"; //$NON-NLS-1$
-	public static final String ATTR_NAME_PROPERTY = "property"; //$NON-NLS-1$
-	public static final String ATTR_NAME_VALUE = "value"; //$NON-NLS-1$
-	public static final String ATTR_NAME_PARAM = "param"; //$NON-NLS-1$
-	//   include
-	public static final String ATTR_NAME_PAGE = "page"; //$NON-NLS-1$
-	public static final String ATTR_NAME_FLUSH = "flush"; //$NON-NLS-1$
-	//   plugin
-	public static final String ATTR_NAME_CODE = "code"; //$NON-NLS-1$
-	public static final String ATTR_NAME_CODEBASE = "codebase"; //$NON-NLS-1$
-	public static final String ATTR_NAME_ALIGN = "align"; //$NON-NLS-1$
-	public static final String ATTR_NAME_ARCHIVE = "archive"; //$NON-NLS-1$
-	public static final String ATTR_NAME_HEIGHT = "height"; //$NON-NLS-1$
-	public static final String ATTR_NAME_HSPACE = "hspace"; //$NON-NLS-1$
-	public static final String ATTR_NAME_JREVERSION = "jreversion"; //$NON-NLS-1$
-	public static final String ATTR_NAME_VSPACE = "vspace"; //$NON-NLS-1$
-	public static final String ATTR_NAME_WIDTH = "width"; //$NON-NLS-1$
-	public static final String ATTR_NAME_NSPLUGINURL = "nspluginurl"; //$NON-NLS-1$
-	public static final String ATTR_NAME_IEPLUGINURL = "iepluginurl"; //$NON-NLS-1$
-	//   root
-	public static final String ATTR_NAME_XMLNS_JSP = "xmlns:jsp"; //$NON-NLS-1$
-	public static final String ATTR_NAME_VERSION = "version"; //$NON-NLS-1$
-	// attribute values
-	public static final String ATTR_VALUE_TRUE = "true"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_FALSE = "false"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_JAVA = "java"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_CT_DEFAULT = "text/html; charset=ISO-8859-1";//D195366 //$NON-NLS-1$
-	public static final String ATTR_VALUE_BUFSIZ_DEFAULT = "8kb"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_PAGE = "page"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_SESSION = "session"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_REQUEST = "request"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_APPLICATION = "application"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_BEAN = "bean"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_APPLET = "applet"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_TOP = "top"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_MIDDLE = "middle"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_BOTTOM = "bottom"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_LEFT = "left"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_RIGHT = "right"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_JVER11 = "1.1"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_XMLNS_JSP = "http://java.sun.com/JSP/Page"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSPCMDocument.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSPCMDocument.java
deleted file mode 100644
index a7f37c9..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSPCMDocument.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-/**
- * JSP extension for CMDocument.
- * This interface provides some short hand methods to get declarations
- * by a name.
- */
-public interface JSPCMDocument extends org.eclipse.wst.xml.core.internal.contentmodel.CMDocument {
-
-	/**
-	 * A short hand method to get a element declaration for a JSP element.
-	 * JSP declaration class implements HTMLElementDeclaration interface.
-	 * @param elementName java.lang.String
-	 */
-	HTMLElementDeclaration getElementDeclaration(String elementName);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSPElementCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSPElementCollection.java
deleted file mode 100644
index a2efa22..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSPElementCollection.java
+++ /dev/null
@@ -1,895 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Factory for element declarations of the JSP 1.1.
- */
-final class JSPElementCollection extends DeclCollection implements JSP11Namespace.ElementName {
-
-
-	private class TypePacket {
-		public String name = null;
-		public int content = CMElementDeclaration.EMPTY;
-		public int omit = HTMLElementDeclaration.OMIT_NONE;
-		public int lineBreak = HTMLElementDeclaration.BREAK_NONE;
-		public int layout = HTMLElementDeclaration.LAYOUT_NONE;
-		public int correct = HTMLElementDeclaration.CORRECT_NONE;
-		public int format = HTMLElementDeclaration.FORMAT_XML;
-		public boolean indentChild = false;
-
-		public TypePacket() {
-		}
-	}
-
-	/** JSP element declaration. */
-	private class ElemDecl extends CMContentImpl implements HTMLElementDeclaration, HTMLPropertyDeclaration {
-		private TypePacket type = null;
-		private CMGroupImpl content = null;
-		private CMNamedNodeMapImpl attributes = null;
-
-		public ElemDecl(TypePacket t) {
-			super(t.name, 1, 1);
-			type = t;
-		}
-
-		public void setContent(CMGroupImpl group) {
-			content = group;
-		}
-
-		public void setAttributes(CMNamedNodeMapImpl attrs) {
-			attributes = attrs;
-		}
-
-		// implementes CMNode
-		public int getNodeType() {
-			return CMNode.ELEMENT_DECLARATION;
-		}
-
-		public boolean supports(String propertyName) {
-			if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE)) {
-				return true;
-			}
-			else if (propertyName.equals(HTMLCMProperties.CONTENT_HINT)) {
-				return true;
-			}
-			else {
-				PropertyProvider pp = PropertyProviderFactory.getProvider(propertyName);
-				if (pp == null)
-					return false;
-				return pp.supports(this);
-			}
-		}
-
-		public Object getProperty(String propertyName) {
-			if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE)) {
-				return new Boolean(false); //D208839
-			}
-			else if (propertyName.equals(HTMLCMProperties.CONTENT_HINT)) {
-				String myName = getElementName();
-				if (myName == JSP11Namespace.ElementName.PLUGIN) {
-					return getNamedItem(JSP11Namespace.ElementName.PARAMS); // outer class method.
-				}
-				else if (myName == JSP11Namespace.ElementName.PARAMS) {
-					return getNamedItem(JSP11Namespace.ElementName.PARAM); // outer class method.
-				}
-				else {
-					return null;
-				}
-			}
-			else {
-				PropertyProvider pp = PropertyProviderFactory.getProvider(propertyName);
-				if (pp == null)
-					return null;
-				return pp.get(this);
-			}
-		}
-
-		// implementes CMElementDeclaration
-		public CMNamedNodeMap getAttributes() {
-			return attributes;
-		}
-
-		public CMContent getContent() {
-			return content;
-		}
-
-		public int getContentType() {
-			return type.content;
-		}
-
-		public CMDataType getDataType() {
-			return null;
-		}
-
-		public String getElementName() {
-			return getNodeName();
-		}
-
-		public CMNamedNodeMap getLocalElements() {
-			return null;
-		}
-
-		// implementes HTMLElementDeclaration
-		public HTMLAttributeDeclaration getAttributeDeclaration(String attrName) {
-			if (attributes == null)
-				return null;
-			return (HTMLAttributeDeclaration) attributes.getNamedItem(attrName);
-		}
-
-		public int getCorrectionType() {
-			return type.correct;
-		}
-
-		public CMContent getExclusion() {
-			return null;
-		}
-
-		public CMContent getInclusion() {
-			return null;
-		}
-
-		public CMNamedNodeMap getProhibitedAncestors() {
-			return EMPTY_MAP;
-		}
-
-		public int getFormatType() {
-			return type.format;
-		}
-
-		public int getLayoutType() {
-			return type.layout;
-		}
-
-		public int getLineBreakHint() {
-			return type.lineBreak;
-		}
-
-		public int getOmitType() {
-			return type.omit;
-		}
-
-		public boolean shouldTerminateAt(HTMLElementDeclaration dec) {
-			return false;
-		}
-
-		public boolean shouldKeepSpaces() {
-			return false;
-		}
-
-		public boolean shouldIndentChildSource() {
-			return type.indentChild;
-		}
-
-		public boolean isJSP() {
-			return true;
-		}
-	}
-
-	// element IDs
-	private static class Ids {
-		public static final int ID_SCRIPTLET = 0;
-		public static final int ID_EXPRESSION = 1;
-		public static final int ID_DECLARATION = 2;
-		public static final int ID_DIRECTIVE_PAGE = 3;
-		public static final int ID_DIRECTIVE_INCLUDE = 4;
-		public static final int ID_DIRECTIVE_TAGLIB = 5;
-		public static final int ID_USEBEAN = 6;
-		public static final int ID_SETPROPERTY = 7;
-		public static final int ID_GETPROPERTY = 8;
-		public static final int ID_INCLUDE = 9;
-		public static final int ID_FORWARD = 10;
-		public static final int ID_PLUGIN = 11;
-		public static final int ID_PARAMS = 12;
-		public static final int ID_FALLBACK = 13;
-		public static final int ID_PARAM = 14;
-		public static final int ID_ROOT = 15;
-		public static final int ID_TEXT = 16;
-
-		public static int getNumOfIds() {
-			if (numofids != -1)
-				return numofids;
-
-			// NOTE: If the reflection is too slow, this method should
-			// just return the literal value, like 105.
-			// -- 5/25/2001
-			Class clazz = Ids.class;
-			Field[] fields = clazz.getFields();
-			numofids = 0;
-			for (int i = 0; i < fields.length; i++) {
-				String name = fields[i].getName();
-				if (name.startsWith("ID_"))//$NON-NLS-1$
-					numofids++;
-			}
-			return numofids;
-		}
-
-		// chache the result of the reflection.
-		private static int numofids = -1;
-	}
-
-	// attribute creater
-	private class JACreater implements JSP11Namespace {
-		// attribute declaration
-		private class AttrDecl extends CMNodeImpl implements HTMLAttributeDeclaration {
-			HTMLCMDataTypeImpl type = null;
-			int usage = CMAttributeDeclaration.OPTIONAL;
-
-			// methods
-			public AttrDecl(String attrName) {
-				super(attrName);
-			}
-
-			public String getAttrName() {
-				return getNodeName();
-			}
-
-			public CMDataType getAttrType() {
-				return type;
-			}
-
-			/** @deprecated by superclass */
-			public String getDefaultValue() {
-				if (type.getImpliedValueKind() != CMDataType.IMPLIED_VALUE_DEFAULT)
-					return null;
-				return type.getImpliedValue();
-			}
-
-			/** @deprecated  by superclass */
-			public Enumeration getEnumAttr() {
-				Vector v = new Vector(Arrays.asList(type.getEnumeratedValues()));
-				return v.elements();
-			}
-
-			public int getNodeType() {
-				return CMNode.ATTRIBUTE_DECLARATION;
-			}
-
-			public int getUsage() {
-				return usage;
-			}
-
-			public boolean shouldIgnoreCase() {
-				return false;
-			}
-		}
-
-		private CMNamedNodeMapImpl declarations = null;
-
-		public JACreater() {
-			declarations = new CMNamedNodeMapImpl();
-		}
-
-		public CMNamedNodeMapImpl getDeclarations(int eid) {
-			switch (eid) {
-				case Ids.ID_DIRECTIVE_PAGE :
-					createForDirPage();
-					break;
-				case Ids.ID_DIRECTIVE_INCLUDE :
-					createForDirInclude();
-					break;
-				case Ids.ID_DIRECTIVE_TAGLIB :
-					createForDirTaglib();
-					break;
-				case Ids.ID_USEBEAN :
-					createForUseBean();
-					break;
-				case Ids.ID_SETPROPERTY :
-					createForSetProperty();
-					break;
-				case Ids.ID_GETPROPERTY :
-					createForGetProperty();
-					break;
-				case Ids.ID_INCLUDE :
-					createForInclude();
-					break;
-				case Ids.ID_FORWARD :
-					createForForward();
-					break;
-				case Ids.ID_PLUGIN :
-					createForPlugin();
-					break;
-				case Ids.ID_PARAM :
-					createForParam();
-					break;
-				case Ids.ID_ROOT :
-					createForRoot();
-					break;
-				default :
-					// should warn.
-					break;
-			}
-			return declarations;
-		}
-
-		private AttrDecl createBoolType(String name, String defValue) {
-			AttrDecl adec = new AttrDecl(name);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_TRUE, ATTR_VALUE_FALSE};
-			adec.type.setEnumValues(values);
-			adec.type.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, defValue);
-			return adec;
-		}
-
-		private void createForDirPage() {
-			AttrDecl adec = null;
-			// ("language" CDATA DECLARED "java")
-			adec = new AttrDecl(ATTR_NAME_LANGUAGE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			adec.type.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_JAVA);
-			declarations.putNamedItem(ATTR_NAME_LANGUAGE, adec);
-
-			// ("extends" CDATA IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_EXTENDS);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			declarations.putNamedItem(ATTR_NAME_EXTENDS, adec);
-
-			// ("contentType" CDATA DECLARED "text/html; ISO-8859-1")
-			adec = new AttrDecl(ATTR_NAME_CONTENT_TYPE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			adec.type.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_CT_DEFAULT);
-			declarations.putNamedItem(ATTR_NAME_CONTENT_TYPE, adec);
-
-			// ("import" CDATA IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_IMPORT);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			declarations.putNamedItem(ATTR_NAME_IMPORT, adec);
-
-			// ("session" ENUM DECLARED (true|false) "true")
-			adec = createBoolType(ATTR_NAME_SESSION, ATTR_VALUE_TRUE);
-			if (adec != null)
-				declarations.putNamedItem(ATTR_NAME_SESSION, adec);
-
-			// ("buffer" CDATA DECLARED "8kb")
-			adec = new AttrDecl(ATTR_NAME_BUFFER);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			adec.type.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_BUFSIZ_DEFAULT);
-			declarations.putNamedItem(ATTR_NAME_BUFFER, adec);
-
-			// ("autoFlush" ENUM DECLARED (true|false) "true")
-			adec = createBoolType(ATTR_NAME_AUTOFLUSH, ATTR_VALUE_TRUE);
-			if (adec != null)
-				declarations.putNamedItem(ATTR_NAME_AUTOFLUSH, adec);
-
-			// ("isThreadSafe" ENUM DECLARED (true|false) "true")
-			adec = createBoolType(ATTR_NAME_IS_THREAD_SAFE, ATTR_VALUE_TRUE);
-			if (adec != null)
-				declarations.putNamedItem(ATTR_NAME_IS_THREAD_SAFE, adec);
-
-			// ("info" CDATA IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_INFO);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			declarations.putNamedItem(ATTR_NAME_INFO, adec);
-
-			// ("errorPage" URI IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_ERROR_PAGE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.URI);
-			declarations.putNamedItem(ATTR_NAME_ERROR_PAGE, adec);
-
-			// ("isErrorPage" ENUM DECLARED (true|false) "false")
-			adec = createBoolType(ATTR_NAME_IS_ERROR_PAGE, ATTR_VALUE_FALSE);
-			if (adec != null)
-				declarations.putNamedItem(ATTR_NAME_IS_ERROR_PAGE, adec);
-
-			// ("pageEncoding" CDATA IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_PAGE_ENCODING);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			declarations.putNamedItem(ATTR_NAME_PAGE_ENCODING, adec);
-
-		}
-
-		private void createForDirInclude() {
-			// ("file" URI REQUIRED); Defect TORO:185241
-			AttrDecl adec = new AttrDecl(ATTR_NAME_FILE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.URI);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			declarations.putNamedItem(ATTR_NAME_FILE, adec);
-		}
-
-		private void createForDirTaglib() {
-			// ("uri" URI REQUIRED)
-			AttrDecl adec = new AttrDecl(ATTR_NAME_URI);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.URI);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			declarations.putNamedItem(ATTR_NAME_URI, adec);
-
-			// ("prefix" CDATA REQUIRED)
-			adec = new AttrDecl(ATTR_NAME_PREFIX);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			declarations.putNamedItem(ATTR_NAME_PREFIX, adec);
-		}
-
-		private void createForUseBean() {
-			// ("id" ID REQUIRED)
-			AttrDecl adec = new AttrDecl(ATTR_NAME_ID);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.ID);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			declarations.putNamedItem(ATTR_NAME_ID, adec);
-
-			// ("scope" ENUM DECLARED (page|session|request|application) "page")
-			adec = new AttrDecl(ATTR_NAME_SCOPE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_PAGE, ATTR_VALUE_SESSION, ATTR_VALUE_REQUEST, ATTR_VALUE_APPLICATION};
-			adec.type.setEnumValues(values);
-			adec.type.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_PAGE);
-			declarations.putNamedItem(ATTR_NAME_SCOPE, adec);
-
-			// ("class" CDATA IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_CLASS);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			declarations.putNamedItem(ATTR_NAME_CLASS, adec);
-
-			// ("beanName" CDATA IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_BEAN_NAME);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			declarations.putNamedItem(ATTR_NAME_BEAN_NAME, adec);
-
-			// ("type" CDATA IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_TYPE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			declarations.putNamedItem(ATTR_NAME_TYPE, adec);
-		}
-
-		private void createForSetProperty() {
-			// ("name" IDREF REQUIRED)
-			AttrDecl adec = new AttrDecl(ATTR_NAME_NAME);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.IDREF);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			declarations.putNamedItem(ATTR_NAME_NAME, adec);
-
-			// ("property" CDATA REQUIRED)
-			adec = new AttrDecl(ATTR_NAME_PROPERTY);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			declarations.putNamedItem(ATTR_NAME_PROPERTY, adec);
-
-			// ("value" CDATA IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_VALUE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			declarations.putNamedItem(ATTR_NAME_VALUE, adec);
-
-			// ("param" CDATA IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_PARAM);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			declarations.putNamedItem(ATTR_NAME_PARAM, adec);
-
-		}
-
-		private void createForGetProperty() {
-			// ("name" IDREF REQUIRED)
-			AttrDecl adec = new AttrDecl(ATTR_NAME_NAME);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.IDREF);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			declarations.putNamedItem(ATTR_NAME_NAME, adec);
-
-			// ("property" CDATA REQUIRED)
-			adec = new AttrDecl(ATTR_NAME_PROPERTY);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			declarations.putNamedItem(ATTR_NAME_PROPERTY, adec);
-
-		}
-
-		private void createForInclude() {
-			AttrDecl adec = null;
-			// ("page" URI REQUIRED)
-			adec = new AttrDecl(ATTR_NAME_PAGE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.URI);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			declarations.putNamedItem(ATTR_NAME_PAGE, adec);
-
-			// ("flush" ENUM REQUIRED (true|false)); Defect TORO:185241
-			adec = new AttrDecl(ATTR_NAME_FLUSH);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			String[] values = {ATTR_VALUE_TRUE, ATTR_VALUE_FALSE};
-			adec.type.setEnumValues(values);
-			declarations.putNamedItem(ATTR_NAME_FLUSH, adec);
-		}
-
-		private void createForForward() {
-			// ("page" URI REQUIRED)
-			AttrDecl adec = new AttrDecl(ATTR_NAME_PAGE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.URI);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			declarations.putNamedItem(ATTR_NAME_PAGE, adec);
-		}
-
-		private void createForPlugin() {
-			// ("type" ENUM REQUIRED (bean|applet))
-			AttrDecl adec = new AttrDecl(ATTR_NAME_TYPE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			String[] values = {ATTR_VALUE_BEAN, ATTR_VALUE_APPLET};
-			adec.type.setEnumValues(values);
-			declarations.putNamedItem(ATTR_NAME_TYPE, adec);
-
-			// ("code" CDATA REQUIRED)
-			adec = new AttrDecl(ATTR_NAME_CODE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.URI);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			declarations.putNamedItem(ATTR_NAME_CODE, adec);
-
-			// ("codebase" URI REQUIRED)
-			adec = new AttrDecl(ATTR_NAME_CODEBASE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.URI);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			declarations.putNamedItem(ATTR_NAME_CODEBASE, adec);
-
-			// ("align" ENUM IMPLIED (top|middle|bottom|left|right))
-			adec = new AttrDecl(ATTR_NAME_ALIGN);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] aligns = {ATTR_VALUE_TOP, ATTR_VALUE_MIDDLE, ATTR_VALUE_BOTTOM, ATTR_VALUE_LEFT, ATTR_VALUE_RIGHT};
-			adec.type.setEnumValues(aligns);
-			declarations.putNamedItem(ATTR_NAME_ALIGN, adec);
-
-			// ("archive" CDATA IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_ARCHIVE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			declarations.putNamedItem(ATTR_NAME_ARCHIVE, adec);
-
-			// ("height" CDATA IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_HEIGHT);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			declarations.putNamedItem(ATTR_NAME_HEIGHT, adec);
-
-			// ("hspace" CDATA IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_HSPACE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			declarations.putNamedItem(ATTR_NAME_HSPACE, adec);
-
-			// ("jreversion" CDATA DECLARED "1.1")
-			adec = new AttrDecl(ATTR_NAME_JREVERSION);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			adec.type.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_JVER11);
-			declarations.putNamedItem(ATTR_NAME_JREVERSION, adec);
-
-			// ("name" CDATA IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_NAME);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			declarations.putNamedItem(ATTR_NAME_NAME, adec);
-
-			// ("vspace" CDATA IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_VSPACE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			declarations.putNamedItem(ATTR_NAME_VSPACE, adec);
-
-			// ("width" CDATA IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_WIDTH);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			declarations.putNamedItem(ATTR_NAME_WIDTH, adec);
-
-			// ("nspluginurl" URI IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_NSPLUGINURL);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.URI);
-			declarations.putNamedItem(ATTR_NAME_NSPLUGINURL, adec);
-
-			// ("iepluginurl" URI IMPLIED)
-			adec = new AttrDecl(ATTR_NAME_IEPLUGINURL);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.URI);
-			declarations.putNamedItem(ATTR_NAME_IEPLUGINURL, adec);
-		}
-
-		private void createForParam() {
-			// ("name" CDATA REQUIRED)
-			AttrDecl adec = new AttrDecl(ATTR_NAME_NAME);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			declarations.putNamedItem(ATTR_NAME_NAME, adec);
-
-			// ("value" CDATA REQUIRED); Defect TORO:185241
-			adec = new AttrDecl(ATTR_NAME_VALUE);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			declarations.putNamedItem(ATTR_NAME_VALUE, adec);
-
-		}
-
-		private void createForRoot() {
-			// ("xmlns:jsp" CDATA "http://jva.sun.com/JSP/Page")
-			AttrDecl adec = new AttrDecl(ATTR_NAME_XMLNS_JSP);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			adec.type.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_XMLNS_JSP);
-			declarations.putNamedItem(ATTR_NAME_XMLNS_JSP, adec);
-			// ("version" CDATA REQUIRED)
-			adec = new AttrDecl(ATTR_NAME_VERSION);
-			adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			adec.usage = CMAttributeDeclaration.REQUIRED;
-			declarations.putNamedItem(ATTR_NAME_VERSION, adec);
-		}
-	}
-
-	private final static CMNamedNodeMap EMPTY_MAP = new CMNamedNodeMap() {
-		public int getLength() {
-			return 0;
-		}
-
-		public CMNode getNamedItem(String name) {
-			return null;
-		}
-
-		public CMNode item(int index) {
-			return null;
-		}
-
-		public Iterator iterator() {
-			return new Iterator() {
-				public boolean hasNext() {
-					return false;
-				}
-
-				public Object next() {
-					return null;
-				}
-
-				public void remove() {
-				}
-			};
-		}
-	};
-	private static String[] names = null;
-
-	static {
-		names = new String[Ids.getNumOfIds()];
-		names[Ids.ID_SCRIPTLET] = SCRIPTLET;
-		names[Ids.ID_EXPRESSION] = EXPRESSION;
-		names[Ids.ID_DECLARATION] = DECLARATION;
-		names[Ids.ID_DIRECTIVE_PAGE] = DIRECTIVE_PAGE;
-		names[Ids.ID_DIRECTIVE_INCLUDE] = DIRECTIVE_INCLUDE;
-		names[Ids.ID_DIRECTIVE_TAGLIB] = DIRECTIVE_TAGLIB;
-		names[Ids.ID_USEBEAN] = USEBEAN;
-		names[Ids.ID_SETPROPERTY] = SETPROPERTY;
-		names[Ids.ID_GETPROPERTY] = GETPROPERTY;
-		names[Ids.ID_INCLUDE] = INCLUDE;
-		names[Ids.ID_FORWARD] = FORWARD;
-		names[Ids.ID_PLUGIN] = PLUGIN;
-		names[Ids.ID_PARAMS] = PARAMS;
-		names[Ids.ID_FALLBACK] = FALLBACK;
-		names[Ids.ID_PARAM] = PARAM;
-		names[Ids.ID_ROOT] = ROOT;
-		names[Ids.ID_TEXT] = TEXT;
-	}
-
-	/**
-	 */
-	public JSPElementCollection() {
-		super(names, TOLERANT_CASE);
-	}
-
-	/**
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 * @param elementName java.lang.String
-	 */
-	protected CMNode create(String elementName) {
-		return createElemDecl(getID(elementName));
-	}
-
-	/**
-	 * @param eid int
-	 */
-	private CMGroupImpl createContent(int eid) {
-		if (eid == ID_UNKNOWN)
-			return null;
-
-		CMGroupImpl content = null;
-		CMNode child = null;
-
-		switch (eid) {
-			case Ids.ID_INCLUDE :
-			case Ids.ID_FORWARD :
-				// (jsp:param)*
-				content = new CMGroupImpl(CMGroup.SEQUENCE, 0, CMContentImpl.UNBOUNDED);
-				child = item(Ids.ID_PARAM);
-				if (child != null)
-					content.appendChild(child);
-				break;
-			case Ids.ID_PLUGIN :
-				// (jsp:params | jsp:fallback)?
-				content = new CMGroupImpl(CMGroup.CHOICE, 0, 1);
-				// jsp:params
-				child = item(Ids.ID_PARAMS);
-				if (child != null)
-					content.appendChild(child);
-				// jsp:fallback
-				child = item(Ids.ID_FALLBACK);
-				if (child != null)
-					content.appendChild(child);
-				break;
-			case Ids.ID_PARAMS :
-				// (jsp:param)+
-				content = new CMGroupImpl(CMGroup.SEQUENCE, 1, CMContentImpl.UNBOUNDED);
-				child = item(Ids.ID_PARAM);
-				if (child != null)
-					content.appendChild(child);
-				break;
-			case Ids.ID_ROOT :
-				// %Body;
-				// --> (jsp:text|%Directives;|%Scripts;|%Actions;)*
-				//     %Directives --> jsp:directive.page|jsp:directive.include
-				//     %Scripts; --> jsp:scriptlet|jsp:declaration|jsp:expression
-				//     %Actions --> jsp:useBean|jsp.setProperty|jsp:getProperty
-				//                  |jsp:include|jsp:forward|jsp:plugin
-				content = new CMGroupImpl(CMGroup.CHOICE, 0, CMContentImpl.UNBOUNDED);
-				int validChildren[] = {Ids.ID_TEXT,
-				// %Directves;
-							Ids.ID_DIRECTIVE_PAGE, Ids.ID_DIRECTIVE_INCLUDE,
-							// %Scripts;
-							Ids.ID_SCRIPTLET, Ids.ID_DECLARATION, Ids.ID_EXPRESSION,
-							// %Actions;
-							Ids.ID_USEBEAN, Ids.ID_SETPROPERTY, Ids.ID_GETPROPERTY, Ids.ID_INCLUDE, Ids.ID_FORWARD, Ids.ID_PLUGIN};
-				for (int i = 0; i < validChildren.length; i++) {
-					child = item(validChildren[i]);
-					if (child != null)
-						content.appendChild(child);
-				}
-				break;
-		}
-
-		return content;
-	}
-
-	/**
-	 * @param eid int
-	 */
-	private HTMLElementDeclaration createElemDecl(int eid) {
-		if (eid == ID_UNKNOWN)
-			return null;
-
-		TypePacket packet = new TypePacket();
-		switch (eid) {
-			case Ids.ID_SCRIPTLET :
-				// content, omit, lineBreak, layout, correct, format
-				// scriptlet
-				packet.name = SCRIPTLET;
-				packet.content = CMElementDeclaration.CDATA;
-				packet.layout = HTMLElementDeclaration.LAYOUT_OBJECT;
-				packet.format = HTMLElementDeclaration.FORMAT_JSP_SCRIPT;
-				break;
-			case Ids.ID_EXPRESSION :
-				// expression
-				packet.name = EXPRESSION;
-				packet.content = CMElementDeclaration.CDATA;
-				packet.layout = HTMLElementDeclaration.LAYOUT_OBJECT;
-				packet.format = HTMLElementDeclaration.FORMAT_JSP_SCRIPT;
-				break;
-			case Ids.ID_DECLARATION :
-				// declaration
-				packet.name = DECLARATION;
-				packet.content = CMElementDeclaration.CDATA;
-				packet.layout = HTMLElementDeclaration.LAYOUT_HIDDEN;
-				packet.format = HTMLElementDeclaration.FORMAT_JSP_SCRIPT;
-				break;
-			case Ids.ID_DIRECTIVE_PAGE :
-				// directive.page
-				packet.name = DIRECTIVE_PAGE;
-				packet.omit = HTMLElementDeclaration.OMIT_END;
-				packet.layout = HTMLElementDeclaration.LAYOUT_HIDDEN;
-				packet.format = HTMLElementDeclaration.FORMAT_JSP_DIRECTIVE;
-				break;
-			case Ids.ID_DIRECTIVE_INCLUDE :
-				// directive.inlcude
-				packet.name = DIRECTIVE_INCLUDE;
-				packet.omit = HTMLElementDeclaration.OMIT_END;
-				packet.layout = HTMLElementDeclaration.LAYOUT_HIDDEN;
-				packet.format = HTMLElementDeclaration.FORMAT_JSP_DIRECTIVE;
-				break;
-			case Ids.ID_DIRECTIVE_TAGLIB :
-				// directive.taglib
-				packet.name = DIRECTIVE_TAGLIB;
-				packet.omit = HTMLElementDeclaration.OMIT_END;
-				packet.layout = HTMLElementDeclaration.LAYOUT_HIDDEN;
-				packet.format = HTMLElementDeclaration.FORMAT_JSP_DIRECTIVE;
-				break;
-			case Ids.ID_USEBEAN :
-				// useBean
-				packet.name = USEBEAN;
-				packet.content = CMElementDeclaration.ANY;
-				packet.layout = HTMLElementDeclaration.LAYOUT_HIDDEN;
-				packet.indentChild = true;
-				break;
-			case Ids.ID_SETPROPERTY :
-				// setProperty
-				packet.name = SETPROPERTY;
-				packet.omit = HTMLElementDeclaration.OMIT_END;
-				packet.layout = HTMLElementDeclaration.LAYOUT_HIDDEN;
-				break;
-			case Ids.ID_GETPROPERTY :
-				// getProperty
-				packet.name = GETPROPERTY;
-				packet.omit = HTMLElementDeclaration.OMIT_END;
-				packet.layout = HTMLElementDeclaration.LAYOUT_OBJECT;
-				break;
-			case Ids.ID_INCLUDE :
-				// include
-				packet.name = INCLUDE;
-				packet.content = CMElementDeclaration.ELEMENT;
-				packet.omit = HTMLElementDeclaration.OMIT_END;
-				packet.layout = HTMLElementDeclaration.LAYOUT_OBJECT;
-				packet.indentChild = true;
-				break;
-			case Ids.ID_FORWARD :
-				// forward
-				packet.name = FORWARD;
-				packet.content = CMElementDeclaration.ELEMENT;
-				packet.omit = HTMLElementDeclaration.OMIT_END;
-				packet.layout = HTMLElementDeclaration.LAYOUT_OBJECT;
-				packet.indentChild = true;
-				break;
-			case Ids.ID_PLUGIN :
-				// plugin
-				packet.name = PLUGIN;
-				packet.content = CMElementDeclaration.ELEMENT;
-				packet.layout = HTMLElementDeclaration.LAYOUT_OBJECT;
-				packet.indentChild = true;
-				break;
-			case Ids.ID_PARAMS :
-				// params
-				packet.name = PARAMS;
-				packet.content = CMElementDeclaration.ELEMENT;
-				packet.layout = HTMLElementDeclaration.LAYOUT_HIDDEN;
-				packet.indentChild = true;
-				break;
-			case Ids.ID_FALLBACK :
-				// fallback
-				packet.name = FALLBACK;
-				packet.content = CMElementDeclaration.CDATA;
-				packet.layout = HTMLElementDeclaration.LAYOUT_HIDDEN;
-				break;
-			case Ids.ID_PARAM :
-				// param
-				packet.name = PARAM;
-				packet.omit = HTMLElementDeclaration.OMIT_END;
-				packet.layout = HTMLElementDeclaration.LAYOUT_HIDDEN;
-				break;
-			case Ids.ID_ROOT :
-				packet.name = ROOT;
-				packet.content = CMElementDeclaration.ELEMENT;
-				packet.layout = HTMLElementDeclaration.LAYOUT_HIDDEN; // same as HTML
-				break;
-			case Ids.ID_TEXT :
-				packet.name = TEXT;
-				packet.content = CMElementDeclaration.PCDATA;
-				break;
-			default :
-				// unknown ID
-				return null;
-		}
-
-		ElemDecl dec = new ElemDecl(packet);
-
-		CMGroupImpl content = createContent(eid);
-		if (content != null)
-			dec.setContent(content);
-
-		JACreater creater = new JACreater();
-		dec.setAttributes(creater.getDeclarations(eid));
-
-		return dec;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/PropertyProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/PropertyProvider.java
deleted file mode 100644
index 09cba4b..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/PropertyProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-
-/**
- * PropertyProvider class.
- * This class is intended to be used in HTMLElementDeclaration instances.
- */
-interface PropertyProvider {
-
-	boolean supports(HTMLElementDeclaration edecl);
-
-	Object get(HTMLElementDeclaration edecl);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/PropertyProviderFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/PropertyProviderFactory.java
deleted file mode 100644
index 38e2619..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/PropertyProviderFactory.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel;
-
-import java.util.Hashtable;
-
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.annotation.AnnotationMap;
-
-/**
- * The factory object of PropertyProvider.
- */
-final class PropertyProviderFactory {
-
-
-	/**
-	 * DefaultProvider is intended to be used for unknown properties.
-	 * It always returns null value for any properties.
-	 */
-	class DefaultProvider implements PropertyProvider {
-		public DefaultProvider() {
-			super();
-		}
-
-		public boolean supports(HTMLElementDeclaration edecl) {
-			return false;
-		}
-
-		public Object get(HTMLElementDeclaration edecl) {
-			return null;
-		}
-	}
-
-	abstract class AbstractElementPropertyProvider implements PropertyProvider {
-		protected AbstractElementPropertyProvider() {
-			super();
-		}
-
-		public boolean supports(HTMLElementDeclaration edecl) {
-			return (edecl != null);
-		}
-
-		public Object get(HTMLElementDeclaration edecl) {
-			if (!(edecl instanceof HTMLPropertyDeclaration))
-				return null;
-			return getElementProperty((HTMLPropertyDeclaration)edecl);
-		}
-
-		abstract protected Object getElementProperty(HTMLPropertyDeclaration decl);
-	}
-
-	/*
-	 * "tagInfo"
-	 * gets documentation for the element
-	 */
-	class PPTagInfo extends AbstractElementPropertyProvider {
-		private final static String htmlAnnotationLoc = "data/htmref.xml"; //$NON-NLS-1$
-		protected AnnotationMap fAnnotationMap = null;
-
-		public PPTagInfo() {
-			super();
-		}
-
-		/**
-		 * Gets the annotationMap.
-		 * @return Returns a AnnotationMap
-		 */
-		protected AnnotationMap getAnnotationMap() {
-			if (fAnnotationMap == null) {
-				fAnnotationMap = new AnnotationMap();
-				try {
-					fAnnotationMap.load(htmlAnnotationLoc, HTMLCorePlugin.getDefault().getBundle().getSymbolicName());
-				}
-				catch (Exception e) {
-					// no annotation available
-				}
-			}
-			return fAnnotationMap;
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			if (decl instanceof HTMLElementDeclaration) {
-				return getAnnotationMap().getProperty(((HTMLElementDeclaration)decl).getElementName(), "tagInfo"); //$NON-NLS-1$
-			} else {
-				return null;
-			}
-		}
-	}
-
-	/*
-	 * "shouldKeepSpace"
-	 */
-	class PPShouldKeepSpace extends AbstractElementPropertyProvider {
-		public PPShouldKeepSpace() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			return new Boolean(decl.shouldKeepSpaces());
-		}
-	}
-
-	/*
-	 * "shouldIndentChildSource"
-	 */
-	class PPShouldIndentChildSource extends AbstractElementPropertyProvider {
-		public PPShouldIndentChildSource() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			return new Boolean(decl.shouldIndentChildSource());
-		}
-	}
-
-	/*
-	 * "terminators"
-	 */
-	class PPTerminators extends AbstractElementPropertyProvider {
-		public PPTerminators() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			if (! (decl instanceof HTMLElemDeclImpl)) return null;
-			return ((HTMLElemDeclImpl)decl).getTerminators();
-		}
-	}
-
-	/*
-	 * "prohibitedAncestors"
-	 */
-	class PPProhibitedAncestors extends AbstractElementPropertyProvider {
-		public PPProhibitedAncestors() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			return decl.getProhibitedAncestors();
-		}
-	}
-
-	/*
-	 * "isJSP"
-	 */
-	class PPIsJSP extends AbstractElementPropertyProvider {
-		public PPIsJSP() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			return new Boolean(decl.isJSP());
-		}
-	}
-
-	/*
-	 * "isXHTML"
-	 * HTMLElementDeclaration itself never represent any XHTML element declaration.
-	 * So, this property must be always false.
-	 */
-	class PPIsXHTML extends AbstractElementPropertyProvider {
-		public PPIsXHTML() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			return new Boolean(false);
-		}
-	}
-
-	/*
-	 * "isSSI"
-	 * Each declaration class for SSI elements must provide this property itself,
-	 * and then return true.  Other declaration must always return false.
-	 */
-	class PPIsSSI extends AbstractElementPropertyProvider {
-		public PPIsSSI() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			return new Boolean(false);
-		}
-	}
-
-	/*
-	 * "lineBreakHint"
-	 */
-	class PPLineBreakHint extends AbstractElementPropertyProvider {
-		public PPLineBreakHint() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			String hint = HTMLCMProperties.Values.BREAK_NONE;
-			switch (decl.getLineBreakHint()) {
-				case HTMLElementDeclaration.BREAK_AFTER_START :
-					hint = HTMLCMProperties.Values.BREAK_AFTER_START;
-					break;
-				case HTMLElementDeclaration.BREAK_BEFORE_START_AND_AFTER_END :
-					hint = HTMLCMProperties.Values.BREAK_BEFORE_START_AND_AFTER_END;
-					break;
-				case HTMLElementDeclaration.BREAK_NONE :
-				// nothing to do
-				default :
-					break;
-			}
-			return hint;
-		}
-	}
-
-	/*
-	 * "layoutType"
-	 */
-	class PPLayoutType extends AbstractElementPropertyProvider {
-		public PPLayoutType() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			String type = HTMLCMProperties.Values.LAYOUT_NONE;
-			switch (decl.getLayoutType()) {
-				case HTMLElementDeclaration.LAYOUT_BLOCK :
-					type = HTMLCMProperties.Values.LAYOUT_BLOCK;
-					break;
-				case HTMLElementDeclaration.LAYOUT_BREAK :
-					type = HTMLCMProperties.Values.LAYOUT_BREAK;
-					break;
-				case HTMLElementDeclaration.LAYOUT_HIDDEN :
-					type = HTMLCMProperties.Values.LAYOUT_HIDDEN;
-					break;
-				case HTMLElementDeclaration.LAYOUT_OBJECT :
-					type = HTMLCMProperties.Values.LAYOUT_OBJECT;
-					break;
-				case HTMLElementDeclaration.LAYOUT_WRAP :
-					type = HTMLCMProperties.Values.LAYOUT_WRAP;
-					break;
-				case HTMLElementDeclaration.LAYOUT_NONE :
-				// nothing to do.
-				default :
-					break;
-			}
-			return type;
-		}
-	}
-
-	/*
-	 * "omitType"
-	 */
-	class PPOmitType extends AbstractElementPropertyProvider {
-		public PPOmitType() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			String type = HTMLCMProperties.Values.OMIT_NONE;
-			switch (decl.getOmitType()) {
-				case HTMLElementDeclaration.OMIT_BOTH :
-					type = HTMLCMProperties.Values.OMIT_BOTH;
-					break;
-				case HTMLElementDeclaration.OMIT_END :
-					type = HTMLCMProperties.Values.OMIT_END;
-					break;
-				case HTMLElementDeclaration.OMIT_END_DEFAULT :
-					type = HTMLCMProperties.Values.OMIT_END_DEFAULT;
-					break;
-				case HTMLElementDeclaration.OMIT_END_MUST :
-					type = HTMLCMProperties.Values.OMIT_END_MUST;
-					break;
-				case HTMLElementDeclaration.OMIT_NONE :
-				// nothing to do.
-				default :
-					break;
-			}
-			return type;
-		}
-	}
-
-	/*
-	 * "inclusion"
-	 */
-	class PPInclusion extends AbstractElementPropertyProvider {
-		public PPInclusion() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			return decl.getInclusion();
-		}
-	}
-
-	public static PropertyProvider getProvider(String propName) {
-		PropertyProviderFactory factory = getInstance();
-		PropertyProvider pp = (PropertyProvider) factory.registry.get(propName);
-		if (pp != null)
-			return pp;
-
-		pp = factory.create(propName);
-		if (pp == null)
-			return factory.defaultProvider;
-
-		factory.registry.put(propName, pp);
-		return pp;
-	}
-
-	private static PropertyProviderFactory instance = null;
-
-	private synchronized static PropertyProviderFactory getInstance() {
-		if (instance != null)
-			return instance;
-		instance = new PropertyProviderFactory();
-		return instance;
-	}
-
-	private Hashtable registry = new Hashtable();
-	private PropertyProvider defaultProvider = new DefaultProvider();
-
-	private PropertyProviderFactory() {
-		super();
-	}
-
-	private PropertyProvider create(String propName) {
-		PropertyProvider pp = null;
-		if (propName.equals(HTMLCMProperties.IS_JSP))
-			pp = new PPIsJSP();
-		else if (propName.equals(HTMLCMProperties.IS_XHTML))
-			pp = new PPIsXHTML();
-		else if (propName.equals(HTMLCMProperties.IS_SSI))
-			pp = new PPIsSSI();
-		else if (propName.equals(HTMLCMProperties.LAYOUT_TYPE))
-			pp = new PPLayoutType();
-		else if (propName.equals(HTMLCMProperties.LINE_BREAK_HINT))
-			pp = new PPLineBreakHint();
-		else if (propName.equals(HTMLCMProperties.PROHIBITED_ANCESTORS))
-			pp = new PPProhibitedAncestors();
-		else if (propName.equals(HTMLCMProperties.SHOULD_KEEP_SPACE))
-			pp = new PPShouldKeepSpace();
-		else if (propName.equals(HTMLCMProperties.SHOULD_INDENT_CHILD_SOURCE))
-			pp = new PPShouldIndentChildSource();
-		else if (propName.equals(HTMLCMProperties.TERMINATORS))
-			pp = new PPTerminators();
-		else if (propName.equals(HTMLCMProperties.TAGINFO))
-			pp = new PPTagInfo();
-		else if (propName.equals(HTMLCMProperties.OMIT_TYPE))
-			pp = new PPOmitType();
-		else if (propName.equals(HTMLCMProperties.INCLUSION))
-			pp = new PPInclusion();
-
-		return pp;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/AttributeCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/AttributeCollection.java
deleted file mode 100644
index 5d28203..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/AttributeCollection.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLAttributeDeclaration;
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Factory for attribute declarations.
- */
-final class AttributeCollection extends CMNamedNodeMapImpl implements CHTMLNamespace {
-	/**
-	 * constructor.
-	 */
-	public AttributeCollection() {
-		super();
-	}
-
-	/**
-	 * Create an attribute declaration.
-	 * @param attrName java.lang.String
-	 */
-	private HTMLAttrDeclImpl create(String attrName) {
-		HTMLAttrDeclImpl attr = null;
-		HTMLCMDataTypeImpl atype = null;
-
-		if (attrName.equalsIgnoreCase(ATTR_NAME_ACTION)) {
-			// (action %URI #REQUIRED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ACTION, atype, CMAttributeDeclaration.REQUIRED);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ALT)) {
-			// (alt %Text; #REQUIRED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.TEXT);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ALT, atype, CMAttributeDeclaration.REQUIRED);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_BORDER)) {
-			// (border %Pixels; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.PIXELS);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_BORDER, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CHECKED)) {
-			// (checked (checked) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_CHECKED};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CHECKED, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_CLEAR)) {
-			// (clear (left | all | right | none) none)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_LEFT, ATTR_VALUE_ALL, ATTR_VALUE_RIGHT, ATTR_VALUE_NONE};
-			atype.setEnumValues(values);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_NONE);
-
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_CLEAR, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_COLS)) {
-			// (cols NUMBER #REQUIRED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_COLS, atype, CMAttributeDeclaration.REQUIRED);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ENCTYPE)) {
-			// (enctype %ContentType; "application/x-www-form-urlencoded")
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.CONTENT_TYPE);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_WWW_FORM_URLENCODED);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ENCTYPE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_HEIGHT)) {
-			// (height %Length; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.LENGTH);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_HEIGHT, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_HREF)) {
-			// (href %URI; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_HREF, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_HSPACE)) {
-			// (hspace %Pixels; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.PIXELS);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_HSPACE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_HTTP_EQUIV)) {
-			// (http-equiv NAME #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.NAME);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_HTTP_EQUIV, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_MAXLENGTH)) {
-			// (maxlength NUMBER #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_MAXLENGTH, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_METHOD)) {
-			// (method (GET|POST) GET)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_VALUE_GET, ATTR_VALUE_POST};
-			atype.setEnumValues(values);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, ATTR_VALUE_GET);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_METHOD, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_MULTIPLE)) {
-			// (multiple (multiple) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_MULTIPLE};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_MULTIPLE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_NAME)) {
-			// (name CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_NAME, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_NOSHADE)) {
-			// (noshade (noshade) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_NOSHADE};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_NOSHADE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_ROWS)) {
-			// (rows NUMBER #REQUIRED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_ROWS, atype, CMAttributeDeclaration.REQUIRED);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SELECTED)) {
-			// (selected (selected) #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-			String[] values = {ATTR_NAME_SELECTED};
-			atype.setEnumValues(values);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SELECTED, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SIZE)) {
-			// (size %Pixels; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.PIXELS);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SIZE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_SRC)) {
-			// (src %URI; #IMPLIED)
-			// NOTE: "src" attributes are defined in several elements.
-			//		 The definition of IMG is different from others.
-			//		 So, it should be locally defined.
-			atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_SRC, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_TYPE)) {
-			// (type %CotentType; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.CONTENT_TYPE);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_TYPE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_VALUE)) {
-			// (value CDATA #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_VALUE, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_VERSION)) {
-			// (version CDATA #FIXED '%HTML.Version;)
-			atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-			atype.setImpliedValue(CMDataType.IMPLIED_VALUE_FIXED, ATTR_VALUE_VERSION_TRANSITIONAL);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_VERSION, atype, CMAttributeDeclaration.FIXED);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_WIDTH)) {
-			// (width %Length; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.LENGTH);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_WIDTH, atype, CMAttributeDeclaration.OPTIONAL);
-
-		}
-		else if (attrName.equalsIgnoreCase(ATTR_NAME_VSPACE)) {
-			// (vspace %Pixels; #IMPLIED)
-			atype = new HTMLCMDataTypeImpl(HTMLCMDataType.PIXELS);
-			attr = new HTMLAttrDeclImpl(ATTR_NAME_VSPACE, atype, CMAttributeDeclaration.OPTIONAL);
-
-			// <<D205514
-		}
-		else {
-			// unknown attribute; maybe error.
-			// should warn.
-			attr = null;
-		}
-
-		return attr;
-	}
-
-	/**
-	 * Get %bodycolors; declarations.
-	 */
-	public void getBodycolors(CMNamedNodeMapImpl declarations) {
-	}
-
-	/**
-	 * Get align attribute which has %IAlign; as values..
-	 */
-	public static final HTMLAttrDeclImpl createAlignForImage() {
-		// align (local)
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		// set enum values
-		String[] values = {ATTR_VALUE_TOP, ATTR_VALUE_MIDDLE, ATTR_VALUE_BOTTOM, ATTR_VALUE_LEFT, ATTR_VALUE_RIGHT};
-		atype.setEnumValues(values);
-
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(ATTR_NAME_ALIGN, atype, CMAttributeDeclaration.OPTIONAL);
-		return attr;
-	}
-
-	/**
-	 * Create an attribute declaration for <code>align</code>
-	 * in several elements, like <code>P</code>, <code>DIV</code>.
-	 * The values are different from attributes those have the same name
-	 * in other elements (<code>IMG</code> and <code>TABLE</code>).
-	 * So, it can't treat as global attributes.
-	 * <strong>NOTE: These attribute declaration has
-	 * no owner CMDocument instance.</strong>
-	 */
-	public static final HTMLAttrDeclImpl createAlignForParagraph() {
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		// set enum values: left|center|right|justify
-		String[] values = {ATTR_VALUE_LEFT, ATTR_VALUE_CENTER, ATTR_VALUE_RIGHT,};
-		atype.setEnumValues(values);
-
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(ATTR_NAME_ALIGN, atype, CMAttributeDeclaration.OPTIONAL);
-		return attr;
-	}
-
-	/**
-	 * Get %attrs; declarations.
-	 * %attrs; consists of %coreattrs;, %i18n, and %events;.
-	 */
-	public void getAttrs(CMNamedNodeMapImpl declarations) {
-	}
-
-	/**
-	 * Get %coreattrs; declarations.
-	 */
-	public void getCore(CMNamedNodeMapImpl declarations) {
-	}
-
-	/**
-	 * Get a global attribute declaration.
-	 * @param attrName java.lang.String
-	 */
-	public HTMLAttributeDeclaration getDeclaration(String attrName) {
-		CMNode cmnode = getNamedItem(attrName);
-		if (cmnode != null)
-			return (HTMLAttributeDeclaration) cmnode; // already exists.
-
-		HTMLAttrDeclImpl dec = create(attrName);
-		if (dec != null)
-			putNamedItem(attrName, dec);
-
-		return dec;
-	}
-
-	/**
-	 * Get declarations which are specified by names.
-	 * @param names java.util.Iterator
-	 */
-	public void getDeclarations(CMNamedNodeMapImpl declarations, Iterator names) {
-		while (names.hasNext()) {
-			String attrName = (String) names.next();
-			HTMLAttributeDeclaration dec = getDeclaration(attrName);
-			if (dec != null)
-				declarations.putNamedItem(attrName, dec);
-		}
-	}
-
-	/**
-	 * Get %events; declarations.
-	 */
-	public void getEvents(CMNamedNodeMapImpl declarations) {
-	}
-
-	/**
-	 * Get %i18n; declarations.
-	 */
-	public void getI18n(CMNamedNodeMapImpl declarations) {
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CHCMDocImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CHCMDocImpl.java
deleted file mode 100644
index 5ebf483..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CHCMDocImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocument;
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration;
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLEntityDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * CMDocument implementation for the HTML.
- */
-public class CHCMDocImpl extends CMNodeImpl implements HTMLCMDocument {
-
-	/** Namespace for all names of elements, entities and attributes. */
-	private CMNamespace namespace = null;
-	private ElementCollection elements = null;
-	private EntityCollection entities = null;
-	private AttributeCollection attributes = null;
-
-	/**
-	 */
-	public CHCMDocImpl(String docTypeName, CMNamespace targetNamespace) {
-		super(docTypeName);
-		namespace = targetNamespace;
-		attributes = new AttributeCollection();
-		elements = new ElementCollection(attributes);
-		entities = new EntityCollection();
-	}
-
-	AttributeCollection getAttributes() {
-		return attributes;
-	}
-
-	public HTMLElementDeclaration getElementDeclaration(String elementName) {
-		if (elements == null)
-			return null;
-		return (HTMLElementDeclaration) elements.getNamedItem(elementName);
-	}
-
-	public CMNamedNodeMap getElements() {
-		return elements;
-	}
-
-	public CMNamedNodeMap getEntities() {
-		return entities;
-	}
-
-	public HTMLEntityDeclaration getEntityDeclaration(String entityName) {
-		if (entities == null)
-			return null;
-		return (HTMLEntityDeclaration) entities.getNamedItem(entityName);
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMDocument
-	 */
-	public org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace getNamespace() {
-		return namespace;
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 */
-	public int getNodeType() {
-		return CMNode.DOCUMENT;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CHTMLNamespace.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CHTMLNamespace.java
deleted file mode 100644
index 95d5c21..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CHTMLNamespace.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-
-
-
-/**
- * Provide all names defined in the HTML 4.0? specification.
- */
-public interface CHTMLNamespace {
-
-	// Element names
-	public static interface ElementName {
-		public static final String A = HTML40Namespace.ElementName.A;
-		public static final String ADDRESS = HTML40Namespace.ElementName.ADDRESS;
-		public static final String BASE = HTML40Namespace.ElementName.BASE;
-		public static final String BLOCKQUOTE = HTML40Namespace.ElementName.BLOCKQUOTE;
-		public static final String BODY = HTML40Namespace.ElementName.BODY;
-		public static final String BR = HTML40Namespace.ElementName.BR;
-		public static final String CENTER = HTML40Namespace.ElementName.CENTER;
-		public static final String DD = HTML40Namespace.ElementName.DD;
-		public static final String DIR = HTML40Namespace.ElementName.DIR;
-		public static final String DIV = HTML40Namespace.ElementName.DIV;
-		public static final String DL = HTML40Namespace.ElementName.DL;
-		public static final String DT = HTML40Namespace.ElementName.DT;
-		public static final String FORM = HTML40Namespace.ElementName.FORM;
-		public static final String H1 = HTML40Namespace.ElementName.H1;
-		public static final String H2 = HTML40Namespace.ElementName.H2;
-		public static final String H3 = HTML40Namespace.ElementName.H3;
-		public static final String H4 = HTML40Namespace.ElementName.H4;
-		public static final String H5 = HTML40Namespace.ElementName.H5;
-		public static final String H6 = HTML40Namespace.ElementName.H6;
-		public static final String HEAD = HTML40Namespace.ElementName.HEAD;
-		public static final String HR = HTML40Namespace.ElementName.HR;
-		public static final String HTML = HTML40Namespace.ElementName.HTML;
-		public static final String IMG = HTML40Namespace.ElementName.IMG;
-		public static final String INPUT = HTML40Namespace.ElementName.INPUT;
-		public static final String LI = HTML40Namespace.ElementName.LI;
-		public static final String MENU = HTML40Namespace.ElementName.MENU;
-		public static final String META = HTML40Namespace.ElementName.META;
-		public static final String OL = HTML40Namespace.ElementName.OL;
-		public static final String OPTION = HTML40Namespace.ElementName.OPTION;
-		public static final String P = HTML40Namespace.ElementName.P;
-		public static final String PRE = HTML40Namespace.ElementName.PRE;
-		public static final String SELECT = HTML40Namespace.ElementName.SELECT;
-		public static final String TEXTAREA = HTML40Namespace.ElementName.TEXTAREA;
-		public static final String TITLE = HTML40Namespace.ElementName.TITLE;
-		public static final String UL = HTML40Namespace.ElementName.UL;
-		public static final String SSI_CONFIG = HTML40Namespace.ElementName.SSI_CONFIG;
-		public static final String SSI_ECHO = HTML40Namespace.ElementName.SSI_ECHO;
-		public static final String SSI_EXEC = HTML40Namespace.ElementName.SSI_EXEC;
-		public static final String SSI_FSIZE = HTML40Namespace.ElementName.SSI_FSIZE;
-		public static final String SSI_FLASTMOD = HTML40Namespace.ElementName.SSI_FLASTMOD;
-		public static final String SSI_INCLUDE = HTML40Namespace.ElementName.SSI_INCLUDE;
-		public static final String SSI_PRINTENV = HTML40Namespace.ElementName.SSI_PRINTENV;
-		public static final String SSI_SET = HTML40Namespace.ElementName.SSI_SET;
-	}
-
-	// Character Entities
-	public static interface EntityName {
-	}
-
-	// global attribute names
-	public static final String ATTR_NAME_VERSION = HTML40Namespace.ATTR_NAME_VERSION;
-	public static final String ATTR_NAME_SRC = HTML40Namespace.ATTR_NAME_SRC;
-	public static final String ATTR_NAME_ALT = HTML40Namespace.ATTR_NAME_ALT;
-	public static final String ATTR_NAME_HEIGHT = HTML40Namespace.ATTR_NAME_HEIGHT;
-	public static final String ATTR_NAME_WIDTH = HTML40Namespace.ATTR_NAME_WIDTH;
-	public static final String ATTR_NAME_ALIGN = HTML40Namespace.ATTR_NAME_ALIGN;
-	public static final String ATTR_NAME_BORDER = HTML40Namespace.ATTR_NAME_BORDER;
-	public static final String ATTR_NAME_HSPACE = HTML40Namespace.ATTR_NAME_HSPACE;
-	public static final String ATTR_NAME_VSPACE = HTML40Namespace.ATTR_NAME_VSPACE;
-	public static final String ATTR_NAME_NAME = HTML40Namespace.ATTR_NAME_NAME;
-	public static final String ATTR_NAME_CLEAR = HTML40Namespace.ATTR_NAME_CLEAR;
-	public static final String ATTR_NAME_NOSHADE = HTML40Namespace.ATTR_NAME_NOSHADE;
-	public static final String ATTR_NAME_CHECKED = HTML40Namespace.ATTR_NAME_CHECKED;
-	public static final String ATTR_NAME_MAXLENGTH = HTML40Namespace.ATTR_NAME_MAXLENGTH;
-	public static final String ATTR_NAME_ISTYLE = HTML40Namespace.ATTR_NAME_ISTYLE;
-	public static final String ATTR_NAME_HTTP_EQUIV = HTML40Namespace.ATTR_NAME_HTTP_EQUIV;
-	public static final String ATTR_NAME_CONTENT = HTML40Namespace.ATTR_NAME_CONTENT;
-
-	public static final String ATTR_NAME_HREF = HTML40Namespace.ATTR_NAME_HREF;
-	public static final String ATTR_NAME_MULTIPLE = HTML40Namespace.ATTR_NAME_MULTIPLE;
-	public static final String ATTR_NAME_SELECTED = HTML40Namespace.ATTR_NAME_SELECTED;
-	public static final String ATTR_NAME_ROWS = HTML40Namespace.ATTR_NAME_ROWS;
-	public static final String ATTR_NAME_COLS = HTML40Namespace.ATTR_NAME_COLS;
-	public static final String ATTR_NAME_ACTION = HTML40Namespace.ATTR_NAME_ACTION;
-	public static final String ATTR_NAME_METHOD = HTML40Namespace.ATTR_NAME_METHOD;
-	public static final String ATTR_NAME_ENCTYPE = HTML40Namespace.ATTR_NAME_ENCTYPE;
-	public static final String ATTR_NAME_SIZE = HTML40Namespace.ATTR_NAME_SIZE;
-	public static final String ATTR_NAME_TYPE = HTML40Namespace.ATTR_NAME_TYPE;
-	public static final String ATTR_NAME_VALUE = HTML40Namespace.ATTR_NAME_VALUE;
-
-
-
-	public static final String ATTR_NAME_ERRMSG = HTML40Namespace.ATTR_NAME_ERRMSG;
-	public static final String ATTR_NAME_SIZEFMT = HTML40Namespace.ATTR_NAME_SIZEFMT;
-	public static final String ATTR_NAME_TIMEFMT = HTML40Namespace.ATTR_NAME_TIMEFMT;
-	public static final String ATTR_NAME_VAR = HTML40Namespace.ATTR_NAME_VAR;
-	public static final String ATTR_NAME_CGI = HTML40Namespace.ATTR_NAME_CGI;
-	public static final String ATTR_NAME_CMD = HTML40Namespace.ATTR_NAME_CMD;
-	public static final String ATTR_NAME_FILE = HTML40Namespace.ATTR_NAME_FILE;
-	public static final String ATTR_NAME_VIRTUAL = HTML40Namespace.ATTR_NAME_VIRTUAL;
-
-	// global attribute values; mainly used in enumeration.
-	public static final String ATTR_VALUE_VERSION_TRANSITIONAL = "-//W3C//DTD Compact HTML 1.0 Draft//EN"; //$NON-NLS-1$
-	//   for align (top|middle|bottom|left|right)
-	public static final String ATTR_VALUE_TOP = HTML40Namespace.ATTR_VALUE_TOP;
-	public static final String ATTR_VALUE_MIDDLE = HTML40Namespace.ATTR_VALUE_MIDDLE;
-	public static final String ATTR_VALUE_BOTTOM = HTML40Namespace.ATTR_VALUE_BOTTOM;
-	public static final String ATTR_VALUE_LEFT = HTML40Namespace.ATTR_VALUE_LEFT;
-	public static final String ATTR_VALUE_CENTER = HTML40Namespace.ATTR_VALUE_CENTER;
-	public static final String ATTR_VALUE_RIGHT = HTML40Namespace.ATTR_VALUE_RIGHT;
-	//   for clear (left|all|right|none): left and right are already defined above.
-	public static final String ATTR_VALUE_ALL = HTML40Namespace.ATTR_VALUE_ALL;
-	public static final String ATTR_VALUE_NONE = HTML40Namespace.ATTR_VALUE_NONE;
-	//   for type of INPUT
-	//       (text | password | checkbox | radio | submit | reset |
-	//        file | hidden | image | button)
-	public static final String ATTR_VALUE_TEXT = HTML40Namespace.ATTR_VALUE_TEXT;
-	public static final String ATTR_VALUE_PASSWORD = HTML40Namespace.ATTR_VALUE_PASSWORD;
-	public static final String ATTR_VALUE_CHECKBOX = HTML40Namespace.ATTR_VALUE_CHECKBOX;
-	public static final String ATTR_VALUE_RADIO = HTML40Namespace.ATTR_VALUE_RADIO;
-	public static final String ATTR_VALUE_SUBMIT = HTML40Namespace.ATTR_VALUE_SUBMIT;
-	public static final String ATTR_VALUE_RESET = HTML40Namespace.ATTR_VALUE_RESET;
-	public static final String ATTR_VALUE_HIDDEN = HTML40Namespace.ATTR_VALUE_HIDDEN;
-	//   for span, colspan, rowspan
-	public static final String ATTR_VALUE_1 = HTML40Namespace.ATTR_VALUE_1;
-	//   for frameborder
-	public static final String ATTR_VALUE_0 = HTML40Namespace.ATTR_VALUE_0;
-	//   for method of FORM
-	public static final String ATTR_VALUE_GET = HTML40Namespace.ATTR_VALUE_GET;
-	public static final String ATTR_VALUE_POST = HTML40Namespace.ATTR_VALUE_POST;
-	public static final String ATTR_VALUE_WWW_FORM_URLENCODED = HTML40Namespace.ATTR_VALUE_WWW_FORM_URLENCODED;
-	//   for behaviro of MARQUEE
-	public static final String ATTR_VALUE_SCROLL = HTML40Namespace.ATTR_VALUE_SCROLL;
-	public static final String ATTR_VALUE_SLIDE = HTML40Namespace.ATTR_VALUE_SLIDE;
-	public static final String ATTR_VALUE_ALTERNATE = HTML40Namespace.ATTR_VALUE_ALTERNATE;
-	//   for direction of MARQUEE
-	public static final String ATTR_VALUE_UP = HTML40Namespace.ATTR_VALUE_UP;
-	public static final String ATTR_VALUE_DOWN = HTML40Namespace.ATTR_VALUE_DOWN;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMContentImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMContentImpl.java
deleted file mode 100644
index 28b7966..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMContentImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-/**
- * Implementation of CMContent for HTML CM.
- */
-abstract class CMContentImpl extends CMNodeImpl implements org.eclipse.wst.xml.core.internal.contentmodel.CMContent {
-
-	public static final int UNBOUNDED = -1;
-	/**  -1: it's UNBOUNDED. */
-	private int maxOccur = UNBOUNDED;
-	/**  0: it's OPTIONAL, 1, it's REQUIRED. */
-	private int minOccur = 0;
-
-	/**
-	 * The primary consturctor.
-	 * Use this one for usual cases.<br>
-	 */
-	public CMContentImpl(String name, int min, int max) {
-		super(name);
-		minOccur = min;
-		maxOccur = max;
-	}
-
-	/**
-	 * getMaxOccur method
-	 * @return int
-	 *
-	 * If -1, it's UNBOUNDED.
-	 */
-	public int getMaxOccur() {
-		return maxOccur;
-	}
-
-	/**
-	 * getMinOccur method
-	 * @return int
-	 *
-	 * If 0, it's OPTIONAL.
-	 * If 1, it's REQUIRED.
-	 */
-	public int getMinOccur() {
-		return minOccur;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMGroupImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMGroupImpl.java
deleted file mode 100644
index 812b3ed..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMGroupImpl.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-
-/**
- */
-class CMGroupImpl extends CMContentImpl implements CMGroup {
-
-	private int operator = CMGroup.SEQUENCE;
-	private CMNodeListImpl children = null;
-
-	/**
-	 * CMGroupImpl constructor comment.
-	 */
-	public CMGroupImpl(int op, int minOccur, int maxOccur) {
-		super(null, minOccur, maxOccur);
-		switch (op) {
-			case CMGroup.ALL :
-			case CMGroup.CHOICE :
-			case CMGroup.SEQUENCE :
-				operator = op;
-				break;
-			default :
-				// should warn.
-				break;
-		}
-	}
-
-	/**
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 * @param org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 */
-	protected CMNode appendChild(CMNode child) {
-		if (child == null)
-			return null;
-		if (children == null)
-			children = new CMNodeListImpl();
-		return children.appendNode(child);
-	}
-
-	/**
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList
-	 */
-	public CMNodeList getChildNodes() {
-		return children;
-	}
-
-	/**
-	 * getNodeType method
-	 * @return int
-	 *
-	 * Returns one of :
-	 * ELEMENT_DECLARATION, ATTRIBUTE_DECLARATION, GROUP, ENTITY_DECLARATION.
-	 */
-	public int getNodeType() {
-		return CMNode.GROUP;
-	}
-
-	/**
-	 * getOperation method
-	 * @return int
-	 *
-	 * Returns one of :
-	 * ALONE (a), SEQUENCE (a,b), CHOICE (a|b), ALL (a&b).
-	 */
-	public int getOperator() {
-		return operator;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNamedNodeMapImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNamedNodeMapImpl.java
deleted file mode 100644
index a32cdfd..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNamedNodeMapImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Iterator;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * An implementation of the CMNamedNodeMap interface.
- * This class is intented to be used as a container of attribute declarations.
- * If someone wants to use this class for other purpose, he must pay attention
- * to the fact that this class is tolerant of the key name case.  That is, this
- * class does not distinguish "name", "NAME", and "Name" as a key name.
- */
-class CMNamedNodeMapImpl implements org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap {
-
-	private java.util.Hashtable items = null;
-
-	/**
-	 */
-	public CMNamedNodeMapImpl() {
-		super();
-		items = new java.util.Hashtable();
-	}
-
-	/**
-	 * getLength method
-	 * @return int
-	 */
-	public int getLength() {
-		return items.size();
-	}
-
-	/**
-	 * getNamedItem method
-	 * @return CMNode <code>null</code> for unknown keys.
-	 * @param name java.lang.String
-	 */
-	public CMNode getNamedItem(String name) {
-		String cookedName = makeCanonicalForm(name);
-		if (!items.containsKey(cookedName))
-			return null;
-		return (CMNode) items.get(cookedName);
-	}
-
-	/**
-	 * item method
-	 * @return CMNode
-	 * @param index int
-	 */
-	public CMNode item(int index) {
-		Iterator iter = iterator();
-		while (iter.hasNext()) {
-			CMNode node = (CMNode) iter.next();
-			if (--index < 0)
-				return node;
-		}
-		return null;
-	}
-
-	/**
-	 * @return java.util.Iterator
-	 */
-	public Iterator iterator() {
-		return items.values().iterator();
-	}
-
-	/**
-	 * @return java.lang.String
-	 * @param rawForm java.lang.String
-	 */
-	private String makeCanonicalForm(String rawForm) {
-		return rawForm.toUpperCase();
-	}
-
-	/**
-	 * @param key java.lang.String
-	 * @param item java.lang.String
-	 */
-	void putNamedItem(String name, CMNode item) {
-		String cookedName = makeCanonicalForm(name);
-		if (items.containsKey(cookedName))
-			return; // already registered.
-		items.put(cookedName, item);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNodeImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNodeImpl.java
deleted file mode 100644
index c383848..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNodeImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-
-
-
-/**
- */
-abstract class CMNodeImpl implements org.eclipse.wst.xml.core.internal.contentmodel.CMNode {
-
-	private java.lang.String name = null;
-
-	/**
-	 * CMNodeImpl constructor comment.
-	 */
-	public CMNodeImpl(String nm) {
-		super();
-		name = nm;
-	}
-
-	/**
-	 * getNodeName method
-	 * @return java.lang.String
-	 */
-	public String getNodeName() {
-		return name;
-	}
-
-	/**
-	 * getProperty method
-	 * @return java.lang.Object
-	 *
-	 * Returns the object property desciped by the propertyName
-	 *
-	 */
-	public Object getProperty(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.IS_XHTML))
-			return new Boolean(false);
-		return null;
-	}
-
-	/**
-	 * supports method
-	 * @return boolean
-	 *
-	 * Returns true if the CMNode supports a specified property
-	 *
-	 */
-	public boolean supports(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.IS_XHTML))
-			return true;
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNodeListImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNodeListImpl.java
deleted file mode 100644
index 3e4404a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNodeListImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Analog of dom.NodeList for CM.
- */
-class CMNodeListImpl implements org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList {
-
-	private java.util.Vector nodes = null;
-
-	/**
-	 * CMNodeListImpl constructor comment.
-	 */
-	public CMNodeListImpl() {
-		super();
-		nodes = new java.util.Vector();
-	}
-
-	/**
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 * @param node org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 */
-	protected CMNode appendNode(CMNode node) {
-		nodes.addElement(node);
-		return node;
-	}
-
-	/**
-	 * getLength method
-	 * @return int
-	 */
-	public int getLength() {
-		return nodes.size();
-	}
-
-	/**
-	 * item method
-	 * @return CMNode
-	 * @param index int
-	 */
-	public CMNode item(int index) {
-		if (index < 0 || index >= nodes.size())
-			return null;
-		return (CMNode) nodes.elementAt(index);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ComplexTypeDefinition.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ComplexTypeDefinition.java
deleted file mode 100644
index a0c2dfd..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ComplexTypeDefinition.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-
-/**
- * This class is intended to represent a complex type definition
- * in XML Schema.<br>
- */
-abstract class ComplexTypeDefinition {
-
-	protected CMGroupImpl content = null;
-	protected ElementCollection collection = null;
-	protected String primaryCandidateName = null;
-
-	/**
-	 * ComplexTypeDefinition constructor comment.
-	 */
-	public ComplexTypeDefinition(ElementCollection elementCollection) {
-		super();
-		collection = elementCollection;
-		createContent();
-	}
-
-	/**
-	 * Create an actual content model.
-	 * This method should be called once and only once in the constructor.<br>
-	 */
-	protected abstract void createContent();
-
-	/**
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMGroup
-	 */
-	public CMGroup getContent() {
-		return content;
-	}
-
-	/**
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	/* NOTE: Do we need LOGICAL type?
-	 * -- 3/7/2001
-	 */
-	public abstract int getContentType();
-
-	/**
-	 * Get content hint.
-	 */
-	public HTMLElementDeclaration getPrimaryCandidate() {
-		if (primaryCandidateName == null)
-			return null;
-		return (HTMLElementDeclaration) collection.getNamedItem(primaryCandidateName);
-	}
-
-	/**
-	 * Name of complex type definition.
-	 * Each singleton must know its own name.
-	 * All names should be defined in
-	 * {@link <code>ComplexTypeDefinitionFactory</code>} as constants.<br>
-	 * @return java.lang.String
-	 */
-	public abstract String getTypeName();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ComplexTypeDefinitionFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ComplexTypeDefinitionFactory.java
deleted file mode 100644
index 5f346bf..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ComplexTypeDefinitionFactory.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-/**
- * Factory of ComplexTypeDefinition.
- */
-final class ComplexTypeDefinitionFactory {
-
-	private static ComplexTypeDefinitionFactory instance = null;
-	private java.util.Hashtable definitions = null;
-	// constants for complex type name
-	/** for ADDRESS. */
-	public final static String CTYPE_ADDRESS = "CTYPE_ADDRESS";//$NON-NLS-1$
-	/** CDATA content. No ComplexTypeDefinition instance shuld be created. */
-	public final static String CTYPE_CDATA = "CTYPE_CDATA";//$NON-NLS-1$
-	/** col group content. COL* */
-	public final static String CTYPE_COLUMN_GROUP = "CTYPE_COLUMN_GROUP";//$NON-NLS-1$
-	/** for DL. */
-	public final static String CTYPE_DEFINITION_LIST = "CTYPE_DEFINITION_LIST";//$NON-NLS-1$
-	/** for EMBED. */
-	public final static String CTYPE_EMBED = "CTYPE_EMBED";//$NON-NLS-1$
-	/** empty content. No ComplexTypeDefinition instance should be created. */
-	public final static String CTYPE_EMPTY = "CTYPE_EMPTY";//$NON-NLS-1$
-	/** for FIELDSET. */
-	public final static String CTYPE_FIELDSET = "CTYPE_FIELDSET";//$NON-NLS-1$
-	/** for FRAMESET. */
-	public final static String CTYPE_FRAMESET = "CTYPE_FRAMESET";//$NON-NLS-1$
-	/** flow content. (%flow;)* */
-	public final static String CTYPE_FLOW_CONTAINER = "CTYPE_FLOW_CONTAINER";//$NON-NLS-1$
-	/** html content. HEAD, (FRAMESET|BODY) */
-	public final static String CTYPE_HTML = "CTYPE_HTML";//$NON-NLS-1$
-	/** head content. TITLE & ISINDEX? & BASE? */
-	public final static String CTYPE_HEAD = "CTYPE_HEAD";//$NON-NLS-1$
-	/** inline content. (%inline;)* */
-	public final static String CTYPE_INLINE_CONTAINER = "CTYPE_INLINE_CONTAINER";//$NON-NLS-1$
-	/** list item container. (LI)+ */
-	public final static String CTYPE_LI_CONTAINER = "CTYPE_LI_CONTAINER";//$NON-NLS-1$
-	/** for MAP. */
-	public final static String CTYPE_MAP = "CTYPE_MAP";//$NON-NLS-1$
-	/** noframes content. */
-	public final static String CTYPE_NOFRAMES_CONTENT = "CTYPE_NOFRAMES_CONTENT";//$NON-NLS-1$
-	/** for OPTGROUP. */
-	public final static String CTYPE_OPTION_CONTAINER = "CTYPE_OPTION_CONTAINER";//$NON-NLS-1$
-	/** param container. For OBJECT/APPLET. */
-	public final static String CTYPE_PARAM_CONTAINER = "CTYPE_PARAM_CONTAINER";//$NON-NLS-1$
-	/** PCDATA content. No ComplexTypeDefinition instance shuld be created. */
-	public final static String CTYPE_PCDATA = "CTYPE_PCDATA";//$NON-NLS-1$
-	/** for SELECT. */
-	public final static String CTYPE_SELECT = "CTYPE_SELECT";//$NON-NLS-1$
-	/** table content. CAPTION?, (COL*|COLGROUP*), THEAD?, TFOOT?, TBODY+ */
-	public final static String CTYPE_TABLE = "CTYPE_TABLE";//$NON-NLS-1$
-	/** table cell contaier. (TH|TD)+ */
-	public final static String CTYPE_TCELL_CONTAINER = "CTYPE_TCELL_CONTAINER";//$NON-NLS-1$
-	/** table record container. (TR)+ */
-	public final static String CTYPE_TR_CONTAINER = "CTYPE_TR_CONTAINER";//$NON-NLS-1$
-
-	/**
-	 * ComplexTypeDefinitionFactory constructor comment.
-	 */
-	private ComplexTypeDefinitionFactory() {
-		super();
-		definitions = new java.util.Hashtable();
-	}
-
-	/**
-	 * Factory method for ComplexTypeDefinition.
-	 * Each instance created in this method must be registered into
-	 * the map with its name.
-	 * @param definitionName java.lang.String
-	 * @param elementCollection ElementCollection
-	 */
-	public ComplexTypeDefinition createTypeDefinition(String definitionName, ElementCollection elementCollection) {
-		if (definitions.containsKey(definitionName)) {
-			return (ComplexTypeDefinition) definitions.get(definitionName);
-		}
-
-		ComplexTypeDefinition def = null;
-		if (definitionName == CTYPE_ADDRESS) {
-			def = new CtdAddress(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_DEFINITION_LIST) {
-			def = new CtdDl(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_FLOW_CONTAINER) {
-			def = new CtdFlowContainer(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_HEAD) {
-			def = new CtdHead(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_HTML) {
-			def = new CtdHtml(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_INLINE_CONTAINER) {
-			def = new CtdInlineContainer(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_LI_CONTAINER) {
-			def = new CtdLiContainer(elementCollection);
-
-
-		}
-		else if (definitionName == CTYPE_OPTION_CONTAINER) {
-			def = new CtdOptionContainer(elementCollection);
-
-		}
-		else if (definitionName == CTYPE_SELECT) {
-			def = new CtdSelect(elementCollection);
-
-		}
-		else {
-			def = null;
-		}
-		if (def == null)
-			return null; // fail to create.
-		definitions.put(definitionName, def);
-		return def;
-	}
-
-	/**
-	 * For singleton.<br>
-	 */
-	public synchronized static ComplexTypeDefinitionFactory getInstance() {
-		if (instance != null)
-			return instance;
-		instance = new ComplexTypeDefinitionFactory();
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdAddress.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdAddress.java
deleted file mode 100644
index 84796f4..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdAddress.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * for ADDRESS.
- */
-final class CtdAddress extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdAddress(ElementCollection elementCollection) {
-		super(elementCollection);
-	}
-
-	/**
-	 * ((%inline) | P)*.
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( | )*
-		content = new CMGroupImpl(CMGroup.CHOICE, 0, CMContentImpl.UNBOUNDED);
-		// (%inline)
-		CMGroupImpl inlines = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		if (inlines == null)
-			return;
-		collection.getInline(inlines);
-		content.appendChild(inlines);
-		// P
-		CMNode p = collection.getNamedItem(CHTMLNamespace.ElementName.P);
-		if (p != null)
-			content.appendChild(p);
-	}
-
-	/**
-	 * ((%inline) | P)*.
-	 * Because %inline; contains #PCDATA, the type is MIXED.
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.MIXED;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_ADDRESS;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdDl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdDl.java
deleted file mode 100644
index dcfb159..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdDl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * for DL.
- */
-final class CtdDl extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdDl(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = CHTMLNamespace.ElementName.DT;
-	}
-
-	/**
-	 * (DT | DD)+
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( | )+
-		content = new CMGroupImpl(CMGroup.CHOICE, 1, CMContentImpl.UNBOUNDED);
-		// DT
-		CMNode dec = collection.getNamedItem(CHTMLNamespace.ElementName.DT);
-		if (dec != null)
-			content.appendChild(dec);
-		// DD
-		dec = collection.getNamedItem(CHTMLNamespace.ElementName.DD);
-		if (dec != null)
-			content.appendChild(dec);
-	}
-
-	/**
-	 * (DT | DD)+.
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_DEFINITION_LIST;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdFlowContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdFlowContainer.java
deleted file mode 100644
index ee94d62..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdFlowContainer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-
-/**
- * Complex type definition for containers of <code>%flow;</code>.
- */
-final class CtdFlowContainer extends ComplexTypeDefinition {
-
-	/**
-	 */
-	public CtdFlowContainer(ElementCollection elementCollection) {
-		super(elementCollection);
-	}
-
-	/**
-	 * (%flow;)*
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		content = new CMGroupImpl(CMGroup.CHOICE, 0, CMContentImpl.UNBOUNDED);
-		collection.getFlow(content);
-	}
-
-	public int getContentType() {
-		return CMElementDeclaration.MIXED;
-	}
-
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_FLOW_CONTAINER;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdHead.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdHead.java
deleted file mode 100644
index 5361c3a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdHead.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Complex type definition for the head content.
- * Content Model: (TITLE & ISINDEX? & BASE?)
- */
-final class CtdHead extends ComplexTypeDefinition {
-
-	/**
-	 */
-	public CtdHead(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = CHTMLNamespace.ElementName.TITLE;
-	}
-
-	/**
-	 * for HEAD.
-	 * To avoid using inclusion, the content model comes from the XHTML 1.0.
-	 *
-	 * (%head.misc;, ((title, %head.misc;, (base, %head.misc;)?) | (base, %head.misc;, (title, %head.misc;))))
-	 * And %head.misc; is:
-	 * (script|style|meta|link|object|isindex)*
-	 *
-	 * 0: (%head.misc, A)
-	 * A: (B | C)
-	 * B: (title, %head.misc;, D)
-	 * C: (base, %head.misc;, E)
-	 * D: (base, %head.misc;)?
-	 * E: (title, %head.misc;)
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// At 1st, create %head.misc; content.
-		// %head.misc;
-		//   ( | )*
-		CMGroupImpl misc = new CMGroupImpl(CMGroup.CHOICE, 0, CMContentImpl.UNBOUNDED);
-		if (misc == null)
-			return;
-		String[] names = {CHTMLNamespace.ElementName.META,};
-		collection.getDeclarations(misc, Arrays.asList(names).iterator());
-		// 2nd, get a title
-		CMNode title = collection.getNamedItem(CHTMLNamespace.ElementName.TITLE);
-		// 3rd, get a base
-		CMNode base = collection.getNamedItem(CHTMLNamespace.ElementName.BASE);
-		if (title == null || base == null)
-			return;
-
-		// Top level content is a sequence of %head.misc; and A.
-		// 0: (%head.misc;, A)
-		//   create a sequence
-		content = new CMGroupImpl(CMGroup.SEQUENCE, 1, 1);
-		if (content == null)
-			return;
-		//   append %head.misc;
-		content.appendChild(misc);
-		//   create A and append it to the top level.
-		{
-			// A is a choice of B and C.
-			// A: (B | C)
-			//   create a choice
-			CMGroupImpl gA = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-			if (gA == null)
-				return;
-			//   append A to the top level.
-			content.appendChild(gA);
-
-			// create B and append it to A
-			{
-				// B is a sequence of title, %head.misc;, and D.
-				// B: (title, %head.misc;, D)
-				//   create a sequence
-				CMGroupImpl gB = new CMGroupImpl(CMGroup.SEQUENCE, 1, 1);
-				if (gB == null)
-					return;
-				//   append B to A.
-				gA.appendChild(gB);
-
-				//   append title to B
-				gB.appendChild(title);
-				//   append %head.misc; to B
-				gB.appendChild(misc);
-				//   create D and append it to B.
-				{
-					// D is a sequence of base, %head.misc;.
-					// D: (base, %head.misc;)?
-					//   create a sequence
-					CMGroupImpl gD = new CMGroupImpl(CMGroup.SEQUENCE, 0, 1);
-					if (gD == null)
-						return;
-					//   append D to B.
-					gB.appendChild(gD);
-
-					//   append base to D
-					gD.appendChild(base);
-					//   append %head.misc; to D.
-					gD.appendChild(misc);
-				}
-			}
-			// create C and append it to A
-			{
-				// C is a sequence of base, %head.misc;, and E
-				// C: (base, %head.misc;, E)
-				//   create a sequence
-				CMGroupImpl gC = new CMGroupImpl(CMGroup.SEQUENCE, 1, 1);
-				if (gC == null)
-					return;
-				//   append C to A.
-				gA.appendChild(gC);
-
-				//   append base to C
-				gC.appendChild(base);
-				//   append %head.misc; to C
-				gC.appendChild(misc);
-
-				//   create E and append it to C.
-				{
-					// E is a sequence of title and %head.misc;.
-					// E: (title, %head.misc;)
-					//   create a sequence
-					CMGroupImpl gE = new CMGroupImpl(CMGroup.SEQUENCE, 1, 1);
-					if (gE == null)
-						return;
-					//   append E to C.
-					gC.appendChild(gE);
-
-					//   append title to E
-					gE.appendChild(title);
-					//   append %head.misc; to E.
-					gE.appendChild(misc);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Element content.<br>
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * Name of complex type definition.
-	 * Each singleton must know its own name.
-	 * All names should be defined in
-	 * {@link <code>ComplexTypeDefinitionFactory</code>} as constants.<br>
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_HEAD;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdHtml.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdHtml.java
deleted file mode 100644
index 72bab17..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdHtml.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Complex type definition for <code>HTML</code>.<br>
- * Content Model:
- * HEAD, (FRAMESET|BODY)<br>
- */
-final class CtdHtml extends ComplexTypeDefinition {
-
-	/**
-	 */
-	public CtdHtml(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = CHTMLNamespace.ElementName.HEAD;
-	}
-
-	/**
-	 * (%html.content;).
-	 * %html.content; is HEAD, (FRAMESET | BODY).
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( )
-		content = new CMGroupImpl(CMGroup.SEQUENCE, 1, 1);
-		if (content == null)
-			return;
-
-		// HEAD
-		CMNode edec = collection.getNamedItem(CHTMLNamespace.ElementName.HEAD);
-		if (edec != null)
-			content.appendChild(edec);
-
-		// ( | )
-		CMGroupImpl group = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		content.appendChild(group);
-
-		// FRAMESET, BODY
-		String[] names = {CHTMLNamespace.ElementName.BODY};
-		collection.getDeclarations(group, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 * Element content.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_HTML;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdInlineContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdInlineContainer.java
deleted file mode 100644
index 973944a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdInlineContainer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-
-/**
- * Complex type definition for (%inline;)*.
- */
-final class CtdInlineContainer extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdInlineContainer(ElementCollection elementCollection) {
-		super(elementCollection);
-	}
-
-	/**
-	 * (%inline)*.
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		content = new CMGroupImpl(CMGroup.CHOICE, 0, CMContentImpl.UNBOUNDED);
-		collection.getInline(content);
-	}
-
-	public int getContentType() {
-		return CMElementDeclaration.MIXED;
-	}
-
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_INLINE_CONTAINER;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdLiContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdLiContainer.java
deleted file mode 100644
index 8e4716a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdLiContainer.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * List item container.
- * (LI)+
- */
-final class CtdLiContainer extends ComplexTypeDefinition {
-
-	/**
-	 * @param elemenCollection ElementCollection
-	 */
-	public CtdLiContainer(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = CHTMLNamespace.ElementName.LI;
-	}
-
-	/**
-	 * (LI)+.
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// (LI)+
-		content = new CMGroupImpl(CMGroup.SEQUENCE, 1, CMContentImpl.UNBOUNDED);
-		CMNode li = collection.getNamedItem(CHTMLNamespace.ElementName.LI);
-		if (li != null)
-			content.appendChild(li);
-	}
-
-	/**
-	 * ELEMENT content.<br>
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * Name of complex type definition.
-	 * Each singleton must know its own name.
-	 * All names should be defined in
-	 * {@link <code>ComplexTypeDefinitionFactory</code>} as constants.<br>
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_LI_CONTAINER;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdOptionContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdOptionContainer.java
deleted file mode 100644
index b1e0a54..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdOptionContainer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * OPTION container.
- * (OPTION)+
- */
-final class CtdOptionContainer extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdOptionContainer(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = CHTMLNamespace.ElementName.OPTION;
-	}
-
-	/**
-	 * (OPTION)+.
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( )+
-		content = new CMGroupImpl(CMGroup.SEQUENCE, 1, CMContentImpl.UNBOUNDED);
-		// OPTION
-		CMNode dec = collection.getNamedItem(CHTMLNamespace.ElementName.OPTION);
-		if (dec != null)
-			content.appendChild(dec);
-	}
-
-	/**
-	 * (OPTION)+
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * Name of complex type definition.
-	 * Each singleton must know its own name.
-	 * All names should be defined in
-	 * {@link <code>ComplexTypeDefinitionFactory</code>} as constants.<br>
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_OPTION_CONTAINER;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdSelect.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdSelect.java
deleted file mode 100644
index cc0d61e..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdSelect.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * for SELECT.
- */
-final class CtdSelect extends ComplexTypeDefinition {
-
-	/**
-	 * @param elementCollection ElementCollection
-	 */
-	public CtdSelect(ElementCollection elementCollection) {
-		super(elementCollection);
-		primaryCandidateName = CHTMLNamespace.ElementName.OPTION;
-	}
-
-	/**
-	 * (OPTGROUP | OPTION)+.
-	 */
-	protected void createContent() {
-		if (content != null)
-			return; // already created.
-		if (collection == null)
-			return;
-
-		// ( | )+
-		content = new CMGroupImpl(CMGroup.CHOICE, 1, CMContentImpl.UNBOUNDED);
-		// OPTION
-		CMNode dec = collection.getNamedItem(CHTMLNamespace.ElementName.OPTION);
-		if (dec != null)
-			content.appendChild(dec);
-	}
-
-	/**
-	 * (OPTGROUP | OPTION)+.
-	 * @return int; Should be one of ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA,
-	 * those are defined in CMElementDeclaration.
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.ELEMENT;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	public String getTypeName() {
-		return ComplexTypeDefinitionFactory.CTYPE_SELECT;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/DeclCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/DeclCollection.java
deleted file mode 100644
index 2b56527..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/DeclCollection.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- */
-abstract class DeclCollection implements CMNamedNodeMap {
-
-
-	protected class DualMap {
-		public DualMap() {
-			super();
-		}
-
-		public DualMap(Object[] objects) {
-			super();
-			initialize(objects);
-		}
-
-		public int size() {
-			return table.length;
-		}
-
-		public Object getValue(int key) {
-			if (!isValidIndex(key))
-				return null;
-			return table[key];
-		}
-
-		public int getKey(Object value) {
-			Integer keyObj = (Integer) map.get(value);
-			if (keyObj == null)
-				return ID_UNKNOWN;
-			return keyObj.intValue();
-		}
-
-		protected void initialize(Object[] objects) {
-			if (objects == null)
-				return;
-			table = objects;
-			map = new HashMap();
-			for (int key = 0; key < objects.length; key++) {
-				Object value = table[key];
-				map.put(value, new Integer(key));
-			}
-		}
-
-		private Object[] table = null;
-		private HashMap map = null;
-
-		private boolean isValidIndex(int index) {
-			return index >= 0 && index < table.length;
-		}
-	}
-
-	protected class TolerantStringDualMap extends DualMap {
-		public TolerantStringDualMap(String[] names) {
-			super();
-			Object[] objects = new Object[names.length];
-			for (int i = 0; i < names.length; i++) {
-				objects[i] = makeCanonicalForm(names[i]);
-			}
-			initialize(objects);
-		}
-
-		public int getKey(Object value) {
-			try {
-				String name = (String) value;
-				return super.getKey(makeCanonicalForm(name));
-			}
-			catch (ClassCastException e) {
-				return ID_UNKNOWN;
-			}
-		}
-
-		private String makeCanonicalForm(String raw) {
-			return raw.toUpperCase();
-		}
-	}
-
-	private class DeclIterator implements Iterator {
-		public DeclIterator() {
-			maxid = fDecls.length - 1;
-		}
-
-		public boolean hasNext() {
-			return id < maxid;
-		}
-
-		public Object next() {
-			if (!hasNext())
-				return null;
-			return item(++id);
-		}
-
-		public void remove() { /* nothing should be done. */
-		}
-
-		private int id = -1;
-		private int maxid = -1;
-	}
-
-	CMNode[] fDecls = null;
-	protected final static boolean STRICT_CASE = false;
-	protected final static boolean TOLERANT_CASE = true;
-	protected final static int ID_UNKNOWN = -1;
-	private DualMap fMap = null;
-
-	/**
-	 */
-	public DeclCollection(String[] names, boolean tolerant) {
-		super();
-		fDecls = new CMNode[names.length];
-		if (tolerant) {
-			fMap = new TolerantStringDualMap(names);
-		}
-		else {
-			fMap = new DualMap(names);
-		}
-	}
-
-	/**
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 * @param id int
-	 */
-	protected abstract CMNode create(String name);
-
-	/**
-	 */
-	public CMNamedNodeMap getDeclarations(String[] names) {
-		CMNamedNodeMapImpl map = new CMNamedNodeMapImpl();
-		for (int i = 0; i < names.length; i++) {
-			String name = names[i];
-			CMNode node = getNamedItem(name);
-			if (node == null)
-				continue;
-			map.putNamedItem(name, node);
-		}
-		return map;
-	}
-
-	public void getDeclarations(CMGroupImpl group, Iterator names) {
-		while (names.hasNext()) {
-			String entityName = (String) names.next();
-			CMNode dec = getNamedItem(entityName);
-			if (dec != null)
-				group.appendChild(dec);
-		}
-	}
-
-	/**
-	 * Map name to id.
-	 * @return int
-	 * @param name java.lang.String
-	 */
-	protected int getID(String name) {
-		return fMap.getKey(name);
-	}
-
-	/**
-	 * getLength method
-	 * @return int
-	 */
-	public int getLength() {
-		return fDecls.length;
-	}
-
-	/**
-	 * @return java.lang.String
-	 * @param id int
-	 */
-	protected String getName(int id) {
-		return (String) fMap.getValue(id);
-	}
-
-	/**
-	 * getNamedItem method
-	 * @return CMNode
-	 * @param name java.lang.String
-	 */
-	public CMNode getNamedItem(String name) {
-		int id = getID(name);
-		if (!isValidID(id))
-			return null;
-		return item(id);
-	}
-
-	/**
-	 * @return boolean
-	 * @param id int
-	 */
-	private boolean isValidID(int id) {
-		return id >= 0 && id < fDecls.length;
-	}
-
-	/**
-	 * item method
-	 * @return CMNode
-	 * @param index int
-	 */
-	public CMNode item(int index) {
-		if (!isValidID(index))
-			return null;
-		CMNode decl = fDecls[index];
-		if (decl != null)
-			return decl; // already exist.
-
-		decl = create(getName(index));
-		fDecls[index] = decl;
-		return decl;
-	}
-
-	/**
-	 */
-	public Iterator iterator() {
-		return new DeclIterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ElementCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ElementCollection.java
deleted file mode 100644
index bf5ad46..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ElementCollection.java
+++ /dev/null
@@ -1,492 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Factory for element declarations.
- */
-final class ElementCollection extends DeclCollection implements org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.ElementName {
-
-
-	// Element IDs
-	private static class Ids {
-		public static final int ID_A = 0;
-		public static final int ID_ADDRESS = 1;
-		public static final int ID_BASE = 2;
-		public static final int ID_BLOCKQUOTE = 3;
-		public static final int ID_BODY = 4;
-		public static final int ID_BR = 5;
-		public static final int ID_CENTER = 6;
-		public static final int ID_DD = 7;
-		public static final int ID_DIR = 8;
-		public static final int ID_DIV = 9;
-		public static final int ID_DL = 10;
-		public static final int ID_DT = 11;
-		public static final int ID_FORM = 12;
-		public static final int ID_H1 = 13;
-		public static final int ID_H2 = 14;
-		public static final int ID_H3 = 15;
-		public static final int ID_H4 = 16;
-		public static final int ID_H5 = 17;
-		public static final int ID_H6 = 18;
-		public static final int ID_HEAD = 19;
-		public static final int ID_HR = 20;
-		public static final int ID_HTML = 21;
-		public static final int ID_IMG = 22;
-		public static final int ID_INPUT = 23;
-		public static final int ID_LI = 24;
-		public static final int ID_MENU = 25;
-		public static final int ID_META = 26;
-		public static final int ID_OL = 27;
-		public static final int ID_OPTION = 28;
-		public static final int ID_P = 29;
-		public static final int ID_PRE = 30;
-		public static final int ID_SELECT = 31;
-		public static final int ID_TEXTAREA = 32;
-		public static final int ID_TITLE = 33;
-		public static final int ID_UL = 34;
-		public static final int ID_SSI_CONFIG = 35;
-		public static final int ID_SSI_ECHO = 36;
-		public static final int ID_SSI_EXEC = 37;
-		public static final int ID_SSI_FSIZE = 38;
-		public static final int ID_SSI_FLASTMOD = 39;
-		public static final int ID_SSI_INCLUDE = 40;
-		public static final int ID_SSI_PRINTENV = 41;
-		public static final int ID_SSI_SET = 42;
-
-		public static int getNumOfIds() {
-			if (numofids != -1)
-				return numofids;
-
-			// NOTE: If the reflection is too slow, this method should
-			// just return the literal value, like 105.
-			// -- 5/25/2001
-			Class clazz = Ids.class;
-			Field[] fields = clazz.getFields();
-			numofids = 0;
-			for (int i = 0; i < fields.length; i++) {
-				String name = fields[i].getName();
-				if (name.startsWith("ID_"))//$NON-NLS-1$
-					numofids++;
-			}
-			return numofids;
-		}
-
-		// chache the result of the reflection.
-		private static int numofids = -1;
-	}
-
-	/** %formctl;. INPUT | SELECT | TEXTAREA */
-	private static final String[] FORMCTL = {INPUT, SELECT, TEXTAREA};
-	/** %phrase;.
-	 * DFN
-	 */
-	private static final String[] PHRASE = {DFN};
-	/** %special;.
-	 * A | IMG | BR
-	 */
-	private static final String[] SPECIAL = {A, IMG, BR};
-	/** %heading;. H[1-6] */
-	private static final String[] HEADING = {H1, H2, H3, H4, H5, H6};
-	/** %list;. UL | OL | DIR | MENU */
-	private static final String[] LIST = {UL, OL, DIR, MENU};
-	/** %preformatted;. PRE */
-	private static final String[] PREFORMATTED = {PRE};
-	private AttributeCollection attributeCollection = null;
-	private static String[] names = null;
-
-	static {
-		names = new String[Ids.getNumOfIds()];
-		names[Ids.ID_A] = A;
-		names[Ids.ID_ADDRESS] = ADDRESS;
-		names[Ids.ID_BASE] = BASE;
-		names[Ids.ID_BLOCKQUOTE] = BLOCKQUOTE;
-		names[Ids.ID_BODY] = BODY;
-		names[Ids.ID_BR] = BR;
-		names[Ids.ID_CENTER] = CENTER;
-		names[Ids.ID_DD] = DD;
-		names[Ids.ID_DIR] = DIR;
-		names[Ids.ID_DIV] = DIV;
-		names[Ids.ID_DL] = DL;
-		names[Ids.ID_DT] = DT;
-		names[Ids.ID_FORM] = FORM;
-		names[Ids.ID_H1] = H1;
-		names[Ids.ID_H2] = H2;
-		names[Ids.ID_H3] = H3;
-		names[Ids.ID_H4] = H4;
-		names[Ids.ID_H5] = H5;
-		names[Ids.ID_H6] = H6;
-		names[Ids.ID_HEAD] = HEAD;
-		names[Ids.ID_HR] = HR;
-		names[Ids.ID_HTML] = HTML;
-		names[Ids.ID_IMG] = IMG;
-		names[Ids.ID_INPUT] = INPUT;
-		names[Ids.ID_LI] = LI;
-		names[Ids.ID_MENU] = MENU;
-		names[Ids.ID_META] = META;
-		names[Ids.ID_OL] = OL;
-		names[Ids.ID_OPTION] = OPTION;
-		names[Ids.ID_P] = P;
-		names[Ids.ID_PRE] = PRE;
-		names[Ids.ID_SELECT] = SELECT;
-		names[Ids.ID_TEXTAREA] = TEXTAREA;
-		names[Ids.ID_TITLE] = TITLE;
-		names[Ids.ID_UL] = UL;
-		names[Ids.ID_SSI_CONFIG] = SSI_CONFIG;
-		names[Ids.ID_SSI_ECHO] = SSI_ECHO;
-		names[Ids.ID_SSI_EXEC] = SSI_EXEC;
-		names[Ids.ID_SSI_FSIZE] = SSI_FSIZE;
-		names[Ids.ID_SSI_FLASTMOD] = SSI_FLASTMOD;
-		names[Ids.ID_SSI_INCLUDE] = SSI_INCLUDE;
-		names[Ids.ID_SSI_PRINTENV] = SSI_PRINTENV;
-		names[Ids.ID_SSI_SET] = SSI_SET;
-	}
-
-	/**
-	 */
-	public ElementCollection(AttributeCollection collection) {
-		super(names, TOLERANT_CASE);
-		attributeCollection = collection;
-	}
-
-	/**
-	 * Actually creates HTMLElementDeclaration instance.
-	 * @return HTMLElementDeclaration
-	 */
-	protected CMNode create(String elementName) {
-		HTMLElemDeclImpl edec = null;
-
-		if (elementName.equalsIgnoreCase(A)) {
-			edec = new HedA(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(ADDRESS)) {
-			edec = new HedADDRESS(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(BASE)) {
-			edec = new HedBASE(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(BLOCKQUOTE)) {
-			edec = new HedBLOCKQUOTE(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(BODY)) {
-			edec = new HedBODY(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(BR)) {
-			edec = new HedBR(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(CENTER)) {
-			edec = new HedCENTER(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(DD)) {
-			edec = new HedDD(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(DIR)) {
-			edec = new HedMENU(DIR, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(DIV)) {
-			edec = new HedDIV(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(DL)) {
-			edec = new HedDL(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(DT)) {
-			edec = new HedDT(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(FORM)) {
-			edec = new HedFORM(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(H1)) {
-			edec = new HedHeading(H1, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(H2)) {
-			edec = new HedHeading(H2, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(H3)) {
-			edec = new HedHeading(H3, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(H4)) {
-			edec = new HedHeading(H4, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(H5)) {
-			edec = new HedHeading(H5, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(H6)) {
-			edec = new HedHeading(H6, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(HEAD)) {
-			edec = new HedHEAD(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(HR)) {
-			edec = new HedHR(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(HTML)) {
-			edec = new HedHTML(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(IMG)) {
-			edec = new HedIMG(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(INPUT)) {
-			edec = new HedINPUT(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(LI)) {
-			edec = new HedLI(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(MENU)) {
-			edec = new HedMENU(MENU, this);
-
-		}
-		else if (elementName.equalsIgnoreCase(META)) {
-			edec = new HedMETA(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(OL)) {
-			edec = new HedOL(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(OPTION)) {
-			edec = new HedOPTION(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(P)) {
-			edec = new HedP(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(PRE)) {
-			edec = new HedPRE(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SELECT)) {
-			edec = new HedSELECT(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(TEXTAREA)) {
-			edec = new HedTEXTAREA(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(TITLE)) {
-			edec = new HedTITLE(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(UL)) {
-			edec = new HedUL(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_CONFIG)) {
-			edec = new HedSSIConfig(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_ECHO)) {
-			edec = new HedSSIEcho(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_EXEC)) {
-			edec = new HedSSIExec(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_FSIZE)) {
-			edec = new HedSSIFsize(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_FLASTMOD)) {
-			edec = new HedSSIFlastmod(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_INCLUDE)) {
-			edec = new HedSSIInclude(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_PRINTENV)) {
-			edec = new HedSSIPrintenv(this);
-
-		}
-		else if (elementName.equalsIgnoreCase(SSI_SET)) {
-			edec = new HedSSISet(this);
-
-		} // unknown
-		else {
-			// NOTE: We don't define the UNKNOWN element declaration.
-			// <code>null</code> for a declaration is a sign of
-			// the target element is unknown.
-			// -- 3/9/2001
-			edec = null;
-		}
-		return edec;
-	}
-
-	public AttributeCollection getAttributeCollection() {
-		return attributeCollection;
-	}
-
-	/**
-	 */
-	public final Collection getNamesOfBlock() {
-		// P | %list | %preformatted | DL | DIV | CENTER | BLOCKQUOTE | FORM | HR
-		String[] blockMisc = {P, DL, DIV, CENTER, BLOCKQUOTE, FORM, HR,};
-		Vector blockNames = new Vector(Arrays.asList(blockMisc));
-		// %heading;
-		blockNames.addAll(Arrays.asList(HEADING));
-		// %list;
-		blockNames.addAll(Arrays.asList(LIST));
-		// %preformatted;
-		blockNames.addAll(Arrays.asList(PREFORMATTED));
-
-		return blockNames;
-	}
-
-	/**
-	 * %block;.
-	 * %block; is:
-	 * P | %heading; | %list; | %preformatted; | DL | DIV | CENTER |
-	 * NOSCRIPT | NOFRAMES | BLOCKQUOTE | FORM | ISINDEX | HR |
-	 * TABLE | FIELDSET | ADDRESS.<br>
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getBlock(CMGroupImpl group) {
-		if (group == null)
-			return;
-		getDeclarations(group, getNamesOfBlock().iterator());
-	}
-
-	/**
-	 * Create element declarations and store them
-	 * into a <code>CMGroupImpl</code> instance.
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getFlow(CMGroupImpl group) {
-		if (group == null)
-			return;
-		getBlock(group);
-		getInline(group);
-	}
-
-	/**
-	 * Create element declarations and store them into a <code>CMGroupImpl</code>
-	 * instance.<br>
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getFontstyle(CMGroupImpl group) {
-		return;
-	}
-
-	/**
-	 * Create element declarations and store them into a <code>CMGroupImpl</code>
-	 * instance.<br>
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getFormctrl(CMGroupImpl group) {
-		if (group == null)
-			return;
-		getDeclarations(group, Arrays.asList(FORMCTL).iterator());
-	}
-
-	/**
-	 * %heading;.
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getHeading(CMGroupImpl group) {
-		if (group == null)
-			return;
-
-		getDeclarations(group, Arrays.asList(HEADING).iterator());
-	}
-
-	/**
-	 * Create element declarations and store them
-	 * into a <code>CMGroupImpl</code> instance.
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getInline(CMGroupImpl group) {
-		if (group == null)
-			return;
-		getFontstyle(group);
-		getPhrase(group);
-		getSpecial(group);
-		getFormctrl(group);
-	}
-
-	/**
-	 * %list;.
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getList(CMGroupImpl group) {
-		if (group == null)
-			return;
-
-		getDeclarations(group, Arrays.asList(LIST).iterator());
-	}
-
-	/**
-	 * Create element declarations and store them into a <code>CMGroupImpl</code>
-	 * instance.<br>
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getPhrase(CMGroupImpl group) {
-		if (group == null)
-			return;
-		getDeclarations(group, Arrays.asList(PHRASE).iterator());
-	}
-
-	/**
-	 * %preformatted;
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getPreformatted(CMGroupImpl group) {
-		if (group == null)
-			return;
-
-		getDeclarations(group, Arrays.asList(PREFORMATTED).iterator());
-	}
-
-	/**
-	 * Create element declarations and store them into a <code>CMGroupImpl</code>
-	 * instance.<br>
-	 * @param group CMGroupImpl Return values.
-	 */
-	public final void getSpecial(CMGroupImpl group) {
-		if (group == null)
-			return;
-		getDeclarations(group, Arrays.asList(SPECIAL).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/EntityCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/EntityCollection.java
deleted file mode 100644
index 7b44593..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/EntityCollection.java
+++ /dev/null
@@ -1,837 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.lang.reflect.Field;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Factory for entity declarations.
- */
-final class EntityCollection extends DeclCollection implements org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.EntityName {
-
-
-	private static class Ids {
-		public static final int ID_AACUTE_L = 0;
-		public static final int ID_AACUTE_U = 1;
-		public static final int ID_ACIRC_L = 2;
-		public static final int ID_ACIRC_U = 3;
-		public static final int ID_ACUTE = 4;
-		public static final int ID_AELIG_L = 5;
-		public static final int ID_AELIG_U = 6;
-		public static final int ID_AGRAVE_L = 7;
-		public static final int ID_AGRAVE_U = 8;
-		public static final int ID_ALEFSYM = 9;
-		public static final int ID_ALPHA_L = 10;
-		public static final int ID_ALPHA_U = 11;
-		public static final int ID_AMP = 12;
-		public static final int ID_AND = 13;
-		public static final int ID_ANG = 14;
-		public static final int ID_ARING_L = 15;
-		public static final int ID_ARING_U = 16;
-		public static final int ID_ASYMP = 17;
-		public static final int ID_ATILDE_L = 18;
-		public static final int ID_ATILDE_U = 19;
-		public static final int ID_AUML_L = 20;
-		public static final int ID_AUML_U = 21;
-		public static final int ID_BDQUO = 22;
-		public static final int ID_BETA_L = 23;
-		public static final int ID_BETA_U = 24;
-		public static final int ID_BRVBAR = 25;
-		public static final int ID_BULL = 26;
-		public static final int ID_CAP = 27;
-		public static final int ID_CCEDIL_L = 28;
-		public static final int ID_CCEDIL_U = 29;
-		public static final int ID_CEDIL = 30;
-		public static final int ID_CENT = 31;
-		public static final int ID_CHI_L = 32;
-		public static final int ID_CHI_U = 33;
-		public static final int ID_CIRC = 34;
-		public static final int ID_CLUBS = 35;
-		public static final int ID_CONG = 36;
-		public static final int ID_COPY = 37;
-		public static final int ID_CRARR = 38;
-		public static final int ID_CUP = 39;
-		public static final int ID_CURREN = 40;
-		public static final int ID_DAGGER_L = 41;
-		public static final int ID_DAGGER_U = 42;
-		public static final int ID_DARR_L = 43;
-		public static final int ID_DARR_U = 44;
-		public static final int ID_DEG = 45;
-		public static final int ID_DELTA_L = 46;
-		public static final int ID_DELTA_U = 47;
-		public static final int ID_DIAMS = 48;
-		public static final int ID_DIVIDE = 49;
-		public static final int ID_EACUTE_L = 50;
-		public static final int ID_EACUTE_U = 51;
-		public static final int ID_ECIRC_L = 52;
-		public static final int ID_ECIRC_U = 53;
-		public static final int ID_EGRAVE_L = 54;
-		public static final int ID_EGRAVE_U = 55;
-		public static final int ID_EMPTY = 56;
-		public static final int ID_EMSP = 57;
-		public static final int ID_ENSP = 58;
-		public static final int ID_EPSILON_L = 59;
-		public static final int ID_EPSILON_U = 60;
-		public static final int ID_EQUIV = 61;
-		public static final int ID_ETA_L = 62;
-		public static final int ID_ETA_U = 63;
-		public static final int ID_ETH_L = 64;
-		public static final int ID_ETH_U = 65;
-		public static final int ID_EUML_L = 66;
-		public static final int ID_EUML_U = 67;
-		public static final int ID_EURO = 68;
-		public static final int ID_EXIST = 69;
-		public static final int ID_FNOF = 70;
-		public static final int ID_FORALL = 71;
-		public static final int ID_FRAC12 = 72;
-		public static final int ID_FRAC14 = 73;
-		public static final int ID_FRAC34 = 74;
-		public static final int ID_FRASL = 75;
-		public static final int ID_GAMMA_L = 76;
-		public static final int ID_GAMMA_U = 77;
-		public static final int ID_GE = 78;
-		public static final int ID_GT = 79;
-		public static final int ID_HARR_L = 80;
-		public static final int ID_HARR_U = 81;
-		public static final int ID_HEARTS = 82;
-		public static final int ID_HELLIP = 83;
-		public static final int ID_IACUTE_L = 84;
-		public static final int ID_IACUTE_U = 85;
-		public static final int ID_ICIRC_L = 86;
-		public static final int ID_ICIRC_U = 87;
-		public static final int ID_IEXCL = 88;
-		public static final int ID_IGRAVE_L = 89;
-		public static final int ID_IGRAVE_U = 90;
-		public static final int ID_IMAGE = 91;
-		public static final int ID_INFIN = 92;
-		public static final int ID_INT = 93;
-		public static final int ID_IOTA_L = 94;
-		public static final int ID_IOTA_U = 95;
-		public static final int ID_IQUEST = 96;
-		public static final int ID_ISIN = 97;
-		public static final int ID_IUML_L = 98;
-		public static final int ID_IUML_U = 99;
-		public static final int ID_KAPPA_L = 100;
-		public static final int ID_KAPPA_U = 101;
-		public static final int ID_LAMBDA_L = 102;
-		public static final int ID_LAMBDA_U = 103;
-		public static final int ID_LANG = 104;
-		public static final int ID_LAQUO = 105;
-		public static final int ID_LARR_L = 106;
-		public static final int ID_LARR_U = 107;
-		public static final int ID_LCEIL = 108;
-		public static final int ID_LDQUO = 109;
-		public static final int ID_LE = 110;
-		public static final int ID_LFLOOR = 111;
-		public static final int ID_LOWAST = 112;
-		public static final int ID_LOZ = 113;
-		public static final int ID_LRM = 114;
-		public static final int ID_LSAQUO = 115;
-		public static final int ID_LSQUO = 116;
-		public static final int ID_LT = 117;
-		public static final int ID_MACR = 118;
-		public static final int ID_MDASH = 119;
-		public static final int ID_MICRO = 120;
-		public static final int ID_MIDDOT = 121;
-		public static final int ID_MINUS = 122;
-		public static final int ID_MU_L = 123;
-		public static final int ID_MU_U = 124;
-		public static final int ID_NABLA = 125;
-		public static final int ID_NBSP = 126;
-		public static final int ID_NDASH = 127;
-		public static final int ID_NE = 128;
-		public static final int ID_NI = 129;
-		public static final int ID_NOT = 130;
-		public static final int ID_NOTIN = 131;
-		public static final int ID_NSUB = 132;
-		public static final int ID_NTILDE_L = 133;
-		public static final int ID_NTILDE_U = 134;
-		public static final int ID_NU_L = 135;
-		public static final int ID_NU_U = 136;
-		public static final int ID_OACUTE_L = 137;
-		public static final int ID_OACUTE_U = 138;
-		public static final int ID_OCIRC_L = 139;
-		public static final int ID_OCIRC_U = 140;
-		public static final int ID_OELIG_L = 141;
-		public static final int ID_OELIG_U = 142;
-		public static final int ID_OGRAVE_L = 143;
-		public static final int ID_OGRAVE_U = 144;
-		public static final int ID_OLINE = 145;
-		public static final int ID_OMEGA_L = 146;
-		public static final int ID_OMEGA_U = 147;
-		public static final int ID_OMICRON_L = 148;
-		public static final int ID_OMICRON_U = 149;
-		public static final int ID_OPLUS = 150;
-		public static final int ID_OR = 151;
-		public static final int ID_ORDF = 152;
-		public static final int ID_ORDM = 153;
-		public static final int ID_OSLASH_L = 154;
-		public static final int ID_OSLASH_U = 155;
-		public static final int ID_OTILDE_L = 156;
-		public static final int ID_OTILDE_U = 157;
-		public static final int ID_OTIMES = 158;
-		public static final int ID_OUML_L = 159;
-		public static final int ID_OUML_U = 160;
-		public static final int ID_PARA = 161;
-		public static final int ID_PART = 162;
-		public static final int ID_PERMIL = 163;
-		public static final int ID_PERP = 164;
-		public static final int ID_PHI_L = 165;
-		public static final int ID_PHI_U = 166;
-		public static final int ID_PIV = 167;
-		public static final int ID_PI_L = 168;
-		public static final int ID_PI_U = 169;
-		public static final int ID_PLUSMN = 170;
-		public static final int ID_POUND = 171;
-		public static final int ID_PRIME_L = 172;
-		public static final int ID_PRIME_U = 173;
-		public static final int ID_PROD = 174;
-		public static final int ID_PROP = 175;
-		public static final int ID_PSI_L = 176;
-		public static final int ID_PSI_U = 177;
-		public static final int ID_QUOT = 178;
-		public static final int ID_RADIC = 179;
-		public static final int ID_RANG = 180;
-		public static final int ID_RAQUO = 181;
-		public static final int ID_RARR_L = 182;
-		public static final int ID_RARR_U = 183;
-		public static final int ID_RCEIL = 184;
-		public static final int ID_RDQUO = 185;
-		public static final int ID_REAL = 186;
-		public static final int ID_REG = 187;
-		public static final int ID_RFLOOR = 188;
-		public static final int ID_RHO_L = 189;
-		public static final int ID_RHO_U = 190;
-		public static final int ID_RLM = 191;
-		public static final int ID_RSAQUO = 192;
-		public static final int ID_RSQUO = 193;
-		public static final int ID_SBQUO = 194;
-		public static final int ID_SCARON_L = 195;
-		public static final int ID_SCARON_U = 196;
-		public static final int ID_SDOT = 197;
-		public static final int ID_SECT = 198;
-		public static final int ID_SHY = 199;
-		public static final int ID_SIGMAF = 200;
-		public static final int ID_SIGMA_L = 201;
-		public static final int ID_SIGMA_U = 202;
-		public static final int ID_SIM = 203;
-		public static final int ID_SPADES = 204;
-		public static final int ID_SUB = 205;
-		public static final int ID_SUBE = 206;
-		public static final int ID_SUM = 207;
-		public static final int ID_SUP = 208;
-		public static final int ID_SUP1 = 209;
-		public static final int ID_SUP2 = 210;
-		public static final int ID_SUP3 = 211;
-		public static final int ID_SUPE = 212;
-		public static final int ID_SZLIG = 213;
-		public static final int ID_TAU_L = 214;
-		public static final int ID_TAU_U = 215;
-		public static final int ID_THERE4 = 216;
-		public static final int ID_THETASYM = 217;
-		public static final int ID_THETA_L = 218;
-		public static final int ID_THETA_U = 219;
-		public static final int ID_THINSP = 220;
-		public static final int ID_THORN_L = 221;
-		public static final int ID_THORN_U = 222;
-		public static final int ID_TILDE = 223;
-		public static final int ID_TIMES = 224;
-		public static final int ID_TRADE = 225;
-		public static final int ID_UACUTE_L = 226;
-		public static final int ID_UACUTE_U = 227;
-		public static final int ID_UARR_L = 228;
-		public static final int ID_UARR_U = 229;
-		public static final int ID_UCIRC_L = 230;
-		public static final int ID_UCIRC_U = 231;
-		public static final int ID_UGRAVE_L = 232;
-		public static final int ID_UGRAVE_U = 233;
-		public static final int ID_UML = 234;
-		public static final int ID_UPSIH = 235;
-		public static final int ID_UPSILON_L = 236;
-		public static final int ID_UPSILON_U = 237;
-		public static final int ID_UUML_L = 238;
-		public static final int ID_UUML_U = 239;
-		public static final int ID_WEIERP = 240;
-		public static final int ID_XI_L = 241;
-		public static final int ID_XI_U = 242;
-		public static final int ID_YACUTE_L = 243;
-		public static final int ID_YACUTE_U = 244;
-		public static final int ID_YEN = 245;
-		public static final int ID_YUML_L = 246;
-		public static final int ID_YUML_U = 247;
-		public static final int ID_ZETA_L = 248;
-		public static final int ID_ZETA_U = 249;
-		public static final int ID_ZWJ = 250;
-		public static final int ID_ZWNJ = 251;
-
-		public static int getNumOfIds() {
-			if (numofids != -1)
-				return numofids;
-
-			// NOTE: If the reflection is too slow, this method should
-			// just return the literal value, like 252.
-			// -- 5/24/2001
-			Class clazz = Ids.class;
-			Field[] fields = clazz.getFields();
-			numofids = 0;
-			for (int i = 0; i < fields.length; i++) {
-				String name = fields[i].getName();
-				if (name.startsWith("ID_"))//$NON-NLS-1$
-					numofids++;
-			}
-			return numofids;
-		}
-
-		// chache the result of the reflection.
-		private static int numofids = -1;
-	}
-
-	private static String[] names = null;
-
-	static {
-		names = new String[Ids.getNumOfIds()];
-		names[Ids.ID_AACUTE_L] = AACUTE_L;
-		names[Ids.ID_AACUTE_U] = AACUTE_U;
-		names[Ids.ID_ACIRC_L] = ACIRC_L;
-		names[Ids.ID_ACIRC_U] = ACIRC_U;
-		names[Ids.ID_ACUTE] = ACUTE;
-		names[Ids.ID_AELIG_L] = AELIG_L;
-		names[Ids.ID_AELIG_U] = AELIG_U;
-		names[Ids.ID_AGRAVE_L] = AGRAVE_L;
-		names[Ids.ID_AGRAVE_U] = AGRAVE_U;
-		names[Ids.ID_ALEFSYM] = ALEFSYM;
-		names[Ids.ID_ALPHA_L] = ALPHA_L;
-		names[Ids.ID_ALPHA_U] = ALPHA_U;
-		names[Ids.ID_AMP] = AMP;
-		names[Ids.ID_AND] = AND;
-		names[Ids.ID_ANG] = ANG;
-		names[Ids.ID_ARING_L] = ARING_L;
-		names[Ids.ID_ARING_U] = ARING_U;
-		names[Ids.ID_ASYMP] = ASYMP;
-		names[Ids.ID_ATILDE_L] = ATILDE_L;
-		names[Ids.ID_ATILDE_U] = ATILDE_U;
-		names[Ids.ID_AUML_L] = AUML_L;
-		names[Ids.ID_AUML_U] = AUML_U;
-		names[Ids.ID_BDQUO] = BDQUO;
-		names[Ids.ID_BETA_L] = BETA_L;
-		names[Ids.ID_BETA_U] = BETA_U;
-		names[Ids.ID_BRVBAR] = BRVBAR;
-		names[Ids.ID_BULL] = BULL;
-		names[Ids.ID_CAP] = CAP;
-		names[Ids.ID_CCEDIL_L] = CCEDIL_L;
-		names[Ids.ID_CCEDIL_U] = CCEDIL_U;
-		names[Ids.ID_CEDIL] = CEDIL;
-		names[Ids.ID_CENT] = CENT;
-		names[Ids.ID_CHI_L] = CHI_L;
-		names[Ids.ID_CHI_U] = CHI_U;
-		names[Ids.ID_CIRC] = CIRC;
-		names[Ids.ID_CLUBS] = CLUBS;
-		names[Ids.ID_CONG] = CONG;
-		names[Ids.ID_COPY] = COPY;
-		names[Ids.ID_CRARR] = CRARR;
-		names[Ids.ID_CUP] = CUP;
-		names[Ids.ID_CURREN] = CURREN;
-		names[Ids.ID_DAGGER_L] = DAGGER_L;
-		names[Ids.ID_DAGGER_U] = DAGGER_U;
-		names[Ids.ID_DARR_L] = DARR_L;
-		names[Ids.ID_DARR_U] = DARR_U;
-		names[Ids.ID_DEG] = DEG;
-		names[Ids.ID_DELTA_L] = DELTA_L;
-		names[Ids.ID_DELTA_U] = DELTA_U;
-		names[Ids.ID_DIAMS] = DIAMS;
-		names[Ids.ID_DIVIDE] = DIVIDE;
-		names[Ids.ID_EACUTE_L] = EACUTE_L;
-		names[Ids.ID_EACUTE_U] = EACUTE_U;
-		names[Ids.ID_ECIRC_L] = ECIRC_L;
-		names[Ids.ID_ECIRC_U] = ECIRC_U;
-		names[Ids.ID_EGRAVE_L] = EGRAVE_L;
-		names[Ids.ID_EGRAVE_U] = EGRAVE_U;
-		names[Ids.ID_EMPTY] = EMPTY;
-		names[Ids.ID_EMSP] = EMSP;
-		names[Ids.ID_ENSP] = ENSP;
-		names[Ids.ID_EPSILON_L] = EPSILON_L;
-		names[Ids.ID_EPSILON_U] = EPSILON_U;
-		names[Ids.ID_EQUIV] = EQUIV;
-		names[Ids.ID_ETA_L] = ETA_L;
-		names[Ids.ID_ETA_U] = ETA_U;
-		names[Ids.ID_ETH_L] = ETH_L;
-		names[Ids.ID_ETH_U] = ETH_U;
-		names[Ids.ID_EUML_L] = EUML_L;
-		names[Ids.ID_EUML_U] = EUML_U;
-		names[Ids.ID_EURO] = EURO;
-		names[Ids.ID_EXIST] = EXIST;
-		names[Ids.ID_FNOF] = FNOF;
-		names[Ids.ID_FORALL] = FORALL;
-		names[Ids.ID_FRAC12] = FRAC12;
-		names[Ids.ID_FRAC14] = FRAC14;
-		names[Ids.ID_FRAC34] = FRAC34;
-		names[Ids.ID_FRASL] = FRASL;
-		names[Ids.ID_GAMMA_L] = GAMMA_L;
-		names[Ids.ID_GAMMA_U] = GAMMA_U;
-		names[Ids.ID_GE] = GE;
-		names[Ids.ID_GT] = GT;
-		names[Ids.ID_HARR_L] = HARR_L;
-		names[Ids.ID_HARR_U] = HARR_U;
-		names[Ids.ID_HEARTS] = HEARTS;
-		names[Ids.ID_HELLIP] = HELLIP;
-		names[Ids.ID_IACUTE_L] = IACUTE_L;
-		names[Ids.ID_IACUTE_U] = IACUTE_U;
-		names[Ids.ID_ICIRC_L] = ICIRC_L;
-		names[Ids.ID_ICIRC_U] = ICIRC_U;
-		names[Ids.ID_IEXCL] = IEXCL;
-		names[Ids.ID_IGRAVE_L] = IGRAVE_L;
-		names[Ids.ID_IGRAVE_U] = IGRAVE_U;
-		names[Ids.ID_IMAGE] = IMAGE;
-		names[Ids.ID_INFIN] = INFIN;
-		names[Ids.ID_INT] = INT;
-		names[Ids.ID_IOTA_L] = IOTA_L;
-		names[Ids.ID_IOTA_U] = IOTA_U;
-		names[Ids.ID_IQUEST] = IQUEST;
-		names[Ids.ID_ISIN] = ISIN;
-		names[Ids.ID_IUML_L] = IUML_L;
-		names[Ids.ID_IUML_U] = IUML_U;
-		names[Ids.ID_KAPPA_L] = KAPPA_L;
-		names[Ids.ID_KAPPA_U] = KAPPA_U;
-		names[Ids.ID_LAMBDA_L] = LAMBDA_L;
-		names[Ids.ID_LAMBDA_U] = LAMBDA_U;
-		names[Ids.ID_LANG] = LANG;
-		names[Ids.ID_LAQUO] = LAQUO;
-		names[Ids.ID_LARR_L] = LARR_L;
-		names[Ids.ID_LARR_U] = LARR_U;
-		names[Ids.ID_LCEIL] = LCEIL;
-		names[Ids.ID_LDQUO] = LDQUO;
-		names[Ids.ID_LE] = LE;
-		names[Ids.ID_LFLOOR] = LFLOOR;
-		names[Ids.ID_LOWAST] = LOWAST;
-		names[Ids.ID_LOZ] = LOZ;
-		names[Ids.ID_LRM] = LRM;
-		names[Ids.ID_LSAQUO] = LSAQUO;
-		names[Ids.ID_LSQUO] = LSQUO;
-		names[Ids.ID_LT] = LT;
-		names[Ids.ID_MACR] = MACR;
-		names[Ids.ID_MDASH] = MDASH;
-		names[Ids.ID_MICRO] = MICRO;
-		names[Ids.ID_MIDDOT] = MIDDOT;
-		names[Ids.ID_MINUS] = MINUS;
-		names[Ids.ID_MU_L] = MU_L;
-		names[Ids.ID_MU_U] = MU_U;
-		names[Ids.ID_NABLA] = NABLA;
-		names[Ids.ID_NBSP] = NBSP;
-		names[Ids.ID_NDASH] = NDASH;
-		names[Ids.ID_NE] = NE;
-		names[Ids.ID_NI] = NI;
-		names[Ids.ID_NOT] = NOT;
-		names[Ids.ID_NOTIN] = NOTIN;
-		names[Ids.ID_NSUB] = NSUB;
-		names[Ids.ID_NTILDE_L] = NTILDE_L;
-		names[Ids.ID_NTILDE_U] = NTILDE_U;
-		names[Ids.ID_NU_L] = NU_L;
-		names[Ids.ID_NU_U] = NU_U;
-		names[Ids.ID_OACUTE_L] = OACUTE_L;
-		names[Ids.ID_OACUTE_U] = OACUTE_U;
-		names[Ids.ID_OCIRC_L] = OCIRC_L;
-		names[Ids.ID_OCIRC_U] = OCIRC_U;
-		names[Ids.ID_OELIG_L] = OELIG_L;
-		names[Ids.ID_OELIG_U] = OELIG_U;
-		names[Ids.ID_OGRAVE_L] = OGRAVE_L;
-		names[Ids.ID_OGRAVE_U] = OGRAVE_U;
-		names[Ids.ID_OLINE] = OLINE;
-		names[Ids.ID_OMEGA_L] = OMEGA_L;
-		names[Ids.ID_OMEGA_U] = OMEGA_U;
-		names[Ids.ID_OMICRON_L] = OMICRON_L;
-		names[Ids.ID_OMICRON_U] = OMICRON_U;
-		names[Ids.ID_OPLUS] = OPLUS;
-		names[Ids.ID_OR] = OR;
-		names[Ids.ID_ORDF] = ORDF;
-		names[Ids.ID_ORDM] = ORDM;
-		names[Ids.ID_OSLASH_L] = OSLASH_L;
-		names[Ids.ID_OSLASH_U] = OSLASH_U;
-		names[Ids.ID_OTILDE_L] = OTILDE_L;
-		names[Ids.ID_OTILDE_U] = OTILDE_U;
-		names[Ids.ID_OTIMES] = OTIMES;
-		names[Ids.ID_OUML_L] = OUML_L;
-		names[Ids.ID_OUML_U] = OUML_U;
-		names[Ids.ID_PARA] = PARA;
-		names[Ids.ID_PART] = PART;
-		names[Ids.ID_PERMIL] = PERMIL;
-		names[Ids.ID_PERP] = PERP;
-		names[Ids.ID_PHI_L] = PHI_L;
-		names[Ids.ID_PHI_U] = PHI_U;
-		names[Ids.ID_PIV] = PIV;
-		names[Ids.ID_PI_L] = PI_L;
-		names[Ids.ID_PI_U] = PI_U;
-		names[Ids.ID_PLUSMN] = PLUSMN;
-		names[Ids.ID_POUND] = POUND;
-		names[Ids.ID_PRIME_L] = PRIME_L;
-		names[Ids.ID_PRIME_U] = PRIME_U;
-		names[Ids.ID_PROD] = PROD;
-		names[Ids.ID_PROP] = PROP;
-		names[Ids.ID_PSI_L] = PSI_L;
-		names[Ids.ID_PSI_U] = PSI_U;
-		names[Ids.ID_QUOT] = QUOT;
-		names[Ids.ID_RADIC] = RADIC;
-		names[Ids.ID_RANG] = RANG;
-		names[Ids.ID_RAQUO] = RAQUO;
-		names[Ids.ID_RARR_L] = RARR_L;
-		names[Ids.ID_RARR_U] = RARR_U;
-		names[Ids.ID_RCEIL] = RCEIL;
-		names[Ids.ID_RDQUO] = RDQUO;
-		names[Ids.ID_REAL] = REAL;
-		names[Ids.ID_REG] = REG;
-		names[Ids.ID_RFLOOR] = RFLOOR;
-		names[Ids.ID_RHO_L] = RHO_L;
-		names[Ids.ID_RHO_U] = RHO_U;
-		names[Ids.ID_RLM] = RLM;
-		names[Ids.ID_RSAQUO] = RSAQUO;
-		names[Ids.ID_RSQUO] = RSQUO;
-		names[Ids.ID_SBQUO] = SBQUO;
-		names[Ids.ID_SCARON_L] = SCARON_L;
-		names[Ids.ID_SCARON_U] = SCARON_U;
-		names[Ids.ID_SDOT] = SDOT;
-		names[Ids.ID_SECT] = SECT;
-		names[Ids.ID_SHY] = SHY;
-		names[Ids.ID_SIGMAF] = SIGMAF;
-		names[Ids.ID_SIGMA_L] = SIGMA_L;
-		names[Ids.ID_SIGMA_U] = SIGMA_U;
-		names[Ids.ID_SIM] = SIM;
-		names[Ids.ID_SPADES] = SPADES;
-		names[Ids.ID_SUB] = SUB;
-		names[Ids.ID_SUBE] = SUBE;
-		names[Ids.ID_SUM] = SUM;
-		names[Ids.ID_SUP] = SUP;
-		names[Ids.ID_SUP1] = SUP1;
-		names[Ids.ID_SUP2] = SUP2;
-		names[Ids.ID_SUP3] = SUP3;
-		names[Ids.ID_SUPE] = SUPE;
-		names[Ids.ID_SZLIG] = SZLIG;
-		names[Ids.ID_TAU_L] = TAU_L;
-		names[Ids.ID_TAU_U] = TAU_U;
-		names[Ids.ID_THERE4] = THERE4;
-		names[Ids.ID_THETASYM] = THETASYM;
-		names[Ids.ID_THETA_L] = THETA_L;
-		names[Ids.ID_THETA_U] = THETA_U;
-		names[Ids.ID_THINSP] = THINSP;
-		names[Ids.ID_THORN_L] = THORN_L;
-		names[Ids.ID_THORN_U] = THORN_U;
-		names[Ids.ID_TILDE] = TILDE;
-		names[Ids.ID_TIMES] = TIMES;
-		names[Ids.ID_TRADE] = TRADE;
-		names[Ids.ID_UACUTE_L] = UACUTE_L;
-		names[Ids.ID_UACUTE_U] = UACUTE_U;
-		names[Ids.ID_UARR_L] = UARR_L;
-		names[Ids.ID_UARR_U] = UARR_U;
-		names[Ids.ID_UCIRC_L] = UCIRC_L;
-		names[Ids.ID_UCIRC_U] = UCIRC_U;
-		names[Ids.ID_UGRAVE_L] = UGRAVE_L;
-		names[Ids.ID_UGRAVE_U] = UGRAVE_U;
-		names[Ids.ID_UML] = UML;
-		names[Ids.ID_UPSIH] = UPSIH;
-		names[Ids.ID_UPSILON_L] = UPSILON_L;
-		names[Ids.ID_UPSILON_U] = UPSILON_U;
-		names[Ids.ID_UUML_L] = UUML_L;
-		names[Ids.ID_UUML_U] = UUML_U;
-		names[Ids.ID_WEIERP] = WEIERP;
-		names[Ids.ID_XI_L] = XI_L;
-		names[Ids.ID_XI_U] = XI_U;
-		names[Ids.ID_YACUTE_L] = YACUTE_L;
-		names[Ids.ID_YACUTE_U] = YACUTE_U;
-		names[Ids.ID_YEN] = YEN;
-		names[Ids.ID_YUML_L] = YUML_L;
-		names[Ids.ID_YUML_U] = YUML_U;
-		names[Ids.ID_ZETA_L] = ZETA_L;
-		names[Ids.ID_ZETA_U] = ZETA_U;
-		names[Ids.ID_ZWJ] = ZWJ;
-		names[Ids.ID_ZWNJ] = ZWNJ;
-	}
-	private static char[] values = null;
-
-	static {
-		values = new char[Ids.getNumOfIds()];
-		values[Ids.ID_AACUTE_L] = 225;
-		values[Ids.ID_AACUTE_U] = 193;
-		values[Ids.ID_ACIRC_L] = 226;
-		values[Ids.ID_ACIRC_U] = 194;
-		values[Ids.ID_ACUTE] = 180;
-		values[Ids.ID_AELIG_L] = 230;
-		values[Ids.ID_AELIG_U] = 198;
-		values[Ids.ID_AGRAVE_L] = 224;
-		values[Ids.ID_AGRAVE_U] = 192;
-		values[Ids.ID_ALEFSYM] = 8501;
-		values[Ids.ID_ALPHA_L] = 945;
-		values[Ids.ID_ALPHA_U] = 913;
-		values[Ids.ID_AMP] = 38;
-		values[Ids.ID_AND] = 8743;
-		values[Ids.ID_ANG] = 8736;
-		values[Ids.ID_ARING_L] = 229;
-		values[Ids.ID_ARING_U] = 197;
-		values[Ids.ID_ASYMP] = 8776;
-		values[Ids.ID_ATILDE_L] = 227;
-		values[Ids.ID_ATILDE_U] = 195;
-		values[Ids.ID_AUML_L] = 228;
-		values[Ids.ID_AUML_U] = 196;
-		values[Ids.ID_BDQUO] = 8222;
-		values[Ids.ID_BETA_L] = 946;
-		values[Ids.ID_BETA_U] = 914;
-		values[Ids.ID_BRVBAR] = 166;
-		values[Ids.ID_BULL] = 8226;
-		values[Ids.ID_CAP] = 8745;
-		values[Ids.ID_CCEDIL_L] = 231;
-		values[Ids.ID_CCEDIL_U] = 199;
-		values[Ids.ID_CEDIL] = 184;
-		values[Ids.ID_CENT] = 162;
-		values[Ids.ID_CHI_L] = 967;
-		values[Ids.ID_CHI_U] = 935;
-		values[Ids.ID_CIRC] = 710;
-		values[Ids.ID_CLUBS] = 9827;
-		values[Ids.ID_CONG] = 8773;
-		values[Ids.ID_COPY] = 169;
-		values[Ids.ID_CRARR] = 8629;
-		values[Ids.ID_CUP] = 8746;
-		values[Ids.ID_CURREN] = 164;
-		values[Ids.ID_DAGGER_L] = 8224;
-		values[Ids.ID_DAGGER_U] = 8225;
-		values[Ids.ID_DARR_L] = 8595;
-		values[Ids.ID_DARR_U] = 8659;
-		values[Ids.ID_DEG] = 176;
-		values[Ids.ID_DELTA_L] = 948;
-		values[Ids.ID_DELTA_U] = 916;
-		values[Ids.ID_DIAMS] = 9830;
-		values[Ids.ID_DIVIDE] = 247;
-		values[Ids.ID_EACUTE_L] = 233;
-		values[Ids.ID_EACUTE_U] = 201;
-		values[Ids.ID_ECIRC_L] = 234;
-		values[Ids.ID_ECIRC_U] = 202;
-		values[Ids.ID_EGRAVE_L] = 232;
-		values[Ids.ID_EGRAVE_U] = 200;
-		values[Ids.ID_EMPTY] = 8709;
-		values[Ids.ID_EMSP] = 8195;
-		values[Ids.ID_ENSP] = 8194;
-		values[Ids.ID_EPSILON_L] = 949;
-		values[Ids.ID_EPSILON_U] = 917;
-		values[Ids.ID_EQUIV] = 8801;
-		values[Ids.ID_ETA_L] = 951;
-		values[Ids.ID_ETA_U] = 919;
-		values[Ids.ID_ETH_L] = 240;
-		values[Ids.ID_ETH_U] = 208;
-		values[Ids.ID_EUML_L] = 235;
-		values[Ids.ID_EUML_U] = 203;
-		values[Ids.ID_EURO] = 8364;
-		values[Ids.ID_EXIST] = 8707;
-		values[Ids.ID_FNOF] = 402;
-		values[Ids.ID_FORALL] = 8704;
-		values[Ids.ID_FRAC12] = 189;
-		values[Ids.ID_FRAC14] = 188;
-		values[Ids.ID_FRAC34] = 190;
-		values[Ids.ID_FRASL] = 8260;
-		values[Ids.ID_GAMMA_L] = 947;
-		values[Ids.ID_GAMMA_U] = 915;
-		values[Ids.ID_GE] = 8805;
-		values[Ids.ID_GT] = 62;
-		values[Ids.ID_HARR_L] = 8596;
-		values[Ids.ID_HARR_U] = 8660;
-		values[Ids.ID_HEARTS] = 9829;
-		values[Ids.ID_HELLIP] = 8230;
-		values[Ids.ID_IACUTE_L] = 237;
-		values[Ids.ID_IACUTE_U] = 205;
-		values[Ids.ID_ICIRC_L] = 238;
-		values[Ids.ID_ICIRC_U] = 206;
-		values[Ids.ID_IEXCL] = 161;
-		values[Ids.ID_IGRAVE_L] = 236;
-		values[Ids.ID_IGRAVE_U] = 204;
-		values[Ids.ID_IMAGE] = 8465;
-		values[Ids.ID_INFIN] = 8734;
-		values[Ids.ID_INT] = 8747;
-		values[Ids.ID_IOTA_L] = 953;
-		values[Ids.ID_IOTA_U] = 921;
-		values[Ids.ID_IQUEST] = 191;
-		values[Ids.ID_ISIN] = 8712;
-		values[Ids.ID_IUML_L] = 239;
-		values[Ids.ID_IUML_U] = 207;
-		values[Ids.ID_KAPPA_L] = 954;
-		values[Ids.ID_KAPPA_U] = 922;
-		values[Ids.ID_LAMBDA_L] = 955;
-		values[Ids.ID_LAMBDA_U] = 923;
-		values[Ids.ID_LANG] = 9001;
-		values[Ids.ID_LAQUO] = 171;
-		values[Ids.ID_LARR_L] = 8592;
-		values[Ids.ID_LARR_U] = 8656;
-		values[Ids.ID_LCEIL] = 8968;
-		values[Ids.ID_LDQUO] = 8220;
-		values[Ids.ID_LE] = 8804;
-		values[Ids.ID_LFLOOR] = 8970;
-		values[Ids.ID_LOWAST] = 8727;
-		values[Ids.ID_LOZ] = 9674;
-		values[Ids.ID_LRM] = 8206;
-		values[Ids.ID_LSAQUO] = 8249;
-		values[Ids.ID_LSQUO] = 8216;
-		values[Ids.ID_LT] = 60;
-		values[Ids.ID_MACR] = 175;
-		values[Ids.ID_MDASH] = 8212;
-		values[Ids.ID_MICRO] = 181;
-		values[Ids.ID_MIDDOT] = 183;
-		values[Ids.ID_MINUS] = 8722;
-		values[Ids.ID_MU_L] = 956;
-		values[Ids.ID_MU_U] = 924;
-		values[Ids.ID_NABLA] = 8711;
-		values[Ids.ID_NBSP] = 160;
-		values[Ids.ID_NDASH] = 8211;
-		values[Ids.ID_NE] = 8800;
-		values[Ids.ID_NI] = 8715;
-		values[Ids.ID_NOT] = 172;
-		values[Ids.ID_NOTIN] = 8713;
-		values[Ids.ID_NSUB] = 8836;
-		values[Ids.ID_NTILDE_L] = 241;
-		values[Ids.ID_NTILDE_U] = 209;
-		values[Ids.ID_NU_L] = 957;
-		values[Ids.ID_NU_U] = 925;
-		values[Ids.ID_OACUTE_L] = 243;
-		values[Ids.ID_OACUTE_U] = 211;
-		values[Ids.ID_OCIRC_L] = 244;
-		values[Ids.ID_OCIRC_U] = 212;
-		values[Ids.ID_OELIG_L] = 339;
-		values[Ids.ID_OELIG_U] = 338;
-		values[Ids.ID_OGRAVE_L] = 242;
-		values[Ids.ID_OGRAVE_U] = 210;
-		values[Ids.ID_OLINE] = 8254;
-		values[Ids.ID_OMEGA_L] = 969;
-		values[Ids.ID_OMEGA_U] = 937;
-		values[Ids.ID_OMICRON_L] = 959;
-		values[Ids.ID_OMICRON_U] = 927;
-		values[Ids.ID_OPLUS] = 8853;
-		values[Ids.ID_OR] = 8744;
-		values[Ids.ID_ORDF] = 170;
-		values[Ids.ID_ORDM] = 186;
-		values[Ids.ID_OSLASH_L] = 248;
-		values[Ids.ID_OSLASH_U] = 216;
-		values[Ids.ID_OTILDE_L] = 245;
-		values[Ids.ID_OTILDE_U] = 213;
-		values[Ids.ID_OTIMES] = 8855;
-		values[Ids.ID_OUML_L] = 246;
-		values[Ids.ID_OUML_U] = 214;
-		values[Ids.ID_PARA] = 182;
-		values[Ids.ID_PART] = 8706;
-		values[Ids.ID_PERMIL] = 8240;
-		values[Ids.ID_PERP] = 8869;
-		values[Ids.ID_PHI_L] = 966;
-		values[Ids.ID_PHI_U] = 934;
-		values[Ids.ID_PIV] = 982;
-		values[Ids.ID_PI_L] = 960;
-		values[Ids.ID_PI_U] = 928;
-		values[Ids.ID_PLUSMN] = 177;
-		values[Ids.ID_POUND] = 163;
-		values[Ids.ID_PRIME_L] = 8242;
-		values[Ids.ID_PRIME_U] = 8243;
-		values[Ids.ID_PROD] = 8719;
-		values[Ids.ID_PROP] = 8733;
-		values[Ids.ID_PSI_L] = 968;
-		values[Ids.ID_PSI_U] = 936;
-		values[Ids.ID_QUOT] = 34;
-		values[Ids.ID_RADIC] = 8730;
-		values[Ids.ID_RANG] = 9002;
-		values[Ids.ID_RAQUO] = 187;
-		values[Ids.ID_RARR_L] = 8594;
-		values[Ids.ID_RARR_U] = 8658;
-		values[Ids.ID_RCEIL] = 8969;
-		values[Ids.ID_RDQUO] = 8221;
-		values[Ids.ID_REAL] = 8476;
-		values[Ids.ID_REG] = 174;
-		values[Ids.ID_RFLOOR] = 8971;
-		values[Ids.ID_RHO_L] = 961;
-		values[Ids.ID_RHO_U] = 929;
-		values[Ids.ID_RLM] = 8207;
-		values[Ids.ID_RSAQUO] = 8250;
-		values[Ids.ID_RSQUO] = 8217;
-		values[Ids.ID_SBQUO] = 8218;
-		values[Ids.ID_SCARON_L] = 353;
-		values[Ids.ID_SCARON_U] = 352;
-		values[Ids.ID_SDOT] = 8901;
-		values[Ids.ID_SECT] = 167;
-		values[Ids.ID_SHY] = 173;
-		values[Ids.ID_SIGMAF] = 962;
-		values[Ids.ID_SIGMA_L] = 963;
-		values[Ids.ID_SIGMA_U] = 931;
-		values[Ids.ID_SIM] = 8764;
-		values[Ids.ID_SPADES] = 9824;
-		values[Ids.ID_SUB] = 8834;
-		values[Ids.ID_SUBE] = 8838;
-		values[Ids.ID_SUM] = 8721;
-		values[Ids.ID_SUP] = 8835;
-		values[Ids.ID_SUP1] = 185;
-		values[Ids.ID_SUP2] = 178;
-		values[Ids.ID_SUP3] = 179;
-		values[Ids.ID_SUPE] = 8839;
-		values[Ids.ID_SZLIG] = 223;
-		values[Ids.ID_TAU_L] = 964;
-		values[Ids.ID_TAU_U] = 932;
-		values[Ids.ID_THERE4] = 8756;
-		values[Ids.ID_THETASYM] = 977;
-		values[Ids.ID_THETA_L] = 952;
-		values[Ids.ID_THETA_U] = 920;
-		values[Ids.ID_THINSP] = 8201;
-		values[Ids.ID_THORN_L] = 254;
-		values[Ids.ID_THORN_U] = 222;
-		values[Ids.ID_TILDE] = 732;
-		values[Ids.ID_TIMES] = 215;
-		values[Ids.ID_TRADE] = 8482;
-		values[Ids.ID_UACUTE_L] = 250;
-		values[Ids.ID_UACUTE_U] = 218;
-		values[Ids.ID_UARR_L] = 8593;
-		values[Ids.ID_UARR_U] = 8657;
-		values[Ids.ID_UCIRC_L] = 251;
-		values[Ids.ID_UCIRC_U] = 219;
-		values[Ids.ID_UGRAVE_L] = 249;
-		values[Ids.ID_UGRAVE_U] = 217;
-		values[Ids.ID_UML] = 168;
-		values[Ids.ID_UPSIH] = 978;
-		values[Ids.ID_UPSILON_L] = 965;
-		values[Ids.ID_UPSILON_U] = 933;
-		values[Ids.ID_UUML_L] = 252;
-		values[Ids.ID_UUML_U] = 220;
-		values[Ids.ID_WEIERP] = 8472;
-		values[Ids.ID_XI_L] = 958;
-		values[Ids.ID_XI_U] = 926;
-		values[Ids.ID_YACUTE_L] = 253;
-		values[Ids.ID_YACUTE_U] = 221;
-		values[Ids.ID_YEN] = 165;
-		values[Ids.ID_YUML_L] = 255;
-		values[Ids.ID_YUML_U] = 376;
-		values[Ids.ID_ZETA_L] = 950;
-		values[Ids.ID_ZETA_U] = 918;
-		values[Ids.ID_ZWJ] = 8205;
-		values[Ids.ID_ZWNJ] = 8204;
-	}
-
-	/**
-	 */
-	public EntityCollection() {
-		super(names, STRICT_CASE);
-	}
-
-	/**
-	 * Create an entity declaration.
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 * @param attrName java.lang.String
-	 */
-	protected CMNode create(String entityName) {
-		int id = getID(entityName);
-		if (id == ID_UNKNOWN)
-			return null;
-
-		String value = String.valueOf(values[id]);
-		HTMLEntityDeclImpl dec = new HTMLEntityDeclImpl(entityName, value);
-
-		return dec;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLAttrDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLAttrDeclImpl.java
deleted file mode 100644
index 505d662..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLAttrDeclImpl.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLAttributeDeclaration;
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Implementation class of {@link <code>HTMLAttributeDeclaration</code>} interface.<br>
- */
-class HTMLAttrDeclImpl extends CMNodeImpl implements HTMLAttributeDeclaration {
-
-	private HTMLCMDataTypeImpl type = null;
-	private int usage = 0;
-
-	/**
-	 */
-	public HTMLAttrDeclImpl(String attrName, HTMLCMDataTypeImpl valueType, int valueUsage) {
-		super(attrName);
-		this.type = valueType;
-
-		switch (valueUsage) {
-			case OPTIONAL :
-			case REQUIRED :
-			case FIXED :
-			case PROHIBITED :
-				this.usage = valueUsage;
-				break;
-			default :
-				// should warn...
-				this.usage = OPTIONAL; // fall back
-				break;
-		}
-	}
-
-	/**
-	 * getAttrName method
-	 * @return java.lang.String
-	 */
-	public String getAttrName() {
-		return getNodeName();
-	}
-
-	/**
-	 * getAttrType method
-	 * @return CMDataType
-	 */
-	public CMDataType getAttrType() {
-		return type;
-	}
-
-	/**
-	 * @deprecated in superclass
-	 */
-	public String getDefaultValue() {
-		if (type.getImpliedValueKind() != CMDataType.IMPLIED_VALUE_DEFAULT)
-			return null;
-		return type.getImpliedValue();
-	}
-
-	/**
-	 * @deprecated in superclass
-	 */
-	public Enumeration getEnumAttr() {
-		Vector v = new Vector(Arrays.asList(type.getEnumeratedValues()));
-		return v.elements();
-	}
-
-	/**
-	 * getNodeType method
-	 * @return int
-	 *
-	 * Returns one of :
-	 * ELEMENT_DECLARATION, ATTRIBUTE_DECLARATION, GROUP, ENTITY_DECLARATION.
-	 */
-	public int getNodeType() {
-		return CMNode.ATTRIBUTE_DECLARATION;
-	}
-
-	/**
-	 * @return int
-	 */
-	public int getUsage() {
-		return usage;
-	}
-
-	/**
-	 */
-	public boolean supports(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE))
-			return true;
-		return super.supports(propertyName);
-	}
-
-	/**
-	 */
-	public Object getProperty(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE))
-			return new Boolean(true);
-		return super.getProperty(propertyName);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLCMDataTypeImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLCMDataTypeImpl.java
deleted file mode 100644
index 64931b6..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLCMDataTypeImpl.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-
-
-/**
- */
-class HTMLCMDataTypeImpl extends CMNodeImpl implements HTMLCMDataType {
-
-	private int impliedValueKind = IMPLIED_VALUE_NONE;
-	private String impliedValue = null;
-	private final static String[] emptyArray = new String[0];
-	private String[] enumValues = emptyArray;
-	private String instanceValue = null;
-
-	/**
-	 * HTMLCMDataTypeImpl constructor comment.
-	 * @param nm java.lang.String
-	 */
-	public HTMLCMDataTypeImpl(String typeName) {
-		super(typeName);
-	}
-
-	/**
-	 * HTMLCMDataTypeImpl constructor comment.
-	 * @param nm java.lang.String
-	 */
-	public HTMLCMDataTypeImpl(String typeName, String instanceValue) {
-		super(typeName);
-		this.instanceValue = instanceValue;
-	}
-
-	/**
-	 * getTypeName method
-	 * @return java.lang.String
-	 *
-	 * This method returns a suitable default value that can be used when an instance of the data type is created.
-	 * This returns null of a suitable default is not available.
-	 */
-	public String generateInstanceValue() {
-		return instanceValue;
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMDataType
-	 */
-	public String getDataTypeName() {
-		return getNodeName();
-	}
-
-	/**
-	 * getTypeName method
-	 * @return java.lang.String[]
-	 *
-	 */
-	public String[] getEnumeratedValues() {
-		return enumValues;
-	}
-
-	/**
-	 * getTypeName method
-	 * @return java.lang.String  
-	 *
-	 * Returns the implied value or null if none exists.
-	 */
-	public String getImpliedValue() {
-		return impliedValue;
-	}
-
-	/**
-	 * getImpliedValueKind method
-	 * @return int
-	 *
-	 * Returns one of :
-	 * IMPLIED_VALUE_NONE, IMPLIED_VALUE_FIXED, IMPLIED_VALUE_DEFAULT.
-	 */
-	public int getImpliedValueKind() {
-		return impliedValueKind;
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 */
-	public int getNodeType() {
-		return CMNode.DATA_TYPE;
-	}
-
-	/**
-	 */
-	void setEnumValues(String[] values) {
-		enumValues = new String[values.length];
-		for (int i = 0; i < values.length; i++) {
-			enumValues[i] = values[i];
-		}
-	}
-
-	/**
-	 * package scope.
-	 */
-	void setImpliedValue(int kind, String value) {
-		switch (kind) {
-			case IMPLIED_VALUE_FIXED :
-			case IMPLIED_VALUE_DEFAULT :
-				impliedValueKind = kind;
-				impliedValue = value;
-				break;
-			case IMPLIED_VALUE_NONE :
-			default :
-				impliedValueKind = IMPLIED_VALUE_NONE;
-				impliedValue = null; // maybe a null string?
-				break;
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLCMNode.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLCMNode.java
deleted file mode 100644
index a1e555a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLCMNode.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-/**
- * In HTML Documents, name and value of an attribute/element/entity
- * should be treated ignoring theirs case.  However, in XML documents,
- * they should be distinguished with sensitiveness of their case.
- * CMNode is basically designed to represent DTDs or Schemas for XML
- * documents.  So, it doesn't have interfaces to retrieve such information.
- * However, declarations in the HTML CM should provide such information.
- * This intermediate interface is intended to provide whether ignore cases
- * or not.<br>
- */
-interface HTMLCMNode extends org.eclipse.wst.xml.core.internal.contentmodel.CMNode {
-
-	/**
-	 * Returns <code>true</code>, if declaration is for HTML attribute/element/entity.
-	 * Otherwise, returns <code>false</code>.
-	 * @return boolean
-	 */
-	boolean shouldIgnoreCase();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLElemDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLElemDeclImpl.java
deleted file mode 100644
index 759294d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLElemDeclImpl.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLAttributeDeclaration;
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration;
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLPropertyDeclaration;
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Base class for all Hed???? classes.
- */
-abstract class HTMLElemDeclImpl extends CMContentImpl implements HTMLElementDeclaration, HTMLPropertyDeclaration {
-
-	// DTD
-	protected CMNamedNodeMapImpl attributes = null;
-	protected String typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_EMPTY;
-	/** Never access this field directly.  Instead, use getComplexTypeDefinition method. */
-	private ComplexTypeDefinition typeDefinition = null;
-	protected CMGroupImpl inclusion = null;
-	protected CMGroupImpl exclusion = null;
-	// advanced information
-	protected CMNamedNodeMap prohibitedAncestors = null;
-	protected int correctionType = CORRECT_NONE;
-	protected int formatType = FORMAT_HTML;
-	protected int layoutType = LAYOUT_NONE;
-	protected int omitType = OMIT_NONE;
-	protected boolean keepSpaces = false;
-	protected boolean indentChild = false;
-	protected ElementCollection elementCollection = null;
-	protected AttributeCollection attributeCollection = null;
-	protected final static CMNamedNodeMap EMPTY_MAP = new CMNamedNodeMap() {
-		public int getLength() {
-			return 0;
-		}
-
-		public CMNode getNamedItem(String name) {
-			return null;
-		}
-
-		public CMNode item(int index) {
-			return null;
-		}
-
-		public Iterator iterator() {
-			return new Iterator() {
-				public boolean hasNext() {
-					return false;
-				}
-
-				public Object next() {
-					return null;
-				}
-
-				public void remove() {
-				}
-			};
-		}
-	};
-
-	/**
-	 * HTMLElemDeclImpl constructor.
-	 * In the HTML DTD, an element declaration has no specification
-	 * for its occurrence.  Occurrence is specifed in content model, like
-	 * <code>(LI)+</code>.  To avoid confusion (and complexity),
-	 * occurrence of an element declaration is always 1 (it means, min = 1 and
-	 * max = 1).  Instead, occurrence of CMGroup represents actual occurrence
-	 * of the content.
-	 * <br>
-	 * @param name java.lang.String
-	 */
-	public HTMLElemDeclImpl(String elementName, ElementCollection collection) {
-		super(elementName, 1, 1);
-		elementCollection = collection;
-		attributeCollection = collection.getAttributeCollection();
-	}
-
-	/**
-	 */
-	protected abstract void createAttributeDeclarations();
-
-	private ComplexTypeDefinition createComplexTypeDefinition() {
-		if (typeDefinitionName.equals(ComplexTypeDefinitionFactory.CTYPE_CDATA) || typeDefinitionName.equals(ComplexTypeDefinitionFactory.CTYPE_EMPTY) || typeDefinitionName.equals(ComplexTypeDefinitionFactory.CTYPE_PCDATA))
-			return null;
-
-		ComplexTypeDefinitionFactory factory = ComplexTypeDefinitionFactory.getInstance();
-		if (factory == null)
-			return null; // fatal error.
-
-		ComplexTypeDefinition def = factory.createTypeDefinition(typeDefinitionName, elementCollection);
-		return def;
-	}
-
-	/**
-	 * Get an attribute declaration.
-	 */
-	public HTMLAttributeDeclaration getAttributeDeclaration(String attrName) {
-		if (attributes == null) {
-			createAttributeDeclarations();
-			if (attributes == null)
-				return null; // fail to create
-		}
-
-		CMNode cmnode = attributes.getNamedItem(attrName);
-		if (cmnode == null) {
-			return null;
-		}
-		else {
-			return (HTMLAttributeDeclaration) cmnode; // already exists.
-		}
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public CMNamedNodeMap getAttributes() {
-		if (attributes == null)
-			createAttributeDeclarations(); // lazy eval.
-		return attributes;
-	}
-
-	/**
-	 * Get an instance of complex type definition.
-	 */
-	private ComplexTypeDefinition getComplexTypeDefinition() {
-		if (typeDefinition == null)
-			typeDefinition = createComplexTypeDefinition();
-		return typeDefinition;
-	}
-
-	/**
-	 * Content.<br>
-	 * Element declarations which type is EMPTY or CDATA (maybe PCDATA)
-	 * <strong>MUST</strong> override this method and always return null.
-	 * This default implementation always tries to create a complex type definition
-	 * instance and access to it.
-	 * <br>
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public CMContent getContent() {
-		ComplexTypeDefinition def = getComplexTypeDefinition(); // lazy eval.
-		return (def != null) ? def.getContent() : null;
-	}
-
-	/**
-	 * Content type.<br>
-	 * Element declarations which type is EMPTY or CDATA (maybe PCDATA)
-	 * <strong>MUST</strong> override this method and return an appropriate type.
-	 * This default implementation always tries to create a complex type definition
-	 * instance and access to it.
-	 * <br>
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public int getContentType() {
-		ComplexTypeDefinition def = getComplexTypeDefinition(); // lazy eval.
-		return (def != null) ? def.getContentType() : CMElementDeclaration.CDATA;
-	}
-
-	/**
-	 * @see HTMLElementDeclaration#getCorrectionType
-	 */
-	public int getCorrectionType() {
-		return correctionType;
-	}
-
-	/**
-	 * HTML element doesn't have any data type.  So, this method always
-	 * returns <code>null</code>.<br>
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public CMDataType getDataType() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public String getElementName() {
-		return getNodeName();
-	}
-
-	/**
-	 * Exclusion.
-	 * Almost elements don't have a exclusion.
-	 * Only classes those have exclusion should override this method.
-	 */
-	public CMContent getExclusion() {
-		return null;
-	}
-
-	/**
-	 * Default format type is <code>FORMAT_HTML</code>.<br>
-	 */
-	public int getFormatType() {
-		return formatType;
-	}
-
-	/**
-	 * Inclusion.
-	 * Almost elements don't have a inclusion.
-	 * Only classes those have inclusion should override this method.
-	 */
-	public CMContent getInclusion() {
-		return null;
-	}
-
-	/**
-	 */
-	public int getLayoutType() {
-		return layoutType;
-	}
-
-	/**
-	 * Line break hint is strongly related to layout type.
-	 * Indeed, in the C++DOM, it is determined from layout type only.
-	 * So, this implementation, as the default implementation for all declarations,
-	 * also determines from layout type only.<br>
-	 * @return int
-	 */
-	public int getLineBreakHint() {
-		switch (getLayoutType()) {
-			case HTMLElementDeclaration.LAYOUT_BLOCK :
-				return HTMLElementDeclaration.BREAK_BEFORE_START_AND_AFTER_END;
-			case HTMLElementDeclaration.LAYOUT_BREAK :
-				return HTMLElementDeclaration.BREAK_AFTER_START;
-			case HTMLElementDeclaration.LAYOUT_HIDDEN :
-				return HTMLElementDeclaration.BREAK_BEFORE_START_AND_AFTER_END;
-			default :
-				return HTMLElementDeclaration.BREAK_NONE;
-		}
-	}
-
-	/**
-	 * No HTML element has local elements.  So, this method always
-	 * returns an empty map.
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public CMNamedNodeMap getLocalElements() {
-		return EMPTY_MAP;
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMNode
-	 */
-	public int getNodeType() {
-		return CMNode.ELEMENT_DECLARATION;
-	}
-
-	/**
-	 */
-	public int getOmitType() {
-		return omitType;
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		return EMPTY_MAP;
-	}
-
-	/**
-	 */
-	public boolean supports(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE)) {
-			return true;
-		}
-		else if (propertyName.equals(HTMLCMProperties.CONTENT_HINT)) {
-			ComplexTypeDefinition def = getComplexTypeDefinition();
-			return (def != null);
-		}
-		else {
-			PropertyProvider pp = PropertyProviderFactory.getProvider(propertyName);
-			if (pp == null)
-				return false;
-			return pp.supports(this);
-		}
-
-	}
-
-	/**
-	 */
-	public Object getProperty(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE)) {
-			return new Boolean(true);
-		}
-		else if (propertyName.equals(HTMLCMProperties.CONTENT_HINT)) {
-			ComplexTypeDefinition def = getComplexTypeDefinition();
-			return (def != null) ? def.getPrimaryCandidate() : null;
-		}
-		else {
-			PropertyProvider pp = PropertyProviderFactory.getProvider(propertyName);
-			if (pp == null)
-				return null;
-			return pp.get(this);
-		}
-	}
-
-	/**
-	 * Return element names which terminates this element.<br>
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return null;
-	}
-
-	/**
-	 * return true when the element is a JSP element.
-	 */
-	public boolean isJSP() {
-		return false;
-	}
-
-	/**
-	 * In some elements, such as APPLET, a source generator should indent child
-	 * elements that their parents.  That is, a source generator should generate
-	 * source  of APPLET and PARAMS like this:
-	 * <PRE>
-	 *   &lt;APPLET ...&gt;
-	 *     &lt;PARAM ... &gt;
-	 *     &lt;PARAM ... &gt;
-	 *   &lt;/APPLET&gt;
-	 * <PRE>
-	 * @return boolean
-	 */
-	public boolean shouldIndentChildSource() {
-		return indentChild;
-	}
-
-	/**
-	 * Most of elements can compact spaces in their child text nodes.
-	 * Some special elements should keep them in their source.
-	 * @return boolean
-	 */
-	public boolean shouldKeepSpaces() {
-		return keepSpaces;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public boolean shouldTerminateAt(HTMLElementDeclaration nextElement) {
-		Iterator i = getTerminators();
-		if (i == null)
-			return false;
-		String nextName = nextElement.getElementName();
-		while (i.hasNext()) {
-			if (nextName.equals(i.next()))
-				return true;
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLEntityDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLEntityDeclImpl.java
deleted file mode 100644
index c63d2a8..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLEntityDeclImpl.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLEntityDeclaration;
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-
-
-/**
- */
-class HTMLEntityDeclImpl extends CMNodeImpl implements HTMLEntityDeclaration {
-
-	private java.lang.String value = null;
-
-	/**
-	 * CMEntityDeclImpl constructor comment.
-	 * @param entityName java.lang.String; Entity name.
-	 * @param entityValue java.lang.String; Value string.
-	 */
-	public HTMLEntityDeclImpl(String entityName, String entityValue) {
-		super(entityName);
-		value = entityValue;
-	}
-
-	/**
-	 * getName method
-	 * @return java.lang.String
-	 */
-	public String getName() {
-		return getNodeName();
-	}
-
-	/**
-	 * Get CMNode type.<br>
-	 * @return int; Always return ENTITY_DECLARATION.
-	 */
-	public int getNodeType() {
-		return CMNode.ENTITY_DECLARATION;
-	}
-
-	/**
-	 * getValue method
-	 * @return java.lang.String
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 */
-	public boolean supports(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE))
-			return true;
-		return super.supports(propertyName);
-	}
-
-	/**
-	 * Entities in HTML documents are always treated with ignoring cases.
-	 * Because no special entities are defined in JSP 1.0, this method
-	 * can always return <code>true</code>.<br>
-	 */
-	public Object getProperty(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE))
-			return new Boolean(true);
-		return super.getProperty(propertyName);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedA.java
deleted file mode 100644
index 455ca28..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedA.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * A.
- */
-final class HedA extends HedInlineContainer {
-
-	/**
-	 */
-	public HedA(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.A, collection);
-		// CORRECT_EMPTY - GROUP_COMPACT
-		correctionType = CORRECT_EMPTY;
-	}
-
-	/**
-	 * %attrs;
-	 * (charset %Charset; #IMPLIED)
-	 * (type %ContentType; #IMPLIED)
-	 * (name CDATA #IMPLIED)
-	 * (href %URI; #IMPLIED)
-	 * (hreflang %LanguageCode; #IMPLIED)
-	 * (target %FrameTarget; #IMPLIED)
-	 * (rel %LinkTypes; #IMPLIED)
-	 * (rev %LinkTypes; #IMPLIED)
-	 * (accesskey %Character; #IMPLIED)
-	 * (directkey %Character; #IMPLIED)
-	 * (shape %Shape; rect)
-	 * (coords %Coords; #IMPLIED)
-	 * (tabindex NUMBER #IMPLIED)
-	 * (onfocus %Script; #IMPLIED)
-	 * (onblur %Script; #IMPLIED) 
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {CHTMLNamespace.ATTR_NAME_NAME, CHTMLNamespace.ATTR_NAME_HREF,};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 * Exclusion.
-	 * <code>A</code> has the exclusion.
-	 * It is <code>A</code> itself.
-	 */
-	public CMContent getExclusion() {
-		if (exclusion != null)
-			return exclusion; // already created.
-		if (elementCollection == null)
-			return null;
-
-		exclusion = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		CMNode a = elementCollection.getNamedItem(CHTMLNamespace.ElementName.A);
-		if (a != null)
-			exclusion.appendChild(a);
-
-		return exclusion;
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {CHTMLNamespace.ElementName.A,};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedADDRESS.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedADDRESS.java
deleted file mode 100644
index 55579d8..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedADDRESS.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * ADDRESS.
- */
-final class HedADDRESS extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedADDRESS(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.ADDRESS, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_ADDRESS;
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {CHTMLNamespace.ElementName.DIR, CHTMLNamespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBASE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBASE.java
deleted file mode 100644
index ab2c816..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBASE.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-/**
- * BASE.
- */
-final class HedBASE extends HedEmpty {
-
-	/**
-	 */
-	public HedBASE(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.BASE, collection);
-		// LAYOUT_HIDDEN.
-		// Because, BASE is GROUP_HIDDEN in the C++DOM/DTDParser.cpp.
-		layoutType = LAYOUT_HIDDEN;
-	}
-
-	/**
-	 * BASE.
-	 * (href %URI; #IMPLIED)
-	 * (target %FrameTarget; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {CHTMLNamespace.ATTR_NAME_HREF,};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBLOCKQUOTE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBLOCKQUOTE.java
deleted file mode 100644
index 818156e..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBLOCKQUOTE.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * BLOCKQUOTE.
- */
-final class HedBLOCKQUOTE extends HedFlowContainer {
-
-	/**
-	 */
-	public HedBLOCKQUOTE(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.BLOCKQUOTE, collection);
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs;
-	 * (cite %URI; #IMPLIED) 
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {CHTMLNamespace.ElementName.DIR, CHTMLNamespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBODY.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBODY.java
deleted file mode 100644
index 992288f..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBODY.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-/**
- * BODY.
- */
-final class HedBODY extends HedFlowContainer {
-
-	private static String[] terminators = {CHTMLNamespace.ElementName.HEAD, CHTMLNamespace.ElementName.BODY, CHTMLNamespace.ElementName.HTML};
-
-	/**
-	 */
-	public HedBODY(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.BODY, collection);
-		layoutType = LAYOUT_BLOCK;
-		omitType = OMIT_BOTH;
-	}
-
-	/**
-	 * %attrs;
-	 * %bodycolors;
-	 * (onload %Script; #IMPLIED)
-	 * (onunload %Script; #IMPLIED)
-	 * (background %URI; #IMPLIED)
-	 * (marginwidth %Pixels; #IMPLIED) ... D205514
-	 * (marginheight %Pixels; #IMPLIED) .. D205514
-	 * (topmargin, CDATA, #IMPLIED) ...... D205514
-	 * (bottommargin, CDATA, #IMPLIED) ... D205514
-	 * (leftmargin, CDATA, #IMPLIED) ..... D205514
-	 * (rightmargin, CDATA, #IMPLIED) .... D205514
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// %bodycolors;
-		attributeCollection.getBodycolors(attributes);
-
-	}
-
-	/**
-	 * BODY has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBR.java
deleted file mode 100644
index 30ef48b..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBR.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLAttributeDeclaration;
-
-
-
-/**
- * BR.
- */
-final class HedBR extends HedEmpty {
-
-	/**
-	 */
-	public HedBR(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.BR, collection);
-		// LAYOUT_BREAK.
-		// Because, BR is GROUP_BREAK in the C++DOM/DTDParser.cpp.
-		layoutType = LAYOUT_BREAK;
-	}
-
-	/**
-	 * BR.
-	 * %coreattrs;
-	 * (clear (left | all | right | none) none)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %coreattrs;
-		attributeCollection.getCore(attributes);
-		// clear
-		HTMLAttributeDeclaration attr = attributeCollection.getDeclaration(CHTMLNamespace.ATTR_NAME_CLEAR);
-		if (attr != null)
-			attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_CLEAR, attr);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedCENTER.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedCENTER.java
deleted file mode 100644
index c2c60d6..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedCENTER.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * CENTER.
- */
-final class HedCENTER extends HedFlowContainer {
-
-	/**
-	 */
-	public HedCENTER(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.CENTER, collection);
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {CHTMLNamespace.ElementName.DIR, CHTMLNamespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDD.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDD.java
deleted file mode 100644
index a5da292..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDD.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-/**
- * DD.
- */
-final class HedDD extends HedFlowContainer {
-
-	private static String[] terminators = {CHTMLNamespace.ElementName.DT, CHTMLNamespace.ElementName.DD};
-
-	/**
-	 */
-	public HedDD(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.DD, collection);
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-		omitType = OMIT_END_DEFAULT;
-	}
-
-	/**
-	 * %attrs;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-
-	/**
-	 * DD has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDIV.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDIV.java
deleted file mode 100644
index adb56c2..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDIV.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * DIV.
- */
-final class HedDIV extends HedFlowContainer {
-
-	/**
-	 */
-	public HedDIV(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.DIV, collection);
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs;
-	 * %align;
-	 * %reserved;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// %align;
-		HTMLAttrDeclImpl attr = AttributeCollection.createAlignForParagraph();
-		if (attr != null)
-			attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_ALIGN, attr);
-		// %reserved; ... empty
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {CHTMLNamespace.ElementName.DIR, CHTMLNamespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDL.java
deleted file mode 100644
index c09c9ac..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDL.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * DL.
- */
-final class HedDL extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedDL(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.DL, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_DEFINITION_LIST;
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-		indentChild = true;
-	}
-
-	/**
-	 * %arrays;
-	 * (compact (compact) #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {CHTMLNamespace.ElementName.DIR, CHTMLNamespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDT.java
deleted file mode 100644
index e12c4c4..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDT.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-/**
- * DT.
- */
-final class HedDT extends HedInlineContainer {
-
-	private static String[] terminators = {CHTMLNamespace.ElementName.DT, CHTMLNamespace.ElementName.DD};
-
-	/**
-	 */
-	public HedDT(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.DT, collection);
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-		omitType = OMIT_END_DEFAULT;
-	}
-
-	/**
-	 * %attrs;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-	}
-
-	/**
-	 * DT has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedEmpty.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedEmpty.java
deleted file mode 100644
index 92c30da..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedEmpty.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-
-/**
- * Base class for EMPTY type element declarations.
- */
-abstract class HedEmpty extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedEmpty(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_EMPTY;
-		// EMPTY type has no end tag.
-		omitType = OMIT_END_MUST;
-	}
-
-	/**
-	 * Content.<br>
-	 * EMPTY type always returns <code>null</code>.
-	 * <br>
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMContent
-	 */
-	public CMContent getContent() {
-		return null;
-	}
-
-	/**
-	 * Content type.<br>
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.EMPTY;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedFORM.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedFORM.java
deleted file mode 100644
index 599ca9a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedFORM.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * FORM.
- */
-final class HedFORM extends HedFlowContainer {
-
-	/**
-	 */
-	public HedFORM(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.FORM, collection);
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs;
-	 * (action %URI; #REQUIRED)
-	 * (method (GET|POST) GET)
-	 * (enctype %ContentType; "application/x-www-form-urlencoded")
-	 * (accept %ContentTypes; #IMPLIED)
-	 * (name CDATA #IMPLIED)
-	 * (onsubmit %Script; #IMPLIED)
-	 * (onreset %Script; #IMPLIED)
-	 * (target %FrameTarget; #IMPLIED)
-	 * (accept-charset %Charsets; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {CHTMLNamespace.ATTR_NAME_ACTION, CHTMLNamespace.ATTR_NAME_METHOD, CHTMLNamespace.ATTR_NAME_ENCTYPE, CHTMLNamespace.ATTR_NAME_NAME,};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 * Exclusion.
-	 * <code>FORM</code> has the exclusion.
-	 * It is <code>FORM</code> itself.
-	 */
-	public CMContent getExclusion() {
-		if (exclusion != null)
-			return exclusion; // already created.
-		if (elementCollection == null)
-			return null; // fatal
-
-		exclusion = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		CMNode form = elementCollection.getNamedItem(CHTMLNamespace.ElementName.FORM);
-		if (form != null)
-			exclusion.appendChild(form);
-
-		return exclusion;
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {CHTMLNamespace.ElementName.DIR, CHTMLNamespace.ElementName.FORM, CHTMLNamespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedFlowContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedFlowContainer.java
deleted file mode 100644
index 99f307b..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedFlowContainer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-/**
- * Base class for (%flow;)* containers.
- */
-abstract class HedFlowContainer extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedFlowContainer(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_FLOW_CONTAINER;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHEAD.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHEAD.java
deleted file mode 100644
index 2366dce..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHEAD.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-/**
- * HTML.
- */
-final class HedHEAD extends HTMLElemDeclImpl {
-
-	private static String[] terminators = {CHTMLNamespace.ElementName.HEAD, CHTMLNamespace.ElementName.BODY, CHTMLNamespace.ElementName.HTML};
-
-	/**
-	 */
-	public HedHEAD(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.HEAD, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_HEAD;
-		layoutType = LAYOUT_HIDDEN;
-		omitType = OMIT_BOTH;
-	}
-
-	/**
-	 * Create all attribute declarations.
-	 * This method is called once in the constructor of the super class.
-	 * The <code>HEAD</code> element may have the following attributes:
-	 * <table>
-	 * <tbody>
-	 *   <tr>
-	 *     <th>NAME</th><th>TYPE</th><th>USAGE</th><th>DEFAULT (INITIAL) VALUE</th><th>MEMO</th>
-	 *   </tr>
-	 *   <tr>
-	 *     <td>%i18n;</td><td>-</td><td>-</td><td>-</td><td>-</td>
-	 *   </tr>
-	 *   <tr>
-	 *     <td>profile</td><td>URI</td><td>#IMPLIED</td><td>N/A</td><td>-</td>
-	 *   </tr>
-	 * </tbody>
-	 * </table>
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %i18n;
-		attributeCollection.getI18n(attributes);
-	}
-
-	/**
-	 * HEAD has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHR.java
deleted file mode 100644
index ed65ab3..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHR.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * HR.
- */
-final class HedHR extends HedEmpty {
-
-	/**
-	 */
-	public HedHR(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.HR, collection);
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * %attrs
-	 * (align (left|center|right) #IMPLIED) ... should be defined locally.
-	 * (noshade (noshade) #IMPLIED)
-	 * (size %Pixels; #IMPLIED)
-	 * (width %Length; #IMPLIED)
-	 * (color %Color; #IMPLIED) ... D205514
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		// (align (left|center|right) #IMPLIED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		String[] values = {CHTMLNamespace.ATTR_VALUE_LEFT, CHTMLNamespace.ATTR_VALUE_CENTER, CHTMLNamespace.ATTR_VALUE_RIGHT};
-		atype.setEnumValues(values);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(CHTMLNamespace.ATTR_NAME_ALIGN, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_ALIGN, attr);
-
-		// the rest.
-		String[] names = {CHTMLNamespace.ATTR_NAME_NOSHADE, CHTMLNamespace.ATTR_NAME_SIZE, CHTMLNamespace.ATTR_NAME_WIDTH,};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {CHTMLNamespace.ElementName.DIR, CHTMLNamespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHTML.java
deleted file mode 100644
index a6243d2..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHTML.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLAttributeDeclaration;
-
-
-/**
- * HTML.
- */
-final class HedHTML extends HTMLElemDeclImpl {
-
-	private static String[] terminators = {CHTMLNamespace.ElementName.HTML};
-
-	/**
-	 */
-	public HedHTML(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.HTML, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_HTML;
-		layoutType = LAYOUT_HIDDEN;
-		omitType = OMIT_BOTH;
-	}
-
-	/**
-	 * Create all attribute declarations.
-	 * This method is called once in the constructor of the super class.
-	 * The <code>HTML</code> element may have the following attributes:
-	 * <table>
-	 * <tbody>
-	 *   <tr>
-	 *     <th>NAME</th><th>TYPE</th><th>USAGE</th><th>DEFAULT (INITIAL) VALUE</th><th>MEMO</th>
-	 *   </tr>
-	 *   <tr>
-	 *     <td><code>%i18n;</code></td><td>-</td><td>-</td><td>-</td>
-	 *     <td>{@link PDCMDocImpl#getAttrDeclarationsI18n}</td>
-	 *   </tr>
-	 *   <tr>
-	 *     <td>version</td><td>CDATA</td><td>#FIXED</td>
-	 *     <td>{@link HTML_VERSION_TRANSITIONAL}</td><td>deplecated in HTML4.01</td>
-	 *   </tr>
-	 * </tbody>
-	 * </table><br>
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %i18n;
-		attributeCollection.getI18n(attributes);
-		// version
-		HTMLAttributeDeclaration adec = attributeCollection.getDeclaration(CHTMLNamespace.ATTR_NAME_VERSION);
-		if (adec != null)
-			attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_VERSION, adec);
-	}
-
-	/**
-	 * HTML has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHeading.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHeading.java
deleted file mode 100644
index 398e97a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHeading.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * H[1-6].
- */
-final class HedHeading extends HedInlineContainer {
-
-	/**
-	 */
-	public HedHeading(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-	}
-
-	/**
-	 * Create all attribute declarations.
-	 * This method is called once in the constructor of the super class.
-	 * The <code>H1</code> element may have the following attributes:
-	 * <table>
-	 * <tbody>
-	 *   <tr>
-	 *     <th>NAME</th><th>TYPE</th><th>USAGE</th><th>DEFAULT (INITIAL) VALUE</th><th>MEMO</th>
-	 *   </tr>
-	 *   <tr>
-	 *     <td>%attrs;</td><td>-</td><td>-</td><td>-</td><td>-</td>
-	 *   </tr>
-	 *   <tr>
-	 *     <td>%align;</td><td>-</td><td>-</td><td>-</td><td>-</td>
-	 *   </tr>
-	 * </tbody>
-	 * </table>
-	 * <p><b>%align;</b> means <code>align (left|center|right|justify) #IMPLIED</code>.
-	 * Unfortunately, this <code>align</code> is different from one in
-	 * <code>IMG</code> or <code>TABLE</code>.  So, the attribute declaration
-	 * of <code>align</code> should be localy created and it shouldn't be registered
-	 * in a <code>HCMDocImpl</code> instance.</p>
-	 * <p>However, %align is used in sevaral times.  I wouldn't write same code
-	 * in many times.  So, I add a new utility method into <code>CMUtil</code>
-	 * to create the attribute declaration.</p>
-	 * <br>
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// align
-		HTMLAttrDeclImpl attr = AttributeCollection.createAlignForParagraph();
-		if (attr != null)
-			attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_ALIGN, attr);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {CHTMLNamespace.ElementName.DIR, CHTMLNamespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedIMG.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedIMG.java
deleted file mode 100644
index ae95384..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedIMG.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * IMG.
- */
-final class HedIMG extends HedEmpty {
-
-	/**
-	 */
-	public HedIMG(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.IMG, collection);
-		layoutType = LAYOUT_OBJECT;
-	}
-
-	/**
-	 * IMG.
-	 * %attrs;
-	 * (src %URI; #REQUIRED): should be defined locally.
-	 * (alt %Text; #REQUIRED)
-	 * (longdesc %URI; #IMPLIED)
-	 * (name CDATA #IMPLIED)
-	 * (height %Length; #IMPLIED)
-	 * (width %Length; #IMPLIED)
-	 * (usemap %URI; #IMPLIED)
-	 * (ismap (ismap) #IMPLIED)
-	 * (align %IAlign; #IMPLIED): should be defined locally.
-	 * (border %Pixels; #IMPLIED)
-	 * (hspace %Pixels; #IMPLIED)
-	 * (vspace %Pixels; #IMPLIED)
-	 * (mapfile %URI; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		// (src %URI; #REQUIRED): should be defined locally.
-		HTMLCMDataTypeImpl atype = null;
-		HTMLAttrDeclImpl attr = null;
-		atype = new HTMLCMDataTypeImpl(CMDataType.URI);
-		attr = new HTMLAttrDeclImpl(CHTMLNamespace.ATTR_NAME_SRC, atype, CMAttributeDeclaration.REQUIRED);
-		attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_SRC, attr);
-
-		String[] names = {CHTMLNamespace.ATTR_NAME_ALT, CHTMLNamespace.ATTR_NAME_NAME, CHTMLNamespace.ATTR_NAME_HEIGHT, CHTMLNamespace.ATTR_NAME_WIDTH, CHTMLNamespace.ATTR_NAME_BORDER, CHTMLNamespace.ATTR_NAME_HSPACE, CHTMLNamespace.ATTR_NAME_VSPACE,};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-
-		// align (local); should be defined locally.
-		attr = AttributeCollection.createAlignForImage();
-		attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_ALIGN, attr);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {CHTMLNamespace.ElementName.PRE};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedINPUT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedINPUT.java
deleted file mode 100644
index bf0951c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedINPUT.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-
-/**
- * INPUT.
- */
-final class HedINPUT extends HedEmpty {
-
-	/**
-	 */
-	public HedINPUT(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.INPUT, collection);
-		layoutType = LAYOUT_OBJECT;
-	}
-
-	/**
-	 * INPUT.
-	 * %attrs;
-	 * (type %InputType; TEXT) ... should be defined locally.
-	 * (name CDATA #IMPLIED)
-	 * (value CDATA #IMPLIED)
-	 * (checked (checked) #IMPLIED)
-	 * (disabled (disabled) #IMPLIED)
-	 * (readonly (readonly) #IMPLIED)
-	 * (size CDATA #IMPLIED) ... should be defined locally.
-	 * (maxlength NUMBER #IMPLIED)
-	 * (src %URI; #IMPLIED)
-	 * (alt CDATA #IMPLIED) ... should be defined locally.
-	 * (usemap %URI; #IMPLIED)
-	 * (ismap (ismap) #IMPLIED)
-	 * (tabindex NUMBER #IMPLIED)
-	 * (accesskey %Character; #IMPLIED)
-	 * (onfocus %Script; #IMPLIED)
-	 * (onblur %Script; #IMPLIED)
-	 * (onselect %Script; #IMPLIED)
-	 * (onchange %Script; #IMPLIED)
-	 * (accept %ContentTypes; #IMPLIED)
-	 * (align %IAlign; #IMPLIED) ... should be defined locally.
-	 * (istyle CDATA #IMPLIED)
-	 * <<D215684
-	 * (width CDATA; #IMPLIED)
-	 * (height CDATA; #IMPLIED)
-	 * (border CDATA; #IMPLIED)
-	 * D215684
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		HTMLCMDataTypeImpl atype = null;
-		HTMLAttrDeclImpl attr = null;
-		// (type %InputType; TEXT) ... should be defined locally.
-		// NOTE: %InputType is ENUM;
-		// (text | password | checkbox | radio | submit | reset |
-		//  file | hidden | image | button)
-		atype = new HTMLCMDataTypeImpl(CMDataType.ENUM);
-		String[] values = {CHTMLNamespace.ATTR_VALUE_TEXT, CHTMLNamespace.ATTR_VALUE_PASSWORD, CHTMLNamespace.ATTR_VALUE_CHECKBOX, CHTMLNamespace.ATTR_VALUE_RADIO, CHTMLNamespace.ATTR_VALUE_SUBMIT, CHTMLNamespace.ATTR_VALUE_RESET, CHTMLNamespace.ATTR_VALUE_HIDDEN,};
-		atype.setEnumValues(values);
-		atype.setImpliedValue(CMDataType.IMPLIED_VALUE_DEFAULT, CHTMLNamespace.ATTR_VALUE_TEXT);
-		attr = new HTMLAttrDeclImpl(CHTMLNamespace.ATTR_NAME_TYPE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_TYPE, attr);
-
-		// (size CDATA #IMPLIED) ... should be defined locally.
-		atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-		attr = new HTMLAttrDeclImpl(CHTMLNamespace.ATTR_NAME_SIZE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_SIZE, attr);
-
-		// (alt CDATA #IMPLIED) ... should be defined locally.
-		atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-		attr = new HTMLAttrDeclImpl(CHTMLNamespace.ATTR_NAME_ALT, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_ALT, attr);
-
-		// (align %IAlign; #IMPLIED) ... should be defined locally.
-		attr = AttributeCollection.createAlignForImage();
-		attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_ALIGN, attr);
-
-		// the rest.
-		String[] names = {CHTMLNamespace.ATTR_NAME_NAME, CHTMLNamespace.ATTR_NAME_VALUE, CHTMLNamespace.ATTR_NAME_CHECKED, CHTMLNamespace.ATTR_NAME_SIZE, CHTMLNamespace.ATTR_NAME_MAXLENGTH, CHTMLNamespace.ATTR_NAME_SRC, CHTMLNamespace.ATTR_NAME_ALT, CHTMLNamespace.ATTR_NAME_ALIGN, CHTMLNamespace.ATTR_NAME_ISTYLE,
-		//<<D215684
-					CHTMLNamespace.ATTR_NAME_WIDTH, CHTMLNamespace.ATTR_NAME_HEIGHT, CHTMLNamespace.ATTR_NAME_BORDER
-		//<D215684
-		};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedInlineContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedInlineContainer.java
deleted file mode 100644
index 99f14c9..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedInlineContainer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-/**
- * Base class for (%inline;)* containers.
- */
-abstract class HedInlineContainer extends HTMLElemDeclImpl {
-
-	/**
-	 * HedInlineContainer.
-	 * @param elementName java.lang.String
-	 * @param collection ElementCollection
-	 */
-	public HedInlineContainer(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_INLINE_CONTAINER;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedLI.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedLI.java
deleted file mode 100644
index 6a3a344..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedLI.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-/**
- * LI.
- */
-final class HedLI extends HedFlowContainer {
-
-	private static String[] terminators = {CHTMLNamespace.ElementName.LI};
-
-	/**
-	 */
-	public HedLI(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.LI, collection);
-		layoutType = LAYOUT_BLOCK;
-		omitType = OMIT_END_DEFAULT;
-	}
-
-	/**
-	 * %attrs;
-	 * (type %LIStyle; #IMPLIED) ... should be defined locally.
-	 * (value NUMBER #IMPLIED) ... should be defined locally.
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-	}
-
-	/**
-	 * LI has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedListItemContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedListItemContainer.java
deleted file mode 100644
index 9e457c7..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedListItemContainer.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-/**
- * Base class for list item container declarations.
- * - OL, UL, MENU, DIR.
- */
-abstract class HedListItemContainer extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedListItemContainer(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_LI_CONTAINER;
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-		indentChild = true;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedMENU.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedMENU.java
deleted file mode 100644
index 581d954..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedMENU.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * MENU/DIR.
- */
-final class HedMENU extends HedListItemContainer {
-
-	/**
-	 */
-	public HedMENU(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-	}
-
-	/**
-	 * MENU/DIR.
-	 * (compact (compact) #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-	}
-
-	/**
-	 * Exclusion.
-	 * <code>MENU/DIR</code> has the exclusion.
-	 * It is <code>%block;</code>.
-	 * %block; is:
-	 * P | %heading; | %list; | %preformatted; | DL | DIV | CENTER |
-	 * NOSCRIPT | NOFRAMES | BLOCKQUOTE | FORM | ISINDEX | HR |
-	 * TABLE | FIELDSET | ADDRESS.
-	 * %heading; is: H1 | H2 | H3 | H4 | H5 | H6.
-	 * %list; is : UL | OL | DIR | MENU.
-	 * %preformatted; is PRE.
-	 * <br>
-	 */
-	public CMContent getExclusion() {
-		if (exclusion != null)
-			return exclusion; // already created.
-		if (elementCollection == null)
-			return null;
-
-		// %block;
-		exclusion = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		String[] names = {CHTMLNamespace.ElementName.P, CHTMLNamespace.ElementName.H1, CHTMLNamespace.ElementName.H2, CHTMLNamespace.ElementName.H3, CHTMLNamespace.ElementName.H4, CHTMLNamespace.ElementName.H5, CHTMLNamespace.ElementName.H6, CHTMLNamespace.ElementName.UL, CHTMLNamespace.ElementName.OL, CHTMLNamespace.ElementName.DIR, CHTMLNamespace.ElementName.MENU, CHTMLNamespace.ElementName.PRE, CHTMLNamespace.ElementName.DL, CHTMLNamespace.ElementName.DIV, CHTMLNamespace.ElementName.CENTER, CHTMLNamespace.ElementName.BLOCKQUOTE, CHTMLNamespace.ElementName.FORM, CHTMLNamespace.ElementName.HR, CHTMLNamespace.ElementName.ADDRESS};
-		elementCollection.getDeclarations(exclusion, Arrays.asList(names).iterator());
-		return exclusion;
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {CHTMLNamespace.ElementName.DIR, CHTMLNamespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedMETA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedMETA.java
deleted file mode 100644
index 882eca9..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedMETA.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-
-/**
- * META.
- */
-final class HedMETA extends HedEmpty {
-
-	/**
-	 */
-	public HedMETA(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.META, collection);
-		layoutType = LAYOUT_HIDDEN;
-	}
-
-	/**
-	 * META.
-	 * %i18n;
-	 * (http-equiv NAME #IMPLIED)
-	 * (name NAME #IMPLIED) ... should be defined locally.
-	 * (content CDATA #REQUIRED)
-	 * (scheme CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %i18n;
-		attributeCollection.getI18n(attributes);
-
-		// (name NAME #IMPLIED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(HTMLCMDataType.NAME);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(CHTMLNamespace.ATTR_NAME_NAME, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_NAME, attr);
-
-		// 249493
-		atype = new HTMLCMDataTypeImpl(CMDataType.CDATA);
-		attr = new HTMLAttrDeclImpl(CHTMLNamespace.ATTR_NAME_CONTENT, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_CONTENT, attr);
-
-		String[] names = {CHTMLNamespace.ATTR_NAME_HTTP_EQUIV,
-		//		CHTMLNamespace.ATTR_NAME_CONTENT
-		};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedOL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedOL.java
deleted file mode 100644
index b2583d0..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedOL.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * OL.
- */
-final class HedOL extends HedListItemContainer {
-
-	/**
-	 */
-	public HedOL(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.OL, collection);
-	}
-
-	/**
-	 * OL.
-	 * (type %OLStyle; #IMPLIED) ... should be defined locally.
-	 * (compact (compact) #IMPLIED)
-	 * (start NUMBER #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {CHTMLNamespace.ElementName.DIR, CHTMLNamespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedOPTION.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedOPTION.java
deleted file mode 100644
index 84a081d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedOPTION.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-/**
- * OPTION.
- */
-final class HedOPTION extends HedPcdata {
-
-	private static String[] terminators = {CHTMLNamespace.ElementName.OPTION};
-
-	/**
-	 */
-	public HedOPTION(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.OPTION, collection);
-		layoutType = LAYOUT_HIDDEN;
-		omitType = OMIT_END;
-	}
-
-	/**
-	 * OPTION.
-	 * %attrs;
-	 * (selected (selected) #IMPLIED)
-	 * (disabled (disabled) #IMPLIED)
-	 * (label %Text; #IMPLIED)
-	 * (value CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {CHTMLNamespace.ATTR_NAME_SELECTED, CHTMLNamespace.ATTR_NAME_VALUE};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-
-	/**
-	 * OPTION has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		return Arrays.asList(terminators).iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedP.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedP.java
deleted file mode 100644
index eb056eb..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedP.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * P.
- */
-final class HedP extends HedInlineContainer {
-
-	private static Collection terminators = null;
-
-	/**
-	 */
-	public HedP(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.P, collection);
-		correctionType = CORRECT_EMPTY;
-		layoutType = LAYOUT_BLOCK;
-		omitType = OMIT_END;
-	}
-
-	/**
-	 * Create all attribute declarations.
-	 * This method is called once in the constructor of the super class.
-	 * The <code>P</code> element may have the following attributes:
-	 * <table>
-	 * <tbody>
-	 *   <tr>
-	 *     <th>NAME</th><th>TYPE</th><th>USAGE</th><th>DEFAULT (INITIAL) VALUE</th><th>MEMO</th>
-	 *   </tr>
-	 *   <tr>
-	 *     <td>%attrs;</td><td>-</td><td>-</td><td>-</td><td>-</td>
-	 *   </tr>
-	 *   <tr>
-	 *     <td>%align;</td><td>-</td><td>-</td><td>-</td><td>-</td>
-	 *   </tr>
-	 * </tbody>
-	 * </table>
-	 * <p><b>%align;</b> means <code>align (left|center|right|justify) #IMPLIED</code>.
-	 * Unfortunately, this <code>align</code> is different from one in
-	 * <code>IMG</code> or <code>TABLE</code>.  So, the attribute declaration
-	 * of <code>align</code> should be localy created and it shouldn't be registered
-	 * in a <code>HCMDocImpl</code> instance.</p>
-	 * <p>However, %align is used in sevaral times.  I wouldn't write same code
-	 * in many times.  So, I add a new utility method into <code>CMUtil</code>
-	 * to create the attribute declaration.</p>
-	 * <br>
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-		attributes = new CMNamedNodeMapImpl();
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// align
-		HTMLAttrDeclImpl adec = AttributeCollection.createAlignForParagraph();
-		attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_ALIGN, adec);
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-		String[] names = {CHTMLNamespace.ElementName.DIR, CHTMLNamespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-		return prohibitedAncestors;
-	}
-
-	/**
-	 * Return names of terminators.
-	 * <code>P</code> has terminators.
-	 * @return java.util.Iterator
-	 */
-	protected Iterator getTerminators() {
-		if (terminators != null)
-			return terminators.iterator();
-		//<<D217982
-		terminators = new Vector();
-		terminators.addAll(elementCollection.getNamesOfBlock());
-		terminators.add(CHTMLNamespace.ElementName.LI);
-		terminators.add(CHTMLNamespace.ElementName.DT);
-		terminators.add(CHTMLNamespace.ElementName.DD);
-		//D217982
-		return terminators.iterator();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedPRE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedPRE.java
deleted file mode 100644
index 99f5975..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedPRE.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * PRE.
- */
-final class HedPRE extends HedInlineContainer {
-
-	/**
-	 * PRE element should keep spaces in its source.
-	 */
-	public HedPRE(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.PRE, collection);
-		// CORRECT_EMPTY - GROUP_COMPACT
-		correctionType = CORRECT_EMPTY;
-
-		keepSpaces = true;
-	}
-
-	/**
-	 * %attrs;
-	 * (width NUMBER #IMPLIED) ... should be defined locally.
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-		// (width NUMBER #IMPLIED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(CHTMLNamespace.ATTR_NAME_WIDTH, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_WIDTH, attr);
-	}
-
-	/**
-	 * Exclusion.
-	 * <code>PRE</code> has the exclusion.
-	 * It is <code>%pre.exclusion;</code>.
-	 * %pre.exclusion is:
-	 * IMG | OBJECT | APPLET | BIG | SMALL | SUB | SUP | FONT | BASEFONT
-	 */
-	public CMContent getExclusion() {
-		if (exclusion != null)
-			return exclusion; // already created.
-		if (elementCollection == null)
-			return null;
-
-		exclusion = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-		String[] names = {CHTMLNamespace.ElementName.IMG,};
-		elementCollection.getDeclarations(exclusion, Arrays.asList(names).iterator());
-
-		return exclusion;
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {CHTMLNamespace.ElementName.DIR, CHTMLNamespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedPcdata.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedPcdata.java
deleted file mode 100644
index 15b13c3..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedPcdata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-
-/**
- * Base class for PCDATA type element declarations.<br>
- */
-abstract class HedPcdata extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedPcdata(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_PCDATA;
-	}
-
-	/**
-	 * Content.<br>
-	 * PCDATA type always returns <code>null</code>.
-	 * <br>
-	 * @return org.eclipse.wst.xml.core.internal.contentmodel.CMContent
-	 */
-	public CMContent getContent() {
-		return null;
-	}
-
-	/**
-	 * Content type.<br>
-	 * @see org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration
-	 */
-	public int getContentType() {
-		return CMElementDeclaration.PCDATA;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSELECT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSELECT.java
deleted file mode 100644
index cbd0bb8..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSELECT.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-
-/**
- * SELECT.
- */
-final class HedSELECT extends HTMLElemDeclImpl {
-
-	/**
-	 */
-	public HedSELECT(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.SELECT, collection);
-		typeDefinitionName = ComplexTypeDefinitionFactory.CTYPE_SELECT;
-		layoutType = LAYOUT_OBJECT;
-		indentChild = true;
-	}
-
-	/**
-	 * %attrs;
-	 * %reserved;
-	 * (name CDATA #IMPLIED)
-	 * (size NUMBER #IMPLIED) ... should be defined locally.
-	 * (multiple (multiple) #IMPLIED)
-	 * (disabled (disabled) #IMPLIED)
-	 * (tabindex NUMBER #IMPLIED)
-	 * (onfocus %Script; #IMPLIED)
-	 * (onblur %Script; #IMPLIED)
-	 * (onchange %Script; #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		// (size NUMBER #IMPLIED) ... should be defined locally.
-		HTMLCMDataTypeImpl atype = new HTMLCMDataTypeImpl(CMDataType.NUMBER);
-		HTMLAttrDeclImpl attr = new HTMLAttrDeclImpl(CHTMLNamespace.ATTR_NAME_SIZE, atype, CMAttributeDeclaration.OPTIONAL);
-		attributes.putNamedItem(CHTMLNamespace.ATTR_NAME_SIZE, attr);
-
-		String[] names = {CHTMLNamespace.ATTR_NAME_NAME, CHTMLNamespace.ATTR_NAME_MULTIPLE,};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIBase.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIBase.java
deleted file mode 100644
index b0e0bd3..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIBase.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration;
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-
-
-
-
-/**
- * Base class for SSI declarations.
- */
-abstract class HedSSIBase extends HedEmpty {
-
-	/**
-	 */
-	public HedSSIBase(String elementName, ElementCollection collection) {
-		super(elementName, collection);
-		layoutType = LAYOUT_OBJECT;
-	}
-
-	/**
-	 */
-	public int getFormatType() {
-		return HTMLElementDeclaration.FORMAT_SSI;
-	}
-
-	/**
-	 */
-	public boolean supports(String propName) {
-		if (propName.equals(HTMLCMProperties.IS_SSI))
-			return true;
-		return super.supports(propName);
-	}
-
-	/*
-	 */
-	public Object getProperty(String propName) {
-		if (propName.equals(HTMLCMProperties.IS_SSI))
-			return new Boolean(true);
-		return super.getProperty(propName);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIConfig.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIConfig.java
deleted file mode 100644
index d5e92e3..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIConfig.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-/**
- * SSI:CONFIG.
- */
-final class HedSSIConfig extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSIConfig(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.SSI_CONFIG, collection);
-	}
-
-	/**
-	 * SSI:CONFIG.
-	 * (errmsg CDATA #IMPLIED)
-	 * (sizefmt CDATA #IMPLIED)
-	 * (timefmt CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {CHTMLNamespace.ATTR_NAME_ERRMSG, CHTMLNamespace.ATTR_NAME_SIZEFMT, CHTMLNamespace.ATTR_NAME_TIMEFMT};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIEcho.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIEcho.java
deleted file mode 100644
index 3cf3f7c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIEcho.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-/**
- * SSI:ECHO.
- */
-final class HedSSIEcho extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSIEcho(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.SSI_ECHO, collection);
-	}
-
-	/**
-	 * SSI:ECHO
-	 * (var CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {CHTMLNamespace.ATTR_NAME_VAR};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIExec.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIExec.java
deleted file mode 100644
index e97cb5d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIExec.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-/**
- * SSI:EXEC.
- */
-final class HedSSIExec extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSIExec(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.SSI_EXEC, collection);
-	}
-
-	/**
-	 * SSI:EXEC
-	 * (cgi %URI; #IMPLIED)
-	 * (cmd CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {CHTMLNamespace.ATTR_NAME_CGI, CHTMLNamespace.ATTR_NAME_CMD};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIFlastmod.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIFlastmod.java
deleted file mode 100644
index 75eaf9d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIFlastmod.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-/**
- * SSI:FLASTMOD.
- */
-final class HedSSIFlastmod extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSIFlastmod(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.SSI_FLASTMOD, collection);
-	}
-
-	/**
-	 * SSI:FLASTMOD
-	 * (file %URI; #IMPLIED)
-	 * (virtual %URI #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {CHTMLNamespace.ATTR_NAME_FILE, CHTMLNamespace.ATTR_NAME_VIRTUAL};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIFsize.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIFsize.java
deleted file mode 100644
index 3fbf3c1..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIFsize.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-/**
- * SSI:FSIZE.
- */
-final class HedSSIFsize extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSIFsize(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.SSI_FSIZE, collection);
-	}
-
-	/**
-	 * SSI:FSIZE
-	 * (file %URI; #IMPLIED)
-	 * (virtual %URI #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {CHTMLNamespace.ATTR_NAME_FILE, CHTMLNamespace.ATTR_NAME_VIRTUAL};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIInclude.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIInclude.java
deleted file mode 100644
index 4788b5e..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIInclude.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-/**
- * SSI:INCLUDE.
- */
-final class HedSSIInclude extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSIInclude(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.SSI_INCLUDE, collection);
-	}
-
-	/**
-	 * SSI:INCLUDE
-	 * (file %URI; #IMPLIED)
-	 * (virtual %URI #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {CHTMLNamespace.ATTR_NAME_FILE, CHTMLNamespace.ATTR_NAME_VIRTUAL};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIPrintenv.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIPrintenv.java
deleted file mode 100644
index 0064a4f..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIPrintenv.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * SSI:PRINTENV.
- */
-final class HedSSIPrintenv extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSIPrintenv(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.SSI_PRINTENV, collection);
-	}
-
-	/**
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-	}
-
-	/**
-	 * SSI:PRINTENV has no attributes.  So, this method should
-	 * always return <code>null</code>.
-	 * Note: Since somebody doesn't expect null is returned, return the empty attribute
-	 * like a custom tag which doesn't have attributes
-	 */
-	public CMNamedNodeMap getAttributes() {
-		return super.getAttributes();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSISet.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSISet.java
deleted file mode 100644
index e1a8e1d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSISet.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-/**
- * SSI:SET.
- */
-final class HedSSISet extends HedSSIBase {
-
-	/**
-	 */
-	public HedSSISet(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.SSI_SET, collection);
-	}
-
-	/**
-	 * SSI:SET
-	 * (var CDATA #IMPLIED)
-	 * (value CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		String[] names = {CHTMLNamespace.ATTR_NAME_VAR, CHTMLNamespace.ATTR_NAME_VALUE};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedTEXTAREA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedTEXTAREA.java
deleted file mode 100644
index bef9535..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedTEXTAREA.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-/**
- * TEXTAREA.
- */
-final class HedTEXTAREA extends HedPcdata {
-
-	/**
-	 * TEXTAREA should keep spaces in its source.
-	 */
-	public HedTEXTAREA(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.TEXTAREA, collection);
-		layoutType = LAYOUT_OBJECT;
-
-		keepSpaces = true;
-	}
-
-	/**
-	 * TEXTAREA.
-	 * %attrs;
-	 * %reserved; ... empty
-	 * (name CDATA #IMPLIED)
-	 * (rows NUMBER #REQUIRED)
-	 * (cols NUMBER #REQUIRED)
-	 * (disabled (disabled) #IMPLIED)
-	 * (readonly (readonly) #IMPLIED)
-	 * (tabindex NUMBER #IMPLIED)
-	 * (accesskey %Character; #IMPLIED)
-	 * (onfocus %Script; #IMPLIED)
-	 * (onblur %Script; #IMPLIED)
-	 * (onselect %Script; #IMPLIED)
-	 * (onchange %Script; #IMPLIED)
-	 * (istyle CDATA #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-		String[] names = {CHTMLNamespace.ATTR_NAME_NAME, CHTMLNamespace.ATTR_NAME_ROWS, CHTMLNamespace.ATTR_NAME_COLS, CHTMLNamespace.ATTR_NAME_ISTYLE};
-		attributeCollection.getDeclarations(attributes, Arrays.asList(names).iterator());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedTITLE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedTITLE.java
deleted file mode 100644
index 007bf35..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedTITLE.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-
-/**
- * TITLE.
- */
-final class HedTITLE extends HedPcdata {
-
-	/**
-	 */
-	public HedTITLE(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.TITLE, collection);
-		layoutType = LAYOUT_HIDDEN;
-	}
-
-	/**
-	 * TITLE.
-	 * %i18n;
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %i18n;
-		attributeCollection.getI18n(attributes);
-	}
-
-	/**
-	 * Exclusion.
-	 * <code>TITLE</code> has the exclusion.
-	 * It is <code>%head.misc;</code>.
-	 * %head.misc; is <code>SCRIPT|STYLE|META|LINK|OBJECT</code>.
-	 * <br>
-	 */
-	public CMContent getExclusion() {
-		if (exclusion != null)
-			return exclusion; // already created.
-		if (elementCollection == null)
-			return null;
-
-		// (SCRIPT|STYLE|META|LINK|OBJECT)
-		exclusion = new CMGroupImpl(CMGroup.CHOICE, 1, 1);
-
-		String[] names = {CHTMLNamespace.ElementName.META,};
-		elementCollection.getDeclarations(exclusion, Arrays.asList(names).iterator());
-		return exclusion;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedUL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedUL.java
deleted file mode 100644
index 15ddbc1..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedUL.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * UL.
- */
-final class HedUL extends HedListItemContainer {
-
-	/**
-	 */
-	public HedUL(ElementCollection collection) {
-		super(CHTMLNamespace.ElementName.UL, collection);
-	}
-
-	/**
-	 * UL.
-	 * (type %ULStyle; #IMPLIED) ... should be defined locally.
-	 * (compact (compact) #IMPLIED)
-	 */
-	protected void createAttributeDeclarations() {
-		if (attributes != null)
-			return; // already created.
-		if (attributeCollection == null)
-			return; // fatal
-
-		attributes = new CMNamedNodeMapImpl();
-
-		// %attrs;
-		attributeCollection.getAttrs(attributes);
-
-	}
-
-	/**
-	 */
-	public CMNamedNodeMap getProhibitedAncestors() {
-		if (prohibitedAncestors != null)
-			return prohibitedAncestors;
-
-		String[] names = {CHTMLNamespace.ElementName.DIR, CHTMLNamespace.ElementName.MENU};
-		prohibitedAncestors = elementCollection.getDeclarations(names);
-
-		return prohibitedAncestors;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/PropertyProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/PropertyProvider.java
deleted file mode 100644
index 6ed567d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/PropertyProvider.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration;
-
-
-
-/**
- * PropertyProvider class.
- * This class is intended to be used in HTMLElementDeclaration instances.
- */
-interface PropertyProvider {
-
-	boolean supports(HTMLElementDeclaration edecl);
-
-	Object get(HTMLElementDeclaration edecl);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/PropertyProviderFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/PropertyProviderFactory.java
deleted file mode 100644
index 2c7b1b9..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/PropertyProviderFactory.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.chtml;
-
-import java.util.Hashtable;
-
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration;
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLPropertyDeclaration;
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.annotation.AnnotationMap;
-
-/**
- * The factory object of PropertyProvider.
- */
-final class PropertyProviderFactory {
-
-
-	/**
-	 * DefaultProvider is intended to be used for unknown properties.
-	 * It always returns null value for any properties.
-	 */
-	class DefaultProvider implements PropertyProvider {
-		public DefaultProvider() {
-			super();
-		}
-
-		public boolean supports(HTMLElementDeclaration edecl) {
-			return false;
-		}
-
-		public Object get(HTMLElementDeclaration edecl) {
-			return null;
-		}
-	}
-
-	abstract class AbstractElementPropertyProvider implements PropertyProvider {
-		protected AbstractElementPropertyProvider() {
-			super();
-		}
-
-		public boolean supports(HTMLElementDeclaration edecl) {
-			return (edecl != null);
-		}
-
-		public Object get(HTMLElementDeclaration edecl) {
-			if (!(edecl instanceof HTMLPropertyDeclaration))
-				return null;
-			return getElementProperty((HTMLPropertyDeclaration)edecl);
-		}
-
-		abstract protected Object getElementProperty(HTMLPropertyDeclaration decl);
-	}
-
-	/*
-	 * "tagInfo"
-	 * gets documentation for the element
-	 */
-	class PPTagInfo extends AbstractElementPropertyProvider {
-		private final static String htmlAnnotationLoc = "data/htmref.xml"; //$NON-NLS-1$
-		protected AnnotationMap fAnnotationMap = null;
-
-		public PPTagInfo() {
-			super();
-		}
-
-		/**
-		 * Gets the annotationMap.
-		 * @return Returns a AnnotationMap
-		 */
-		protected AnnotationMap getAnnotationMap() {
-			if (fAnnotationMap == null) {
-				fAnnotationMap = new AnnotationMap();
-				try {
-					fAnnotationMap.load(htmlAnnotationLoc, HTMLCorePlugin.getDefault().getBundle().getSymbolicName());
-				}
-				catch (Exception e) {
-					// no annotation available
-				}
-			}
-			return fAnnotationMap;
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			if (decl instanceof HTMLElementDeclaration) {
-				return getAnnotationMap().getProperty(((HTMLElementDeclaration)decl).getElementName(), "tagInfo"); //$NON-NLS-1$
-			} else {
-				return null;
-			}
-		}
-	}
-
-	/*
-	 * "shouldKeepSpace"
-	 */
-	class PPShouldKeepSpace extends AbstractElementPropertyProvider {
-		public PPShouldKeepSpace() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			return new Boolean(decl.shouldKeepSpaces());
-		}
-	}
-
-	/*
-	 * "shouldIndentChildSource"
-	 */
-	class PPShouldIndentChildSource extends AbstractElementPropertyProvider {
-		public PPShouldIndentChildSource() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			return new Boolean(decl.shouldIndentChildSource());
-		}
-	}
-
-	/*
-	 * "terminators"
-	 */
-	class PPTerminators extends AbstractElementPropertyProvider {
-		public PPTerminators() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			if (decl == null)
-				return null;
-			if (! (decl instanceof HTMLElemDeclImpl)) return null;
-			return ((HTMLElemDeclImpl)decl).getTerminators();
-		}
-	}
-
-	/*
-	 * "prohibitedAncestors"
-	 */
-	class PPProhibitedAncestors extends AbstractElementPropertyProvider {
-		public PPProhibitedAncestors() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			return decl.getProhibitedAncestors();
-		}
-	}
-
-	/*
-	 * "isJSP"
-	 */
-	class PPIsJSP extends AbstractElementPropertyProvider {
-		public PPIsJSP() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			return new Boolean(decl.isJSP());
-		}
-	}
-
-	/*
-	 * "isXHTML"
-	 * HTMLElementDeclaration itself never represent any XHTML element declaration.
-	 * So, this property must be always false.
-	 */
-	class PPIsXHTML extends AbstractElementPropertyProvider {
-		public PPIsXHTML() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			return new Boolean(false);
-		}
-	}
-
-	/*
-	 * "isSSI"
-	 * Each declaration class for SSI elements must provide this property itself,
-	 * and then return true.  Other declaration must always return false.
-	 */
-	class PPIsSSI extends AbstractElementPropertyProvider {
-		public PPIsSSI() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			return new Boolean(false);
-		}
-	}
-
-	/*
-	 * "lineBreakHint"
-	 */
-	class PPLineBreakHint extends AbstractElementPropertyProvider {
-		public PPLineBreakHint() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			String hint = HTMLCMProperties.Values.BREAK_NONE;
-			switch (decl.getLineBreakHint()) {
-				case HTMLElementDeclaration.BREAK_AFTER_START :
-					hint = HTMLCMProperties.Values.BREAK_AFTER_START;
-					break;
-				case HTMLElementDeclaration.BREAK_BEFORE_START_AND_AFTER_END :
-					hint = HTMLCMProperties.Values.BREAK_BEFORE_START_AND_AFTER_END;
-					break;
-				case HTMLElementDeclaration.BREAK_NONE :
-				// nothing to do
-				default :
-					break;
-			}
-			return hint;
-		}
-	}
-
-	/*
-	 * "layoutType"
-	 */
-	class PPLayoutType extends AbstractElementPropertyProvider {
-		public PPLayoutType() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			String type = HTMLCMProperties.Values.LAYOUT_NONE;
-			switch (decl.getLayoutType()) {
-				case HTMLElementDeclaration.LAYOUT_BLOCK :
-					type = HTMLCMProperties.Values.LAYOUT_BLOCK;
-					break;
-				case HTMLElementDeclaration.LAYOUT_BREAK :
-					type = HTMLCMProperties.Values.LAYOUT_BREAK;
-					break;
-				case HTMLElementDeclaration.LAYOUT_HIDDEN :
-					type = HTMLCMProperties.Values.LAYOUT_HIDDEN;
-					break;
-				case HTMLElementDeclaration.LAYOUT_OBJECT :
-					type = HTMLCMProperties.Values.LAYOUT_OBJECT;
-					break;
-				case HTMLElementDeclaration.LAYOUT_WRAP :
-					type = HTMLCMProperties.Values.LAYOUT_WRAP;
-					break;
-				case HTMLElementDeclaration.LAYOUT_NONE :
-				// nothing to do.
-				default :
-					break;
-			}
-			return type;
-		}
-	}
-
-	/*
-	 * "omitType"
-	 */
-	class PPOmitType extends AbstractElementPropertyProvider {
-		public PPOmitType() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			String type = HTMLCMProperties.Values.OMIT_NONE;
-			switch (decl.getOmitType()) {
-				case HTMLElementDeclaration.OMIT_BOTH :
-					type = HTMLCMProperties.Values.OMIT_BOTH;
-					break;
-				case HTMLElementDeclaration.OMIT_END :
-					type = HTMLCMProperties.Values.OMIT_END;
-					break;
-				case HTMLElementDeclaration.OMIT_END_DEFAULT :
-					type = HTMLCMProperties.Values.OMIT_END_DEFAULT;
-					break;
-				case HTMLElementDeclaration.OMIT_END_MUST :
-					type = HTMLCMProperties.Values.OMIT_END_MUST;
-					break;
-				case HTMLElementDeclaration.OMIT_NONE :
-				// nothing to do.
-				default :
-					break;
-			}
-			return type;
-		}
-	}
-
-	/*
-	 * "inclusion"
-	 */
-	class PPInclusion extends AbstractElementPropertyProvider {
-		public PPInclusion() {
-			super();
-		}
-
-		protected Object getElementProperty(HTMLPropertyDeclaration decl) {
-			return decl.getInclusion();
-		}
-	}
-
-	public static PropertyProvider getProvider(String propName) {
-		PropertyProviderFactory factory = getInstance();
-		PropertyProvider pp = (PropertyProvider) factory.registry.get(propName);
-		if (pp != null)
-			return pp;
-
-		pp = factory.create(propName);
-		if (pp == null)
-			return factory.defaultProvider;
-
-		factory.registry.put(propName, pp);
-		return pp;
-	}
-
-	private static PropertyProviderFactory instance = null;
-
-	private synchronized static PropertyProviderFactory getInstance() {
-		if (instance != null)
-			return instance;
-		instance = new PropertyProviderFactory();
-		return instance;
-	}
-
-	private Hashtable registry = new Hashtable();
-	private PropertyProvider defaultProvider = new DefaultProvider();
-
-	private PropertyProviderFactory() {
-		super();
-	}
-
-	private PropertyProvider create(String propName) {
-		PropertyProvider pp = null;
-		if (propName.equals(HTMLCMProperties.IS_JSP))
-			pp = new PPIsJSP();
-		else if (propName.equals(HTMLCMProperties.IS_XHTML))
-			pp = new PPIsXHTML();
-		else if (propName.equals(HTMLCMProperties.IS_SSI))
-			pp = new PPIsSSI();
-		else if (propName.equals(HTMLCMProperties.LAYOUT_TYPE))
-			pp = new PPLayoutType();
-		else if (propName.equals(HTMLCMProperties.LINE_BREAK_HINT))
-			pp = new PPLineBreakHint();
-		else if (propName.equals(HTMLCMProperties.PROHIBITED_ANCESTORS))
-			pp = new PPProhibitedAncestors();
-		else if (propName.equals(HTMLCMProperties.SHOULD_KEEP_SPACE))
-			pp = new PPShouldKeepSpace();
-		else if (propName.equals(HTMLCMProperties.SHOULD_INDENT_CHILD_SOURCE))
-			pp = new PPShouldIndentChildSource();
-		else if (propName.equals(HTMLCMProperties.TERMINATORS))
-			pp = new PPTerminators();
-		else if (propName.equals(HTMLCMProperties.TAGINFO))
-			pp = new PPTagInfo();
-		else if (propName.equals(HTMLCMProperties.OMIT_TYPE))
-			pp = new PPOmitType();
-		else if (propName.equals(HTMLCMProperties.INCLUSION))
-			pp = new PPInclusion();
-
-		return pp;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ssi/SSICMDocumentFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ssi/SSICMDocumentFactory.java
deleted file mode 100644
index 949941f..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ssi/SSICMDocumentFactory.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contentmodel.ssi;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType;
-
-/**
- * CMDocument factory for SSI documents.
- */
-public final class SSICMDocumentFactory {
-
-	private final static String PREFIX = "SSI";//$NON-NLS-1$
-	private final static String DOC_TYPE_NAME = "SSI";//$NON-NLS-1$
-
-	static class CMNamespaceImpl implements CMNamespace {
-		public CMNamespaceImpl() {
-			super();
-		}
-
-		public String getPrefix() {
-			return PREFIX;
-		}
-
-		public String getURI() {
-			return ""; //$NON-NLS-1$
-		}
-
-		public String getNodeName() {
-			return DOC_TYPE_NAME;
-		}
-
-		public int getNodeType() {
-			return CMNode.NAME_SPACE;
-		}
-
-		public boolean supports(String propertyName) {
-			return false;
-		}
-
-		public Object getProperty(String propertyName) {
-			return null;
-		}
-
-	}
-
-	static class CMDocImpl implements CMDocument {
-		private static CMDocument hcm = HTMLCMDocumentFactory.getCMDocument(CMDocType.HTML_DOC_TYPE);
-
-		static class Elements implements CMNamedNodeMap {
-			private static String[] names = {HTML40Namespace.ElementName.SSI_CONFIG, HTML40Namespace.ElementName.SSI_ECHO, HTML40Namespace.ElementName.SSI_EXEC, HTML40Namespace.ElementName.SSI_FSIZE, HTML40Namespace.ElementName.SSI_FLASTMOD, HTML40Namespace.ElementName.SSI_INCLUDE, HTML40Namespace.ElementName.SSI_PRINTENV, HTML40Namespace.ElementName.SSI_SET};
-			private Hashtable map = new Hashtable();
-
-			public Elements() {
-				CMNamedNodeMap elems = hcm.getElements();
-				for (int i = 0; i < names.length; i++) {
-					String name = names[i];
-					CMElementDeclaration dec = (CMElementDeclaration) elems.getNamedItem(name);
-					if (dec != null)
-						map.put(name, dec);
-				}
-			}
-
-			public int getLength() {
-				return map.size();
-			}
-
-			public CMNode getNamedItem(String name) {
-				String cooked = getCanonicalName(name);
-				if (!map.containsKey(cooked))
-					return null;
-				return (CMNode) map.get(cooked);
-			}
-
-			public CMNode item(int index) {
-				Iterator iter = iterator();
-				while (iter.hasNext()) {
-					Object node = iter.next();
-					if (--index < 0)
-						return (CMNode) node;
-				}
-				return null;
-			}
-
-			public Iterator iterator() {
-				return map.values().iterator();
-			}
-
-			private String getCanonicalName(String rawName) {
-				return rawName.toUpperCase();
-			}
-		}
-
-		static private Elements elements = new Elements();
-
-
-		public CMDocImpl() {
-			super();
-		}
-
-		public String getNodeName() {
-			return ""; //$NON-NLS-1$
-		}
-
-		public int getNodeType() {
-			return CMNode.DOCUMENT;
-		}
-
-		public CMNamedNodeMap getElements() {
-			return elements;
-		}
-
-		public CMNamedNodeMap getEntities() {
-			return null;
-		}
-
-		public CMNamespace getNamespace() {
-			return ssins;
-		}
-
-		public Object getProperty(String propertyName) {
-			return null;
-		}
-
-		public boolean supports(String propertyName) {
-			return false;
-		}
-	}
-
-	private static CMNamespace ssins = new CMNamespaceImpl();
-	private static CMDocument mycm = new CMDocImpl();
-
-	private SSICMDocumentFactory() {
-		super();
-	}
-
-	public static CMDocument getCMDocument() {
-		return mycm;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/AbstractResourceEncodingDetector.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/AbstractResourceEncodingDetector.java
deleted file mode 100644
index 66b6bc2..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/AbstractResourceEncodingDetector.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contenttype;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.IllegalCharsetNameException;
-import java.nio.charset.UnsupportedCharsetException;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.sse.core.internal.encoding.CodedIO;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-
-public abstract class AbstractResourceEncodingDetector implements IResourceCharsetDetector {
-
-	protected EncodingMemento fEncodingMemento;
-
-	protected boolean fHeaderParsed;
-
-	protected Reader fReader;
-
-	/**
-	 * 
-	 */
-	public AbstractResourceEncodingDetector() {
-		super();
-	}
-
-	/**
-	 * Note: once this instance is created, trace info still needs to be
-	 * appended by caller, depending on the context its created.
-	 */
-	private void createEncodingMemento(String detectedCharsetName) {
-		fEncodingMemento = new EncodingMemento();
-		fEncodingMemento.setJavaCharsetName(getAppropriateJavaCharset(detectedCharsetName));
-		fEncodingMemento.setDetectedCharsetName(detectedCharsetName);
-		// TODO: if detectedCharset and spec default is
-		// null, need to use "work
-		// bench based" defaults.
-		fEncodingMemento.setAppropriateDefault(getSpecDefaultEncoding());
-	}
-
-	/**
-	 * convience method all subclasses can use (but not override)
-	 * 
-	 * @param detectedCharsetName
-	 * @param reason
-	 */
-	final protected void createEncodingMemento(String detectedCharsetName, String reason) {
-		createEncodingMemento(detectedCharsetName);
-	}
-
-	/**
-	 * convience method all subclasses can use (but not override)
-	 */
-	final protected void ensureInputSet() {
-		if (fReader == null) {
-			throw new IllegalStateException("input must be set before use"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * This method can return null, if invalid charset name (in which case
-	 * "appropriateDefault" should be used, if a name is really need for some
-	 * "save anyway" cases).
-	 * 
-	 * @param detectedCharsetName
-	 * @return
-	 */
-	private String getAppropriateJavaCharset(String detectedCharsetName) {
-		String result = null;
-		// 1. Check explicit mapping overrides from
-		// property file -- its here we pick up "rules" for cases
-		// that are not even in Java
-		result = CodedIO.checkMappingOverrides(detectedCharsetName);
-		// 2. Use the "canonical" name from JRE mappings
-		// Note: see Charset JavaDoc, the name you get one
-		// with can be alias,
-		// the name you get back is "standard" name.
-		Charset javaCharset = null;
-		try {
-			javaCharset = Charset.forName(detectedCharsetName);
-		}
-		catch (UnsupportedCharsetException e) {
-			// only set invalid, if result is same as detected -- they won't
-			// be equal if
-			// overridden
-			if (result != null && result.equals(detectedCharsetName)) {
-				fEncodingMemento.setInvalidEncoding(detectedCharsetName);
-			}
-		}
-		catch (IllegalCharsetNameException e) {
-			// only set invalid, if result is same as detected -- they won't
-			// be equal if
-			// overridden
-			if (result != null && result.equals(detectedCharsetName)) {
-				fEncodingMemento.setInvalidEncoding(detectedCharsetName);
-			}
-		}
-		// give priority to java cononical name, if present
-		if (javaCharset != null) {
-			result = javaCharset.name();
-			// but still allow overrides
-			result = CodedIO.checkMappingOverrides(result);
-		}
-		return result;
-	}
-
-	public String getEncoding() throws IOException {
-		return getEncodingMemento().getDetectedCharsetName();
-	}
-
-	// to ensure consist overall rules used, we'll mark as
-	// final,
-	// and require subclasses to provide certain pieces of
-	// the
-	// implementation
-	public EncodingMemento getEncodingMemento() throws IOException {
-		ensureInputSet();
-		if (!fHeaderParsed) {
-			parseInput();
-			// we keep track of if header's already been
-			// parse, so can make
-			// multiple 'get' calls, without causing
-			// reparsing.
-			fHeaderParsed = true;
-			// Note: there is a "hidden assumption" here
-			// that an empty
-			// string in content should be treated same as
-			// not present.
-		}
-		if (fEncodingMemento == null) {
-			handleSpecDefault();
-		}
-		if (fEncodingMemento == null) {
-			// safty net
-			fEncodingMemento = new NullMemento();
-		}
-		return fEncodingMemento;
-	}
-
-	/**
-	 * This is to return a default encoding -- as specified by an industry
-	 * content type spec -- when not present in the stream, for example, XML
-	 * specifies UTF-8, JSP specifies ISO-8859-1. This method should return
-	 * null if there is no such "spec default".
-	 */
-	abstract public String getSpecDefaultEncoding();
-
-	public EncodingMemento getSpecDefaultEncodingMemento() {
-		resetAll();
-		EncodingMemento result = null;
-		String enc = getSpecDefaultEncoding();
-		if (enc != null) {
-			createEncodingMemento(enc, EncodingMemento.DEFAULTS_ASSUMED_FOR_EMPTY_INPUT);
-			fEncodingMemento.setAppropriateDefault(enc);
-			result = fEncodingMemento;
-		}
-		return result;
-	}
-
-	private void handleSpecDefault() {
-		String encodingName;
-		encodingName = getSpecDefaultEncoding();
-		if (encodingName != null) {
-			// createEncodingMemento(encodingName,
-			// EncodingMemento.USED_CONTENT_TYPE_DEFAULT);
-			fEncodingMemento = new EncodingMemento();
-			fEncodingMemento.setJavaCharsetName(encodingName);
-			fEncodingMemento.setAppropriateDefault(encodingName);
-		}
-	}
-
-	/**
-	 * Every subclass must provide a way to parse the input. This method has
-	 * several critical responsibilities:
-	 * <li>set the fEncodingMemento field appropriately, according to the
-	 * results of the parse of fReader.</li>
-	 * <li>set fHarderParsed to true, to avoid wasted re-parsing.</li>
-	 */
-	abstract protected void parseInput() throws IOException;
-
-	/**
-	 * 
-	 */
-	private void resetAll() {
-		fReader = null;
-		fHeaderParsed = false;
-		fEncodingMemento = null;
-	}
-
-	/**
-	 * 
-	 */
-	public void set(InputStream inputStream) {
-		resetAll();
-		fReader = new ByteReader(inputStream);
-		try {
-			fReader.mark(CodedIO.MAX_MARK_SIZE);
-		}
-		catch (IOException e) {
-			// impossible, since we know ByteReader
-			// supports marking
-			throw new Error(e);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void set(IStorage iStorage) throws CoreException {
-		resetAll();
-		InputStream inputStream = iStorage.getContents();
-		InputStream resettableStream = new BufferedInputStream(inputStream, CodedIO.MAX_BUF_SIZE);
-		resettableStream.mark(CodedIO.MAX_MARK_SIZE);
-		set(resettableStream);
-		// TODO we'll need to "remember" IFile, or
-		// get its (or its project's) settings, in case
-		// those are needed to handle cases when the
-		// encoding is not in the file stream.
-	}
-
-	/**
-	 * Note: this is not part of interface to help avoid confusion ... it
-	 * expected this Reader is a well formed character reader ... that is, its
-	 * all ready been determined to not be a unicode marked input stream. And,
-	 * its assumed to be in the correct position, at position zero, ready to
-	 * read first character.
-	 */
-	public void set(Reader reader) {
-		resetAll();
-		fReader = reader;
-		if (!fReader.markSupported()) {
-			fReader = new BufferedReader(fReader);
-		}
-		try {
-			fReader.mark(CodedIO.MAX_MARK_SIZE);
-		}
-		catch (IOException e) {
-			// impossble, since we just checked if markable
-			throw new Error(e);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/ByteReader.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/ByteReader.java
deleted file mode 100644
index bfca51a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/ByteReader.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contenttype;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.eclipse.wst.sse.core.internal.encoding.CodedIO;
-
-/**
- * This is an "adapter" class, simply to get in input stream to act like a
- * reader. We could not use InputStreamReader directly because its internal
- * buffers are not controllable, and it sometimes pulls too much out of input
- * stream (even when it wasn't needed for our purposes).
- * 
- * The use of this class is highly specialized and by not means meant to be
- * general purpose. Its use is restricted to those cases where the input
- * stream can be regarded as ascii just long enough to determine what the real
- * encoding should be.
- */
-
-public class ByteReader extends Reader {
-
-	
-	public static final int DEFAULT_BUFFER_SIZE = CodedIO.MAX_BUF_SIZE;
-
-	protected byte[] fBuffer;
-
-	protected InputStream fInputStream;
-
-	protected ByteReader() {
-		super();
-	}
-
-	public ByteReader(InputStream inputStream) {
-		this(inputStream, DEFAULT_BUFFER_SIZE);
-		if (!inputStream.markSupported()) {
-			throw new IllegalArgumentException("ByteReader is required to have a resettable stream"); //$NON-NLS-1$
-		}
-	}
-
-	public ByteReader(InputStream inputStream, int size) {
-		this.fInputStream = inputStream;
-		if (!inputStream.markSupported()) {
-			throw new IllegalArgumentException("ByteReader is required to have a resettable stream"); //$NON-NLS-1$
-		}
-		this.fBuffer = new byte[size];
-
-	}
-
-	public void close() throws IOException {
-		this.fInputStream.close();
-	}
-
-	public void mark(int readAheadLimit) {
-		this.fInputStream.mark(readAheadLimit);
-	}
-
-	public boolean markSupported() {
-		return true;
-	}
-
-	public int read() throws IOException {
-		int b0 = this.fInputStream.read();
-		return (b0 & 0x00FF);
-	}
-
-	public int read(char ch[], int offset, int length) throws IOException {
-		if (length > this.fBuffer.length) {
-			length = this.fBuffer.length;
-		}
-
-		int count = this.fInputStream.read(this.fBuffer, 0, length);
-
-		for (int i = 0; i < count; i++) {
-			int b0 = this.fBuffer[i];
-			// the 0x00FF is to "lose" the negative bits filled in the byte to
-			// int conversion
-			// (and which would be there if cast directly from byte to char).
-			char c0 = (char) (b0 & 0x00FF);
-			ch[offset + i] = c0;
-		}
-		return count;
-	}
-
-	public boolean ready() throws IOException {
-		return this.fInputStream.available() > 0;
-	}
-
-	public void reset() throws IOException {
-		this.fInputStream.reset();
-	}
-
-	public long skip(long n) throws IOException {
-		return this.fInputStream.skip(n);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/ContentDescriberForHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/ContentDescriberForHTML.java
deleted file mode 100644
index 66897c2..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/ContentDescriberForHTML.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contenttype;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.content.IContentDescriber;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.ITextContentDescriber;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IContentDescriptionExtended;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-
-public final class ContentDescriberForHTML implements ITextContentDescriber {
-
-	final private static QualifiedName[] SUPPORTED_OPTIONS = {IContentDescription.CHARSET, IContentDescription.BYTE_ORDER_MARK, IContentDescriptionExtended.DETECTED_CHARSET, IContentDescriptionExtended.UNSUPPORTED_CHARSET, IContentDescriptionExtended.APPROPRIATE_DEFAULT};
-	private IResourceCharsetDetector resourceCharsetDetector;
-
-	public int describe(InputStream contents, IContentDescription description) throws IOException {
-		int result = IContentDescriber.INDETERMINATE;
-
-		if (description == null) {
-			result = computeValidity(contents);
-		}
-		else {
-			calculateSupportedOptions(contents, description);
-			// assummming we should return same 'validity' value we did
-			// when called before. (technically, could be a performance issue
-			// in future, so might want to check if any 'ol value would
-			// be ok here.
-			result = computeValidity(contents);
-		}
-
-		return result;
-	}
-
-	public int describe(Reader contents, IContentDescription description) throws IOException {
-		int result = IContentDescriber.INDETERMINATE;
-
-		if (description == null) {
-			result = computeValidity(contents);
-		}
-		else {
-			calculateSupportedOptions(contents, description);
-			// assummming we should return same 'validity' value we did
-			// when called before. (technically, could be a performance issue
-			// in future, so might want to check if hard coded 'valid' would
-			// be ok here.
-			result = computeValidity(contents);
-		}
-
-		return result;
-	}
-
-	public QualifiedName[] getSupportedOptions() {
-
-		return SUPPORTED_OPTIONS;
-	}
-
-	private void calculateSupportedOptions(InputStream contents, IContentDescription description) throws IOException {
-		if (isRelevent(description)) {
-			IResourceCharsetDetector detector = getDetector();
-			detector.set(contents);
-			handleCalculations(description, detector);
-		}
-	}
-
-	/**
-	 * @param contents
-	 * @param description
-	 * @throws IOException
-	 */
-	private void calculateSupportedOptions(Reader contents, IContentDescription description) throws IOException {
-		if (isRelevent(description)) {
-			IResourceCharsetDetector detector = getDetector();
-			detector.set(contents);
-			handleCalculations(description, detector);
-		}
-	}
-
-	private int computeValidity(InputStream inputStream) {
-		// currently no contents specific check for valid HTML contents
-		// (this may change once we add XHTML content type)
-		return IContentDescriber.INDETERMINATE;
-	}
-
-	private int computeValidity(Reader reader) {
-		// currently no contents specific check for valid HTML contents
-		// (this may change once we add XHTML content type)
-		return IContentDescriber.INDETERMINATE;
-	}
-
-	private IResourceCharsetDetector getDetector() {
-		if (resourceCharsetDetector == null) {
-			resourceCharsetDetector = new HTMLResourceEncodingDetector();
-		}
-		return resourceCharsetDetector;
-	}
-
-	/**
-	 * @param description
-	 * @param detector
-	 * @throws IOException
-	 */
-	private void handleCalculations(IContentDescription description, IResourceCharsetDetector detector) throws IOException {
-		// note: if we're asked for one, we set them all. I need to be sure if
-		// called
-		// mulitiple times (one for each, say) that we don't waste time
-		// processing same
-		// content again.
-		EncodingMemento encodingMemento = ((HTMLResourceEncodingDetector) detector).getEncodingMemento();
-		// TODO: I need to verify to see if this BOM work is always done
-		// by text type.
-		Object detectedByteOrderMark = encodingMemento.getUnicodeBOM();
-		if (detectedByteOrderMark != null) {
-			Object existingByteOrderMark = description.getProperty(IContentDescription.BYTE_ORDER_MARK);
-			// not sure why would ever be different, so if is different, may
-			// need to "push" up into base.
-			if (!detectedByteOrderMark.equals(existingByteOrderMark))
-				description.setProperty(IContentDescription.BYTE_ORDER_MARK, detectedByteOrderMark);
-		}
-
-
-		if (!encodingMemento.isValid()) {
-			// note: after setting here, its the mere presence of
-			// IContentDescriptionExtended.UNSUPPORTED_CHARSET
-			// in the resource's description that can be used to determine if
-			// invalid
-			// in those cases, the "detected" property contains an
-			// "appropriate default" to use.
-			description.setProperty(IContentDescriptionExtended.UNSUPPORTED_CHARSET, encodingMemento.getInvalidEncoding());
-			description.setProperty(IContentDescriptionExtended.APPROPRIATE_DEFAULT, encodingMemento.getAppropriateDefault());
-		}
-
-		Object detectedCharset = encodingMemento.getDetectedCharsetName();
-		Object javaCharset = encodingMemento.getJavaCharsetName();
-
-		// we always include detected, if its different than java
-		handleDetectedSpecialCase(description, detectedCharset, javaCharset);
-
-		if (javaCharset != null) {
-			Object existingCharset = description.getProperty(IContentDescription.CHARSET);
-			if (javaCharset.equals(existingCharset)) {
-				handleDetectedSpecialCase(description, detectedCharset, javaCharset);
-			}
-			else {
-				// we may need to add what we found, but only need to add
-				// if different from default.the
-				Object defaultCharset = getDetector().getSpecDefaultEncoding();
-				if (defaultCharset != null) {
-					if (!defaultCharset.equals(javaCharset)) {
-						description.setProperty(IContentDescription.CHARSET, javaCharset);
-					}
-				}
-				else {
-					// assuming if there is no spec default, we always need to
-					// add, I'm assuming
-					description.setProperty(IContentDescription.CHARSET, javaCharset);
-				}
-			}
-		}
-
-		// avoid adding anything if not absolutly needed, since always
-		// "cached" per session
-		// description.setProperty(IContentDescriptionExtended.ENCODING_MEMENTO,
-		// encodingMemento);
-	}
-
-	private void handleDetectedSpecialCase(IContentDescription description, Object detectedCharset, Object javaCharset) {
-		// since equal, we don't need to add, but if our detected version is
-		// different than
-		// javaCharset, then we should add it. This will happen, for example,
-		// if there's
-		// differences in case, or differences due to override properties
-		if (detectedCharset != null) {
-			// if (!detectedCharset.equals(javaCharset)) {
-			// description.setProperty(IContentDescriptionExtended.DETECTED_CHARSET,
-			// detectedCharset);
-			// }
-
-			// Once we detected a charset, we should set the property even
-			// though it's the same as javaCharset
-			// because there are clients that rely on this property to
-			// determine if the charset is actually detected in file or not.
-			description.setProperty(IContentDescriptionExtended.DETECTED_CHARSET, detectedCharset);
-		}
-	}
-
-	/**
-	 * @param description
-	 * @return
-	 */
-	private boolean isRelevent(IContentDescription description) {
-		boolean result = false;
-		if (description == null)
-			result = false;
-		else if (description.isRequested(IContentDescription.BYTE_ORDER_MARK))
-			result = true;
-		else if (description.isRequested(IContentDescription.CHARSET))
-			result = true;
-		else if (description.isRequested(IContentDescriptionExtended.APPROPRIATE_DEFAULT))
-			result = true;
-		else if (description.isRequested(IContentDescriptionExtended.DETECTED_CHARSET))
-			result = true;
-		else if (description.isRequested(IContentDescriptionExtended.UNSUPPORTED_CHARSET))
-			result = true;
-		// else if
-		// (description.isRequested(IContentDescriptionExtended.ENCODING_MEMENTO))
-		// result = true;
-		return result;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/EncodingGuesser.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/EncodingGuesser.java
deleted file mode 100644
index be7f3a0..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/EncodingGuesser.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contenttype;
-
-/**
- * 
- * This is ported from PageDesigner's hpbcom/Kanji.cpp's
- * Kanji::guess_kanji_code(),
- *  
- */
-public class EncodingGuesser {
-	private static final int ASCII = 0; // ASCII
-	// ISO-2022-JP
-	private static final int ASCII_IN = 8; // This is after ISO2022's change
-	// Shift-JIS
-	private static final int EUC_HALFKANA = 6; // This is Half Kana in EUC-JP
-	private static final int EUC_JP = 3; // This is EUC-JP
-	private static final int ISO2022_JP = 4; // This is ISO-2022-JP
-	private static final int JIS_HALFKANA = 7; // THis is Half Kana in
-	private static final byte KT_EUC1 = 0x40;
-	private static final byte KT_EUC2 = (byte) 0x80;
-	// ASCII
-	private static final byte KT_JIN = 0x01;
-	private static final byte KT_JOUT = 0x02;
-	//	private static final byte KT_ESC = 0x04;
-	//	private static final byte KT_JIS = 0x08;
-	private static final byte KT_SFT1 = 0x10;
-	private static final byte KT_SFT2 = 0x20;
-	private static final byte ktype[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 00 */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 10 */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x09, 0x08, 0x08, 0x08, /* !"#$%&' *//* " */
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, /* ()*+,-./ */
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, /* 01234567 */
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, /* 89:; <=>? */
-	0x29, 0x28, 0x2b, 0x28, 0x28, 0x28, 0x28, 0x28, /* @ABCDEFG */
-	0x2a, 0x28, 0x2a, 0x28, 0x28, 0x28, 0x28, 0x28, /* HIJKLMNO */
-	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, /* PQRSTUVW */
-	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, /* XYZ[\]^_ */
-	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, /* abcdefg */
-	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, /* hijklmno */
-	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, /* pqrstuvw */
-	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x00, /* xyz{|}~ */
-	0x20, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, /* 80 */
-	0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, /* 90 */
-	0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x20, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, /* A0 */
-	(byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, /* B0 */
-	(byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, /* C0 */
-	(byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, /* D0 */
-	(byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xe0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, /* E0 */
-	(byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, /* F0 */
-	(byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xf0, (byte) 0xc0, (byte) 0xc0, 0x00,};
-	//	private static final int ISO8859_1 = 1; // ISO-1
-	private static final int SHIFT_JIS = 2; // This is Shift-JIS
-	private static final int SJIS_HALFKANA = 5; // This is Half Kana in
-
-	/**
-	 * Currently, only Japanese encodings are supported.
-	 */
-	private static final int UNKNOWN = -1; // Unknown
-
-	/**
-	 * @return java.lang.String
-	 * @param code
-	 *            int
-	 * 
-	 * Convert private int to IANA Encoding name.
-	 */
-	private static String convertToIANAEncodingName(int code) {
-		String encoding = null;
-
-		switch (code) {
-			case SHIFT_JIS :
-			case SJIS_HALFKANA :
-				encoding = "Shift_JIS";//$NON-NLS-1$
-				break;
-			case EUC_JP :
-			case EUC_HALFKANA :
-				encoding = "EUC-JP";//$NON-NLS-1$
-				break;
-			case ISO2022_JP :
-			case JIS_HALFKANA :
-				encoding = "ISO-2022-JP";//$NON-NLS-1$
-			default :
-				break;
-		}
-
-		return encoding;
-	}
-
-	/**
-	 * Return guessed Java Encoding name target: bytes to be inspected length:
-	 * length of target
-	 */
-	public static String guessEncoding(byte[] target, int length) {
-		int code = UNKNOWN;
-
-		// Currently, only Japanese is supported.
-		String system_ctype = java.util.Locale.getDefault().getLanguage();
-		String jp_ctype = java.util.Locale.JAPANESE.getLanguage();
-		if (system_ctype.compareTo(jp_ctype) == 0) {
-			// Ok, I'm under ja_JP.
-			code = ASCII;
-			int pos = 0;
-			while ((code == ASCII) && (length > 0)) {
-				int ch1 = target[pos];
-				ch1 = ch1 & 0x000000FF;
-				int ch2 = (length >= 2) ? target[pos + 1] : 0;
-				ch2 = ch2 & 0x000000FF;
-				int ch3 = (length >= 3) ? target[pos + 2] : 0;
-				ch3 = ch3 & 0x000000FF;
-				code = guessJapaneseKanjiCode(ch1, ch2, ch3, 0);
-				pos++;
-				length--;
-			}
-			switch (code) {
-				case ISO2022_JP :
-				case JIS_HALFKANA :
-					code = ISO2022_JP;
-					break;
-				case EUC_JP :
-					code = EUC_JP;
-					break;
-				default :
-					code = SHIFT_JIS;
-			}
-		}
-		return (convertToIANAEncodingName(code));
-	}
-
-	/**
-	 * Guess the encoding. halfkana_flag = 0x01 ( detect SJIS half kana )
-	 * halfkana_flag = 0x02 ( detect EUC half kana )
-	 */
-	private static int guessJapaneseKanjiCode(int ch1, int ch2, int ch3, int halfkana_flag) {
-		boolean sjis_hankaku_flag = ((halfkana_flag & 0x01) != 0) ? true : false;
-		boolean euc_hankaku_flag = ((halfkana_flag & 0x02) != 0) ? true : false;
-
-		if (ch1 == 0)
-			return UNKNOWN;
-		if (sjis_hankaku_flag && ch1 >= 0xa1 && ch1 <= 0xdf)
-			return SJIS_HALFKANA;
-		else if (euc_hankaku_flag && ch1 == 0x8e && ch2 >= 0xa1 && ch2 <= 0xdf)
-			return EUC_HALFKANA;
-		else if (((ktype[ch1] & KT_SFT1) != 0) && ((ktype[ch2] & KT_SFT2) != 0))
-			return SHIFT_JIS;
-		else if (((ktype[ch1] & KT_EUC1) != 0) && ((ktype[ch2] & KT_EUC2) != 0))
-			return EUC_JP;
-		else if (ch1 == 0x1b && ((ktype[ch2] & KT_JIN) != 0))
-			return ISO2022_JP;
-		else if (ch1 >= 0xa1 && ch1 <= 0xdf)
-			return SJIS_HALFKANA;
-		else if (ch1 == 0x1b && ch2 == 0x28/* '(' */&& ch3 == 0x49/* 'I' */)
-			return JIS_HALFKANA;
-		else if (ch1 == 0x1b && ch2 == 0x28/* '(' */&& ((ktype[ch3] & KT_JOUT) != 0))
-			return ASCII_IN;
-
-		return ASCII;
-	}
-
-	public EncodingGuesser() {
-		super();
-	}
-}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/HTMLHeadTokenizer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/HTMLHeadTokenizer.java
deleted file mode 100644
index dc68f67..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/HTMLHeadTokenizer.java
+++ /dev/null
@@ -1,1690 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/* The following code was generated by JFlex 1.2.2 on 1/27/04 6:41 PM */
-
-/*nlsXXX*/  
-package org.eclipse.wst.html.core.internal.contenttype;
-
-import java.io.IOException;
-import java.io.Reader;
-
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
-
-
-
-/**
- * This class is a scanner generated by 
- * <a href="http://www.informatik.tu-muenchen.de/~kleing/jflex/">JFlex</a> 1.2.2
- * on 1/27/04 6:41 PM from the specification file
- * <tt>file:/D:/DevTimeSupport/HeadParsers/HTMLHeadTokenizer/HTMLHeadTokenizer.jflex</tt>
- */
-public class HTMLHeadTokenizer {
-
-	/** this character denotes the end of file */
-	final public static int YYEOF = -1;
-
-	/** lexical states */
-	final public static int ST_META_TAG = 4;
-	final public static int YYINITIAL = 0;
-	final public static int UnDelimitedString = 12;
-	final public static int DQ_STRING = 8;
-	final public static int SQ_STRING = 10;
-	final public static int ST_XMLDecl = 2;
-	final public static int QuotedAttributeValue = 6;
-
-	/**
-	 * YY_LEXSTATE[l] is the state in the DFA for the lexical state l
-	 * YY_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-	 *                  at the beginning of a line
-	 * l is of the form l = 2*k, k a non negative integer
-	 */
-	private final static int YY_LEXSTATE[] = {0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7};
-
-	/** 
-	 * Translates characters to character classes
-	 */
-	final private static String yycmap_packed = "\11\0\1\6\1\7\2\0\1\11\22\0\1\22\1\0\1\40\2\0" + "\1\44\1\0\1\43\5\0\1\34\1\0\1\42\13\0\1\45\1\12" + "\1\10\1\31\1\13\1\0\1\21\1\0\1\24\1\26\1\17\1\0" + "\1\30\1\32\1\27\2\0\1\16\1\15\1\23\1\25\1\33\1\35" + "\2\0\1\20\1\36\1\37\1\0\1\14\1\41\7\0\1\21\1\0" + "\1\24\1\26\1\17\1\0\1\30\1\32\1\27\2\0\1\16\1\15" + "\1\23\1\25\1\33\1\35\2\0\1\20\1\36\1\37\1\0\1\14" + "\1\41\101\0\1\4\3\0\1\5\17\0\1\3\16\0\1\1\20\0" + "\1\3\16\0\1\1\1\2\170\0\1\2\ufe87\0";
-
-	/** 
-	 * Translates characters to character classes
-	 */
-	final private static char[] yycmap = yy_unpack_cmap(yycmap_packed);
-
-
-	/* error codes */
-	final private static int YY_UNKNOWN_ERROR = 0;
-	final private static int YY_ILLEGAL_STATE = 1;
-	final private static int YY_NO_MATCH = 2;
-	final private static int YY_PUSHBACK_2BIG = 3;
-
-	/* error messages for the codes above */
-	final private static String YY_ERROR_MSG[] = {"Unkown internal scanner error", "Internal error: unknown state", "Error: could not match input", "Error: pushback value was too large"};
-
-	/** the input device */
-	private java.io.Reader yy_reader;
-
-	/** the current state of the DFA */
-	private int yy_state;
-
-	/** the current lexical state */
-	private int yy_lexical_state = YYINITIAL;
-
-	/** this buffer contains the current text to be matched and is
-	 the source of the yytext() string */
-	private char yy_buffer[] = new char[16384];
-
-	/** the textposition at the last accepting state */
-	private int yy_markedPos;
-
-	/** the textposition at the last state to be included in yytext */
-	private int yy_pushbackPos;
-
-	/** the current text position in the buffer */
-	private int yy_currentPos;
-
-	/** startRead marks the beginning of the yytext() string in the buffer */
-	private int yy_startRead;
-
-	/** endRead marks the last character in the buffer, that has been read
-	 from input */
-	private int yy_endRead;
-
-
-	/** the number of characters up to the start of the matched text */
-	private int yychar;
-
-
-	/** 
-	 * yy_atBOL == true <=> the scanner is currently at the beginning of a line
-	 */
-	private boolean yy_atBOL;
-
-	/** yy_atEOF == true <=> the scanner has returned a value for EOF */
-	private boolean yy_atEOF;
-
-	/** denotes if the user-EOF-code has already been executed */
-	private boolean yy_eof_done;
-
-	/* user code: */
-
-
-	private boolean hasMore = true;
-	private final static int MAX_TO_SCAN = 8000;
-	StringBuffer string = new StringBuffer();
-	// state stack for easier state handling
-	private IntStack fStateStack = new IntStack();
-	private String valueText = null;
-	boolean foundContentTypeValue = false;
-
-
-
-	public HTMLHeadTokenizer() {
-		super();
-	}
-
-	public void reset(Reader in) {
-		/* the input device */
-		yy_reader = in;
-
-		/* the current state of the DFA */
-		yy_state = 0;
-
-		/* the current lexical state */
-		yy_lexical_state = YYINITIAL;
-
-		/* this buffer contains the current text to be matched and is
-		 the source of the yytext() string */
-		java.util.Arrays.fill(yy_buffer, (char) 0);
-
-		/* the textposition at the last accepting state */
-		yy_markedPos = 0;
-
-		/* the textposition at the last state to be included in yytext */
-		yy_pushbackPos = 0;
-
-		/* the current text position in the buffer */
-		yy_currentPos = 0;
-
-		/* startRead marks the beginning of the yytext() string in the buffer */
-		yy_startRead = 0;
-
-		/** 
-		 * endRead marks the last character in the buffer, that has been read
-		 * from input 
-		 */
-		yy_endRead = 0;
-
-
-		/* the number of characters up to the start of the matched text */
-		yychar = 0;
-
-
-		/** 
-		 * yy_atBOL == true <=> the scanner is currently at the beginning 
-		 * of a line
-		 */
-		yy_atBOL = false;
-
-		/* yy_atEOF == true <=> the scanner has returned a value for EOF */
-		yy_atEOF = false;
-
-		/* denotes if the user-EOF-code has already been executed */
-		yy_eof_done = false;
-
-
-		fStateStack.clear();
-
-		hasMore = true;
-
-		// its a little wasteful to "throw away" first char array generated
-		// by class init (via auto generated code), but we really do want
-		// a small buffer for our head parsers.
-		if (yy_buffer.length != MAX_TO_SCAN) {
-			yy_buffer = new char[MAX_TO_SCAN];
-		}
-
-
-	}
-
-
-	public final HeadParserToken getNextToken() throws IOException {
-		String context = null;
-		context = primGetNextToken();
-		HeadParserToken result = null;
-		if (valueText != null) {
-			result = createToken(context, yychar, valueText);
-			valueText = null;
-		}
-		else {
-			result = createToken(context, yychar, yytext());
-		}
-		return result;
-	}
-
-	public final boolean hasMoreTokens() {
-		return hasMore && yychar < MAX_TO_SCAN;
-	}
-
-	private void pushCurrentState() {
-		fStateStack.push(yystate());
-
-	}
-
-	private void popState() {
-		yybegin(fStateStack.pop());
-	}
-
-	private HeadParserToken createToken(String context, int start, String text) {
-		return new HeadParserToken(context, start, text);
-	}
-
-
-
-	/**
-	 * Creates a new scanner
-	 * There is also a java.io.InputStream version of this constructor.
-	 *
-	 * @param   in  the java.io.Reader to read input from.
-	 */
-	public HTMLHeadTokenizer(java.io.Reader in) {
-		this.yy_reader = in;
-	}
-
-	/**
-	 * Creates a new scanner.
-	 * There is also java.io.Reader version of this constructor.
-	 *
-	 * @param   in  the java.io.Inputstream to read input from.
-	 */
-	public HTMLHeadTokenizer(java.io.InputStream in) {
-		this(new java.io.InputStreamReader(in));
-	}
-
-	/** 
-	 * Unpacks the compressed character translation table.
-	 *
-	 * @param packed   the packed character translation table
-	 * @return         the unpacked character translation table
-	 */
-	private static char[] yy_unpack_cmap(String packed) {
-		char[] map = new char[0x10000];
-		int i = 0; /* index in packed string  */
-		int j = 0; /* index in unpacked array */
-		while (i < 174) {
-			int count = packed.charAt(i++);
-			char value = packed.charAt(i++);
-			do
-				map[j++] = value;
-			while (--count > 0);
-		}
-		return map;
-	}
-
-
-	/**
-	 * Gets the next input character.
-	 *
-	 * @return      the next character of the input stream, EOF if the
-	 *              end of the stream is reached.
-	 * @exception   IOException  if any I/O-Error occurs
-	 */
-	private int yy_advance() throws java.io.IOException {
-
-		/* standard case */
-		if (yy_currentPos < yy_endRead)
-			return yy_buffer[yy_currentPos++];
-
-		/* if the eof is reached, we don't need to work hard */
-		if (yy_atEOF)
-			return YYEOF;
-
-		/* otherwise: need to refill the buffer */
-
-		/* first: make room (if you can) */
-		if (yy_startRead > 0) {
-			System.arraycopy(yy_buffer, yy_startRead, yy_buffer, 0, yy_endRead - yy_startRead);
-
-			/* translate stored positions */
-			yy_endRead -= yy_startRead;
-			yy_currentPos -= yy_startRead;
-			yy_markedPos -= yy_startRead;
-			yy_pushbackPos -= yy_startRead;
-			yy_startRead = 0;
-		}
-
-		/* is the buffer big enough? */
-		if (yy_currentPos >= yy_buffer.length) {
-			/* if not: blow it up */
-			char newBuffer[] = new char[yy_currentPos * 2];
-			System.arraycopy(yy_buffer, 0, newBuffer, 0, yy_buffer.length);
-			yy_buffer = newBuffer;
-		}
-
-		/* finally: fill the buffer with new input */
-		int numRead = yy_reader.read(yy_buffer, yy_endRead, yy_buffer.length - yy_endRead);
-
-		if (numRead == -1)
-			return YYEOF;
-
-		yy_endRead += numRead;
-
-		return yy_buffer[yy_currentPos++];
-	}
-
-
-	/**
-	 * Closes the input stream.
-	 */
-	final public void yyclose() throws java.io.IOException {
-		yy_atEOF = true; /* indicate end of file */
-		yy_endRead = yy_startRead; /* invalidate buffer    */
-		yy_reader.close();
-	}
-
-
-	/**
-	 * Returns the current lexical state.
-	 */
-	final public int yystate() {
-		return yy_lexical_state;
-	}
-
-	/**
-	 * Enters a new lexical state
-	 *
-	 * @param newState the new lexical state
-	 */
-	final public void yybegin(int newState) {
-		yy_lexical_state = newState;
-	}
-
-
-	/**
-	 * Returns the text matched by the current regular expression.
-	 */
-	final public String yytext() {
-		return new String(yy_buffer, yy_startRead, yy_markedPos - yy_startRead);
-	}
-
-	/**
-	 * Returns the length of the matched text region.
-	 */
-	final public int yylength() {
-		return yy_markedPos - yy_startRead;
-	}
-
-
-	/**
-	 * Reports an error that occured while scanning.
-	 *
-	 * @param   errorCode  the code of the errormessage to display
-	 */
-	private void yy_ScanError(int errorCode) {
-		try {
-			System.out.println(YY_ERROR_MSG[errorCode]);
-		}
-		catch (ArrayIndexOutOfBoundsException e) {
-			System.out.println(YY_ERROR_MSG[YY_UNKNOWN_ERROR]);
-		}
-
-		System.exit(1);
-	}
-
-
-	/**
-	 * Pushes the specified amount of characters back into the input stream.
-	 *
-	 * They will be read again by then next call of the scanning method
-	 *
-	 * @param number  the number of characters to be read again.
-	 *                This number must not be greater than yylength()!
-	 */
-	private void yypushback(int number) {
-		if (number > yylength())
-			yy_ScanError(YY_PUSHBACK_2BIG);
-
-		yy_markedPos -= number;
-	}
-
-
-	/**
-	 * Contains user EOF-code, which will be executed exactly once,
-	 * when the end of file is reached
-	 */
-	private void yy_do_eof() {
-		if (!yy_eof_done) {
-			yy_eof_done = true;
-			hasMore = false;
-
-		}
-	}
-
-
-	/**
-	 * Resumes scanning until the next regular expression is matched,
-	 * the end of input is encountered or an I/O-Error occurs.
-	 *
-	 * @return      the next token
-	 * @exception   IOException  if any I/O-Error occurs
-	 */
-	public String primGetNextToken() throws java.io.IOException {
-		int yy_input;
-		int yy_action;
-
-
-		while (true) {
-
-			yychar += yylength();
-
-			yy_atBOL = yy_markedPos <= 0 || yy_buffer[yy_markedPos - 1] == '\n';
-			if (!yy_atBOL && yy_buffer[yy_markedPos - 1] == '\r') {
-				yy_atBOL = yy_advance() != '\n';
-				if (!yy_atEOF)
-					yy_currentPos--;
-			}
-
-			yy_action = -1;
-
-			yy_currentPos = yy_startRead = yy_markedPos;
-
-			if (yy_atBOL)
-				yy_state = YY_LEXSTATE[yy_lexical_state + 1];
-			else
-				yy_state = YY_LEXSTATE[yy_lexical_state];
-
-
-			yy_forAction : {
-				while (true) {
-
-					yy_input = yy_advance();
-
-					if (yy_input == YYEOF)
-						break yy_forAction;
-
-					yy_input = yycmap[yy_input];
-
-					boolean yy_isFinal = false;
-					boolean yy_noLookAhead = false;
-
-					yy_forNext : {
-						switch (yy_state) {
-							case 0 :
-								switch (yy_input) {
-									case 1 :
-										yy_isFinal = true;
-										yy_state = 9;
-										break yy_forNext;
-									case 2 :
-										yy_isFinal = true;
-										yy_state = 10;
-										break yy_forNext;
-									case 3 :
-										yy_isFinal = true;
-										yy_state = 11;
-										break yy_forNext;
-									case 10 :
-										yy_isFinal = true;
-										yy_state = 12;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 8;
-										break yy_forNext;
-								}
-
-							case 1 :
-								switch (yy_input) {
-									case 1 :
-										yy_isFinal = true;
-										yy_state = 9;
-										break yy_forNext;
-									case 2 :
-										yy_isFinal = true;
-										yy_state = 10;
-										break yy_forNext;
-									case 3 :
-										yy_isFinal = true;
-										yy_state = 11;
-										break yy_forNext;
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_isFinal = true;
-										yy_state = 13;
-										break yy_forNext;
-									case 10 :
-										yy_isFinal = true;
-										yy_state = 14;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 8;
-										break yy_forNext;
-								}
-
-							case 2 :
-								switch (yy_input) {
-									case 11 :
-										yy_isFinal = true;
-										yy_state = 15;
-										break yy_forNext;
-									case 15 :
-										yy_isFinal = true;
-										yy_state = 16;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 8;
-										break yy_forNext;
-								}
-
-							case 3 :
-								switch (yy_input) {
-									case 25 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 17;
-										break yy_forNext;
-									case 26 :
-										yy_isFinal = true;
-										yy_state = 18;
-										break yy_forNext;
-									case 34 :
-										yy_isFinal = true;
-										yy_state = 19;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 8;
-										break yy_forNext;
-								}
-
-							case 4 :
-								switch (yy_input) {
-									case 6 :
-									case 9 :
-									case 18 :
-										yy_isFinal = true;
-										yy_state = 21;
-										break yy_forNext;
-									case 7 :
-										yy_isFinal = true;
-										yy_state = 22;
-										break yy_forNext;
-									case 32 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 23;
-										break yy_forNext;
-									case 35 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 24;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 20;
-										break yy_forNext;
-								}
-
-							case 5 :
-								switch (yy_input) {
-									case 7 :
-									case 9 :
-									case 10 :
-									case 25 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 26;
-										break yy_forNext;
-									case 11 :
-									case 34 :
-										yy_isFinal = true;
-										yy_state = 27;
-										break yy_forNext;
-									case 32 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 28;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 25;
-										break yy_forNext;
-								}
-
-							case 6 :
-								switch (yy_input) {
-									case 7 :
-									case 9 :
-									case 10 :
-									case 25 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 26;
-										break yy_forNext;
-									case 34 :
-										yy_isFinal = true;
-										yy_state = 27;
-										break yy_forNext;
-									case 35 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 28;
-										break yy_forNext;
-									case 36 :
-										yy_isFinal = true;
-										yy_state = 29;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 25;
-										break yy_forNext;
-								}
-
-							case 7 :
-								switch (yy_input) {
-									case 10 :
-									case 25 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 26;
-										break yy_forNext;
-									case 34 :
-										yy_isFinal = true;
-										yy_state = 27;
-										break yy_forNext;
-									case 11 :
-										yy_isFinal = true;
-										yy_state = 29;
-										break yy_forNext;
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 30;
-										break yy_forNext;
-									case 32 :
-									case 35 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 31;
-										break yy_forNext;
-									case 37 :
-										yy_isFinal = true;
-										yy_state = 32;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 25;
-										break yy_forNext;
-								}
-
-							case 9 :
-								switch (yy_input) {
-									case 2 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 33;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 10 :
-								switch (yy_input) {
-									case 1 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 34;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 11 :
-								switch (yy_input) {
-									case 4 :
-										yy_state = 35;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 12 :
-								switch (yy_input) {
-									case 13 :
-										yy_state = 36;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 13 :
-								switch (yy_input) {
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_state = 37;
-										break yy_forNext;
-									case 10 :
-										yy_state = 38;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 14 :
-								switch (yy_input) {
-									case 13 :
-										yy_state = 36;
-										break yy_forNext;
-									case 11 :
-										yy_state = 39;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 15 :
-								switch (yy_input) {
-									case 25 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 40;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 16 :
-								switch (yy_input) {
-									case 19 :
-										yy_state = 41;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 18 :
-								switch (yy_input) {
-									case 16 :
-										yy_state = 42;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 19 :
-								switch (yy_input) {
-									case 25 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 43;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 21 :
-								switch (yy_input) {
-									case 6 :
-									case 9 :
-									case 18 :
-										yy_isFinal = true;
-										yy_state = 21;
-										break yy_forNext;
-									case 7 :
-										yy_state = 44;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 20;
-										break yy_forNext;
-								}
-
-							case 22 :
-								switch (yy_input) {
-									case 6 :
-									case 9 :
-									case 18 :
-										yy_isFinal = true;
-										yy_state = 21;
-										break yy_forNext;
-									case 7 :
-										yy_state = 44;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 20;
-										break yy_forNext;
-								}
-
-							case 27 :
-								switch (yy_input) {
-									case 25 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 45;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 29 :
-								switch (yy_input) {
-									case 25 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 46;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 32 :
-								switch (yy_input) {
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_isFinal = true;
-										yy_state = 32;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 35 :
-								switch (yy_input) {
-									case 5 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 47;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 36 :
-								switch (yy_input) {
-									case 15 :
-										yy_state = 48;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 37 :
-								switch (yy_input) {
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_state = 37;
-										break yy_forNext;
-									case 10 :
-										yy_state = 38;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 38 :
-								switch (yy_input) {
-									case 11 :
-										yy_state = 39;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 39 :
-								switch (yy_input) {
-									case 12 :
-										yy_state = 49;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 41 :
-								switch (yy_input) {
-									case 20 :
-										yy_state = 50;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 42 :
-								switch (yy_input) {
-									case 16 :
-										yy_state = 51;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 44 :
-								switch (yy_input) {
-									case 6 :
-									case 9 :
-									case 18 :
-										yy_isFinal = true;
-										yy_state = 21;
-										break yy_forNext;
-									case 7 :
-										yy_state = 44;
-										break yy_forNext;
-									default :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 20;
-										break yy_forNext;
-								}
-
-							case 48 :
-								switch (yy_input) {
-									case 16 :
-										yy_state = 52;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 49 :
-								switch (yy_input) {
-									case 13 :
-										yy_state = 53;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 50 :
-								switch (yy_input) {
-									case 21 :
-										yy_state = 54;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 51 :
-								switch (yy_input) {
-									case 27 :
-										yy_state = 55;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 52 :
-								switch (yy_input) {
-									case 17 :
-										yy_state = 56;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 53 :
-								switch (yy_input) {
-									case 14 :
-										yy_state = 57;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 54 :
-								switch (yy_input) {
-									case 22 :
-										yy_state = 58;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 55 :
-								switch (yy_input) {
-									case 28 :
-										yy_state = 59;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 56 :
-								switch (yy_input) {
-									case 18 :
-										yy_isFinal = true;
-										yy_noLookAhead = true;
-										yy_state = 60;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 57 :
-								switch (yy_input) {
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_isFinal = true;
-										yy_state = 61;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 58 :
-								switch (yy_input) {
-									case 23 :
-										yy_state = 62;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 59 :
-								switch (yy_input) {
-									case 15 :
-										yy_state = 63;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 61 :
-								switch (yy_input) {
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_isFinal = true;
-										yy_state = 61;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 62 :
-								switch (yy_input) {
-									case 19 :
-										yy_state = 64;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 63 :
-								switch (yy_input) {
-									case 29 :
-										yy_state = 65;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 64 :
-								switch (yy_input) {
-									case 24 :
-										yy_state = 66;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 65 :
-								switch (yy_input) {
-									case 30 :
-										yy_state = 67;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 66 :
-								switch (yy_input) {
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_state = 66;
-										break yy_forNext;
-									case 8 :
-										yy_isFinal = true;
-										yy_state = 68;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 67 :
-								switch (yy_input) {
-									case 23 :
-										yy_state = 69;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 68 :
-								switch (yy_input) {
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_isFinal = true;
-										yy_state = 68;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 69 :
-								switch (yy_input) {
-									case 31 :
-										yy_state = 70;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 70 :
-								switch (yy_input) {
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_state = 70;
-										break yy_forNext;
-									case 8 :
-										yy_state = 71;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 71 :
-								switch (yy_input) {
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_state = 71;
-										break yy_forNext;
-									case 20 :
-										yy_state = 72;
-										break yy_forNext;
-									case 32 :
-										yy_state = 73;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 72 :
-								switch (yy_input) {
-									case 21 :
-										yy_state = 74;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 73 :
-								switch (yy_input) {
-									case 20 :
-										yy_state = 72;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 74 :
-								switch (yy_input) {
-									case 19 :
-										yy_state = 75;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 75 :
-								switch (yy_input) {
-									case 16 :
-										yy_state = 76;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 76 :
-								switch (yy_input) {
-									case 15 :
-										yy_state = 77;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 77 :
-								switch (yy_input) {
-									case 19 :
-										yy_state = 78;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 78 :
-								switch (yy_input) {
-									case 16 :
-										yy_state = 79;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 79 :
-								switch (yy_input) {
-									case 28 :
-										yy_state = 80;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 80 :
-								switch (yy_input) {
-									case 16 :
-										yy_state = 81;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 81 :
-								switch (yy_input) {
-									case 33 :
-										yy_state = 82;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 82 :
-								switch (yy_input) {
-									case 27 :
-										yy_state = 83;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 83 :
-								switch (yy_input) {
-									case 15 :
-										yy_state = 84;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 84 :
-								switch (yy_input) {
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_state = 85;
-										break yy_forNext;
-									case 32 :
-										yy_state = 86;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 85 :
-								switch (yy_input) {
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_state = 85;
-										break yy_forNext;
-									case 20 :
-										yy_state = 87;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 86 :
-								switch (yy_input) {
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_state = 85;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 87 :
-								switch (yy_input) {
-									case 21 :
-										yy_state = 88;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 88 :
-								switch (yy_input) {
-									case 19 :
-										yy_state = 89;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 89 :
-								switch (yy_input) {
-									case 16 :
-										yy_state = 90;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 90 :
-								switch (yy_input) {
-									case 15 :
-										yy_state = 91;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 91 :
-								switch (yy_input) {
-									case 19 :
-										yy_state = 92;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 92 :
-								switch (yy_input) {
-									case 16 :
-										yy_state = 93;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 93 :
-								switch (yy_input) {
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_state = 93;
-										break yy_forNext;
-									case 8 :
-										yy_isFinal = true;
-										yy_state = 94;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							case 94 :
-								switch (yy_input) {
-									case 6 :
-									case 7 :
-									case 9 :
-									case 18 :
-										yy_isFinal = true;
-										yy_state = 94;
-										break yy_forNext;
-									default :
-										break yy_forAction;
-								}
-
-							default :
-								yy_ScanError(YY_ILLEGAL_STATE);
-								break;
-						}
-					}
-
-					if (yy_isFinal) {
-						yy_action = yy_state;
-						yy_markedPos = yy_currentPos;
-						if (yy_noLookAhead)
-							break yy_forAction;
-					}
-
-				}
-			}
-
-
-			switch (yy_action) {
-
-				case 26 :
-					{
-						yypushback(1);
-						popState();
-						valueText = string.toString();
-						return EncodingParserConstants.InvalidTerminatedStringValue;
-					}
-				case 96 :
-					break;
-				case 20 :
-				case 21 :
-					{
-						yypushback(1);
-						yybegin(UnDelimitedString);
-						string.setLength(0);
-					}
-				case 97 :
-					break;
-				case 17 :
-					{
-						yybegin(YYINITIAL);
-						if (foundContentTypeValue)
-							hasMore = false;
-						return HTMLHeadTokenizerConstants.MetaTagEnd;
-					}
-				case 98 :
-					break;
-				case 31 :
-					{
-						yypushback(1);
-						popState();
-						valueText = string.toString();
-						return EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue;
-					}
-				case 99 :
-					break;
-				case 43 :
-					{
-						yybegin(YYINITIAL);
-						if (foundContentTypeValue)
-							hasMore = false;
-						return HTMLHeadTokenizerConstants.MetaTagEnd;
-					}
-				case 100 :
-					break;
-				case 45 :
-					{
-						yypushback(2);
-						popState();
-						valueText = string.toString();
-						return EncodingParserConstants.InvalidTerminatedStringValue;
-					}
-				case 101 :
-					break;
-				case 46 :
-					{
-						yypushback(2);
-						popState();
-						valueText = string.toString();
-						return EncodingParserConstants.InvalidTerminatedStringValue;
-					}
-				case 102 :
-					break;
-				case 61 :
-					{
-						if (yychar == 0) {
-							yybegin(ST_XMLDecl);
-							return XMLHeadTokenizerConstants.XMLDeclStart;
-						}
-					}
-				case 103 :
-					break;
-				case 8 :
-				case 9 :
-				case 10 :
-				case 11 :
-				case 12 :
-				case 13 :
-				case 14 :
-				case 15 :
-				case 16 :
-				case 18 :
-				case 19 :
-				case 22 :
-					{
-						if (yychar > MAX_TO_SCAN) {
-							hasMore = false;
-							return EncodingParserConstants.MAX_CHARS_REACHED;
-						}
-					}
-				case 104 :
-					break;
-				case 60 :
-					{
-						yybegin(ST_META_TAG);
-						return HTMLHeadTokenizerConstants.MetaTagStart;
-					}
-				case 105 :
-					break;
-				case 40 :
-					{
-						yybegin(YYINITIAL);
-						return XMLHeadTokenizerConstants.XMLDeclEnd;
-					}
-				case 106 :
-					break;
-				case 94 :
-					{
-						pushCurrentState();
-						yybegin(QuotedAttributeValue);
-						foundContentTypeValue = true;
-						return HTMLHeadTokenizerConstants.MetaTagContentType;
-					}
-				case 107 :
-					break;
-				case 68 :
-					{
-						pushCurrentState();
-						yybegin(QuotedAttributeValue);
-						return XMLHeadTokenizerConstants.XMLDelEncoding;
-					}
-				case 108 :
-					break;
-				case 33 :
-					{
-						hasMore = false;
-						return EncodingParserConstants.UTF16BE;
-					}
-				case 109 :
-					break;
-				case 34 :
-					{
-						hasMore = false;
-						return EncodingParserConstants.UTF16LE;
-					}
-				case 110 :
-					break;
-				case 47 :
-					{
-						hasMore = false;
-						return EncodingParserConstants.UTF83ByteBOM;
-					}
-				case 111 :
-					break;
-				case 28 :
-					{
-						popState();
-						valueText = string.toString();
-						return EncodingParserConstants.StringValue;
-					}
-				case 112 :
-					break;
-				case 25 :
-				case 27 :
-				case 29 :
-				case 32 :
-					{
-						string.append(yytext());
-					}
-				case 113 :
-					break;
-				case 24 :
-					{
-						yybegin(SQ_STRING);
-						string.setLength(0);
-					}
-				case 114 :
-					break;
-				case 23 :
-					{
-						yybegin(DQ_STRING);
-						string.setLength(0);
-					}
-				case 115 :
-					break;
-				case 30 :
-					{
-						yypushback(1);
-						popState();
-						valueText = string.toString();
-						return EncodingParserConstants.UnDelimitedStringValue;
-					}
-				case 116 :
-					break;
-				default :
-					if (yy_input == YYEOF && yy_startRead == yy_currentPos) {
-						yy_atEOF = true;
-						yy_do_eof();
-						{
-							hasMore = false;
-							return EncodingParserConstants.EOF;
-						}
-					}
-					else {
-						yy_ScanError(YY_NO_MATCH);
-					}
-			}
-		}
-	}
-
-	/**
-	 * Runs the scanner on input files.
-	 *
-	 * This main method is the debugging routine for the scanner.
-	 * It prints each returned token to System.out until the end of
-	 * file is reached, or an error occured.
-	 *
-	 * @param argv   the command line, contains the filenames to run
-	 *               the scanner on.
-	 */
-	public static void main(String argv[]) {
-		for (int i = 0; i < argv.length; i++) {
-			HTMLHeadTokenizer scanner = null;
-			try {
-				scanner = new HTMLHeadTokenizer(new java.io.FileReader(argv[i]));
-			}
-			catch (java.io.FileNotFoundException e) {
-				System.out.println("File not found : \"" + argv[i] + "\"");
-				System.exit(1);
-			}
-			catch (ArrayIndexOutOfBoundsException e) {
-				System.out.println("Usage : java HTMLHeadTokenizer <inputfile>");
-				System.exit(1);
-			}
-
-			try {
-				do {
-					System.out.println(scanner.primGetNextToken());
-				}
-				while (!scanner.yy_atEOF);
-
-			}
-			catch (java.io.IOException e) {
-				System.out.println("An I/O error occured while scanning :");
-				System.out.println(e);
-				System.exit(1);
-			}
-			catch (Exception e) {
-				e.printStackTrace();
-				System.exit(1);
-			}
-		}
-	}
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/HTMLHeadTokenizerConstants.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/HTMLHeadTokenizerConstants.java
deleted file mode 100644
index 938bcde..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/HTMLHeadTokenizerConstants.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contenttype;
-
-
-public interface HTMLHeadTokenizerConstants {
-
-	String MetaTagEnd = "MetaTagEnd"; //$NON-NLS-1$
-	String MetaTagStart = "MetaTagStart"; //$NON-NLS-1$
-	String MetaTagContentType = "MetaTagContentType"; //$NON-NLS-1$
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/HTMLResourceEncodingDetector.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/HTMLResourceEncodingDetector.java
deleted file mode 100644
index bff2219..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/HTMLResourceEncodingDetector.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contenttype;
-
-import java.io.IOException;
-import java.util.regex.Pattern;
-
-import org.eclipse.wst.sse.core.internal.encoding.CodedIO;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-
-public class HTMLResourceEncodingDetector extends AbstractResourceEncodingDetector implements IResourceCharsetDetector {
-
-	private HTMLHeadTokenizer fTokenizer;
-
-	/**
-	 * There is no spec defined encoding for HTML (historically), so null is
-	 * returned.
-	 */
-	public String getSpecDefaultEncoding() {
-		return null;
-	}
-
-	private boolean canHandleAsUnicodeStream(String tokenType) {
-		boolean canHandleAsUnicodeStream = false;
-		if (tokenType == EncodingParserConstants.UTF83ByteBOM) {
-			canHandleAsUnicodeStream = true;
-			String enc = "UTF-8"; //$NON-NLS-1$
-			createEncodingMemento(enc, EncodingMemento.DETECTED_STANDARD_UNICODE_BYTES);
-			fEncodingMemento.setUTF83ByteBOMUsed(true);
-		}
-		else if (tokenType == EncodingParserConstants.UTF16BE) {
-			canHandleAsUnicodeStream = true;
-			String enc = "UTF-16BE"; //$NON-NLS-1$
-			createEncodingMemento(enc, EncodingMemento.DETECTED_STANDARD_UNICODE_BYTES);
-		}
-		else if (tokenType == EncodingParserConstants.UTF16LE) {
-			canHandleAsUnicodeStream = true;
-			String enc = "UTF-16"; //$NON-NLS-1$
-			createEncodingMemento(enc, EncodingMemento.DETECTED_STANDARD_UNICODE_BYTES);
-		}
-		return canHandleAsUnicodeStream;
-	}
-
-	/**
-	 * @return Returns the tokenizer.
-	 */
-	private HTMLHeadTokenizer getTokenizer() {
-		// TODO: need to work on 'reset' in tokenizer, so new instance isn't
-		// always needed
-		//if (fTokenizer == null) {
-		fTokenizer = new HTMLHeadTokenizer();
-		//		}
-		return fTokenizer;
-	}
-
-	private boolean isLegalString(String valueTokenType) {
-		if (valueTokenType == null)
-			return false;
-		else
-			return valueTokenType.equals(EncodingParserConstants.StringValue) || valueTokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || valueTokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || valueTokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
-	}
-
-	protected void parseInput() throws IOException {
-		checkInContent();
-		if (fEncodingMemento == null) {
-			checkHeuristics();
-		}
-	}
-
-	/**
-	 *  
-	 */
-	private void checkHeuristics() throws IOException {
-		boolean noHeuristic = false;
-		String heuristicEncoding = null;
-		try {
-			fReader.reset();
-			fReader.mark(CodedIO.MAX_MARK_SIZE);
-			byte[] bytes = new byte[CodedIO.MAX_MARK_SIZE];
-			int nRead = 0;
-			for (int i = 0; i < bytes.length; i++) {
-				if (fReader.ready()) {
-					int oneByte = fReader.read();
-					nRead++;
-					if (oneByte <= 0xFF) {
-						bytes[i] = (byte) oneByte;
-					}
-					else {
-						noHeuristic = true;
-						break;
-					}
-				}
-				else {
-					break;
-				}
-			}
-			if (!noHeuristic) {
-				heuristicEncoding = EncodingGuesser.guessEncoding(bytes, nRead);
-			}
-		}
-		catch (IOException e) {
-			// if any IO exception, then not a heuristic case
-		}
-		finally {
-			fReader.reset();
-		}
-		if (heuristicEncoding != null) {
-			createEncodingMemento(heuristicEncoding, EncodingMemento.GUESSED_ENCODING_FROM_STREAM);
-		}
-
-	}
-
-	private void checkInContent() throws IOException {
-		HTMLHeadTokenizer tokenizer = getTokenizer();
-		tokenizer.reset(fReader);
-		HeadParserToken token = null;
-		String tokenType = null;
-		String contentTypeValue = null;
-		do {
-			token = tokenizer.getNextToken();
-			tokenType = token.getType();
-			if (canHandleAsUnicodeStream(tokenType)) {
-				// side effect of canHandle is to create appropriate
-				// memento
-			}
-			else if (tokenType == HTMLHeadTokenizerConstants.MetaTagContentType) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						contentTypeValue = valueToken.getText();
-
-					}
-				}
-			}
-
-		}
-		while (tokenizer.hasMoreTokens());
-		if (contentTypeValue != null) {
-			parseContentTypeValue(contentTypeValue);
-		}
-	}
-
-	private void parseContentTypeValue(String contentType) {
-		String charset = null;
-		Pattern pattern = Pattern.compile(";\\s*charset\\s*=\\s*"); //$NON-NLS-1$
-		String[] parts = pattern.split(contentType);
-		if (parts.length > 0) {
-			// if only one item, it can still be charset instead of
-			// contentType
-			if (parts.length == 1) {
-				if (parts[0].length() > 6) {
-					String checkForCharset = parts[0].substring(0, 7);
-					if (checkForCharset.equalsIgnoreCase("charset")) { //$NON-NLS-1$
-						int eqpos = parts[0].indexOf('=');
-						eqpos = eqpos + 1;
-						if (eqpos < parts[0].length()) {
-							charset = parts[0].substring(eqpos);
-							charset = charset.trim();
-						}
-					}
-				}
-			}
-			else {
-				//fContentType = parts[0];
-			}
-		}
-		if (parts.length > 1) {
-			charset = parts[1];
-		}
-		
-		if (charset != null && charset.length() > 0) {
-			createEncodingMemento(charset, EncodingMemento.FOUND_ENCODING_IN_CONTENT);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/HeadParserToken.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/HeadParserToken.java
deleted file mode 100644
index ffd0406..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/HeadParserToken.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contenttype;
-
-public class HeadParserToken {
-	private int fStart;
-
-	private String fText;
-	private String fType;
-
-	protected HeadParserToken() {
-		super();
-	}
-
-	public HeadParserToken(String type, int start, String text) {
-		this();
-		fType = type;
-		fStart = start;
-		fText = text;
-
-	}
-
-	public String getText() {
-		return fText;
-	}
-
-	public String getType() {
-		return fType;
-	}
-
-	public String toString() {
-		return ("text: " + fText + " offset: " + fStart + " type: " + fType); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/IntStack.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/IntStack.java
deleted file mode 100644
index 5006745..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/IntStack.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contenttype;
-
-/*
- * 
- * A non-resizable class implementing the behavior of java.util.Stack, but
- * directly for the <code> integer </code> primitive.
- */
-import java.util.EmptyStackException;
-
-public class IntStack {
-	private int[] list = null;
-
-	private int size = 0;
-
-	public IntStack() {
-		this(100);
-	}
-
-	public IntStack(int maxdepth) {
-		super();
-		list = new int[maxdepth];
-		initialize();
-	}
-
-	public void clear() {
-		initialize();
-	}
-
-	public boolean empty() {
-		return size == 0;
-	}
-
-	public int get(int slot) {
-		return list[slot];
-	}
-
-	private void initialize() {
-		for (int i = 0; i < list.length; i++)
-			list[i] = -1;
-	}
-
-	/**
-	 * Returns the int at the top of the stack without removing it
-	 * 
-	 * @return int at the top of this stack.
-	 * @exception EmptyStackException
-	 *                when empty.
-	 */
-	public int peek() {
-		if (size == 0)
-			throw new EmptyStackException();
-		return list[size - 1];
-	}
-
-	/**
-	 * Removes and returns the int at the top of the stack
-	 * 
-	 * @return int at the top of this stack.
-	 * @exception EmptyStackException
-	 *                when empty.
-	 */
-	public int pop() {
-		int value = peek();
-		list[size - 1] = -1;
-		size--;
-		return value;
-	}
-
-	/**
-	 * Pushes an item onto the top of this stack.
-	 * 
-	 * @param newValue -
-	 *            the int to be pushed onto this stack.
-	 * @return the <code>newValue</code> argument.
-	 */
-	public int push(int newValue) {
-		if (size == list.length) {
-			throw new StackOverflowError();
-		}
-		list[size++] = newValue;
-		return newValue;
-	}
-
-	public int size() {
-		return list.length;
-	}
-}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/NullMemento.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/NullMemento.java
deleted file mode 100644
index 5e22af0..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contenttype/NullMemento.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.contenttype;
-
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.NonContentBasedEncodingRules;
-
-
-
-/**
- * This class can be used in place of an EncodingMemento (its super class),
- * when there is not in fact ANY encoding information. For example, when a
- * structuredDocument is created directly from a String
- */
-public class NullMemento extends EncodingMemento {
-	/**
-	 *  
-	 */
-	public NullMemento() {
-		super();
-		String defaultCharset = NonContentBasedEncodingRules.useDefaultNameRules(null);
-		setJavaCharsetName(defaultCharset);
-		setAppropriateDefault(defaultCharset);
-		setDetectedCharsetName(null);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/DOMStyleModelImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/DOMStyleModelImpl.java
deleted file mode 100644
index 7dbc200..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/DOMStyleModelImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 2, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.html.core.internal.document;
-
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.w3c.dom.Document;
-
-/**
- * @author davidw
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DOMStyleModelImpl extends DOMModelImpl {
-	public DOMStyleModelImpl() {
-		// remember, the document is created in super constructor, 
-		// via internalCreateDocument
-		super();
-	}
-
-	public void releaseFromEdit() {
-		releaseStyleSheets();
-		super.releaseFromEdit();
-	}
-
-	/**
-	 */
-	public void releaseFromRead() {
-		releaseStyleSheets();
-		super.releaseFromRead();
-	}
-
-	private void releaseStyleSheets() {
-		if (!isShared()) {
-			Document doc = getDocument();
-			if (doc instanceof DocumentStyleImpl) {
-				((DocumentStyleImpl) doc).releaseStyleSheets();
-			}
-		}
-	}
-
-	/**
-	 * createDocument method
-	 * @return org.w3c.dom.Document
-	 */
-	protected Document internalCreateDocument() {
-		DocumentStyleImpl document = new DocumentStyleImpl();
-		document.setModel(this);
-		return document;
-	}
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/DocumentStyleImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/DocumentStyleImpl.java
deleted file mode 100644
index ff46210..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/DocumentStyleImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 2, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.html.core.internal.document;
-
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetListAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.DocumentCSS;
-import org.w3c.dom.stylesheets.StyleSheetList;
-
-/**
- * @author davidw
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DocumentStyleImpl extends DocumentImpl implements IDOMDocument, DocumentCSS {
-	public DocumentStyleImpl() {
-		super();
-	}
-
-	protected DocumentStyleImpl(DocumentImpl that) {
-		super(that);
-	}
-
-	public CSSStyleDeclaration getOverrideStyle(Element element, String pseudoName) {
-		INodeAdapter adapter = getAdapterFor(IStyleSheetListAdapter.class);
-		if (adapter == null)
-			return null;
-		return ((IStyleSheetListAdapter) adapter).getOverrideStyle(element, pseudoName);
-	}
-
-	public StyleSheetList getStyleSheets() {
-		INodeAdapter adapter = getAdapterFor(IStyleSheetListAdapter.class);
-		if (adapter == null)
-			return null;
-		return ((IStyleSheetListAdapter) adapter).getStyleSheets();
-	}
-
-	protected void releaseStyleSheets() {
-		INodeAdapter adapter = getExistingAdapter(IStyleSheetListAdapter.class);
-		if (adapter == null)
-			return;
-		((IStyleSheetListAdapter) adapter).releaseStyleSheets();
-	}
-
-	/**
-	 * createElement method
-	 * @return org.w3c.dom.Element
-	 * @param tagName java.lang.String
-	 */
-	public Element createElement(String tagName) throws DOMException {
-		checkTagNameValidity(tagName);
-
-		ElementStyleImpl element = new ElementStyleImpl();
-		element.setOwnerDocument(this);
-		element.setTagName(tagName);
-		return element;
-	}
-
-	/**
-	 * cloneNode method
-	 * @return org.w3c.dom.Node
-	 * @param deep boolean
-	 */
-	public Node cloneNode(boolean deep) {
-		DocumentStyleImpl cloned = new DocumentStyleImpl(this);
-		if (deep)
-			cloned.importChildNodes(this, true);
-		return cloned;
-	}
-
-	protected void setModel(IDOMModel model) {
-		super.setModel(model);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/ElementStyleImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/ElementStyleImpl.java
deleted file mode 100644
index 943218b..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/ElementStyleImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 2, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.html.core.internal.document;
-
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.xml.core.internal.document.ElementImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.ElementCSSInlineStyle;
-import org.w3c.dom.stylesheets.LinkStyle;
-import org.w3c.dom.stylesheets.StyleSheet;
-
-public class ElementStyleImpl extends ElementImpl implements IDOMElement, ElementCSSInlineStyle, LinkStyle {
-	public ElementStyleImpl() {
-		super();
-	}
-
-	public ElementStyleImpl(ElementImpl that) {
-		super(that);
-	}
-
-	public StyleSheet getSheet() {
-		INodeAdapter adapter = getAdapterFor(IStyleSheetAdapter.class);
-		if (adapter == null)
-			return null;
-		if (!(adapter instanceof IStyleSheetAdapter))
-			return null;
-		return ((IStyleSheetAdapter) adapter).getSheet();
-	}
-
-	public CSSStyleDeclaration getStyle() {
-		INodeAdapter adapter = getAdapterFor(IStyleDeclarationAdapter.class);
-		if (adapter == null)
-			return null;
-		if (!(adapter instanceof IStyleDeclarationAdapter))
-			return null;
-		return ((IStyleDeclarationAdapter) adapter).getStyle();
-	}
-
-	protected void setOwnerDocument(Document ownerDocument) {
-		super.setOwnerDocument(ownerDocument);
-	}
-
-	protected void setTagName(String tagName) {
-		super.setTagName(tagName);
-	}
-
-	public Node cloneNode(boolean deep) {
-		ElementImpl cloned = new ElementStyleImpl(this);
-		if (deep)
-			cloneChildNodes(cloned, deep);
-		return cloned;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLConverter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLConverter.java
deleted file mode 100644
index 4207f6f..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLConverter.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.document;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.html.core.internal.cleanup.HTMLCleanupProcessorImpl;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocumentType;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-/**
- */
-public class HTMLConverter {
-
-	/**
-	 */
-	public HTMLConverter() {
-		super();
-
-	}
-
-	public void cleanupModel(IDOMModel model) {
-		if (model == null)
-			return;
-
-		HTMLCleanupProcessorImpl processor = new HTMLCleanupProcessorImpl();
-		IStructuredCleanupPreferences pref = processor.getCleanupPreferences();
-
-		// backup options
-		boolean compressEmptyElementTags = pref.getCompressEmptyElementTags();
-		boolean insertRequiredAttrs = pref.getInsertRequiredAttrs();
-		boolean insertMissingTags = pref.getInsertMissingTags();
-		boolean quoteAttrValues = pref.getQuoteAttrValues();
-		boolean formatSource = pref.getFormatSource();
-		int tagNameCase = pref.getTagNameCase();
-		int attrNameCase = pref.getAttrNameCase();
-
-		// setup options
-		pref.setCompressEmptyElementTags(true);
-		pref.setInsertRequiredAttrs(true);
-		pref.setInsertMissingTags(true);
-		pref.setQuoteAttrValues(true);
-		pref.setFormatSource(false);
-		if (model.getDocument().isXMLType()) { // XHTML
-			pref.setTagNameCase(HTMLCorePreferenceNames.LOWER);
-			pref.setAttrNameCase(HTMLCorePreferenceNames.LOWER);
-		}
-		else {
-			pref.setTagNameCase(HTMLCorePreferenceNames.ASIS);
-			pref.setAttrNameCase(HTMLCorePreferenceNames.ASIS);
-		}
-
-		processor.cleanupModel(model);
-
-		// set back options
-		pref.setCompressEmptyElementTags(compressEmptyElementTags);
-		pref.setInsertRequiredAttrs(insertRequiredAttrs);
-		pref.setInsertMissingTags(insertMissingTags);
-		pref.setQuoteAttrValues(quoteAttrValues);
-		pref.setFormatSource(formatSource);
-		pref.setTagNameCase(tagNameCase);
-		pref.setAttrNameCase(attrNameCase);
-	}
-
-	/**
-	 * declaratoin: "data" for XML declaration, such as "version=\"1.0\""
-	 * publicId: publicId for DOCTYPE declaration
-	 */
-	public void convert(IDOMModel model, String declaration, String publicId) {
-		if (model == null)
-			return;
-		setDeclaration(model, declaration, publicId);
-		cleanupModel(model);
-	}
-
-	/**
-	 * declaratoin: "data" for XML declaration, such as "version=\"1.0\""
-	 * publicId: publicId for DOCTYPE declaration
-	 */
-	public void convert(InputStream input, OutputStream output, String declaration, String publicId) throws UnsupportedEncodingException, IOException, CoreException {
-		IDOMModel model = readModel(input);
-		if (model == null)
-			return;
-		try {
-			convert(model, declaration, publicId);
-			writeModel(model, output);
-		}
-		finally {
-			if (model != null)
-				model.releaseFromEdit();
-		}
-	}
-
-	/**
-	 * declaratoin: "data" for XML declaration, such as "version=\"1.0\""
-	 * publicId: publicId for DOCTYPE declaration
-	 */
-	public void convert(IFile file, String declaration, String publicId) throws IOException, CoreException {
-		IDOMModel model = readModel(file);
-		if (model == null)
-			return;
-		try {
-			convert(model, declaration, publicId);
-			writeModel(model, file);
-		}
-		finally {
-			if (model != null)
-				model.releaseFromEdit();
-		}
-	}
-
-	/**
-	 */
-	private static void insertBreak(IDOMModel model, Node node) {
-		if (model == null || node == null)
-			return;
-		if (node.getNodeType() == Node.TEXT_NODE)
-			return;
-
-		// get delimiter string
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (structuredDocument == null)
-			return;
-		String delim = structuredDocument.getLineDelimiter();
-		if (delim == null || delim.length() == 0)
-			return;
-
-		Node parent = node.getParentNode();
-		if (parent == null)
-			return;
-		Document document = node.getOwnerDocument();
-		if (document == null)
-			return;
-		Text text = document.createTextNode(delim);
-		parent.insertBefore(text, node);
-	}
-
-	/**
-	 */
-	private IDOMModel readModel(InputStream input) throws IOException, UnsupportedEncodingException {
-		if (input == null)
-			return null;
-		// create temporary model
-		String id = input.toString() + ".html"; //$NON-NLS-1$
-		IModelManager manager = StructuredModelManager.getModelManager();
-		IStructuredModel model = manager.getModelForEdit(id, input, null);
-		if (!(model instanceof IDOMModel)) {
-			if (model == null)
-				model.releaseFromEdit();
-			return null;
-		}
-		return (IDOMModel) model;
-	}
-
-	/**
-	 */
-	private IDOMModel readModel(IFile file) throws IOException, CoreException {
-		if (file == null)
-			return null;
-		IModelManager manager = StructuredModelManager.getModelManager();
-		IStructuredModel model = manager.getModelForEdit(file);
-		if (!(model instanceof IDOMModel)) {
-			if (model != null)
-				model.releaseFromEdit();
-			return null;
-		}
-		return (IDOMModel) model;
-	}
-
-	/**
-	 */
-	public void setDeclaration(IDOMModel model, String declaration, String publicId) {
-		if (model == null)
-			return;
-		IDOMDocument document = model.getDocument();
-		if (document == null)
-			return;
-
-		try {
-			model.aboutToChangeModel();
-
-			ProcessingInstruction pi = null;
-			Node child = document.getFirstChild();
-			if (child != null && child.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) {
-				String target = child.getNodeName();
-				if (target != null && target.equals("xml")) { //$NON-NLS-1$
-					pi = (ProcessingInstruction) child;
-					child = child.getNextSibling();
-				}
-			}
-			IDOMDocumentType docType = (IDOMDocumentType) document.getDoctype();
-
-			if (declaration != null) {
-				if (pi != null) {
-					pi.setData(declaration);
-				}
-				else {
-					pi = document.createProcessingInstruction("xml", declaration); //$NON-NLS-1$
-					document.insertBefore(pi, child);
-					insertBreak(model, child);
-				}
-			}
-
-			if (publicId != null) {
-				HTMLDocumentTypeEntry entry = HTMLDocumentTypeRegistry.getInstance().getEntry(publicId);
-				String name = (entry != null ? entry.getName() : null);
-				if (name == null || name.length() == 0)
-					name = "HTML"; // default //$NON-NLS-1$
-				if (docType != null) {
-					if (!name.equals(docType.getName())) { // replace
-						Node parent = docType.getParentNode();
-						child = docType;
-						docType = (IDOMDocumentType) document.createDoctype(name);
-						parent.insertBefore(docType, child);
-						parent.removeChild(child);
-					}
-				}
-				else {
-					docType = (IDOMDocumentType) document.createDoctype(name);
-					document.insertBefore(docType, child);
-					insertBreak(model, child);
-				}
-				docType.setPublicId(publicId);
-				if (entry != null) {
-					String systemId = entry.getSystemId();
-					if (systemId != null)
-						docType.setSystemId(systemId);
-					String namespaceURI = entry.getNamespaceURI();
-					if (namespaceURI != null) {
-						Element element = document.getDocumentElement();
-						if (element != null) {
-							element.setAttribute("xmlns", namespaceURI); //$NON-NLS-1$
-						}
-					}
-				}
-			}
-		}
-		finally {
-			model.changedModel();
-		}
-	}
-
-	/**
-	 */
-	private void writeModel(IDOMModel model, OutputStream output) throws UnsupportedEncodingException, IOException, CoreException {
-		if (model == null || output == null)
-			return;
-		model.save();
-	}
-
-	/**
-	 */
-	private void writeModel(IDOMModel model, IFile file) throws IOException, CoreException {
-		if (model == null || file == null)
-			return;
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (structuredDocument == null)
-			return;
-		//ByteArrayOutputStream output = null;
-		ByteArrayInputStream input = null;
-		try {
-			//output = new
-			// ByteArrayOutputStream(structuredDocument.getLength());
-			model.save();
-			//input = new ByteArrayInputStream(output.toByteArray());
-			//file.setContents(input, true, true, null);
-		}
-		finally {
-			//			if (output != null)
-			//				output.close();
-			if (input != null)
-				input.close();
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapter.java
deleted file mode 100644
index dcd957a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapter.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.document;
-
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.provisional.contentproperties.ContentSettings;
-import org.eclipse.wst.sse.ui.internal.provisional.contentproperties.ContentSettingsChangeSubject;
-import org.eclipse.wst.sse.ui.internal.provisional.contentproperties.IContentSettings;
-import org.eclipse.wst.sse.ui.internal.provisional.contentproperties.IContentSettingsListener;
-import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter;
-import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapterImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocumentType;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Node;
-
-/**
- */
-public class HTMLDocumentTypeAdapter extends DocumentTypeAdapterImpl implements IContentSettingsListener, HTMLDocumentTypeConstants {
-
-	private HTMLDocumentTypeAdapterFactory fFactory = null;
-	private HTMLDocumentTypeEntry entry = null;
-	private boolean isXMLType = false;
-	private final static String XML = "xml"; //$NON-NLS-1$
-	private final static String XHTML = "xhtml"; //$NON-NLS-1$
-	private final static String WML = "wml"; //$NON-NLS-1$
-
-
-	/**
-	 */
-	protected HTMLDocumentTypeAdapter() {
-		super();
-	}
-
-	/**
-	 */
-	protected HTMLDocumentTypeAdapter(IDOMDocument document, HTMLDocumentTypeAdapterFactory factory) {
-		super(document);
-
-		this.fFactory = factory;
-
-		// initialize
-		documentTypeChanged();
-
-		ContentSettingsChangeSubject.getSubject().addListener(this);
-	}
-
-	/**
-	 */
-	public void contentSettingsChanged(IResource resource) {
-		if (resource == null)
-			return;
-		IDOMDocument document = getDocument();
-		if (document == null)
-			return;
-		IDOMModel model = document.getModel();
-		if (model == null)
-			return;
-		IFile file = getFile(model);
-		if (file == null)
-			return;
-		IProject project = file.getProject();
-		if (project == null)
-			return;
-		if (!project.equals(resource.getProject()))
-			return;
-		documentTypeChanged();
-	}
-
-	/**
-	 */
-	private void documentTypeChanged() {
-		IDOMDocument document = getDocument();
-		if (document == null)
-			return; // error
-		IDOMModel model = document.getModel();
-		if (model == null)
-			return; // error
-
-		IFile file = getFile(model);
-
-		// find DOCTYPE delcaration and Public ID
-		String publicId = null;
-		DocumentType newDocumentType = findDocumentType(document);
-		if (newDocumentType != null) {
-			publicId = newDocumentType.getPublicId();
-		} else {
-			// lookup default set by contentsettings
-			publicId = getDefaultPublicId(file);
-		}
-
-		// lookup DOCTYPE registry
-		HTMLDocumentTypeEntry newEntry = null;
-		if (publicId != null) {
-			newEntry = HTMLDocumentTypeRegistry.getInstance().getEntry(publicId);
-		}
-
-		boolean newXMLType = (newEntry != null ? newEntry.isXMLType() : false);
-		boolean newWMLType = (newEntry != null ? newEntry.isWMLType() : false);
-
-		if (!newXMLType) {
-			// find XML declaration
-			if (findXMLNode(document) != null) {
-				newXMLType = true;
-			}
-
-			// check file extension
-			if (file != null) {
-				String ext = file.getFileExtension();
-				if (ext != null && ext.equalsIgnoreCase(XHTML)) {
-					newXMLType = true;
-				}
-
-				if (ext != null && ext.equalsIgnoreCase(WML)) {
-					newXMLType = true;
-					newWMLType = true;
-				}
-			}
-
-		}
-
-		if (newEntry == null) {
-			// lookup system default
-			if (newXMLType && newDocumentType == null) {
-				// use default XHTML, if it's XML and no document type
-				// declared
-				if (newWMLType)
-					newEntry = HTMLDocumentTypeRegistry.getInstance().getDefaultEntry(HTMLDocumentTypeRegistry.DEFAULT_WML);
-				else
-					newEntry = HTMLDocumentTypeRegistry.getInstance().getDefaultEntry(HTMLDocumentTypeRegistry.DEFAULT_XHTML);
-
-			} else {
-				newEntry = HTMLDocumentTypeRegistry.getInstance().getDefaultEntry(HTMLDocumentTypeRegistry.DEFAULT_HTML);
-			}
-			if (newEntry == null)
-				return; // error
-		}
-
-		if (newDocumentType == null) {
-			DocumentType oldDocumentType = getDocumentType();
-			if (oldDocumentType == null || oldDocumentType.getName() != newEntry.getName()) {
-				// create implicit DocumentType
-				DOMImplementation impl = document.getImplementation();
-				if (impl != null) {
-					String name = newEntry.getName();
-					publicId = newEntry.getPublicId();
-					String systemId = newEntry.getSystemId();
-					newDocumentType = impl.createDocumentType(name, publicId, systemId);
-				}
-			}
-		}
-
-		boolean notify = false;
-		if (this.entry != null) { // do not notify on initialization
-			notify = (newEntry != this.entry || newXMLType != this.isXMLType);
-		}
-
-		if (newDocumentType != null)
-			setDocumentType(newDocumentType);
-		this.entry = newEntry;
-		this.isXMLType = newXMLType;
-
-		if (notify)
-			notifyDocumentTypeChanged();
-	}
-
-	/**
-	 */
-	private IDOMDocumentType findDocumentType(IDOMDocument document) {
-		IDOMDocumentType documentType = (IDOMDocumentType) document.getDoctype();
-		if (documentType != null && documentType.getExistingAdapter(DocumentTypeAdapter.class) == null) {
-			// watch future changes
-			documentType.addAdapter(this);
-		}
-		return documentType;
-	}
-
-	/**
-	 */
-	private Node findXMLNode(Document document) {
-		for (Node child = document.getFirstChild(); child != null; child = child.getNextSibling()) {
-			if (child.getNodeType() != Node.PROCESSING_INSTRUCTION_NODE)
-				continue;
-			String target = child.getNodeName();
-			if (target != null && target.equals(XML)) {
-				return child;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 */
-	public int getAttrNameCase() {
-		if (isXMLType())
-			return LOWER_CASE; // XHTML
-		return this.fFactory.getAttrNameCase();
-	}
-
-	/**
-	 */
-	private String getDefaultPublicId(IFile file) {
-		if (file == null)
-			return null;
-		IProject project = file.getProject();
-		if (project == null)
-			return null;
-		IContentSettings settings = ContentSettings.getInstance();
-		if (settings == null)
-			return null;
-		String publicId = settings.getProperty(file, IContentSettings.HTML_DOCUMENT_TYPE);
-		if (publicId == null || publicId.length() == 0) {
-			// look up project default
-			publicId = settings.getProperty(project, IContentSettings.HTML_DOCUMENT_TYPE);
-		}
-		return publicId;
-	}
-
-	private IFile getFile(IStructuredModel model) {
-		IFile result = null;
-		String location = model.getBaseLocation();
-		if (location != null) {
-			IPath path = new Path(location);
-			if (!path.toFile().exists() && path.segmentCount() > 1) {
-				result = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 */
-	public int getTagNameCase() {
-		if (isXMLType())
-			return LOWER_CASE; // XHTML
-		return this.fFactory.getTagNameCase();
-	}
-
-	/**
-	 */
-	public boolean hasFeature(String feature) {
-		if (feature == null)
-			return false;
-		if (feature.equals(HTML))
-			return true;
-		if (feature.equals(SSI))
-			return true;
-		if (feature.equals(FRAMESET)) {
-			if (this.entry == null)
-				return false;
-			return this.entry.hasFrameset();
-		}
-		return false;
-	}
-
-	/**
-	 */
-	public boolean isXMLType() {
-		return this.isXMLType;
-	}
-
-	/**
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		if (notifier == null)
-			return;
-		if (notifier instanceof IDOMDocument) {
-			if (eventType != INodeNotifier.STRUCTURE_CHANGED)
-				return;
-		} else {
-			if (eventType != INodeNotifier.CHANGE)
-				return;
-		}
-		documentTypeChanged();
-	}
-
-	/**
-	 */
-	public void release() {
-		ContentSettingsChangeSubject.getSubject().removeListener(this);
-		super.release();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapterFactory.java
deleted file mode 100644
index 14028b0..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapterFactory.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.document;
-
-
-
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-
-/**
- */
-public class HTMLDocumentTypeAdapterFactory implements INodeAdapterFactory, Preferences.IPropertyChangeListener {
-
-	private int tagNameCase = DocumentTypeAdapter.LOWER_CASE;
-	private int attrNameCase = DocumentTypeAdapter.LOWER_CASE;
-	private Preferences preferences = null;
-
-	// for removal later on release()
-	private HashMap fDoc2AdapterMap = new HashMap();
-	
-	/**
-	 */
-	public HTMLDocumentTypeAdapterFactory() {
-		super();
-		this.preferences = HTMLCorePlugin.getDefault().getPluginPreferences();
-
-		if (this.preferences != null) {
-			updateCases(); // initialize
-			this.preferences.addPropertyChangeListener(this);
-		}
-	}
-
-	/**
-	 * Method that returns the adapter associated with the given object. It
-	 * may be a singleton or not ... depending on the needs of the
-	 * INodeAdapter ... but in general it is recommended for an adapter to be
-	 * stateless, so the efficiencies of a singleton can be gained.
-	 * 
-	 * The implementation of this method should call addAdapter on the adapted
-	 * object with the correct instance of the adapter.
-	 */
-	public INodeAdapter adapt(INodeNotifier notifier) {
-		INodeAdapter result = null;
-		// only adapt IDOMDocument
-		if (notifier instanceof IDOMDocument) {
-
-			// if already has an adapter, no need to recreate/initialize.
-			// Note: this means if "doctype" for DOM changes,
-			// theDocumentTypeAdatper for that DOM
-			// should be removed (and released) and it will be re-created next
-			// time required.
-			DocumentTypeAdapter oldAdapter = (DocumentTypeAdapter) notifier.getExistingAdapter(DocumentTypeAdapter.class);
-			if (oldAdapter != null) {
-				result = oldAdapter;
-			}
-			else {
-				
-				// if there already was an adapter
-				//if(fAdapter != null) 
-				//	fAdapter.release();
-				
-				// note, the factory is included in this case to have a central place
-				// to come back to for case preferences.
-				result = new HTMLDocumentTypeAdapter((IDOMDocument) notifier, this);
-				notifier.addAdapter(result);
-				
-				fDoc2AdapterMap.put(notifier, result);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 */
-	public int getAttrNameCase() {
-		return this.attrNameCase;
-	}
-
-	/**
-	 */
-	public int getTagNameCase() {
-		return this.tagNameCase;
-	}
-
-	/**
-	 */
-	public boolean isFactoryForType(Object type) {
-		return (type == DocumentTypeAdapter.class);
-	}
-
-	/**
-	 */
-	public void propertyChange(Preferences.PropertyChangeEvent event) {
-		if (event == null)
-			return;
-		String property = event.getProperty();
-		if (property == null)
-			return;
-
-		if (property.equals(HTMLCorePreferenceNames.TAG_NAME_CASE) || property.equals(HTMLCorePreferenceNames.ATTR_NAME_CASE)) {
-			updateCases();
-		}
-	}
-
-	/**
-	 */
-	private void updateCases() {
-		this.tagNameCase = DocumentTypeAdapter.LOWER_CASE;
-		this.attrNameCase = DocumentTypeAdapter.LOWER_CASE;
-
-		if (this.preferences == null)
-			return;
-
-		int tagCase = this.preferences.getInt(HTMLCorePreferenceNames.TAG_NAME_CASE);
-		if (tagCase == HTMLCorePreferenceNames.LOWER)
-			this.tagNameCase = DocumentTypeAdapter.LOWER_CASE;
-		else if (tagCase == HTMLCorePreferenceNames.UPPER)
-			this.tagNameCase = DocumentTypeAdapter.UPPER_CASE;
-		
-		int attCase = this.preferences.getInt(HTMLCorePreferenceNames.ATTR_NAME_CASE);
-		if (attCase == HTMLCorePreferenceNames.LOWER)
-			this.attrNameCase = DocumentTypeAdapter.LOWER_CASE;
-		else if (attCase == HTMLCorePreferenceNames.UPPER)
-			this.tagNameCase = DocumentTypeAdapter.UPPER_CASE;
-	}
-
-	/**
-	 */
-	public void release() {
-		
-		if(!fDoc2AdapterMap.isEmpty()) {
-			Object[] docs = fDoc2AdapterMap.keySet().toArray();
-			DocumentTypeAdapter adapter = null;
-			for (int i = 0; i < docs.length; i++) {
-				adapter = (DocumentTypeAdapter)fDoc2AdapterMap.get(docs[i]);
-				adapter.release();
-				((IDOMDocument)docs[i]).removeAdapter(adapter);
-			}
-			fDoc2AdapterMap.clear();
-		}
-		
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95960
-		if (this.preferences != null) {
-			this.preferences.removePropertyChangeListener(this);
-		}
-	}
-
-	/**
-	 * Overriding copy method
-	 */
-	public INodeAdapterFactory copy() {
-		return new HTMLDocumentTypeAdapterFactory();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeConstants.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeConstants.java
deleted file mode 100644
index abc3284..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeConstants.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.document;
-
-public interface HTMLDocumentTypeConstants {
-
-	public final static String HTML = "HTML"; //$NON-NLS-1$
-	public final static String FRAMESET = "FRAMESET"; //$NON-NLS-1$
-	public final static String SSI = "SSI"; //$NON-NLS-1$
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeEntry.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeEntry.java
deleted file mode 100644
index c8a51b3..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeEntry.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.document;
-
-
-
-/**
- */
-public class HTMLDocumentTypeEntry {
-
-	private String name;
-	private String publicId;
-	private String systemId;
-	private String namespaceURI;
-	private boolean isXMLType;
-	private boolean isXHTMLType;
-	private boolean isWMLType;
-	private boolean hasFrameset;
-	private String displayName;
-	private boolean isDefaultXHTML;
-	private boolean isDefaultWML;
-	private static String XHTML_NAME = "html"; //$NON-NLS-1$
-	private static String HTML_NAME = "HTML"; //$NON-NLS-1$
-
-	/**
-	 */
-	private HTMLDocumentTypeEntry() {
-		super();
-	}
-
-	/**
-	 */
-	public HTMLDocumentTypeEntry(String name, String publicId, String systemId, String namespaceURI, boolean isXHTMLType, boolean hasFrameset, String displayName, boolean isDefaultXHTML, boolean isDefaultWML, boolean isWMLType) {
-		super();
-
-		if (name != null && name.length() > 0) {
-			this.name = name;
-		}
-		else {
-			if (isXMLType)
-				this.name = XHTML_NAME;// need code for wml?
-			else
-				this.name = HTML_NAME;
-		}
-		this.publicId = publicId;
-		this.systemId = systemId;
-		this.namespaceURI = namespaceURI;
-		this.isXMLType = isXHTMLType | isWMLType;
-		this.hasFrameset = hasFrameset;
-		this.displayName = displayName;
-		this.isDefaultXHTML = isDefaultXHTML;
-		this.isDefaultWML = isDefaultWML;
-		this.isXHTMLType = isXHTMLType;
-		this.isWMLType = isWMLType;
-	}
-
-	/**
-	 */
-	public final String getName() {
-		return this.name;
-	}
-
-	/**
-	 */
-	public final String getNamespaceURI() {
-		return this.namespaceURI;
-	}
-
-	/**
-	 */
-	public final String getPublicId() {
-		return this.publicId;
-	}
-
-	/**
-	 */
-	public final String getSystemId() {
-		return this.systemId;
-	}
-
-	/**
-	 */
-	public final boolean isXMLType() {
-		return this.isXMLType;
-	}
-
-	/**
-	 */
-	public final boolean hasFrameset() {
-		return this.hasFrameset;
-	}
-
-	/**
-	 */
-	public final String getDisplayName() {
-		return this.displayName;
-	}
-
-	/**
-	 */
-	public final boolean isDefaultXHTML() {
-		return this.isDefaultXHTML;
-	}
-
-	public final boolean isDefaultWML() {
-		return this.isDefaultWML;
-	}
-
-
-	public final boolean isXHTMLType() {
-		return isXHTMLType;
-	}
-
-	public final boolean isWMLType() {
-		return isWMLType;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeRegistry.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeRegistry.java
deleted file mode 100644
index 6f9cd0c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeRegistry.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.document;
-
-
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-/**
- */
-public class HTMLDocumentTypeRegistry {
-
-	private static HTMLDocumentTypeRegistry instance = null;
-	private Hashtable entries = null;
-	private HTMLDocumentTypeEntry defaultEntry = null;
-	private HTMLDocumentTypeEntry defaultXHTMLEntry = null;
-	private HTMLDocumentTypeEntry defaultWMLEntry = null;
-	private HTMLDocumentTypeEntry defaultCHTMLEntry = null;
-
-	final static int DEFAULT_HTML = 0;
-	final static int DEFAULT_XHTML = 1;
-	final static int DEFAULT_WML = 2;
-	final static int DEFAULT_CHTML = 3;
-
-	public static final String CHTML_PUBLIC_ID = "-//W3C//DTD Compact HTML 1.0 Draft//EN";//$NON-NLS-1$
-
-	/**
-	 */
-	private HTMLDocumentTypeRegistry() {
-		super();
-
-		this.entries = new Hashtable();
-		// HTML 4.01
-		String name = "HTML";//$NON-NLS-1$
-		String publicId = "-//W3C//DTD HTML 4.01 Transitional//EN";//$NON-NLS-1$
-		String displayName = "HTML 4.01 Transitional"; //$NON-NLS-1$
-		this.defaultEntry = new HTMLDocumentTypeEntry(name, publicId, null, null, false, false, displayName, false, false, false);
-		this.entries.put(publicId, this.defaultEntry);
-		publicId = "-//W3C//DTD HTML 4.01//EN";//$NON-NLS-1$
-		displayName = "HTML 4.01 Strict"; //$NON-NLS-1$
-		this.entries.put(publicId, new HTMLDocumentTypeEntry(name, publicId, null, null, false, false, displayName, false, false, false));
-		publicId = "-//W3C//DTD HTML 4.01 Frameset//EN";//$NON-NLS-1$
-		displayName = "HTML 4.01 Frameset"; //$NON-NLS-1$
-		this.entries.put(publicId, new HTMLDocumentTypeEntry(name, publicId, null, null, false, true, displayName, false, false, false));
-		// CHTML
-		name = "HTML";//$NON-NLS-1$
-		publicId = CHTML_PUBLIC_ID;
-		displayName = "Compact HTML 1.0 Draft"; //$NON-NLS-1$
-		this.defaultCHTMLEntry = new HTMLDocumentTypeEntry(name, publicId, null, null, false, false, displayName, false, false, false);
-		this.entries.put(publicId, this.defaultCHTMLEntry);
-
-		HTMLDocumentTypeRegistryReader reader = new HTMLDocumentTypeRegistryReader();
-		if (reader != null)
-			reader.readRegistry(this);
-	}
-
-	/**
-	 */
-	void regist(String pid, HTMLDocumentTypeEntry doctype) {
-		if (pid == null || doctype == null)
-			return;
-		this.entries.put(pid, doctype);
-		if (this.defaultXHTMLEntry == null) {
-			if (doctype.isDefaultXHTML())
-				this.defaultXHTMLEntry = doctype;
-		}
-		if (this.defaultWMLEntry == null) {
-			if (doctype.isDefaultWML())
-				this.defaultWMLEntry = doctype;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public HTMLDocumentTypeEntry getDefaultEntry(int type) {
-		HTMLDocumentTypeEntry entry = null;
-		switch (type) {
-			case DEFAULT_XHTML :
-				entry = this.defaultXHTMLEntry;
-				break;
-			case DEFAULT_WML :
-				entry = this.defaultWMLEntry;
-				break;
-			case DEFAULT_CHTML :
-				entry = this.defaultCHTMLEntry;
-				break;
-			case DEFAULT_HTML :
-			default :
-				entry = this.defaultEntry;
-				break;
-		}
-		return entry;
-	}
-
-	/**
-	 * 
-	 */
-	public HTMLDocumentTypeEntry getDefaultEntry() {
-		return this.defaultEntry;
-	}
-
-	/**
-	 */
-	public HTMLDocumentTypeEntry getXHTMLDefaultEntry() {
-		return this.defaultXHTMLEntry;
-	}
-
-	/**
-	 */
-	public Enumeration getEntries() {
-		return this.entries.elements();
-	}
-
-	/**
-	 */
-	public HTMLDocumentTypeEntry getEntry(String publicId) {
-		if (publicId == null)
-			return null;
-		return (HTMLDocumentTypeEntry) this.entries.get(publicId);
-	}
-
-	/**
-	 */
-	public synchronized static HTMLDocumentTypeRegistry getInstance() {
-		if (instance == null)
-			instance = new HTMLDocumentTypeRegistry();
-		return instance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeRegistryReader.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeRegistryReader.java
deleted file mode 100644
index 2dbf6ed..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeRegistryReader.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.document;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-/**
- */
-class HTMLDocumentTypeRegistryReader {
-
-	//
-	private final static String PLUGIN_ID = "org.eclipse.wst.sse.core"; //$NON-NLS-1$
-	private final static String EXTENSION_POINT_ID = "documentTypes"; //$NON-NLS-1$
-	private final static String TAG_NAME = "documentType"; //$NON-NLS-1$
-	private final static String ATT_PID = "publicID"; //$NON-NLS-1$
-	private final static String ATT_SID = "systemID"; //$NON-NLS-1$
-	private final static String ATT_IS_XHTML = "isXHTML"; //$NON-NLS-1$
-	private final static String ATT_IS_WML = "isWML"; //$NON-NLS-1$
-	private final static String ATT_HAS_FRAMESET = "hasFrameset"; //$NON-NLS-1$
-	private final static String ATT_NSURI = "namespaceURI"; //$NON-NLS-1$
-	private final static String ATT_ENAME = "elementName"; //$NON-NLS-1$
-	private final static String ATT_DNAME = "displayName"; //$NON-NLS-1$
-	private final static String ATT_IS_DEFAULT_XHTML = "defaultXHTML"; //$NON-NLS-1$
-	private final static String ATT_IS_DEFAULT_WML = "defaultWML"; //$NON-NLS-1$
-	private final static String ATV_TRUE = "true"; //$NON-NLS-1$
-	private final static String ATV_NULL_STRING = ""; //$NON-NLS-1$
-
-	/**
-	 */
-	HTMLDocumentTypeRegistryReader() {
-		super();
-	}
-
-	/**
-	 */
-	void readRegistry(HTMLDocumentTypeRegistry reg) {
-		if (reg == null)
-			return;
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint point = registry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
-		if (point != null) {
-			IConfigurationElement[] elements = point.getConfigurationElements();
-			for (int i = 0; i < elements.length; i++) {
-				HTMLDocumentTypeEntry doctype = readElement(elements[i]);
-				// null can be returned if there's an error reading the element
-				if (doctype != null) {
-					reg.regist(doctype.getPublicId(), doctype);
-				}
-			}
-		}
-	}
-
-	/**
-	 */
-	private HTMLDocumentTypeEntry readElement(IConfigurationElement element) {
-		HTMLDocumentTypeEntry doctype = null;
-		String pid = null;
-		String sid = null;
-		String nsuri = null;
-		String root = null;
-		boolean xhtml = true;
-		boolean frameset = false;
-		String dname = null;
-		boolean defaultXhtml = false;
-		boolean defaultWML = false;
-		boolean isWML = false;
-
-		if (element.getName().equals(TAG_NAME)) {
-			pid = element.getAttribute(ATT_PID);
-			// publicID attribute is mandatory.
-			if (pid == null || pid.equals(ATV_NULL_STRING))
-				return null;
-
-			sid = element.getAttribute(ATT_SID);
-			nsuri = element.getAttribute(ATT_NSURI);
-			root = element.getAttribute(ATT_ENAME);
-			xhtml = getBoolean(element, ATT_IS_XHTML);
-			frameset = getBoolean(element, ATT_HAS_FRAMESET);
-			dname = element.getAttribute(ATT_DNAME);
-			defaultXhtml = getBoolean(element, ATT_IS_DEFAULT_XHTML);
-			defaultWML = getBoolean(element, ATT_IS_DEFAULT_WML);
-			isWML = getBoolean(element, ATT_IS_WML);
-			doctype = new HTMLDocumentTypeEntry(root, pid, sid, nsuri, xhtml, frameset, dname, defaultXhtml, defaultWML, isWML);
-		}
-		return doctype;
-	}
-
-	/**
-	 */
-	private boolean getBoolean(IConfigurationElement element, String att) {
-		String value = element.getAttribute(att);
-		if (value != null && value.equals(ATV_TRUE))
-			return true;
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapter.java
deleted file mode 100644
index 1033d09..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapter.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.document;
-
-
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.document.CMNodeUtil;
-import org.eclipse.wst.xml.core.internal.document.ModelParserAdapter;
-import org.eclipse.wst.xml.core.internal.document.TagAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * HTMLDocumentImpl class
- */
-public class HTMLModelParserAdapter implements ModelParserAdapter {
-	/**
-	 * note: I made public, temparily, so could be used by JSPLoader
-	 */
-	protected HTMLModelParserAdapter() {
-		super();
-	}
-
-	private boolean shouldTerminateAt(CMElementDeclaration parent, CMElementDeclaration child) {
-		if (!parent.supports(HTMLCMProperties.TERMINATORS))
-			return false;
-		java.util.Iterator i = (java.util.Iterator) parent.getProperty(HTMLCMProperties.TERMINATORS);
-		if (i == null)
-			return false;
-		String nextName = child.getElementName();
-		while (i.hasNext()) {
-			// NOTE: CMElementDeclaration of child is not always HTMLCMElementDeclaration.
-			// It might be one of based on DTD (for XHTML element).  So, comparison must
-			// be performed ignoring case.
-			// -- 3/20/2002
-			String terminator = (String) i.next();
-			if (terminator == null)
-				continue;
-			if (nextName.equalsIgnoreCase(terminator))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 */
-	public boolean canContain(Element element, Node child) {
-		if (element == null || child == null)
-			return false;
-		IDOMElement impl = (IDOMElement) element;
-
-		if (child.getNodeType() == Node.ELEMENT_NODE) {
-			if (!impl.isGlobalTag())
-				return true; // non HTML tag
-			IDOMElement childElement = (IDOMElement) child;
-
-			CMElementDeclaration myDec = CMNodeUtil.getElementDeclaration(element);
-			if (myDec == null)
-				return true;
-			//if (!(myDec instanceof HTMLElementDeclaration)) return true;
-			if (myDec.getContentType() == CMElementDeclaration.EMPTY)
-				return false;
-
-			if (!childElement.isGlobalTag())
-				return true; // non HTML tag
-			CMElementDeclaration childDec = CMNodeUtil.getElementDeclaration(childElement);
-			if (childDec == null)
-				return true;
-			//if (!(childDec instanceof HTMLElementDeclaration)) return true;
-
-			if (myDec instanceof HTMLElementDeclaration) {
-				if (((Boolean) ((HTMLElementDeclaration) myDec).getProperty(HTMLCMProperties.IS_JSP)).booleanValue())
-					return true;
-			}
-			if (shouldTerminateAt(myDec, childDec) && !isValidChild(myDec, childDec)) {
-				return false;
-			}
-
-			String tagName = impl.getTagName();
-			if (tagName == null)
-				return true;
-			String childName = childElement.getTagName();
-			if (childName == null)
-				return true;
-			if (!impl.hasStartTag() && !impl.hasEndTag()) {
-				// implicit element
-				if (tagName.equalsIgnoreCase(childElement.getTagName()))
-					return false;
-				if (tagName.equalsIgnoreCase(HTML40Namespace.ElementName.HEAD)) {
-					if (!childName.equalsIgnoreCase(HTML40Namespace.ElementName.META) && !childName.equalsIgnoreCase(HTML40Namespace.ElementName.TITLE) && !childName.equalsIgnoreCase(HTML40Namespace.ElementName.LINK) && !childName.equalsIgnoreCase(HTML40Namespace.ElementName.STYLE) && !childName.equalsIgnoreCase(HTML40Namespace.ElementName.BASE) && !childName.equalsIgnoreCase(HTML40Namespace.ElementName.ISINDEX)) {
-						return false;
-					}
-				}
-
-				Node parent = element.getParentNode();
-				if (parent != null && parent.getNodeType() == Node.ELEMENT_NODE) {
-					IDOMElement parentElement = (IDOMElement) parent;
-					if (!parentElement.hasStartTag() && !parentElement.hasEndTag()) {
-						if (!canContain(parentElement, child))
-							return false;
-					}
-				}
-				return true;
-			}
-
-			// contexual termination for TABLE content tags
-			boolean isTableContent = false;
-			if (childName.equalsIgnoreCase(HTML40Namespace.ElementName.TBODY) || childName.equalsIgnoreCase(HTML40Namespace.ElementName.THEAD) || childName.equalsIgnoreCase(HTML40Namespace.ElementName.TFOOT)) {
-				if (tagName.equalsIgnoreCase(HTML40Namespace.ElementName.TABLE))
-					return true;
-				isTableContent = true;
-			}
-			else if (childName.equalsIgnoreCase(HTML40Namespace.ElementName.TR)) {
-				if (tagName.equalsIgnoreCase(HTML40Namespace.ElementName.TBODY) || tagName.equalsIgnoreCase(HTML40Namespace.ElementName.THEAD) || tagName.equalsIgnoreCase(HTML40Namespace.ElementName.TFOOT) || tagName.equalsIgnoreCase(HTML40Namespace.ElementName.TABLE))
-					return true;
-				isTableContent = true;
-			}
-			else if (childName.equalsIgnoreCase(HTML40Namespace.ElementName.TD) || childName.equalsIgnoreCase(HTML40Namespace.ElementName.TH)) {
-				if (tagName.equalsIgnoreCase(HTML40Namespace.ElementName.TR) || tagName.equalsIgnoreCase(HTML40Namespace.ElementName.TBODY) || tagName.equalsIgnoreCase(HTML40Namespace.ElementName.THEAD) || tagName.equalsIgnoreCase(HTML40Namespace.ElementName.TFOOT) || tagName.equalsIgnoreCase(HTML40Namespace.ElementName.TABLE))
-					return true;
-				isTableContent = true;
-			}
-			if (isTableContent) {
-				// TABLE content tags should terminate non TABLE content tags,
-				// if in TABLE
-				for (Node parent = element.getParentNode(); parent != null; parent = parent.getParentNode()) {
-					if (parent.getNodeType() != Node.ELEMENT_NODE)
-						break;
-					IDOMElement parentElement = (IDOMElement) parent;
-					String parentName = parentElement.getTagName();
-					if (parentName == null)
-						continue;
-					if (parentName.equalsIgnoreCase(HTML40Namespace.ElementName.TABLE))
-						return false;
-				}
-			}
-			if (tagName.equalsIgnoreCase(HTML40Namespace.ElementName.EMBED)) {
-				if (!childName.equalsIgnoreCase(HTML40Namespace.ElementName.NOEMBED))
-					return false;
-			}
-		}
-		else if (child.getNodeType() == Node.TEXT_NODE) {
-			String tagName = impl.getTagName();
-			if (tagName != null && tagName.equalsIgnoreCase(HTML40Namespace.ElementName.EMBED)) {
-				IDOMText text = (IDOMText) child;
-				if (!text.isElementContentWhitespace())
-					return false;
-			}
-		}
-		else if (child.getNodeType() == Node.DOCUMENT_TYPE_NODE) {
-			if (impl.isImplicitTag())
-				return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 */
-	public boolean canBeImplicitTag(Element element) {
-		return false;
-	}
-
-	/**
-	 */
-	public boolean canBeImplicitTag(Element element, Node child) {
-		return false;
-	}
-
-	/**
-	 */
-	public Element createCommentElement(Document document, String data, boolean isJSPTag) {
-		if (document == null || data == null || data.length() == 0)
-			return null;
-
-		return createMetaElement(document, data, isJSPTag);
-	}
-
-	/**
-	 * This routine create an implicit Element for given parent and child,
-	 * such as HTML, BODY, HEAD, and TBODY for HTML document.
-	 */
-	public Element createImplicitElement(Document document, Node parent, Node child) {
-		return null;
-	}
-
-	/**
-	 */
-	private Element createMetaElement(Document document, String data, boolean isJSPTag) {
-		if (data == null || data.length() == 0)
-			return null;
-
-		TagScanner scanner = new TagScanner(data, 0, true); // one line
-		String name = scanner.nextName();
-		if (name == null || !name.equalsIgnoreCase(MetaData.METADATA))
-			return null;
-
-		String type = null;
-		boolean isStartSpan = false;
-		boolean isEndSpan = false;
-		name = scanner.nextName();
-		while (name != null) {
-			String value = scanner.nextValue();
-			if (name.equalsIgnoreCase(MetaData.TYPE)) {
-				if (value == null)
-					return null;
-				if (value.equalsIgnoreCase(MetaData.DESIGNER_CONTROL)) {
-					type = MetaData.DESIGNER_CONTROL;
-				}
-				else if (value.equalsIgnoreCase(MetaData.DYNAMIC_DATA)) {
-					type = MetaData.DYNAMIC_DATA;
-				}
-				else if (value.equalsIgnoreCase(MetaData.AUTHOR_TIME_VISUAL)) {
-					type = MetaData.AUTHOR_TIME_VISUAL;
-				}
-				else if (value.equalsIgnoreCase(MetaData.ANNOTATION)) {
-					type = MetaData.ANNOTATION;
-				}
-				else {
-					return null;
-				}
-			}
-			else if (name.equalsIgnoreCase(MetaData.STARTSPAN)) {
-				isStartSpan = true;
-			}
-			else if (name.equalsIgnoreCase(MetaData.ENDSPAN)) {
-				if (!isStartSpan)
-					isEndSpan = true;
-			}
-			name = scanner.nextName();
-		}
-		if (type == null)
-			return null;
-		if (!isStartSpan && !isEndSpan)
-			return null;
-		String metaData = null;
-		int offset = scanner.getNextOffset(); // skip new line
-		if (offset < data.length())
-			metaData = data.substring(offset);
-		if (metaData == null)
-			metaData = new String();
-
-		IDOMElement element = (IDOMElement) document.createElement(MetaData.PREFIX + type);
-
-		MetaDataAdapter adapter = new MetaDataAdapter(type);
-		if (isStartSpan) {
-			if (metaData != null)
-				adapter.setData(metaData);
-		}
-		else {
-			if (metaData != null)
-				adapter.setEndData(metaData);
-		}
-		element.addAdapter(adapter);
-		adapter.setElement(element);
-		element.setJSPTag(isJSPTag);
-
-		return element;
-	}
-
-	/**
-	 */
-	public String getFindRootName(String tagName) {
-		if (tagName == null)
-			return null;
-		// tag matching should not beyond TABLE tag except BODY tag
-		if (tagName.equalsIgnoreCase(HTML40Namespace.ElementName.BODY))
-			return null;
-		return HTML40Namespace.ElementName.TABLE;
-	}
-
-	/**
-	 */
-	public boolean isAdapterForType(Object type) {
-		return (type == ModelParserAdapter.class);
-	}
-
-	/**
-	 */
-	public boolean isEndTag(IDOMElement element) {
-		TagAdapter adapter = (TagAdapter) element.getExistingAdapter(TagAdapter.class);
-		if (adapter != null)
-			return adapter.isEndTag();
-		return element.isEndTag();
-	}
-
-	/**
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		// do nothing on notifiy change
-		// TODO: this means good candidate for regular platform adapter
-	}
-
-	private static boolean isValidChild(CMElementDeclaration parent, CMElementDeclaration child) {
-		if (parent == null || child == null)
-			return false;
-		CMContent content = parent.getContent();
-		if (content == null)
-			return false;
-		return isChild(content, child);
-	}
-
-	/**
-	 */
-	private static boolean isChild(CMContent content, CMElementDeclaration target) {
-		switch (content.getNodeType()) {
-			case CMNode.ELEMENT_DECLARATION :
-				return isSameDeclaration((CMElementDeclaration) content, target);
-			case CMNode.GROUP :
-				CMNodeList children = ((CMGroup) content).getChildNodes();
-				for (int i = 0; i < children.getLength(); i++) {
-					CMNode child = children.item(i);
-					switch (child.getNodeType()) {
-						case CMNode.ELEMENT_DECLARATION :
-							if (isSameDeclaration((CMElementDeclaration) child, target))
-								return true;
-							continue; // Go next child.
-						case CMNode.GROUP :
-							if (isChild((CMContent) child, target))
-								return true;
-							continue; // Go next child.
-						default :
-							continue; // Go next child.
-					}
-				}
-		}
-		return false;
-	}
-
-	/**
-	 */
-	private static boolean isSameDeclaration(CMElementDeclaration aDec, CMElementDeclaration otherDec) {
-		return aDec.getElementName() == otherDec.getElementName();
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapterFactory.java
deleted file mode 100644
index 397419e..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapterFactory.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.document.ModelParserAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-
-/**
- */
-public class HTMLModelParserAdapterFactory implements INodeAdapterFactory {
-
-	private static HTMLModelParserAdapterFactory instance = null;
-
-	/**
-	 */
-	private HTMLModelParserAdapterFactory() {
-		super();
-	}
-
-	/**
-	 * Method that returns the adapter associated with the given object. It
-	 * may be a singleton or not ... depending on the needs of the
-	 * INodeAdapter ... but in general it is recommended for an adapter to be
-	 * stateless, so the efficiencies of a singleton can be gained.
-	 * 
-	 * The implementation of this method should call addAdapter on the adapted
-	 * object with the correct instance of the adapter.
-	 */
-	public INodeAdapter adapt(INodeNotifier notifier) {
-		INodeAdapter adapter = null;
-		if (notifier != null) {
-			if (notifier instanceof IDOMDocument) {
-				adapter = notifier.getExistingAdapter(ModelParserAdapter.class);
-				if (adapter == null) {
-					adapter = new HTMLModelParserAdapter();
-					notifier.addAdapter(adapter);
-				}
-			}
-		}
-		return adapter;
-
-	}
-
-	/**
-	 */
-	public synchronized static HTMLModelParserAdapterFactory getInstance() {
-		if (instance == null)
-			instance = new HTMLModelParserAdapterFactory();
-		return instance;
-	}
-
-	/**
-	 */
-	public boolean isFactoryForType(Object type) {
-		return (type == ModelParserAdapter.class);
-	}
-
-	/**
-	 */
-	public void release() {
-		// no state to cleanup
-	}
-
-	/**
-	 * Overriding copy method
-	 */
-	public INodeAdapterFactory copy() {
-		return getInstance();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/MetaData.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/MetaData.java
deleted file mode 100644
index 132e18b..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/MetaData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.document;
-
-
-
-/**
- */
-public interface MetaData {
-
-	static final String METADATA = "METADATA";//$NON-NLS-1$
-	static final String TYPE = "type";//$NON-NLS-1$
-	static final String STARTSPAN = "startspan";//$NON-NLS-1$
-	static final String ENDSPAN = "endspan";//$NON-NLS-1$
-	static final String DESIGNER_CONTROL = "DesignerControl";//$NON-NLS-1$
-	static final String DYNAMIC_DATA = "DynamicData";//$NON-NLS-1$
-	static final String AUTHOR_TIME_VISUAL = "AuthorTimeVisual";//$NON-NLS-1$
-	static final String ANNOTATION = "Annotation";//$NON-NLS-1$
-	static final String PREFIX = "METADATA:";//$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/MetaDataAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/MetaDataAdapter.java
deleted file mode 100644
index 4fc4ca9..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/MetaDataAdapter.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.document;
-
-
-
-import java.util.Iterator;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.document.TagAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-/**
- */
-public class MetaDataAdapter implements TagAdapter, MetaData {
-
-	private IDOMElement element = null;
-	private String type = null;
-	private String data = null;
-	private String endData = null;
-
-	/**
-	 */
-	public MetaDataAdapter(String type) {
-		super();
-
-		if (type != null) {
-			if (type.equals(ANNOTATION)) {
-				this.type = ANNOTATION;
-			}
-			else if (type.equals(AUTHOR_TIME_VISUAL)) {
-				this.type = AUTHOR_TIME_VISUAL;
-			}
-			else {
-				this.type = type;
-			}
-		}
-	}
-
-	/**
-	 */
-	private String getData(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return null;
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null)
-			return null;
-
-		String data = null;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			String regionType = region.getType();
-			if (isCommentText(regionType)) {
-				data = flatNode.getText(region);
-				break;
-			}
-		}
-		if (data == null)
-			return null;
-		int length = data.length();
-		int offset = 0;
-		for (; offset < length; offset++) {
-			char c = data.charAt(offset);
-			if (c == '\r' || c == '\n') {
-				offset++;
-				break;
-			}
-		}
-		for (; offset < length; offset++) {
-			char c = data.charAt(offset);
-			if (c != '\r' && c != '\n') {
-				break;
-			}
-		}
-		return data.substring(offset);
-	}
-
-	private boolean isCommentText(String regionType) {
-		boolean result = false;
-		result = isDOMComment(regionType) || isNestedContentComment(regionType);
-		return result;
-	}
-
-	/**
-	 * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-	 * way for expedency. Should be evolved in future to depend on
-	 * "nestedContext".
-	 */
-
-	private boolean isNestedContentComment(String regionType) {
-		final String JSP_COMMENT_TEXT = "JSP_COMMENT_TEXT"; //$NON-NLS-1$
-		return regionType.equals(JSP_COMMENT_TEXT);
-	}
-
-	private boolean isDOMComment(String regionType) {
-		return regionType == DOMRegionContext.XML_COMMENT_TEXT;
-	}
-
-	public String getData() {
-		if (this.element == null)
-			return null;
-		IStructuredDocumentRegion flatNode = this.element.getStartStructuredDocumentRegion();
-		if (flatNode == null)
-			return null;
-		if (this.data != null)
-			return this.data;
-		return getData(flatNode);
-	}
-
-	/**
-	 */
-	private String getDelimiter(IDOMModel model) {
-		String delim = null;
-		if (model != null) {
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			if (structuredDocument != null)
-				delim = structuredDocument.getLineDelimiter();
-		}
-		if (delim == null)
-			delim = "\r\n";//$NON-NLS-1$
-		return delim;
-	}
-
-	/**
-	 */
-	public String getEndData() {
-		if (this.element == null)
-			return null;
-		IStructuredDocumentRegion flatNode = this.element.getEndStructuredDocumentRegion();
-		if (flatNode == null)
-			return null;
-		if (this.endData != null)
-			return this.endData;
-		return getData(flatNode);
-	}
-
-	/**
-	 */
-	public String getEndTag(IDOMElement element) {
-		StringBuffer buffer = new StringBuffer();
-		if (element.isJSPTag())
-			buffer.append("<%--");//$NON-NLS-1$
-		else
-			buffer.append("<!--");//$NON-NLS-1$
-		buffer.append(METADATA);
-		buffer.append(' ');
-		buffer.append(TYPE);
-		buffer.append("=\"");//$NON-NLS-1$
-		buffer.append(this.type);
-		buffer.append("\" ");//$NON-NLS-1$
-		buffer.append(MetaData.ENDSPAN);
-		String data = getEndData();
-		if (data != null && data.length() > 0) {
-			String delim = getDelimiter(element.getModel());
-			buffer.append(delim);
-			buffer.append(data);
-			buffer.append(delim);
-		}
-		if (element.isJSPTag())
-			buffer.append("--%>");//$NON-NLS-1$
-		else
-			buffer.append("-->");//$NON-NLS-1$
-
-		return buffer.toString();
-	}
-
-	/**
-	 */
-	public String getStartTag(IDOMElement element) {
-		StringBuffer buffer = new StringBuffer();
-		if (element.isJSPTag())
-			buffer.append("<%--");//$NON-NLS-1$
-		else
-			buffer.append("<!--");//$NON-NLS-1$
-		buffer.append(METADATA);
-		buffer.append(' ');
-		buffer.append(TYPE);
-		buffer.append("=\"");//$NON-NLS-1$
-		buffer.append(this.type);
-		buffer.append("\" ");//$NON-NLS-1$
-		buffer.append(MetaData.STARTSPAN);
-		String data = getData();
-		if (data != null && data.length() > 0) {
-			String delim = getDelimiter(element.getModel());
-			buffer.append(delim);
-			buffer.append(data);
-			buffer.append(delim);
-		}
-		if (element.isJSPTag())
-			buffer.append("--%>");//$NON-NLS-1$
-		else
-			buffer.append("-->");//$NON-NLS-1$
-
-		return buffer.toString();
-	}
-
-	/**
-	 */
-	public String getType() {
-		return this.type;
-	}
-
-	/**
-	 */
-	public boolean isAdapterForType(Object type) {
-		return (type == TagAdapter.class || type == MetaDataAdapter.class);
-	}
-
-	/**
-	 */
-	public boolean isEndTag() {
-		if (this.element == null)
-			return false;
-		if (this.element.hasStartTag())
-			return false;
-		if (this.element.hasEndTag())
-			return true;
-		if (this.data != null)
-			return false;
-		return (this.endData != null);
-	}
-
-	/**
-	 */
-	public boolean isRuntimeContainer() {
-		return (this.type == ANNOTATION || this.type == AUTHOR_TIME_VISUAL);
-	}
-
-	/**
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-	}
-
-	/**
-	 */
-	public void setData(String data) {
-		this.data = data;
-
-		if (this.element != null)
-			this.element.notifyStartTagChanged();
-	}
-
-	/**
-	 */
-	public void setEndData(String data) {
-		this.endData = data;
-
-		if (this.element != null)
-			this.element.notifyEndTagChanged();
-	}
-
-	/**
-	 */
-	public void setElement(IDOMElement element) {
-		this.element = element;
-
-		if (this.element != null) {
-			this.element.setCommentTag(true);
-			if (this.type != MetaData.ANNOTATION) {
-				this.element.setJSPTag(true);
-			}
-		}
-	}
-
-	/**
-	 */
-	public void setRuntimeSource(String source) {
-		if (source == null)
-			return;
-		if (this.element == null)
-			return;
-		if (isRuntimeContainer())
-			return;
-
-		IDOMModel model = this.element.getModel();
-		if (model == null)
-			return;
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (structuredDocument == null)
-			return;
-		int offset = this.element.getStartEndOffset();
-		int end = this.element.getEndStartOffset();
-		int length = end - offset;
-		structuredDocument.replaceText(model, offset, length, source);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/TagScanner.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/TagScanner.java
deleted file mode 100644
index 17e0bb1..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/TagScanner.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.document;
-
-
-
-/**
- */
-class TagScanner {
-
-	private String tag = null;
-	private int offset = 0;
-	private int length = 0;
-	private boolean oneLine = false;
-
-	/**
-	 */
-	TagScanner(String tag, int offset) {
-		super();
-
-		this.tag = tag;
-		this.offset = offset;
-		if (tag != null)
-			this.length = tag.length();
-	}
-
-	/**
-	 */
-	TagScanner(String tag, int offset, boolean oneLine) {
-		this(tag, offset);
-
-		this.oneLine = oneLine;
-	}
-
-	/**
-	 */
-	int getNextOffset() {
-		for (; this.offset < this.length; this.offset++) {
-			char c = this.tag.charAt(this.offset);
-			if (!isEnd(c))
-				break;
-		}
-		return this.offset;
-	}
-
-	/**
-	 */
-	int getOffset() {
-		return this.offset;
-	}
-
-	/**
-	 */
-	private final boolean isEnd(char c) {
-		return (this.oneLine && (c == '\r' || c == '\n'));
-	}
-
-	/**
-	 */
-	private static boolean isEqual(char c) {
-		return (c == '=');
-	}
-
-	/**
-	 */
-	private static boolean isQuote(char c) {
-		return (c == '"' || c == '\'');
-	}
-
-	/**
-	 */
-	private static boolean isSpace(char c) {
-		return Character.isWhitespace(c);
-	}
-
-	/**
-	 */
-	private char nextChar() {
-		for (; this.offset < this.length; this.offset++) {
-			char c = this.tag.charAt(this.offset);
-			if (isEnd(c))
-				break;
-			if (!isSpace(c))
-				return c;
-		}
-		return 0;
-	}
-
-	/**
-	 */
-	String nextName() {
-		if (this.tag == null)
-			return null;
-		if (this.offset >= this.length)
-			return null;
-
-		if (nextChar() == 0)
-			return null;
-
-		int nameOffset = this.offset;
-		for (; this.offset < this.length; this.offset++) {
-			char c = this.tag.charAt(this.offset);
-			if (isEnd(c) || isSpace(c))
-				break;
-			if (isEqual(c) && this.offset > nameOffset)
-				break;
-		}
-		if (this.offset == nameOffset)
-			return null;
-
-		return this.tag.substring(nameOffset, this.offset);
-	}
-
-	/**
-	 */
-	String nextValue() {
-		if (this.tag == null)
-			return null;
-		if (this.offset >= this.length)
-			return null;
-
-		char seperator = nextChar();
-		if (!isEqual(seperator))
-			return null;
-		this.offset++; // skip '='
-		char quote = nextChar();
-		if (quote == 0)
-			return null;
-		if (isQuote(quote))
-			this.offset++;
-		else
-			quote = 0;
-
-		int valueOffset = this.offset;
-		for (; this.offset < this.length; this.offset++) {
-			char c = this.tag.charAt(this.offset);
-			if (isEnd(c)) {
-				quote = 0;
-				break;
-			}
-			if (quote == 0) {
-				if (isSpace(c))
-					break;
-			}
-			else {
-				if (c == quote)
-					break;
-			}
-		}
-		int valueEnd = this.offset;
-		if (quote != 0 && this.offset < this.length)
-			this.offset++;
-		if (valueEnd == valueOffset)
-			return null;
-
-		return this.tag.substring(valueOffset, valueEnd);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/UnknownTagAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/UnknownTagAdapter.java
deleted file mode 100644
index c6fcf4a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/UnknownTagAdapter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.document.TagAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-/**
- */
-public class UnknownTagAdapter implements TagAdapter {
-
-	private String startTag = null;
-	private String endTag = null;
-
-	/**
-	 */
-	public UnknownTagAdapter() {
-		super();
-	}
-
-	/**
-	 */
-	public String getEndTag(IDOMElement element) {
-		String tag = null;
-		if (this.endTag != null) {
-			tag = this.endTag;
-			this.endTag = null;
-		}
-		return tag;
-	}
-
-	/**
-	 */
-	public String getStartTag(IDOMElement element) {
-		String tag = null;
-		if (this.startTag != null) {
-			tag = this.startTag;
-			this.startTag = null;
-		}
-		return tag;
-	}
-
-	/**
-	 */
-	public boolean isAdapterForType(Object type) {
-		return (type == TagAdapter.class);
-	}
-
-	/**
-	 */
-	public boolean isEndTag() {
-		return false;
-	}
-
-	/**
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-	}
-
-	/**
-	 */
-	public void setEndTag(String endTag) {
-		this.endTag = endTag;
-	}
-
-	/**
-	 */
-	public void setStartTag(String startTag) {
-		this.startTag = startTag;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentCharsetDetector.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentCharsetDetector.java
deleted file mode 100644
index a0242c9..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentCharsetDetector.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.encoding;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.html.core.internal.contenttype.HTMLResourceEncodingDetector;
-import org.eclipse.wst.sse.core.internal.document.DocumentReader;
-import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
-
-/**
- * This class parses beginning portion of HTML file to get the encoding value
- * in a META tag. Example:
- * <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- * 
- * Note: even though, technically, a META tag must come in a <HEAD>tag, we
- * don't check for that, under the assumption that whatever, or whereever, the
- * the first <META>tag is, it is the one intended to be used by the user, and
- * they may just be trying to repair the error. The HTML validator will tell
- * them if its in the wrong location.
- *  
- */
-public class HTMLDocumentCharsetDetector extends HTMLResourceEncodingDetector implements IDocumentCharsetDetector {
-
-
-	public HTMLDocumentCharsetDetector() {
-		super();
-	}
-
-	public void set(IDocument document) {
-		set(new DocumentReader(document, 0));
-
-
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentLoader.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentLoader.java
deleted file mode 100644
index 43a50a9..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentLoader.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.encoding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.wst.html.core.internal.contenttype.EncodingGuesser;
-import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeAdapterFactory;
-import org.eclipse.wst.html.core.internal.document.HTMLModelParserAdapterFactory;
-import org.eclipse.wst.html.core.internal.htmlcss.HTMLStyleSelectorAdapterFactory;
-import org.eclipse.wst.html.core.internal.htmlcss.StyleAdapterFactory;
-import org.eclipse.wst.html.core.internal.modelquery.ModelQueryAdapterFactoryForHTML;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.html.core.internal.text.StructuredTextPartitionerForHTML;
-import org.eclipse.wst.sse.core.internal.PropagatingAdapter;
-import org.eclipse.wst.sse.core.internal.document.AbstractDocumentLoader;
-import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
-import org.eclipse.wst.xml.core.internal.parser.XMLStructuredDocumentReParser;
-import org.eclipse.wst.xml.core.internal.propagate.PropagatingAdapterFactoryImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-public class HTMLDocumentLoader extends AbstractDocumentLoader {
-
-	public HTMLDocumentLoader() {
-		super();
-	}
-
-	/**
-	 * Convenience method to add tag names using BlockMarker object
-	 */
-	protected void addHTMLishTag(XMLSourceParser parser, String tagname) {
-		BlockMarker bm = new BlockMarker(tagname, null, DOMRegionContext.BLOCK_TEXT, false);
-		parser.addBlockMarker(bm);
-	}
-
-	/**
-	 * Default encoding. For HTML, there is no spec.
-	 */
-	protected String getSpecDefaultEncoding() {
-		return null;
-	}
-
-	/**
-	 * @return java.lang.String
-	 * @param string
-	 *            byte[]
-	 * @param length
-	 *            int
-	 * 
-	 * Do automatic encoding detection by guess
-	 */
-	protected String getEncodingNameByGuess(byte[] string, int length) {
-		final String ianaEnc = EncodingGuesser.guessEncoding(string, length);
-		return ianaEnc;
-	}
-
-	/*
-	 * @see AbstractLoader#createNewStructuredDocument()
-	 */
-	protected IEncodedDocument newEncodedDocument() {
-		IStructuredDocument structuredDocument = StructuredDocumentFactory.getNewStructuredDocumentInstance(getParser());
-		((BasicStructuredDocument) structuredDocument).setReParser(new XMLStructuredDocumentReParser());
-
-		return structuredDocument;
-	}
-
-	/*
-	 * @see IModelLoader#getParser()
-	 */
-	public RegionParser getParser() {
-		XMLSourceParser parser = new XMLSourceParser();
-		// for the "static HTML" case, we need to initialize
-		// Blocktags here.
-		addHTMLishTag(parser, "script"); //$NON-NLS-1$
-		addHTMLishTag(parser, "style"); //$NON-NLS-1$
-		return parser;
-	}
-
-	/**
-	 * This method must return those factories which must be attached to the
-	 * structuredModel before content is applied.
-	 */
-	public List getAdapterFactories() {
-		List result = new ArrayList();
-		INodeAdapterFactory factory = null;
-		factory = StyleAdapterFactory.getInstance();
-		result.add(factory);
-		factory = HTMLStyleSelectorAdapterFactory.getInstance();
-		result.add(factory);
-		factory = new HTMLDocumentTypeAdapterFactory();
-		result.add(factory);
-		factory = HTMLModelParserAdapterFactory.getInstance();
-		result.add(factory);
-		//
-		factory = new ModelQueryAdapterFactoryForHTML();
-		result.add(factory);
-
-		factory = new PropagatingAdapterFactoryImpl();
-		result.add(factory);
-
-
-		return result;
-	}
-
-	protected String getPreferredNewLineDelimiter() {
-		return ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForHTML.ContentTypeID_HTML);
-	}
-
-	public IDocumentCharsetDetector getDocumentEncodingDetector() {
-		if (fDocumentEncodingDetector == null) {
-			fDocumentEncodingDetector = new HTMLDocumentCharsetDetector();
-		}
-		return fDocumentEncodingDetector;
-	}
-
-	protected void preLoadAdapt(IStructuredModel structuredModel) {
-		// DMW: just added this preload on 8/16/2002
-		// I noticed the ProagatingAdapterFactory was being added,
-		// that that the ProagatingAdapterAdapter was not being
-		// preload adapted -- I'm assuing it ALWAYS has to be.
-		IDOMModel domModel = (IDOMModel) structuredModel;
-		// if there is a model in the adapter, this will adapt it to
-		// first node. After that the PropagatingAdater spreads over the
-		// children being
-		// created. Each time that happends, a side effect is to
-		// also "spread" sprecific registered adapters,
-		// they two can propigate is needed.
-		((INodeNotifier) domModel.getDocument()).getAdapterFor(PropagatingAdapter.class);
-	}
-
-	public IDocumentPartitioner getDefaultDocumentPartitioner() {
-		return new StructuredTextPartitionerForHTML();
-	}
-
-	public IDocumentLoader newInstance() {
-		return new HTMLDocumentLoader();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLModelLoader.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLModelLoader.java
deleted file mode 100644
index 0f84fc8..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLModelLoader.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.encoding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.html.core.internal.document.DOMStyleModelImpl;
-import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeAdapterFactory;
-import org.eclipse.wst.html.core.internal.document.HTMLModelParserAdapterFactory;
-import org.eclipse.wst.html.core.internal.htmlcss.HTMLStyleSelectorAdapterFactory;
-import org.eclipse.wst.html.core.internal.htmlcss.StyleAdapterFactory;
-import org.eclipse.wst.html.core.internal.modelquery.ModelQueryAdapterFactoryForHTML;
-import org.eclipse.wst.sse.core.internal.PropagatingAdapter;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.model.AbstractModelLoader;
-import org.eclipse.wst.sse.core.internal.provisional.IModelLoader;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.xml.core.internal.DebugAdapterFactory;
-import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
-import org.eclipse.wst.xml.core.internal.propagate.PropagatingAdapterFactoryImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-public class HTMLModelLoader extends AbstractModelLoader {
-
-
-	public HTMLModelLoader() {
-		super();
-	}
-
-	/**
-	 * Convenience method to add tag names using BlockMarker object
-	 */
-	protected void addHTMLishTag(XMLSourceParser parser, String tagname) {
-		BlockMarker bm = new BlockMarker(tagname, null, DOMRegionContext.BLOCK_TEXT, false);
-		parser.addBlockMarker(bm);
-	}
-
-	public IStructuredModel newModel() {
-		DOMStyleModelImpl model = new DOMStyleModelImpl();
-		return model;
-	}
-
-	/**
-	 * This method must return those factories which must be attached to the
-	 * structuredModel before content is applied.
-	 */
-	public List getAdapterFactories() {
-		List result = new ArrayList();
-		INodeAdapterFactory factory = null;
-		factory = StyleAdapterFactory.getInstance();
-		result.add(factory);
-		factory = HTMLStyleSelectorAdapterFactory.getInstance();
-		result.add(factory);
-		factory = new HTMLDocumentTypeAdapterFactory();
-		result.add(factory);
-		factory = HTMLModelParserAdapterFactory.getInstance();
-		result.add(factory);
-		//
-		factory = new ModelQueryAdapterFactoryForHTML();
-		result.add(factory);
-
-		factory = new PropagatingAdapterFactoryImpl();
-		result.add(factory);
-		
-
-		return result;
-	}
-
-	protected void preLoadAdapt(IStructuredModel structuredModel) {
-		super.preLoadAdapt(structuredModel);
-		// DMW: just added this preload on 8/16/2002
-		// I noticed the ProagatingAdapterFactory was being added,
-		// that that the ProagatingAdapterAdapter was not being
-		// preload adapted -- I'm assuing it ALWAYS has to be.
-		IDOMModel domModel = (IDOMModel) structuredModel;
-		// if there is a model in the adapter, this will adapt it to
-		// first node. After that the PropagatingAdater spreads over the
-		// children being
-		// created. Each time that happends, a side effect is to
-		// also "spread" sprecific registered adapters,
-		// they two can propigate is needed.
-		((INodeNotifier) domModel.getDocument()).getAdapterFor(PropagatingAdapter.class);
-		if (Debug.debugNotificationAndEvents) {
-			PropagatingAdapter propagatingAdapter = (PropagatingAdapter) ((INodeNotifier) domModel.getDocument()).getAdapterFor(PropagatingAdapter.class);
-			propagatingAdapter.addAdaptOnCreateFactory(new DebugAdapterFactory());
-		}	}
-
-	public IModelLoader newInstance() {
-		return new HTMLModelLoader();
-	}
-
-	public IDocumentLoader getDocumentLoader() {
-		if (documentLoaderInstance == null) {
-			documentLoaderInstance = new HTMLDocumentLoader();
-		}
-		return documentLoaderInstance;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/EmbeddedCSSFormatter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/EmbeddedCSSFormatter.java
deleted file mode 100644
index 294906c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/EmbeddedCSSFormatter.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.format;
-
-
-
-import org.eclipse.wst.css.core.internal.format.CSSSourceFormatter;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.html.core.internal.provisional.HTMLFormatContraints;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
-
-// nakamori_TODO: check and remove
-
-public class EmbeddedCSSFormatter extends HTMLFormatter {
-
-	//private IAdapterFactory factory = new CSSSourceFormatterFactory(CSSSourceFormatter.class, true);
-	/**
-	 */
-	protected EmbeddedCSSFormatter() {
-		super();
-	}
-
-	/**
-	 */
-	protected void formatNode(IDOMNode node, HTMLFormatContraints contraints) {
-		if (node == null)
-			return;
-		IDOMText text = (IDOMText) node;
-
-		String source = getCSSContent(node);
-		if (source == null) { // fallback
-			source = text.getSource();
-		}
-
-		int offset = text.getStartOffset();
-		int length = text.getEndOffset() - offset;
-		replaceSource(text.getModel(), offset, length, source);
-		setWidth(contraints, source);
-	}
-
-	/**
-	 */
-	private String getCSSContent(IDOMNode text) {
-		ICSSModel model = getCSSModel(text);
-		if (model == null)
-			return null;
-		ICSSNode document = model.getDocument();
-		if (document == null)
-			return null;
-		INodeNotifier notifier = (INodeNotifier) document;
-		INodeAdapter adapter = notifier.getAdapterFor(CSSSourceFormatter.class);
-		if (adapter == null)
-			return null;
-		CSSSourceFormatter formatter = (CSSSourceFormatter) adapter;
-		StringBuffer buffer = formatter.format(document);
-		if (buffer == null)
-			return null;
-		return buffer.toString();
-	}
-
-	/**
-	 */
-	private ICSSModel getCSSModel(IDOMNode text) {
-		if (text == null)
-			return null;
-		INodeNotifier notifier = (INodeNotifier) text.getParentNode();
-		if (notifier == null)
-			return null;
-		INodeAdapter adapter = notifier.getAdapterFor(IStyleSheetAdapter.class);
-		if (adapter == null)
-			return null;
-		if (!(adapter instanceof IStyleSheetAdapter))
-			return null;
-		IStyleSheetAdapter styleAdapter = (IStyleSheetAdapter) adapter;
-		return styleAdapter.getModel();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLElementFormatter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLElementFormatter.java
deleted file mode 100644
index 27fcc9b..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLElementFormatter.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.format;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.format.CSSSourceFormatter;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.html.core.internal.provisional.HTMLFormatContraints;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Attr;
-import org.w3c.dom.NamedNodeMap;
-
-// nakamori_TODO: check and remove CSS formatting
-
-public class HTMLElementFormatter extends HTMLFormatter {
-
-	/**
-	 */
-	protected HTMLElementFormatter() {
-		super();
-	}
-
-	/**
-	 */
-	private void compressTailingSpaces(IStructuredDocumentRegion flatNode, ITextRegion region) {
-		int offset = region.getTextEnd();
-		int count = region.getEnd() - offset;
-		if (count == 1) {
-			String source = flatNode.getFullText(region);
-			int start = region.getStart();
-			if (source != null && source.charAt(offset - start) == ' ') {
-				// nothing to do
-				return;
-			}
-		}
-		replaceSource(flatNode, offset, count, " ");//$NON-NLS-1$
-	}
-
-	/**
-	 */
-	private void formatEndTag(IDOMElement element, HTMLFormatContraints contraints) {
-		IStructuredDocumentRegion endStructuredDocumentRegion = element.getEndStructuredDocumentRegion();
-		if (endStructuredDocumentRegion == null)
-			return;
-
-		if (element.isJSPTag() || element.isCommentTag()) {
-			String endTag = endStructuredDocumentRegion.getText();
-			if (endTag != null && endTag.length() > 0) {
-				setWidth(contraints, endTag);
-			}
-			return;
-		}
-
-		ITextRegion prevRegion = null;
-		ITextRegionList regions = endStructuredDocumentRegion.getRegions();
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			if (region == null)
-				continue;
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedTag(regionType)) {
-				if (prevRegion != null && prevRegion.getType() == DOMRegionContext.XML_END_TAG_OPEN) {
-					removeTailingSpaces(endStructuredDocumentRegion, prevRegion);
-				}
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_CLOSE) {
-				if (prevRegion != null && (prevRegion.getType() == DOMRegionContext.XML_TAG_NAME || isNestedRootTag(prevRegion.getType()))) {
-					removeTailingSpaces(endStructuredDocumentRegion, prevRegion);
-				}
-			}
-			prevRegion = region;
-		}
-		if (prevRegion != null && (prevRegion.getType() == DOMRegionContext.XML_TAG_NAME || isNestedRootTag(prevRegion.getType()))) {
-			removeTailingSpaces(endStructuredDocumentRegion, prevRegion);
-		}
-
-		String newEndTag = endStructuredDocumentRegion.getText();
-		if (newEndTag != null && newEndTag.length() > 0) {
-			setWidth(contraints, newEndTag);
-		}
-	}
-
-	/**
-	 */
-	protected void formatNode(IDOMNode node, HTMLFormatContraints contraints) {
-		if (node == null)
-			return;
-		IDOMElement element = (IDOMElement) node;
-
-		formatStartTag(element, contraints);
-
-		formatChildNodes(element, contraints);
-
-		formatEndTag(element, contraints);
-	}
-
-	/**
-	 */
-	private void formatStartTag(IDOMElement element, HTMLFormatContraints contraints) {
-		IStructuredDocumentRegion startStructuredDocumentRegion = element.getStartStructuredDocumentRegion();
-		if (startStructuredDocumentRegion == null)
-			return;
-
-		// We should format attributes in JSPTag?
-		// if (element.isJSPTag() || element.isCommentTag()) {
-		if (element.isCommentTag()) {
-			String startTag = startStructuredDocumentRegion.getText();
-			if (startTag != null && startTag.length() > 0) {
-				setWidth(contraints, startTag);
-			}
-			return;
-		}
-
-		// first process style attribute
-		if (element.isGlobalTag()) {
-			Attr attr = element.getAttributeNode("style");//$NON-NLS-1$
-			if (attr != null)
-				formatStyleAttr(attr);
-		}
-		boolean insertBreak = false;
-		insertBreak = ((IStructuredFormatPreferencesXML) getFormatPreferences()).getSplitMultiAttrs();
-
-		if (insertBreak) {
-			NamedNodeMap attributes = element.getAttributes();
-			if (attributes == null || attributes.getLength() < 2)
-				insertBreak = false;
-		}
-		String breakSpaces = getBreakSpaces(element);
-		String indent = getIndent();
-		if (indent != null && indent.length() > 0) {
-			breakSpaces += indent;
-		}
-		ITextRegion lastBreakRegion = null;
-
-		ITextRegion prevRegion = null;
-		ITextRegionList regions = startStructuredDocumentRegion.getRegions();
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			if (region == null)
-				continue;
-
-			ITextRegion breakRegion = null;
-
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedTag(regionType)) {
-				if (prevRegion != null && prevRegion.getType() == DOMRegionContext.XML_TAG_OPEN) {
-					removeTailingSpaces(startStructuredDocumentRegion, prevRegion);
-				}
-				breakRegion = region;
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-				if (prevRegion != null && (prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME || prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS)) {
-					// attribute name without value
-					breakRegion = prevRegion;
-				}
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) {
-				if (prevRegion != null && prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-					removeTailingSpaces(startStructuredDocumentRegion, prevRegion);
-				}
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-				if (prevRegion != null && prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) {
-					removeTailingSpaces(startStructuredDocumentRegion, prevRegion);
-				}
-				breakRegion = region;
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_CLOSE || regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE) {
-				if (prevRegion != null && (prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME || prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS)) {
-					// attribute name without value
-					breakRegion = prevRegion;
-				}
-			}
-
-			if (breakRegion != null) {
-				int end = breakRegion.getTextEnd();
-				if (lastBreakRegion != null) {
-					int offset = lastBreakRegion.getEnd();
-					int count = end - offset;
-					if (insertBreak || !isWidthAvailable(contraints, count + 1)) {
-						replaceTailingSpaces(startStructuredDocumentRegion, lastBreakRegion, breakSpaces);
-						setWidth(contraints, breakSpaces);
-					}
-					else {
-						compressTailingSpaces(startStructuredDocumentRegion, lastBreakRegion);
-						addWidth(contraints, 1);
-					}
-					addWidth(contraints, count);
-				}
-				else {
-					addWidth(contraints, end);
-				}
-				lastBreakRegion = breakRegion;
-			}
-
-			prevRegion = region;
-		}
-		if (prevRegion != null && (prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME || prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS)) {
-			// attribute name without value
-			int end = prevRegion.getTextEnd();
-			if (lastBreakRegion != null) {
-				int offset = lastBreakRegion.getEnd();
-				int count = end - offset;
-				if (insertBreak || !isWidthAvailable(contraints, count + 1)) {
-					replaceTailingSpaces(startStructuredDocumentRegion, lastBreakRegion, breakSpaces);
-					setWidth(contraints, breakSpaces);
-				}
-				else {
-					compressTailingSpaces(startStructuredDocumentRegion, lastBreakRegion);
-					addWidth(contraints, 1);
-				}
-				addWidth(contraints, count);
-			}
-			else {
-				addWidth(contraints, end);
-			}
-			lastBreakRegion = prevRegion;
-		}
-
-		if (lastBreakRegion != null) {
-			int offset = lastBreakRegion.getTextEnd();
-			int count = startStructuredDocumentRegion.getLength() - offset;
-			if (prevRegion != null && prevRegion.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) {
-				compressTailingSpaces(startStructuredDocumentRegion, lastBreakRegion);
-				count++;
-			}
-			else
-				removeTailingSpaces(startStructuredDocumentRegion, lastBreakRegion);
-			addWidth(contraints, count);
-		}
-		else {
-			addWidth(contraints, startStructuredDocumentRegion.getLength());
-		}
-	}
-
-	/**
-	 * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-	 * way for expedency. Should be evolved in future to depend on
-	 * "nestedContext".
-	 */
-	private boolean isNestedTag(String regionType) {
-		final String JSP_ROOT_TAG_NAME = "JSP_ROOT_TAG_NAME"; //$NON-NLS-1$
-		final String JSP_DIRECTIVE_NAME = "JSP_DIRECTIVE_NAME"; //$NON-NLS-1$
-		boolean result = regionType.equals(JSP_ROOT_TAG_NAME) || regionType.equals(JSP_DIRECTIVE_NAME);
-		return result;
-	}
-
-	/**
-	 * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-	 * way for expedency. Should be evolved in future to depend on
-	 * "nestedContext".
-	 */
-	private boolean isNestedRootTag(String regionType) {
-		final String JSP_ROOT_TAG_NAME = "JSP_ROOT_TAG_NAME"; //$NON-NLS-1$
-		boolean result = regionType.equals(JSP_ROOT_TAG_NAME);
-		return result;
-	}
-
-
-	/**
-	 */
-	private void formatStyleAttr(Attr attr) {
-		if (attr == null)
-			return;
-		String value = getCSSValue(attr);
-		if (value == null)
-			return;
-		String oldValue = ((IDOMNode) attr).getValueSource();
-		if (oldValue != null && value.equals(oldValue))
-			return;
-		attr.setValue(value);
-	}
-
-	/**
-	 */
-	private ICSSModel getCSSModel(Attr attr) {
-		if (attr == null)
-			return null;
-		INodeNotifier notifier = (INodeNotifier) attr.getOwnerElement();
-		if (notifier == null)
-			return null;
-		INodeAdapter adapter = notifier.getAdapterFor(IStyleDeclarationAdapter.class);
-		if (adapter == null)
-			return null;
-		if (!(adapter instanceof IStyleDeclarationAdapter))
-			return null;
-		IStyleDeclarationAdapter styleAdapter = (IStyleDeclarationAdapter) adapter;
-		return styleAdapter.getModel();
-	}
-
-	/**
-	 */
-	private String getCSSValue(Attr attr) {
-		ICSSModel model = getCSSModel(attr);
-		if (model == null)
-			return null;
-		ICSSNode document = model.getDocument();
-		if (document == null)
-			return null;
-		INodeNotifier notifier = (INodeNotifier) document;
-		INodeAdapter adapter = notifier.getAdapterFor(CSSSourceFormatter.class);
-		if (adapter == null)
-			return null;
-		CSSSourceFormatter formatter = (CSSSourceFormatter) adapter;
-		StringBuffer buffer = formatter.format(document);
-		if (buffer == null)
-			return null;
-		return buffer.toString();
-	}
-
-	/**
-	 */
-	private void removeTailingSpaces(IStructuredDocumentRegion flatNode, ITextRegion region) {
-		int offset = region.getTextEnd();
-		int count = region.getEnd() - offset;
-		if (count <= 0)
-			return;
-		replaceSource(flatNode, offset, count, null);
-	}
-
-	/**
-	 */
-	private void replaceTailingSpaces(IStructuredDocumentRegion flatNode, ITextRegion region, String spaces) {
-		int offset = region.getTextEnd();
-		int count = region.getEnd() - offset;
-		if (count == spaces.length()) {
-			String source = flatNode.getFullText(region);
-			if (source != null && source.endsWith(spaces)) {
-				// nothing to do
-				return;
-			}
-		}
-		replaceSource(flatNode, offset, count, spaces);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatContraintsImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatContraintsImpl.java
deleted file mode 100644
index c650384..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatContraintsImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.format;
-
-import org.eclipse.wst.html.core.internal.provisional.HTMLFormatContraints;
-import org.eclipse.wst.sse.core.internal.format.StructuredFormatContraints;
-
-/**
- * @deprecated
- * Please un-deprecate this if Page Designer thinks they are needed.
- */
-public class HTMLFormatContraintsImpl extends StructuredFormatContraints implements HTMLFormatContraints {
-	protected int fAvailableLineWidth;
-
-	/**
-	 * @deprecated
-	 * 	It's very hard to keep the available line width accurate.
-	 * 	Sometimes a node wants to start on a new line, sometimes it doesn't.
-	 * 	It's best for the node to figure out the available line width on the fly.
-	 */
-	public int getAvailableLineWidth() {
-		return fAvailableLineWidth;
-	}
-
-	/**
-	 * @deprecated
-	 * 	It's very hard to keep the available line width accurate.
-	 * 	Sometimes a node wants to start on a new line, sometimes it doesn't.
-	 * 	It's best for the node to figure out the available line width on the fly.
-	 */
-	public void setAvailableLineWidth(int availableLineWidth) {
-		fAvailableLineWidth = availableLineWidth;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatProcessorImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatProcessorImpl.java
deleted file mode 100644
index 0665cc4..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatProcessorImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.format;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML;
-import org.eclipse.wst.xml.core.internal.provisional.format.StructuredFormatPreferencesXML;
-import org.w3c.dom.Node;
-
-public class HTMLFormatProcessorImpl extends FormatProcessorXML {
-	protected String getFileExtension() {
-		return "html"; //$NON-NLS-1$
-	}
-
-	protected IStructuredFormatter getFormatter(Node node) {
-		IStructuredFormatter formatter = HTMLFormatterFactory.getInstance().createFormatter(node, getFormatPreferences());
-
-		return formatter;
-	}
-
-	public IStructuredFormatPreferences getFormatPreferences() {
-		if (fFormatPreferences == null) {
-			fFormatPreferences = new StructuredFormatPreferencesXML();
-
-			Preferences preferences = HTMLCorePlugin.getDefault().getPluginPreferences();
-			if (preferences != null) {
-				fFormatPreferences.setLineWidth(preferences.getInt(HTMLCorePreferenceNames.LINE_WIDTH));
-				((IStructuredFormatPreferencesXML) fFormatPreferences).setSplitMultiAttrs(preferences.getBoolean(HTMLCorePreferenceNames.SPLIT_MULTI_ATTRS));
-				fFormatPreferences.setClearAllBlankLines(preferences.getBoolean(HTMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES));
-
-				char indentChar = ' ';
-				String indentCharPref = preferences.getString(HTMLCorePreferenceNames.INDENTATION_CHAR);
-				if (HTMLCorePreferenceNames.TAB.equals(indentCharPref)) {
-					indentChar = '\t';
-				}
-				int indentationWidth = preferences.getInt(HTMLCorePreferenceNames.INDENTATION_SIZE);
-
-				StringBuffer indent = new StringBuffer();
-				for (int i = 0; i < indentationWidth; i++) {
-					indent.append(indentChar);
-				}
-				fFormatPreferences.setIndent(indent.toString());
-			}
-		}
-
-		return fFormatPreferences;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatter.java
deleted file mode 100644
index 6333ccf..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatter.java
+++ /dev/null
@@ -1,651 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.format;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.html.core.internal.provisional.HTMLFormatContraints;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatContraints;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML;
-import org.eclipse.wst.xml.core.internal.provisional.format.StructuredFormatPreferencesXML;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class HTMLFormatter implements IStructuredFormatter {
-
-	private static final String HTML_NAME = "html";//$NON-NLS-1$
-	private static final String BODY_NAME = "BODY";//$NON-NLS-1$
-
-	/**
-	 */
-	protected void addWidth(HTMLFormatContraints contraints, int width) {
-		if (contraints == null)
-			return;
-		if (!splitLines() || getLineWidth() < 0)
-			return;
-
-		int availableWidth = contraints.getAvailableLineWidth() - width;
-		if (availableWidth < 0)
-			availableWidth = 0;
-		contraints.setAvailableLineWidth(availableWidth);
-	}
-
-	/**
-	 */
-	protected boolean canFormatChild(Node node) {
-		while (node != null) {
-			if (node.getNodeType() != Node.ELEMENT_NODE)
-				return true;
-			CMElementDeclaration decl = getElementDeclaration((Element) node);
-			if (decl != null) {
-				if (decl.getContentType() == CMElementDeclaration.CDATA)
-					return false;
-				if (decl.supports(HTMLCMProperties.SHOULD_KEEP_SPACE)) {
-					boolean shouldKeepSpace = ((Boolean) decl.getProperty(HTMLCMProperties.SHOULD_KEEP_SPACE)).booleanValue();
-					if (shouldKeepSpace)
-						return false;
-				}
-			}
-			node = node.getParentNode();
-		}
-		return false;
-	}
-
-	/**
-	 */
-	protected boolean canInsertBreakAfter(CMElementDeclaration decl) {
-		if (decl == null)
-			return false;
-		if (!decl.supports(HTMLCMProperties.LINE_BREAK_HINT))
-			return false;
-		String hint = (String) decl.getProperty(HTMLCMProperties.LINE_BREAK_HINT);
-		if (hint == null)
-			return false;
-		return (hint.equals(HTMLCMProperties.Values.BREAK_BEFORE_START_AND_AFTER_END) || hint.equals(HTMLCMProperties.Values.BREAK_AFTER_START));
-	}
-
-	/**
-	 */
-	protected boolean canInsertBreakAfter(Node node) {
-		if (node == null)
-			return false;
-		Node parent = node.getParentNode();
-		if (parent == null)
-			return false;
-		Node next = node.getNextSibling();
-
-		if (parent.getNodeType() == Node.DOCUMENT_NODE) {
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				// do not insert break after unclosed tag
-				if (!((IDOMElement) node).isClosed())
-					return false;
-			}
-			return true;
-		}
-		else if (parent.getNodeType() == Node.ELEMENT_NODE) {
-			IDOMElement element = (IDOMElement) parent;
-			// do not insert break before missing end tag
-			if (next == null && element.getEndStructuredDocumentRegion() == null)
-				return false;
-
-			// insert line break under non-HTML elements including JSP elements
-			if (element.getPrefix() != null)
-				return true;
-
-			CMElementDeclaration decl = getElementDeclaration(element);
-			if (decl != null) {
-				if (decl.getContentType() == CMElementDeclaration.ELEMENT)
-					return true;
-				String tagName = element.getTagName();
-				// special for direct children under BODY
-				if (tagName != null && tagName.equalsIgnoreCase(BODY_NAME))
-					return true;
-			}
-		}
-
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			IDOMElement element = (IDOMElement) node;
-			CMElementDeclaration decl = getElementDeclaration(element);
-			if (canInsertBreakAfter(decl)) {
-				// spcial for BR
-				return canFormatChild(parent);
-			}
-		}
-		if (next != null && next.getNodeType() == Node.ELEMENT_NODE) {
-			CMElementDeclaration decl = getElementDeclaration((Element) next);
-			if (canInsertBreakBefore(decl))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 */
-	protected boolean canInsertBreakBefore(CMElementDeclaration decl) {
-		if (decl == null)
-			return false;
-		if (!decl.supports(HTMLCMProperties.LINE_BREAK_HINT))
-			return false;
-		String hint = (String) decl.getProperty(HTMLCMProperties.LINE_BREAK_HINT);
-		if (hint == null)
-			return false;
-		return hint.equals(HTMLCMProperties.Values.BREAK_BEFORE_START_AND_AFTER_END);
-	}
-
-	/**
-	 */
-	protected boolean canInsertBreakBefore(Node node) {
-		if (node == null)
-			return false;
-		Node parent = node.getParentNode();
-		if (parent == null)
-			return false;
-		Node prev = node.getPreviousSibling();
-
-		if (parent.getNodeType() == Node.DOCUMENT_NODE) {
-			if (prev == null)
-				return false;
-			return true;
-		}
-		else if (parent.getNodeType() == Node.ELEMENT_NODE) {
-			IDOMElement element = (IDOMElement) parent;
-			// do not insert break after missing start tag
-			if (prev == null && element.getStartStructuredDocumentRegion() == null)
-				return false;
-
-			// insert line break under non-HTML elements including JSP elements
-			if (element.getPrefix() != null)
-				return true;
-
-			CMElementDeclaration decl = getElementDeclaration(element);
-			if (decl != null) {
-				if (decl.getContentType() == CMElementDeclaration.ELEMENT)
-					return true;
-				String tagName = element.getTagName();
-				// special for direct children under BODY
-				if (tagName != null && tagName.equalsIgnoreCase(BODY_NAME))
-					return true;
-			}
-		}
-
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			CMElementDeclaration decl = getElementDeclaration((Element) node);
-			if (canInsertBreakBefore(decl))
-				return true;
-		}
-		if (prev != null && prev.getNodeType() == Node.ELEMENT_NODE) {
-			CMElementDeclaration decl = getElementDeclaration((Element) prev);
-			if (canInsertBreakAfter(decl)) {
-				// spcial for BR
-				return canFormatChild(parent);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 */
-	public void format(Node node) {
-		format(node, getFormatContraints());
-	}
-
-	/**
-	 */
-	public void format(Node node, IStructuredFormatContraints contraints) {
-		if (node instanceof IDOMNode && contraints instanceof HTMLFormatContraints)
-			format((IDOMNode) node, (HTMLFormatContraints) contraints);
-	}
-
-	public void format(IDOMNode node, HTMLFormatContraints contraints) {
-		if (node == null)
-			return;
-		if (node.getParentNode() == null)
-			return; // do not format removed node
-
-		setWidth(contraints, node);
-
-		if (canInsertBreakBefore(node))
-			insertBreakBefore(node, contraints);
-
-		formatNode(node, contraints);
-
-		if (canInsertBreakAfter(node))
-			insertBreakAfter(node, contraints);
-	}
-
-	/**
-	 */
-	protected void formatChildNodes(IDOMNode node, HTMLFormatContraints contraints) {
-		if (node == null)
-			return;
-		if (!node.hasChildNodes())
-			return;
-
-		// concat adjacent texts
-		node.normalize();
-
-		// disable sibling indent during formatting all the children
-		boolean indent = false;
-		if (contraints != null) {
-			indent = contraints.getFormatWithSiblingIndent();
-			contraints.setFormatWithSiblingIndent(false);
-		}
-
-		boolean insertBreak = true;
-		IDOMNode child = (IDOMNode) node.getFirstChild();
-		while (child != null) {
-			if (child.getParentNode() != node)
-				break;
-			IDOMNode next = (IDOMNode) child.getNextSibling();
-
-			if (insertBreak && canInsertBreakBefore(child)) {
-				insertBreakBefore(child, contraints);
-			}
-
-			IStructuredFormatter formatter = HTMLFormatterFactory.getInstance().createFormatter(child, getFormatPreferences());
-			if (formatter != null) {
-				if (formatter instanceof HTMLFormatter) {
-					HTMLFormatter htmlFormatter = (HTMLFormatter) formatter;
-					htmlFormatter.formatNode(child, contraints);
-				}
-				else {
-					formatter.format(child);
-				}
-			}
-
-			if (canInsertBreakAfter(child)) {
-				insertBreakAfter(child, contraints);
-				insertBreak = false; // not to insert twice
-			}
-			else {
-				insertBreak = true;
-			}
-
-			child = next;
-		}
-
-		if (contraints != null)
-			contraints.setFormatWithSiblingIndent(indent);
-	}
-
-	/**
-	 */
-	protected void formatNode(IDOMNode node, HTMLFormatContraints contraints) {
-		if (node == null)
-			return;
-
-		if (node.hasChildNodes()) { // container
-			formatChildNodes(node, contraints);
-		}
-		else { // leaf
-			IStructuredDocumentRegion flatNode = node.getStartStructuredDocumentRegion();
-			if (flatNode != null) {
-				String source = flatNode.getText();
-				if (source != null && source.length() > 0) {
-					setWidth(contraints, source);
-				}
-			}
-		}
-	}
-
-	/**
-	 */
-	protected String getBreakSpaces(Node node) {
-		if (node == null)
-			return null;
-		StringBuffer buffer = new StringBuffer();
-
-		String delim = ((IDOMNode) node).getModel().getStructuredDocument().getLineDelimiter();
-		if (delim != null && delim.length() > 0)
-			buffer.append(delim);
-
-		String indent = getIndent();
-		if (indent != null && indent.length() > 0) {
-			for (Node parent = node.getParentNode(); parent != null; parent = parent.getParentNode()) {
-				if (parent.getNodeType() != Node.ELEMENT_NODE)
-					break;
-				// ignore omitted tag
-				if (((IDOMNode) parent).getStartStructuredDocumentRegion() == null)
-					continue;
-
-				IDOMElement element = (IDOMElement) parent;
-				if (element.getPrefix() != null) {
-					String localName = element.getLocalName();
-					// special for html:html
-					if (localName != null && !localName.equals(HTML_NAME)) {
-						buffer.append(indent);
-					}
-					continue;
-				}
-
-				CMElementDeclaration decl = getElementDeclaration(element);
-				if (decl != null && decl.supports(HTMLCMProperties.SHOULD_INDENT_CHILD_SOURCE)) {
-					boolean shouldIndent = ((Boolean) decl.getProperty(HTMLCMProperties.SHOULD_INDENT_CHILD_SOURCE)).booleanValue();
-					if (shouldIndent)
-						buffer.append(indent);
-				}
-
-			}
-		}
-
-		return buffer.toString();
-	}
-
-	/**
-	 */
-	protected String getIndent() {
-		return getFormatPreferences().getIndent();
-	}
-
-	/**
-	 */
-	protected int getLineWidth() {
-		return getFormatPreferences().getLineWidth();
-	}
-
-	/**
-	 */
-	protected CMElementDeclaration getElementDeclaration(Element element) {
-		if (element == null)
-			return null;
-		Document document = element.getOwnerDocument();
-		if (document == null)
-			return null;
-		ModelQuery modelQuery = ModelQueryUtil.getModelQuery(document);
-		if (modelQuery == null)
-			return null;
-		return modelQuery.getCMElementDeclaration(element);
-	}
-
-	/**
-	 */
-	protected void insertBreakAfter(IDOMNode node, HTMLFormatContraints contraints) {
-		if (node == null)
-			return;
-		if (node.getNodeType() == Node.TEXT_NODE)
-			return;
-		Node parent = node.getParentNode();
-		if (parent == null)
-			return;
-		Node next = node.getNextSibling();
-
-		String spaces = null;
-		if (next == null) { // last spaces
-			// use parent indent for the end tag
-			spaces = getBreakSpaces(parent);
-		}
-		else if (next.getNodeType() == Node.TEXT_NODE) {
-			if (contraints != null && contraints.getFormatWithSiblingIndent()) {
-				IDOMNode text = (IDOMNode) next;
-				IStructuredFormatter formatter = HTMLFormatterFactory.getInstance().createFormatter(text, getFormatPreferences());
-				if (formatter instanceof HTMLTextFormatter) {
-					HTMLTextFormatter textFormatter = (HTMLTextFormatter) formatter;
-					textFormatter.formatText(text, contraints, HTMLTextFormatter.FORMAT_HEAD);
-				}
-			}
-			return;
-		}
-		else {
-			spaces = getBreakSpaces(node);
-		}
-		if (spaces == null || spaces.length() == 0)
-			return;
-
-		replaceSource(node.getModel(), node.getEndOffset(), 0, spaces);
-		setWidth(contraints, spaces);
-	}
-
-	/**
-	 */
-	protected void insertBreakBefore(IDOMNode node, HTMLFormatContraints contraints) {
-		if (node == null)
-			return;
-		if (node.getNodeType() == Node.TEXT_NODE)
-			return;
-		Node parent = node.getParentNode();
-		if (parent == null)
-			return;
-		Node prev = node.getPreviousSibling();
-
-		String spaces = null;
-		if (prev != null && prev.getNodeType() == Node.TEXT_NODE) {
-			if (contraints != null && contraints.getFormatWithSiblingIndent()) {
-				IDOMNode text = (IDOMNode) prev;
-				IStructuredFormatter formatter = HTMLFormatterFactory.getInstance().createFormatter(text, getFormatPreferences());
-				if (formatter instanceof HTMLTextFormatter) {
-					HTMLTextFormatter textFormatter = (HTMLTextFormatter) formatter;
-					textFormatter.formatText(text, contraints, HTMLTextFormatter.FORMAT_TAIL);
-				}
-			}
-			return;
-		}
-		else {
-			spaces = getBreakSpaces(node);
-		}
-		if (spaces == null || spaces.length() == 0)
-			return;
-
-		replaceSource(node.getModel(), node.getStartOffset(), 0, spaces);
-		setWidth(contraints, spaces);
-	}
-
-	/**
-	 */
-	protected boolean isWidthAvailable(HTMLFormatContraints contraints, int width) {
-		if (contraints == null)
-			return true;
-		if (!splitLines() || getLineWidth() < 0)
-			return true;
-		return (contraints.getAvailableLineWidth() >= width);
-	}
-
-	/**
-	 */
-	protected boolean keepBlankLines(HTMLFormatContraints contraints) {
-		if (contraints == null)
-			return true;
-		return (!contraints.getClearAllBlankLines());
-	}
-
-	/**
-	 */
-	protected void replaceSource(IStructuredDocumentRegion flatNode, int offset, int length, String source) {
-		if (flatNode == null)
-			return;
-		IStructuredDocument structuredDocument = flatNode.getParentDocument();
-		if (structuredDocument == null)
-			return;
-		if (source == null)
-			source = new String();
-		int startOffset = flatNode.getStartOffset();
-		if (structuredDocument.containsReadOnly(startOffset + offset, length))
-			return;
-		// We use 'structuredDocument' as the requester object just so this and the other
-		// format-related 'repalceText' (in replaceSource) can use the same requester.
-		// Otherwise, if requester is not identical, 
-		// the undo group gets "broken" into multiple pieces based
-		// on the requesters being different. Technically, any unique, common
-		// requester object would work.
-		structuredDocument.replaceText(structuredDocument, startOffset + offset, length, source);
-	}
-
-	/**
-	 */
-	protected void replaceSource(IDOMModel model, int offset, int length, String source) {
-		if (model == null)
-			return;
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (structuredDocument == null)
-			return;
-		if (source == null)
-			source = new String();
-		if (structuredDocument.containsReadOnly(offset, length))
-			return;
-		// We use 'structuredDocument' as the requester object just so this and the other
-		// format-related 'repalceText' (in replaceSource) can use the same requester.
-		// Otherwise, if requester is not identical, 
-		// the undo group gets "broken" into multiple pieces based
-		// on the requesters being different. Technically, any unique, common
-		// requester object would work. 
-		structuredDocument.replaceText(structuredDocument, offset, length, source);
-	}
-
-	/**
-	 */
-	protected void setWidth(HTMLFormatContraints contraints, String source) {
-		if (contraints == null)
-			return;
-		if (source == null)
-			return;
-		int length = source.length();
-		if (length == 0)
-			return;
-
-		if (!splitLines())
-			return;
-		int lineWidth = getLineWidth();
-		if (lineWidth < 0)
-			return;
-
-		int offset = source.lastIndexOf('\n');
-		int offset2 = source.lastIndexOf('\r');
-		if (offset2 > offset)
-			offset = offset2;
-		if (offset >= 0)
-			offset++;
-
-		int availableWidth = 0;
-		if (offset >= 0) {
-			availableWidth = lineWidth - (length - offset);
-		}
-		else {
-			availableWidth = contraints.getAvailableLineWidth() - length;
-		}
-		if (availableWidth < 0)
-			availableWidth = 0;
-		contraints.setAvailableLineWidth(availableWidth);
-	}
-
-	/**
-	 */
-	protected void setWidth(HTMLFormatContraints contraints, Node node) {
-		if (contraints == null)
-			return;
-		if (node == null)
-			return;
-		IStructuredDocument structuredDocument = ((IDOMNode) node).getStructuredDocument();
-		if (structuredDocument == null)
-			return; // error
-
-		if (!splitLines())
-			return;
-		int lineWidth = getLineWidth();
-		if (lineWidth < 0)
-			return;
-
-		int offset = ((IDOMNode) node).getStartOffset();
-		int line = structuredDocument.getLineOfOffset(offset);
-		int lineOffset = 0;
-		try {
-			lineOffset = structuredDocument.getLineOffset(line);
-		}
-		catch (BadLocationException ex) {
-			return; // error
-		}
-		if (lineOffset > offset)
-			return; // error
-
-		int availableWidth = lineWidth - (offset - lineOffset);
-		if (availableWidth < 0)
-			availableWidth = 0;
-
-		contraints.setAvailableLineWidth(availableWidth);
-	}
-
-	/**
-	 */
-	protected boolean splitLines() {
-		return true;//getFormatPreferences().getSplitLines();
-	}
-
-	protected IStructuredFormatPreferences fFormatPreferences = null;
-	protected HTMLFormatContraints fFormatContraints = null;
-	protected IProgressMonitor fProgressMonitor = null;
-
-	//public void format(XMLNode node, FormatContraints formatContraints) {
-	//	if (formatContraints.getFormatWithSiblingIndent())
-	//		formatContraints.setCurrentIndent(getSiblingIndent(node));
-	//
-	//	formatNode(node, formatContraints);
-	//}
-
-	public void setFormatPreferences(IStructuredFormatPreferences formatPreferences) {
-		fFormatPreferences = formatPreferences;
-	}
-
-	public IStructuredFormatPreferences getFormatPreferences() {
-		if (fFormatPreferences == null) {
-			fFormatPreferences = new StructuredFormatPreferencesXML();
-
-			Preferences preferences = HTMLCorePlugin.getDefault().getPluginPreferences();
-			if (preferences != null) {
-				fFormatPreferences.setLineWidth(preferences.getInt(HTMLCorePreferenceNames.LINE_WIDTH));
-				((IStructuredFormatPreferencesXML) fFormatPreferences).setSplitMultiAttrs(preferences.getBoolean(HTMLCorePreferenceNames.SPLIT_MULTI_ATTRS));
-				fFormatPreferences.setClearAllBlankLines(preferences.getBoolean(HTMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES));
-
-				char indentChar = ' ';
-				String indentCharPref = preferences.getString(HTMLCorePreferenceNames.INDENTATION_CHAR);
-				if (HTMLCorePreferenceNames.TAB.equals(indentCharPref)) {
-					indentChar = '\t';
-				}
-				int indentationWidth = preferences.getInt(HTMLCorePreferenceNames.INDENTATION_SIZE);
-
-				StringBuffer indent = new StringBuffer();
-				for (int i = 0; i < indentationWidth; i++) {
-					indent.append(indentChar);
-				}
-				fFormatPreferences.setIndent(indent.toString());
-			}
-		}
-
-		return fFormatPreferences;
-	}
-
-	public IStructuredFormatContraints getFormatContraints() {
-		if (fFormatContraints == null) {
-			fFormatContraints = new HTMLFormatContraintsImpl();
-
-			fFormatContraints.setAvailableLineWidth(getFormatPreferences().getLineWidth());
-			fFormatContraints.setClearAllBlankLines(getFormatPreferences().getClearAllBlankLines());
-		}
-
-		return fFormatContraints;
-	}
-
-	public void setProgressMonitor(IProgressMonitor progressMonitor) {
-		fProgressMonitor = progressMonitor;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatterFactory.java
deleted file mode 100644
index b17c60a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatterFactory.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.format;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter;
-import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML;
-import org.eclipse.wst.xml.core.internal.provisional.format.StructuredFormatPreferencesXML;
-import org.w3c.dom.Node;
-
-// nakamori_TODO: check and remove CSS formatting
-
-class HTMLFormatterFactory {
-	private static HTMLFormatterFactory fInstance = null;
-	protected IStructuredFormatPreferencesXML fFormatPreferences = null;
-
-	static synchronized HTMLFormatterFactory getInstance() {
-		if (fInstance == null) {
-			fInstance = new HTMLFormatterFactory();
-		}
-		return fInstance;
-	}
-
-	protected IStructuredFormatter createFormatter(Node node, IStructuredFormatPreferences formatPreferences) {
-		IStructuredFormatter formatter = null;
-
-		switch (node.getNodeType()) {
-			case Node.ELEMENT_NODE :
-				formatter = new HTMLElementFormatter();
-				break;
-			case Node.TEXT_NODE :
-				if (isEmbeddedCSS(node)) {
-					formatter = new EmbeddedCSSFormatter();
-				}
-				else {
-					formatter = new HTMLTextFormatter();
-				}
-				break;
-			default :
-				formatter = new HTMLFormatter();
-				break;
-		}
-
-		// init FormatPreferences
-		formatter.setFormatPreferences(formatPreferences);
-
-		return formatter;
-	}
-
-	/**
-	 */
-	private boolean isEmbeddedCSS(Node node) {
-		if (node == null)
-			return false;
-		Node parent = node.getParentNode();
-		if (parent == null)
-			return false;
-		if (parent.getNodeType() != Node.ELEMENT_NODE)
-			return false;
-		String name = parent.getNodeName();
-		if (name == null)
-			return false;
-		return name.equalsIgnoreCase("STYLE");//$NON-NLS-1$
-	}
-
-
-	private HTMLFormatterFactory() {
-		super();
-	}
-
-	protected IStructuredFormatPreferencesXML getFormatPreferences() {
-		if (fFormatPreferences == null) {
-			fFormatPreferences = new StructuredFormatPreferencesXML();
-
-			Preferences preferences = HTMLCorePlugin.getDefault().getPluginPreferences();
-			if (preferences != null) {
-				fFormatPreferences.setLineWidth(preferences.getInt(HTMLCorePreferenceNames.LINE_WIDTH));
-				fFormatPreferences.setSplitMultiAttrs(preferences.getBoolean(HTMLCorePreferenceNames.SPLIT_MULTI_ATTRS));
-				fFormatPreferences.setClearAllBlankLines(preferences.getBoolean(HTMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES));
-
-				char indentChar = ' ';
-				String indentCharPref = preferences.getString(HTMLCorePreferenceNames.INDENTATION_CHAR);
-				if (HTMLCorePreferenceNames.TAB.equals(indentCharPref)) {
-					indentChar = '\t';
-				}
-				int indentationWidth = preferences.getInt(HTMLCorePreferenceNames.INDENTATION_SIZE);
-
-				StringBuffer indent = new StringBuffer();
-				for (int i = 0; i < indentationWidth; i++) {
-					indent.append(indentChar);
-				}
-				fFormatPreferences.setIndent(indent.toString());
-			}
-		}
-
-		return fFormatPreferences;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLTextFormatter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLTextFormatter.java
deleted file mode 100644
index a152f82..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLTextFormatter.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.format;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.html.core.internal.provisional.HTMLFormatContraints;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class HTMLTextFormatter extends HTMLFormatter {
-
-	public static int FORMAT_ALL = 0;
-	public static int FORMAT_HEAD = 1;
-	public static int FORMAT_TAIL = 2;
-
-	/**
-	 */
-	protected HTMLTextFormatter() {
-		super();
-	}
-
-	/**
-	 */
-	private boolean canFormatText(IDOMText text) {
-		if (text == null)
-			return false;
-
-		IStructuredDocumentRegion flatNode = text.getFirstStructuredDocumentRegion();
-		if (flatNode != null) {
-			String type = flatNode.getType();
-			if (isUnparsedRegion(type))
-				return false;
-		}
-
-		Node parent = text.getParentNode();
-		if (parent != null && parent.getNodeType() == Node.ELEMENT_NODE) {
-			IDOMElement element = (IDOMElement) parent;
-			if (!element.isGlobalTag() && !text.isElementContentWhitespace())
-				return false;
-		}
-
-		return canFormatChild(parent);
-	}
-
-	private boolean isUnparsedRegion(String type) {
-		boolean result = isNestedScannedRegion(type) || isBlockScannedRegion(type);
-		return result;
-	}
-
-	private boolean isBlockScannedRegion(String type) {
-		return type == DOMRegionContext.BLOCK_TEXT;
-	}
-
-	/**
-	 * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-	 * way for expedency. Should be evolved in future to depend on
-	 * "nestedContext".
-	 */
-	private boolean isNestedScannedRegion(String type) {
-		final String JSP_CONTENT = "JSP_CONTENT"; //$NON-NLS-1$
-		return type.equals(JSP_CONTENT);
-	}
-
-	/**
-	 */
-	private boolean canRemoveHeadingSpaces(IDOMNode node) {
-		if (node == null)
-			return false;
-		if (node.getPreviousSibling() != null)
-			return false;
-		Node parent = node.getParentNode();
-		if (parent == null || parent.getNodeType() != Node.ELEMENT_NODE)
-			return false;
-
-		CMElementDeclaration decl = getElementDeclaration((Element) parent);
-		if (decl == null || (!decl.supports(HTMLCMProperties.LINE_BREAK_HINT)))
-			return false;
-		String hint = (String) decl.getProperty(HTMLCMProperties.LINE_BREAK_HINT);
-		return hint.equals(HTMLCMProperties.Values.BREAK_BEFORE_START_AND_AFTER_END);
-	}
-
-	/**
-	 */
-	private boolean canRemoveTailingSpaces(IDOMNode node) {
-		if (node == null)
-			return false;
-		if (node.getNextSibling() != null)
-			return false;
-		Node parent = node.getParentNode();
-		if (parent == null || parent.getNodeType() != Node.ELEMENT_NODE)
-			return false;
-
-		CMElementDeclaration decl = getElementDeclaration((Element) parent);
-		if (decl == null || (!decl.supports(HTMLCMProperties.LINE_BREAK_HINT)))
-			return false;
-		String hint = (String) decl.getProperty(HTMLCMProperties.LINE_BREAK_HINT);
-		return hint.equals(HTMLCMProperties.Values.BREAK_BEFORE_START_AND_AFTER_END);
-	}
-
-	/**
-	 */
-	protected void formatNode(IDOMNode node, HTMLFormatContraints contraints) {
-		formatText(node, contraints, FORMAT_ALL); // full format
-	}
-
-	/**
-	 */
-	protected void formatText(IDOMNode node, HTMLFormatContraints contraints, int mode) {
-		if (node == null)
-			return;
-		Node parent = node.getParentNode();
-		if (parent == null)
-			return;
-
-		IDOMText text = (IDOMText) node;
-		String source = text.getSource();
-
-		if (!canFormatText(text)) {
-			setWidth(contraints, source);
-			return;
-		}
-
-		int offset = text.getStartOffset();
-		int length = text.getEndOffset() - offset;
-
-		// format adjacent text at once
-		if (mode == FORMAT_HEAD) {
-			Node next = node.getNextSibling();
-			while (next != null && next.getNodeType() == Node.TEXT_NODE) {
-				IDOMText nextText = (IDOMText) next;
-				length += (nextText.getEndOffset() - nextText.getStartOffset());
-				String nextSource = nextText.getSource();
-				if (nextSource != null && nextSource.length() > 0) {
-					if (source == null)
-						source = nextSource;
-					else
-						source += nextSource;
-				}
-				next = next.getNextSibling();
-			}
-		}
-		else if (mode == FORMAT_TAIL) {
-			Node prev = node.getPreviousSibling();
-			while (prev != null && prev.getNodeType() == Node.TEXT_NODE) {
-				IDOMText prevText = (IDOMText) prev;
-				offset = prevText.getStartOffset();
-				length += (prevText.getEndOffset() - offset);
-				String prevSource = prevText.getSource();
-				if (prevSource != null && prevSource.length() > 0) {
-					if (source == null)
-						source = prevSource;
-					else
-						source = prevSource + source;
-				}
-				prev = prev.getPreviousSibling();
-			}
-		}
-
-		SpaceConverter converter = new SpaceConverter(source, keepBlankLines(contraints));
-
-		int wordLength = converter.nextWord();
-		if (wordLength == 0) { // only spaces
-			if (!converter.hasSpaces())
-				return; // empty
-			boolean removeSpaces = false;
-			if (parent.getNodeType() == Node.ELEMENT_NODE) {
-				// check if tags are omitted
-				IDOMNode element = (IDOMNode) parent;
-				if (node.getPreviousSibling() == null && element.getStartStructuredDocumentRegion() == null) {
-					removeSpaces = true;
-				}
-				else if (node.getNextSibling() == null && element.getEndStructuredDocumentRegion() == null) {
-					removeSpaces = true;
-				}
-			}
-			if (removeSpaces) {
-				converter.replaceSpaces(null);
-			}
-			else if (!isWidthAvailable(contraints, 2) || canInsertBreakAfter(node) || canInsertBreakBefore(node)) {
-				String spaces = null;
-				if (node.getNextSibling() == null) { // last spaces
-					// use parent indent for the end tag
-					spaces = getBreakSpaces(parent);
-				}
-				else {
-					spaces = getBreakSpaces(node);
-				}
-				converter.replaceSpaces(spaces);
-				setWidth(contraints, spaces);
-			}
-			else if (canRemoveHeadingSpaces(node) || canRemoveTailingSpaces(node)) {
-				converter.replaceSpaces(null);
-			}
-			else {
-				converter.compressSpaces();
-				addWidth(contraints, 1);
-			}
-		}
-		else {
-			String breakSpaces = null;
-
-			// format heading spaces
-			boolean hasSpaces = converter.hasSpaces();
-			if (mode == FORMAT_TAIL) {
-				// keep spaces as is
-				addWidth(contraints, converter.getSpaceCount());
-			}
-			else if ((hasSpaces && !isWidthAvailable(contraints, wordLength + 1)) || canInsertBreakBefore(node)) {
-				breakSpaces = getBreakSpaces(node);
-				converter.replaceSpaces(breakSpaces);
-				setWidth(contraints, breakSpaces);
-			}
-			else {
-				if (hasSpaces) {
-					if (canRemoveHeadingSpaces(node)) {
-						converter.replaceSpaces(null);
-					}
-					else {
-						converter.compressSpaces();
-						addWidth(contraints, 1);
-					}
-				}
-			}
-			addWidth(contraints, wordLength);
-
-			// format middle
-			wordLength = converter.nextWord();
-			while (wordLength > 0) {
-				if (mode != FORMAT_ALL) {
-					// keep spaces as is
-					addWidth(contraints, converter.getSpaceCount());
-				}
-				else if (!isWidthAvailable(contraints, wordLength + 1)) {
-					if (breakSpaces == null)
-						breakSpaces = getBreakSpaces(node);
-					converter.replaceSpaces(breakSpaces);
-					setWidth(contraints, breakSpaces);
-				}
-				else {
-					converter.compressSpaces();
-					addWidth(contraints, 1);
-				}
-				addWidth(contraints, wordLength);
-				wordLength = converter.nextWord();
-			}
-
-			// format tailing spaces
-			hasSpaces = converter.hasSpaces();
-			if (mode == FORMAT_HEAD) {
-				// keep spaces as is
-				addWidth(contraints, converter.getSpaceCount());
-			}
-			else if ((hasSpaces && !isWidthAvailable(contraints, 2)) || canInsertBreakAfter(node)) {
-				if (node.getNextSibling() == null) { // last test
-					// use parent indent for the end tag
-					breakSpaces = getBreakSpaces(parent);
-				}
-				else {
-					if (breakSpaces == null)
-						breakSpaces = getBreakSpaces(node);
-				}
-				converter.replaceSpaces(breakSpaces);
-				setWidth(contraints, breakSpaces);
-			}
-			else {
-				if (hasSpaces) {
-					if (canRemoveTailingSpaces(node)) {
-						converter.replaceSpaces(null);
-					}
-					else {
-						converter.compressSpaces();
-						addWidth(contraints, 1);
-					}
-				}
-			}
-		}
-
-		if (converter.isModified()) {
-			source = converter.getSource();
-			replaceSource(text.getModel(), offset, length, source);
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/SpaceConverter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/SpaceConverter.java
deleted file mode 100644
index a7b6f66..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/SpaceConverter.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.format;
-
-
-
-final class SpaceConverter {
-
-	private String source = null;
-	private int length = 0;
-	private int startOffset = 0;
-	private int endOffset = 0;
-	private int spaceCount = 0;
-	private int wordCount = 0;
-	private StringBuffer buffer = null;
-	private int lastOffset = 0;
-	private boolean keepBlankLines = false;
-
-	/**
-	 */
-	public SpaceConverter(String source) {
-		super();
-
-		if (source == null) {
-			this.source = new String();
-		}
-		else {
-			this.source = source;
-			this.length = source.length();
-		}
-	}
-
-	/**
-	 */
-	public SpaceConverter(String source, boolean keepBlankLines) {
-		super();
-
-		if (source == null) {
-			this.source = new String();
-		}
-		else {
-			this.source = source;
-			this.length = source.length();
-		}
-		this.keepBlankLines = keepBlankLines;
-	}
-
-	/**
-	 */
-	public void compressSpaces() {
-		if (this.spaceCount == 0)
-			return;
-		if (this.spaceCount == 1 && this.source.charAt(this.startOffset) == ' ')
-			return;
-
-		if (this.buffer == null)
-			this.buffer = new StringBuffer();
-		if (this.startOffset > this.lastOffset) {
-			this.buffer.append(this.source.substring(this.lastOffset, this.startOffset));
-		}
-
-		this.buffer.append(' ');
-
-		this.lastOffset = this.startOffset + this.spaceCount;
-	}
-
-	/**
-	 */
-	public String getSource() {
-		if (this.buffer == null)
-			this.buffer = new StringBuffer();
-		if (this.length > this.lastOffset) {
-			this.buffer.append(this.source.substring(this.lastOffset, this.length));
-		}
-		return this.buffer.toString();
-	}
-
-	/**
-	 */
-	public int getSpaceCount() {
-		return this.spaceCount;
-	}
-
-	/**
-	 */
-	public boolean hasSpaces() {
-		return (this.spaceCount > 0);
-	}
-
-	/**
-	 */
-	public boolean isModified() {
-		return (this.buffer != null);
-	}
-
-	/**
-	 * Add number of the old blank lines to new space string
-	 */
-	private static String mergeBlankLines(String newSpaces, String oldSpaces) {
-		if (newSpaces == null || newSpaces.length() == 0)
-			return newSpaces;
-		if (oldSpaces == null)
-			return newSpaces;
-
-		// count old new lines
-		int newLineCount = 0;
-		int oldLength = oldSpaces.length();
-		for (int i = 0; i < oldLength; i++) {
-			char c = oldSpaces.charAt(i);
-			if (c == '\r') {
-				newLineCount++;
-				if (i + 1 < oldLength) {
-					c = oldSpaces.charAt(i + 1);
-					if (c == '\n')
-						i++;
-				}
-			}
-			else {
-				if (c == '\n')
-					newLineCount++;
-			}
-		}
-		if (newLineCount < 2)
-			return newSpaces; // no blank line
-
-		// here assuming newSpaces starts with a new line if any
-		String delim = null;
-		char d = newSpaces.charAt(0);
-		if (d == '\r') {
-			if (newSpaces.length() > 1 && newSpaces.charAt(1) == '\n')
-				delim = "\r\n";//$NON-NLS-1$
-			else
-				delim = "\r";//$NON-NLS-1$
-		}
-		else {
-			if (d == '\n')
-				delim = "\n";//$NON-NLS-1$
-			else
-				return newSpaces; // no new line
-		}
-
-		newLineCount--;
-		StringBuffer buffer = new StringBuffer(newSpaces.length() + newLineCount * 2);
-		while (newLineCount > 0) {
-			buffer.append(delim);
-			newLineCount--;
-		}
-		buffer.append(newSpaces);
-		return buffer.toString();
-	}
-
-	/**
-	 */
-	public int nextWord() {
-		if (this.endOffset == this.length) {
-			this.startOffset = this.endOffset;
-			this.spaceCount = 0;
-			this.wordCount = 0;
-			return 0;
-		}
-
-		this.startOffset = this.endOffset;
-		int i = this.startOffset;
-		for (; i < this.length; i++) {
-			if (!Character.isWhitespace(this.source.charAt(i)))
-				break;
-		}
-		this.spaceCount = i - this.startOffset;
-
-		int wordOffset = i;
-		for (; i < this.length; i++) {
-			if (Character.isWhitespace(this.source.charAt(i)))
-				break;
-		}
-		this.wordCount = i - wordOffset;
-		this.endOffset = i;
-
-		return this.wordCount;
-	}
-
-	/**
-	 */
-	public void replaceSpaces(String spaces) {
-		int spaceLength = (spaces != null ? spaces.length() : 0);
-		String oldSpaces = null;
-		if (spaceLength == this.spaceCount) {
-			if (spaceLength == 0)
-				return;
-			if (this.startOffset == 0) {
-				if (this.source.startsWith(spaces))
-					return;
-			}
-			else if (this.endOffset == this.length) {
-				if (this.source.endsWith(spaces))
-					return;
-			}
-			else {
-				int textOffset = this.startOffset + this.spaceCount;
-				oldSpaces = this.source.substring(this.startOffset, textOffset);
-				if (oldSpaces.equals(spaces))
-					return;
-			}
-		}
-		if (this.keepBlankLines && this.spaceCount > 0) {
-			if (oldSpaces == null) {
-				int textOffset = this.startOffset + this.spaceCount;
-				oldSpaces = this.source.substring(this.startOffset, textOffset);
-			}
-			if (oldSpaces != null) {
-				spaces = mergeBlankLines(spaces, oldSpaces);
-			}
-		}
-
-		if (this.buffer == null)
-			this.buffer = new StringBuffer();
-		if (this.startOffset > this.lastOffset) {
-			this.buffer.append(this.source.substring(this.lastOffset, this.startOffset));
-		}
-
-		if (spaceLength > 0)
-			this.buffer.append(spaces);
-
-		this.lastOffset = this.startOffset + this.spaceCount;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/AbstractCSSModelAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/AbstractCSSModelAdapter.java
deleted file mode 100644
index aa1be40..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/AbstractCSSModelAdapter.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.document.CSSModelImpl;
-import org.eclipse.wst.css.core.internal.provisional.adapters.ICSSModelAdapter;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Element;
-
-/**
- */
-public abstract class AbstractCSSModelAdapter implements ICSSModelAdapter {
-	private final static String CSS_ID = ContentTypeIdForCSS.ContentTypeID_CSS;
-
-	private Element element = null;
-	private ICSSModel model = null;
-
-	/**
-	 */
-	AbstractCSSModelAdapter() {
-		super();
-	}
-
-	/**
-	 */
-	protected ICSSModel createModel() {
-		// create embedded CSS model (not for external CSS)
-		if (getElement() == null)
-			return null;
-		IStructuredModel baseModel = ((IDOMNode) getElement()).getModel();
-		ICSSModel newModel = (ICSSModel) baseModel.getModelManager().createUnManagedStructuredModelFor(CSS_ID);
-		((CSSModelImpl) newModel).setOwnerDOMNode(getElement());
-		return newModel;
-	}
-
-	/**
-	 */
-	public Element getElement() {
-		return this.element;
-	}
-
-	/**
-	 */
-	protected ICSSModel getExistingModel() {
-		return this.model;
-	}
-
-	/**
-	 */
-	protected void notifyStyleChanged(Element target) {
-		INodeNotifier notifier = (INodeNotifier) target;
-		if (notifier == null)
-			return;
-		Collection adapters = notifier.getAdapters();
-		if (adapters == null)
-			return;
-		Iterator it = adapters.iterator();
-		if (it == null)
-			return;
-		while (it.hasNext()) {
-			INodeAdapter adapter = (INodeAdapter) it.next();
-			if (adapter instanceof StyleListener) {
-				StyleListener listener = (StyleListener) adapter;
-				listener.styleChanged();
-			}
-		}
-	}
-
-	/**
-	 */
-	void setElement(Element element) {
-		this.element = element;
-	}
-
-	/**
-	 * check 
-	 * 1. If attributes of element is valid (type,rel ...)
-	 * 2. If content model supports this element / attribute (future ?)
-	 */
-	protected boolean isValidAttribute() {
-		return (getElement() != null);
-	}
-
-	/**
-	 */
-	protected void setModel(ICSSModel model) {
-		this.model = model;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/AbstractStyleSheetAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/AbstractStyleSheetAdapter.java
deleted file mode 100644
index a2daac2..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/AbstractStyleSheetAdapter.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.event.ICSSStyleListener;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IModelProvideAdapter;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.css.core.internal.util.ImportedCollector;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.document.XMLModelNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.stylesheets.DocumentStyle;
-import org.w3c.dom.stylesheets.StyleSheet;
-import org.w3c.dom.stylesheets.StyleSheetList;
-import org.w3c.dom.traversal.DocumentTraversal;
-import org.w3c.dom.traversal.NodeFilter;
-import org.w3c.dom.traversal.NodeIterator;
-
-/**
- */
-public abstract class AbstractStyleSheetAdapter extends AbstractCSSModelAdapter implements ICSSStyleListener, IStyleSheetAdapter {
-
-	// this variable to hold the class is just a VAJava trick.
-	// it improves performance in VAJava by minimizing class loading.
-	private final Class StyleSheetAdapterClass = IStyleSheetAdapter.class;
-	private Collection styleChangedNodes;
-
-	/**
-	 */
-	protected AbstractStyleSheetAdapter() {
-		super();
-	}
-
-	/**
-	 */
-	protected ICSSModel createModel() {
-		ICSSModel newModel = super.createModel();
-		if (newModel != null) {
-			// get ModelProvideAdapter
-			IModelProvideAdapter adapter = (IModelProvideAdapter) ((INodeNotifier) getElement()).getAdapterFor(IModelProvideAdapter.class);
-			// notify adapter
-			if (adapter != null)
-				adapter.modelProvided(newModel);
-		}
-		return newModel;
-	}
-
-	/**
-	 */
-	public StyleSheet getSheet() {
-		ICSSModel model = getModel();
-		if (model == null)
-			return null;
-		return (StyleSheet) model.getDocument();
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type
-	 * allows it to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return (type == StyleSheetAdapterClass);
-	}
-
-	/**
-	 */
-	public void released() {
-		ICSSModel currentModel = getModel();
-
-		// get ModelProvideAdapter
-		IModelProvideAdapter adapter = (IModelProvideAdapter) ((INodeNotifier) getElement()).getAdapterFor(IModelProvideAdapter.class);
-
-		setElement(null);
-		setModel(null);
-
-		if (adapter != null)
-			adapter.modelReleased(currentModel);
-
-		if (currentModel != null)
-			currentModel.releaseFromRead();
-	}
-
-	/**
-	 */
-	public void removed() {
-		ICSSModel currentModel = getModel();
-
-		setModel(null);
-
-		// get ModelProvideAdapter
-		IModelProvideAdapter adapter = (IModelProvideAdapter) ((INodeNotifier) getElement()).getAdapterFor(IModelProvideAdapter.class);
-		if (adapter != null)
-			adapter.modelRemoved(currentModel);
-
-		if (currentModel != null)
-			currentModel.releaseFromRead();
-	}
-
-
-	public void styleChanged(ICSSModel srcModel, ICSSSelector[] removed, ICSSSelector[] added, String media) {
-		Element element = getElement();
-		if (element == null)
-			return; // might released
-		Document doc = element.getOwnerDocument();
-		if (doc == null)
-			return; // error
-
-		// to notify GEF tree 
-		if (doc instanceof INodeNotifier) {
-			Collection adapters = ((INodeNotifier) doc).getAdapters();
-			if (adapters == null)
-				return;
-			Iterator it = adapters.iterator();
-			if (it == null)
-				return;
-			while (it.hasNext()) {
-				INodeAdapter adapter = (INodeAdapter) it.next();
-				if (adapter instanceof ICSSStyleListener) {
-					((ICSSStyleListener) adapter).styleChanged(srcModel, removed, added, media);
-				}
-			}
-		}
-		//
-
-		if (styleChangedNodes == null) {
-			styleChangedNodes = new HashSet();
-		}
-
-		try {
-			int removedSelNum = removed != null ? removed.length : 0;
-			int addedSelNum = added != null ? added.length : 0;
-
-			NodeIterator iter = ((DocumentTraversal) doc).createNodeIterator(doc, NodeFilter.SHOW_ELEMENT, null, true);
-			Node node;
-			while ((node = iter.nextNode()) != null) {
-				if (node.getNodeType() == Node.ELEMENT_NODE) {
-					Element elm = (Element) node;
-					boolean match = false;
-					int i;
-					for (i = 0; i < removedSelNum && !match; i++) {
-						match = removed[i].match(elm, null);
-					}
-					for (i = 0; i < addedSelNum && !match; i++) {
-						match = added[i].match(elm, null);
-					}
-					if (match) {
-						if (!styleChangedNodes.contains(elm))
-							styleChangedNodes.add(elm);
-						// notifyStyleChanged(elm);
-					}
-				}
-			}
-		}
-		catch (ClassCastException ex) {
-			// Document doesn't implement DocumentTraversal...
-		}
-
-	}
-
-	
-	public void styleUpdate(ICSSModel srcModel) {
-		IDOMNode node = (IDOMNode) getElement();
-		if (node == null)
-			return;
-		IDOMModel model = node.getModel();
-		if (model == null)
-			return;
-		XMLModelNotifier notifier = model.getModelNotifier();
-		if (notifier == null)
-			return;
-
-		// before updating, all sub-models should be loaded!
-		DocumentStyle document = (DocumentStyle) model.getDocument();
-		StyleSheetList styles = document.getStyleSheets();
-		if (styles != null) {
-			int n = styles.getLength();
-			ImportedCollector trav = new ImportedCollector();
-			for (int i = 0; i < n; i++) {
-				org.w3c.dom.stylesheets.StyleSheet sheet = styles.item(i);
-				if (sheet instanceof ICSSNode)
-					trav.apply((ICSSNode) sheet);
-			}
-		}
-
-		// flash style changed events
-		if (styleChangedNodes != null) {
-			Object[] elements = styleChangedNodes.toArray();
-			for (int i = 0; elements != null && i < elements.length; i++)
-				notifyStyleChanged((Element) elements[i]);
-			styleChangedNodes.clear();
-		}
-
-		// to notify GEF tree 
-		if (document instanceof INodeNotifier) {
-			Collection adapters = ((INodeNotifier) document).getAdapters();
-			if (adapters == null)
-				return;
-			Iterator it = adapters.iterator();
-			if (it == null)
-				return;
-			while (it.hasNext()) {
-				INodeAdapter adapter = (INodeAdapter) it.next();
-				if (adapter instanceof ICSSStyleListener) {
-					((ICSSStyleListener) adapter).styleUpdate(srcModel);
-				}
-			}
-		}
-
-		notifier.propertyChanged(node);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/CSSQueryContext.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/CSSQueryContext.java
deleted file mode 100644
index 6572ae6..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/CSSQueryContext.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-
-
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue;
-import org.eclipse.wst.css.core.internal.util.CSSLinkConverter;
-import org.eclipse.wst.css.core.internal.util.declaration.CSSPropertyContext;
-
-/**
- */
-class CSSQueryContext extends CSSPropertyContext {
-
-	/**
-	 */
-	public CSSQueryContext() {
-		super();
-	}
-
-	/**
-	 */
-	public CSSQueryContext(ICSSStyleDeclaration decl) {
-		super(decl);
-	}
-
-	/**
-	 *
-	 */
-	public void applyFull(ICSSStyleDeclaration decl) {
-		if (decl == null)
-			return;
-		Enumeration keys = fProperties.keys();
-		while (keys.hasMoreElements()) {
-			Object key = keys.nextElement();
-			Object val = fProperties.get(key);
-
-			if (val instanceof CSSQueryDeclarationData) {
-				ICSSStyleDeclItem declItem = ((CSSQueryDeclarationData) val).getDeclItem();
-				if (declItem.getLength() <= 0) {
-					ICSSStyleDeclItem itemToRemove = decl.getDeclItemNode(key.toString());
-					if (itemToRemove != null) {
-						decl.removeDeclItemNode(itemToRemove);
-					}
-				}
-				else {
-					decl.setDeclItemNode(declItem);
-				}
-			}
-			else {
-				String value = (val instanceof ICSSValue) ? ((ICSSValue) val).getCSSValueText() : val.toString();
-
-				if (value == null || value.length() <= 0) {
-					ICSSStyleDeclItem itemToRemove = decl.getDeclItemNode(key.toString());
-					if (itemToRemove != null) {
-						decl.removeDeclItemNode(itemToRemove);
-					}
-				}
-				else {
-					decl.setProperty(key.toString(), value, null);
-				}
-			}
-		}
-	}
-
-	/**
-	 */
-	private boolean check(String propName, boolean important, int specificity) {
-		Object current = fProperties.get(propName);
-		if (current != null && current instanceof CSSQueryValueData) {
-			CSSQueryValueData currentValue = (CSSQueryValueData) current;
-			if ((!important && currentValue.important) || (currentValue.getSpecificity() > specificity)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 */
-	public void overrideWithExpand(ICSSStyleDeclaration decl, int specificity) {
-		if (decl == null)
-			return;
-
-		CSSLinkConverter conv = new CSSLinkConverter(decl.getOwnerDocument().getModel());
-
-		int nProperties = decl.getLength();
-		for (int i = 0; i < nProperties; i++) {
-			String propName = decl.item(i);
-			if (propName != null) {
-				String propN = propName.trim().toLowerCase();
-				if (propN.length() != 0) {
-					PropCMProperty prop = PropCMProperty.getInstanceOf(propN);
-					String priority = decl.getPropertyPriority(propName);
-					boolean important = priority != null && priority.length() > 0;
-					if (prop != null && prop.isShorthand()) {
-						// expand shorthand property
-						CSSQueryContext context = new CSSQueryContext();
-						expandToLeaf(prop, decl.getPropertyValue(propName), context);
-
-						Enumeration properties = context.properties();
-						while (properties.hasMoreElements()) {
-							propN = properties.nextElement().toString();
-							if (check(propN, important, specificity)) {
-								fProperties.put(propN, new CSSQueryValueData(conv.toAbsolute(context.get(propN)), important, specificity));
-							}
-						}
-					}
-					else {
-						if (check(propN, important, specificity)) {
-							ICSSStyleDeclItem declItem = (ICSSStyleDeclItem) decl.getDeclItemNode(propName).cloneNode(true);
-							int nValues = declItem.getLength();
-							for (int j = 0; j < nValues; j++) {
-								conv.toAbsolute(declItem.item(j));
-							}
-							declItem.setPriority(null);
-							fProperties.put(propN, new CSSQueryDeclarationData(declItem, important, specificity));
-						}
-					}
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/CSSQueryDeclarationData.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/CSSQueryDeclarationData.java
deleted file mode 100644
index a156d20..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/CSSQueryDeclarationData.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-
-
-
-/**
- */
-public class CSSQueryDeclarationData extends CSSQueryValueData {
-
-
-	ICSSStyleDeclItem declItem;
-
-	public CSSQueryDeclarationData(ICSSStyleDeclItem declItem, boolean imp, int specificity) {
-		super(null, imp, specificity);
-		this.declItem = declItem;
-	}
-
-	/**
-	 */
-	ICSSStyleDeclItem getDeclItem() {
-		return declItem;
-	}
-
-	/**
-	 */
-	public String toString() {
-		if (value == null && declItem != null) {
-			value = declItem.getCSSValueText();
-		}
-		return value;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/CSSQueryTraverser.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/CSSQueryTraverser.java
deleted file mode 100644
index 04f6b6d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/CSSQueryTraverser.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.core.internal.util.AbstractCssTraverser;
-import org.eclipse.wst.css.core.internal.util.CSSStyleDeclarationFactory;
-import org.w3c.dom.Element;
-import org.w3c.dom.css.ElementCSSInlineStyle;
-
-/**
- */
-public class CSSQueryTraverser extends AbstractCssTraverser {
-
-	private Element element;
-	private String pseudoName;
-	private CSSQueryContext context = null;
-	ICSSStyleDeclaration decl = null;
-
-	/**
-	 */
-	public ICSSStyleDeclaration getDeclaration() {
-		try {
-			ICSSStyleDeclaration inlineStyle = (ICSSStyleDeclaration) ((ElementCSSInlineStyle) element).getStyle();
-			if (inlineStyle != null) {
-				if (context == null) {
-					context = new CSSQueryContext();
-				}
-				context.overrideWithExpand(inlineStyle, 10000);
-				// style attribute's specificity is 100 (in CSS2 spec.) and
-				// our implement use 100 as base number (see CSSSelector.java)
-			}
-		}
-		catch (ClassCastException ex) {
-			// element is not ElementCSSInlineStyle ???
-		}
-		if (context == null)
-			return null;
-
-		if (decl == null)
-			decl = CSSStyleDeclarationFactory.getInstance().createStyleDeclaration();
-		context.applyFull(decl);
-		return decl;
-	}
-
-	/**
-	 */
-	private void overwriteDeclaration(ICSSStyleDeclaration d, int specificity) {
-		if (d == null)
-			return;
-		if (context == null)
-			context = new CSSQueryContext();
-		context.overrideWithExpand(d, specificity);
-	}
-
-	/**
-	 */
-	protected short postNode(ICSSNode node) {
-		return TRAV_CONT;
-	}
-
-	/**
-	 */
-	protected short preNode(ICSSNode node) {
-		if (node instanceof ICSSStyleRule) {
-			// style rule
-			ICSSStyleRule style = (ICSSStyleRule) node;
-			ICSSSelectorList list = style.getSelectors();
-			int nSelectors = list.getLength();
-			int maxSpecificity = -1;
-			for (int iSelector = 0; iSelector < nSelectors; iSelector++) {
-				// Check each Selector Lists
-				ICSSSelector selector = list.getSelector(iSelector);
-				int specificity = selector.getSpecificity();
-				if (maxSpecificity < specificity && selector.match(element, pseudoName)) {
-					maxSpecificity = specificity;
-				}
-			}
-			if (maxSpecificity >= 0) {
-				// apply this style to the element
-				overwriteDeclaration((ICSSStyleDeclaration) style.getStyle(), maxSpecificity);
-			}
-			return TRAV_PRUNE;
-		}
-		return TRAV_CONT;
-	}
-
-	/**
-	 */
-	private void resetContext() {
-		context = null;
-	}
-
-	/**
-	 */
-	public void setElement(Element element, String pseudoName) {
-		this.element = element;
-		this.pseudoName = pseudoName;
-		resetContext();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/CSSQueryValueData.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/CSSQueryValueData.java
deleted file mode 100644
index edd74cd..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/CSSQueryValueData.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-
-import org.eclipse.wst.css.core.internal.util.declaration.ValueData;
-
-
-
-/**
- */
-class CSSQueryValueData extends ValueData {
-
-	private int specificity;
-
-	/**
-	 */
-	public CSSQueryValueData() {
-		super();
-	}
-
-	/**
-	 */
-	public CSSQueryValueData(String val, boolean imp) {
-		super(val, imp);
-	}
-
-	/**
-	 */
-	public CSSQueryValueData(String val, boolean imp, int specificity) {
-		super(val, imp);
-		this.specificity = specificity;
-	}
-
-	/**
-	 */
-	int getSpecificity() {
-		return specificity;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLDocumentAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLDocumentAdapter.java
deleted file mode 100644
index 3aed14c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLDocumentAdapter.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetListAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.util.CSSClassTraverser;
-import org.eclipse.wst.css.core.internal.util.ImportRuleCollector;
-import org.eclipse.wst.html.core.internal.contentmodel.JSP11Namespace;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.stylesheets.StyleSheet;
-import org.w3c.dom.stylesheets.StyleSheetList;
-
-
-
-/**
- */
-public class HTMLDocumentAdapter implements IStyleSheetListAdapter, StyleSheetList {
-
-	private Document document = null;
-	private Vector styleAdapters = null;
-	private Vector oldStyleAdapters = null;
-
-	/**
-	 */
-	HTMLDocumentAdapter() {
-		super();
-	}
-
-	/**
-	 */
-	private void addStyleSheet(Element node) {
-		IDOMElement element = (IDOMElement) node;
-		String tagName = element.getTagName();
-		if (tagName == null)
-			return;
-		boolean isContainer = false;
-		if (tagName.equalsIgnoreCase(HTML40Namespace.ElementName.HTML) || tagName.equalsIgnoreCase(HTML40Namespace.ElementName.HEAD) || tagName.equalsIgnoreCase(HTML40Namespace.ElementName.NOSCRIPT) || tagName.equalsIgnoreCase(HTML40Namespace.ElementName.BASE) || tagName.equalsIgnoreCase(JSP11Namespace.ElementName.ROOT) || (!element.isGlobalTag() && element.isContainer())) {
-			isContainer = true;
-		}
-		else if (element.isCommentTag()) {
-			Node parent = element.getParentNode();
-			if (parent == element.getOwnerDocument()) {
-				// This condition is too severe, actually do not work for JSF template.
-				// But above (! globalTag() && isContainer()) cover JSF template + tpl template
-				isContainer = true;
-			}
-			else if (parent.getNodeType() == Node.ELEMENT_NODE) {
-				tagName = ((Element) parent).getTagName();
-				if (tagName != null && tagName.equalsIgnoreCase(HTML40Namespace.ElementName.HEAD)) {
-					isContainer = true;
-				}
-			}
-		}
-
-		else {
-			String localName = element.getLocalName();
-			if (localName != null && localName.equalsIgnoreCase(HTML40Namespace.ElementName.HTML)) {
-				// taglib html tag
-				isContainer = true;
-			}
-			else {
-				INodeNotifier notifier = element;
-				INodeAdapter adapter = notifier.getAdapterFor(IStyleSheetAdapter.class);
-				if (adapter != null && adapter instanceof IStyleSheetAdapter) {
-					this.styleAdapters.addElement(adapter);
-				}
-			}
-		}
-		if (isContainer) {
-			INodeNotifier notifier = element;
-			if (notifier.getExistingAdapter(IStyleSheetListAdapter.class) == null) {
-				notifier.addAdapter(this);
-			}
-			for (Node child = element.getFirstChild(); child != null; child = child.getNextSibling()) {
-				if (child.getNodeType() != Node.ELEMENT_NODE)
-					continue;
-				addStyleSheet((Element) child);
-			}
-		}
-	}
-
-	/**
-	 */
-	void childReplaced() {
-		if (this.styleAdapters == null)
-			return;
-
-		// backup old adapters to be released on updating in getStyleSheets()
-		this.oldStyleAdapters = this.styleAdapters;
-		// invalidate the list
-		this.styleAdapters = null;
-
-		notifyStyleSheetsChanged(this.document);
-	}
-
-	/**
-	 */
-	public Enumeration getClasses() {
-		StyleSheetList sheetList = getStyleSheets();
-		int nSheets = sheetList.getLength();
-
-		final ArrayList classes = new ArrayList();
-
-		CSSClassTraverser traverser = new CSSClassTraverser();
-		traverser.setTraverseImported(true);
-
-		for (int i = 0; i < nSheets; i++) {
-			org.w3c.dom.stylesheets.StyleSheet sheet = sheetList.item(i);
-			if (sheet instanceof ICSSNode) {
-				traverser.apply((ICSSNode) sheet);
-			}
-		}
-		classes.addAll(traverser.getClassNames());
-
-		return new Enumeration() {
-			int i = 0;
-
-			public boolean hasMoreElements() {
-				return i < classes.size();
-			}
-
-			public Object nextElement() {
-				return classes.get(i++);
-			}
-		};
-	}
-
-	/**
-	 */
-	private List getValidAdapters() {
-		Vector validAdapters = new Vector();
-		if (this.styleAdapters != null) {
-			Iterator i = this.styleAdapters.iterator();
-			while (i.hasNext()) {
-				Object obj = i.next();
-				if (obj instanceof AbstractStyleSheetAdapter && ((AbstractStyleSheetAdapter) obj).isValidAttribute()) {
-					validAdapters.add(obj);
-				}
-			}
-		}
-		return validAdapters;
-	}
-
-	/**
-	 */
-	public int getLength() {
-		return getValidAdapters().size();
-	}
-
-	/**
-	 */
-	public CSSStyleDeclaration getOverrideStyle(Element element, String pseudoName) {
-		StyleSheetList ssl = getStyleSheets();
-		int numStyles = ssl.getLength();
-
-		CSSQueryTraverser query = new CSSQueryTraverser();
-		query.setTraverseImported(true);
-		query.setTraverseImportFirst(true);
-		query.setElement(element, pseudoName);
-
-		for (int i = 0; i < numStyles; i++) {
-			// loop for styles (<style> and <link>)
-			org.w3c.dom.stylesheets.StyleSheet ss = ssl.item(i);
-
-			try {
-				query.apply((ICSSNode) ss);
-			}
-			catch (ClassCastException ex) {
-				// I can handle only CSS style
-			}
-		}
-
-		return query.getDeclaration();
-	}
-
-	/**
-	 */
-	public StyleSheetList getStyleSheets() {
-		if (this.styleAdapters == null) {
-			if (this.document == null)
-				return null;
-
-			this.styleAdapters = new Vector();
-			for (Node child = this.document.getFirstChild(); child != null; child = child.getNextSibling()) {
-				if (child.getNodeType() != Node.ELEMENT_NODE)
-					continue;
-				addStyleSheet((Element) child);
-			}
-
-			removeOldStyleSheets();
-		}
-		return this;
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type
-	 * allows it to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return (type == IStyleSheetListAdapter.class);
-	}
-
-	/**
-	 */
-	public StyleSheet item(int index) {
-		if (this.styleAdapters == null)
-			return null;
-
-		List validAdapters = getValidAdapters();
-
-		if (index < 0 || index >= validAdapters.size())
-			return null;
-		org.w3c.dom.stylesheets.StyleSheet sheet = ((IStyleSheetAdapter) validAdapters.get(index)).getSheet();
-		if (sheet == null) {// for LINK element whose link is broken
-			ICSSModel model = ((AbstractStyleSheetAdapter) this.styleAdapters.elementAt(index)).createModel();
-			sheet = ((model != null) ? (StyleSheet) model.getDocument() : null);
-		}
-		return sheet;
-	}
-
-	/**
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		Node node = null;
-		switch (eventType) {
-			case INodeNotifier.ADD :
-				node = (Node) newValue;
-				break;
-			case INodeNotifier.REMOVE :
-				node = (Node) oldValue;
-				break;
-			case INodeNotifier.CHANGE :
-				node = (Node) notifier;
-				break;
-			default :
-				break;
-		}
-		if (node == null || node.getNodeType() != Node.ELEMENT_NODE)
-			return;
-		IDOMElement element = (IDOMElement) node;
-		String tagName = element.getTagName();
-		if (tagName == null)
-			return;
-
-		if (eventType == INodeNotifier.CHANGE) {
-			if (tagName.equalsIgnoreCase(HTML40Namespace.ElementName.BASE)) {
-				refreshAdapters();
-			}
-		}
-		else {
-			if (tagName.equalsIgnoreCase(HTML40Namespace.ElementName.HTML) || tagName.equalsIgnoreCase(HTML40Namespace.ElementName.HEAD) || tagName.equalsIgnoreCase(HTML40Namespace.ElementName.STYLE) || tagName.equalsIgnoreCase(HTML40Namespace.ElementName.LINK) || tagName.equalsIgnoreCase(HTML40Namespace.ElementName.NOSCRIPT) || tagName.equalsIgnoreCase(JSP11Namespace.ElementName.ROOT) || element.isCommentTag() || (!element.isGlobalTag() && element.isContainer())) {
-				childReplaced();
-			}
-			else if (tagName.equalsIgnoreCase(HTML40Namespace.ElementName.BASE)) {
-				refreshAdapters();
-			}
-			else {
-				String localName = element.getLocalName();
-				if (localName != null && localName.equalsIgnoreCase(HTML40Namespace.ElementName.HTML)) {
-					// taglib html tag
-					childReplaced();
-				}
-			}
-		}
-	}
-
-	/**
-	 * reload LINK / @import if BASE changed
-	 */
-	private void refreshAdapters() {
-		Iterator iAdapter = this.styleAdapters.iterator();
-		while (iAdapter.hasNext()) {
-			Object adapter = iAdapter.next();
-			if (adapter instanceof LinkElementAdapter) {
-				((LinkElementAdapter) adapter).refreshSheet();
-			}
-			else if (adapter instanceof StyleElementAdapter) {
-				ICSSModel model = ((StyleElementAdapter) adapter).getModel();
-				ImportRuleCollector trav = new ImportRuleCollector();
-				trav.apply(model);
-				Iterator iRule = trav.getRules().iterator();
-				while (iRule.hasNext()) {
-					ICSSImportRule rule = (ICSSImportRule) iRule.next();
-					rule.refreshStyleSheet();
-				}
-			}
-		}
-	}
-
-	/**
-	 */
-	private void notifyStyleSheetsChanged(Document target) {
-		INodeNotifier notifier = (INodeNotifier) target;
-		if (notifier == null)
-			return;
-		Collection adapters = notifier.getAdapters();
-		if (adapters == null)
-			return;
-		Iterator it = adapters.iterator();
-		if (it == null)
-			return;
-		while (it.hasNext()) {
-			INodeAdapter adapter = (INodeAdapter) it.next();
-			if (adapter instanceof StyleListener) {
-				StyleListener listener = (StyleListener) adapter;
-				listener.styleChanged();
-			}
-		}
-	}
-
-	/**
-	 */
-	private void releaseOldStyleSheets() {
-		if (this.oldStyleAdapters == null)
-			return;
-		Iterator it = this.oldStyleAdapters.iterator();
-		while (it.hasNext()) {
-			IStyleSheetAdapter adapter = (IStyleSheetAdapter) it.next();
-			if (adapter == null)
-				continue;
-			// if the same adapter is in the current list,
-			// do not release
-			if (this.styleAdapters != null && this.styleAdapters.contains(adapter))
-				continue;
-			adapter.released();
-		}
-		this.oldStyleAdapters = null;
-	}
-
-	/**
-	 */
-	public void releaseStyleSheets() {
-		releaseOldStyleSheets();
-
-		if (this.styleAdapters == null)
-			return;
-		Iterator it = this.styleAdapters.iterator();
-		while (it.hasNext()) {
-			IStyleSheetAdapter adapter = (IStyleSheetAdapter) it.next();
-			if (adapter != null)
-				adapter.released();
-		}
-		this.styleAdapters = null;
-	}
-
-	/**
-	 */
-	private void removeOldStyleSheets() {
-		if (this.oldStyleAdapters == null)
-			return;
-		Iterator it = this.oldStyleAdapters.iterator();
-		while (it.hasNext()) {
-			IStyleSheetAdapter adapter = (IStyleSheetAdapter) it.next();
-			if (adapter == null)
-				continue;
-			// if the same adapter is in the current list,
-			// do not release
-			if (this.styleAdapters != null && this.styleAdapters.contains(adapter))
-				continue;
-			adapter.removed();
-		}
-		this.oldStyleAdapters = null;
-	}
-
-	/**
-	 */
-	void setDocument(Document document) {
-		this.document = document;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLStyleSelectorAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLStyleSelectorAdapter.java
deleted file mode 100644
index ba48234..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLStyleSelectorAdapter.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-
-
-
-import java.util.StringTokenizer;
-
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSelectorAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.w3c.dom.Element;
-
-/**
- * Insert the type's description here.
- */
-public class HTMLStyleSelectorAdapter implements IStyleSelectorAdapter {
-
-	static private HTMLStyleSelectorAdapter instance;
-	private Object toMatch = IStyleSelectorAdapter.class;
-
-	public synchronized static HTMLStyleSelectorAdapter getInstance() {
-		if (instance == null) {
-			instance = new HTMLStyleSelectorAdapter();
-		}
-		return instance;
-	}
-
-	public boolean isAdapterForType(Object type) {
-		return type == toMatch;
-	}
-
-	public boolean match(ICSSSimpleSelector selector, Element element, String pseudoName) {
-		if (element == null)
-			return false;
-		int i;
-		String key;
-
-		// PseudoName
-		i = selector.getNumOfPseudoNames();
-		if (i > 0) {
-			if (pseudoName == null || pseudoName.length() == 0)
-				return false;
-			for (i = i - 1; i >= 0; i--) {
-				if (pseudoName.equalsIgnoreCase(selector.getPseudoName(i))) {
-					break;
-				}
-			}
-			if (i < 0)
-				return false;
-		}
-
-		// check tag name
-		if (!selector.isUniversal() && !element.getNodeName().equalsIgnoreCase(selector.getName()))
-			return false;
-
-		// check id
-		i = selector.getNumOfIDs();
-		if (i > 0) {
-			if (i > 1)
-				return false;
-			key = element.getAttribute("id");//$NON-NLS-1$
-			if (key == null)
-				return false;
-			if (!selector.getID(0).equals(key))
-				return false;
-		}
-
-		// check class
-		i = selector.getNumOfClasses();
-		if (i > 0) {
-			key = element.getAttribute("class");//$NON-NLS-1$
-			if (key == null)
-				return false;
-			StringTokenizer tokenizer = new StringTokenizer(key);
-			for (i = i - 1; i >= 0; i--) {
-				boolean ok = false;
-				while (tokenizer.hasMoreTokens()) {
-					if (selector.getClass(i).equals(tokenizer.nextToken())) {
-						ok = true;
-						break;
-					}
-				}
-				if (!ok)
-					return false;
-			}
-		}
-
-		// check attributes
-		for (i = selector.getNumOfAttributes() - 1; i >= 0; i--) {
-			StringTokenizer tokenizer = new StringTokenizer(selector.getAttribute(i), "=~| \t\r\n\f");//$NON-NLS-1$
-			int countTokens = tokenizer.countTokens();
-			if (countTokens > 0) {
-				String attrValue = element.getAttribute(tokenizer.nextToken());
-				if (attrValue == null)
-					return false;
-				if (countTokens > 1) {
-					String token = tokenizer.nextToken("= \t\r\n\f");//$NON-NLS-1$
-					StringTokenizer attrValueTokenizer = null;
-					if (token.equals("~")) {//$NON-NLS-1$
-						attrValueTokenizer = new StringTokenizer(attrValue);
-					}
-					else if (token.equals("|")) {//$NON-NLS-1$
-						attrValueTokenizer = new StringTokenizer(attrValue, "-");//$NON-NLS-1$
-					}
-					if (attrValueTokenizer != null) {
-						if (tokenizer.hasMoreTokens()) {
-							token = tokenizer.nextToken();
-							boolean ok = false;
-							while (attrValueTokenizer.hasMoreTokens()) {
-								if (token.equals(attrValueTokenizer.nextToken())) {
-									ok = true;
-									break;
-								}
-							}
-							if (!ok)
-								return false;
-						}
-					}
-					else {
-						if (!attrValue.equals(token))
-							return false;
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLStyleSelectorAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLStyleSelectorAdapterFactory.java
deleted file mode 100644
index 4c66fbf..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLStyleSelectorAdapterFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSelectorAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-/**
- * Insert the type's description here.
- */
-public class HTMLStyleSelectorAdapterFactory implements INodeAdapterFactory {
-
-	private static HTMLStyleSelectorAdapterFactory instance;
-	private Object toMatch = IStyleSelectorAdapter.class;
-
-	/**
-	 * CSSModelProvideAdapterFactory constructor comment.
-	 */
-	public HTMLStyleSelectorAdapterFactory() {
-		super();
-	}
-
-	/**
-	 * Method that returns the adapter associated with the given object.
-	 * It may be a singleton or not ... depending on the needs of the INodeAdapter  ...
-	 * but in general it is recommended for an adapter to be stateless, 
-	 * so the efficiencies of a singleton can be gained.
-	 *
-	 * The implementation of this method should call addAdapter on the adapted
-	 * object with the correct instance of the adapter.
-	 */
-	public INodeAdapter adapt(INodeNotifier notifier) {
-		INodeAdapter adapter = notifier.getExistingAdapter(IStyleSelectorAdapter.class);
-		if (adapter != null)
-			return adapter;
-		adapter = HTMLStyleSelectorAdapter.getInstance();
-		notifier.addAdapter(adapter);
-		return adapter;
-	}
-
-	public synchronized static HTMLStyleSelectorAdapterFactory getInstance() {
-		if (instance == null)
-			instance = new HTMLStyleSelectorAdapterFactory();
-		return instance;
-	}
-
-	/**
-	 * isFactoryForType method comment.
-	 */
-	public boolean isFactoryForType(Object type) {
-		return type == toMatch;
-	}
-
-	public void release() {
-		// default is to do nothing
-	}
-
-	/**
-	 * Overriding copy method
-	 */
-	public INodeAdapterFactory copy() {
-		return getInstance();
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/LinkElementAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/LinkElementAdapter.java
deleted file mode 100644
index 3156ed7..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/LinkElementAdapter.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IModelProvideAdapter;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetListAdapter;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.util.URIResolver;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- */
-public class LinkElementAdapter extends AbstractStyleSheetAdapter {
-
-	private final static String CSS_ID = ContentTypeIdForCSS.ContentTypeID_CSS;
-	private boolean replaceModel = true;
-	// this variable to hold the class is just a VAJava trick.
-	// it improves performance in VAJava by minimizing class loading.
-	private final Class ModelProvideAdapterClass = IModelProvideAdapter.class;
-
-	/**
-	 */
-	protected LinkElementAdapter() {
-		super();
-	}
-
-	/**
-	 */
-	private void attrReplaced() {
-		this.replaceModel = true;
-
-		Element element = getElement();
-		if (element == null)
-			return; // error
-		Document document = element.getOwnerDocument();
-		if (document == null)
-			return; // error
-		INodeNotifier notifier = (INodeNotifier) document;
-		HTMLDocumentAdapter adapter = (HTMLDocumentAdapter) notifier.getAdapterFor(IStyleSheetListAdapter.class);
-		if (adapter == null)
-			return;
-		adapter.childReplaced();
-	}
-
-	protected ICSSModel createModel() {
-		// create phantom(broken link) external CSS model
-		if (getElement() == null)
-			return null;
-		IStructuredModel baseModel = ((IDOMNode) getElement()).getModel();
-		ICSSModel newModel = (ICSSModel) baseModel.getModelManager().createUnManagedStructuredModelFor(CSS_ID);
-
-		// calculate base location and set
-		// get resolver in Model
-		URIResolver resolver = baseModel.getResolver();
-
-		// resolve to absolute url : this need not exact location of css file. It is important that absurl is not null. 
-		String ref = getElement().getAttribute(org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.ATTR_NAME_HREF);
-		String absurl = (resolver != null && ref != null) ? resolver.getLocationByURI(ref, true) : null;
-		if ((absurl == null) || (absurl.length() == 0)) {
-			IPath basePath = new Path(baseModel.getBaseLocation());
-			URLHelper helper = new URLHelper(basePath.removeLastSegments(1).toString());
-			absurl = helper.toAbsolute(ref == null ? "" : ref);//$NON-NLS-1$
-		}
-		if ((absurl == null) || (absurl.length() == 0)) {
-			absurl = ref;
-		}
-		if (absurl == null) {
-			absurl = "";//$NON-NLS-1$
-		}
-		newModel.setBaseLocation(absurl);
-
-		// set style listener
-		newModel.addStyleListener(this);
-
-		return newModel;
-	}
-
-	/**
-	 */
-	public ICSSModel getModel() {
-		ICSSModel model = getExistingModel();
-		if (this.replaceModel) {
-			ICSSModel oldModel = model;
-
-			model = retrieveModel();
-			setModel(model);
-
-			// release old model
-			if (oldModel != null) {
-				// get ModelProvideAdapter
-				IModelProvideAdapter adapter = (IModelProvideAdapter) ((INodeNotifier) getElement()).getAdapterFor(IModelProvideAdapter.class);
-				adapter.modelRemoved(oldModel);
-
-				oldModel.releaseFromRead();
-
-			}
-			this.replaceModel = false;
-		}
-		return model;
-	}
-
-	/**
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		if (eventType != INodeNotifier.CHANGE)
-			return;
-		Attr attr = (Attr) changedFeature;
-		if (attr == null)
-			return;
-		String name = attr.getName();
-		if (name.equalsIgnoreCase("rel") || //$NON-NLS-1$
-					name.equalsIgnoreCase("type") || //$NON-NLS-1$	
-					name.equalsIgnoreCase("href")) {//$NON-NLS-1$
-			attrReplaced();
-		}
-	}
-
-	/**
-	 */
-	public void refreshSheet() {
-		if (!replaceModel) {
-			removed();
-			replaceModel = true;
-
-			IDOMNode node = (IDOMNode) getElement();
-			if (node != null) {
-				node.notify(INodeNotifier.CHANGE, getElement().getAttributeNode(org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.ATTR_NAME_HREF), null, null, node.getStartOffset());
-			}
-		}
-	}
-
-	/**
-	 */
-	public void released() {
-		ICSSModel model = getExistingModel();
-		if (model != null) {
-			try {
-				// get ModelProvideAdapter
-				IModelProvideAdapter adapter = (IModelProvideAdapter) ((INodeNotifier) getElement()).getAdapterFor(IModelProvideAdapter.class);
-
-				// set element to null first, so that no document wide updates
-				setElement(null);
-				setModel(null);
-
-				if (adapter != null)
-					adapter.modelReleased(model);
-			}
-			finally {
-				model.releaseFromRead();
-			}
-		}
-		this.replaceModel = false;
-	}
-
-	/**
-	 */
-	public void removed() {
-		ICSSModel model = getExistingModel();
-		if (model != null) {
-			try {
-				setModel(null);
-
-				// get ModelProvideAdapter
-				IModelProvideAdapter adapter = (IModelProvideAdapter) ((INodeNotifier) getElement()).getAdapterFor(IModelProvideAdapter.class);
-				if (adapter != null)
-					adapter.modelRemoved(model);
-			}
-			finally {
-				model.releaseFromRead();
-			}
-		}
-		this.replaceModel = false;
-	}
-
-	/**
-	 */
-	protected boolean isValidAttribute() {
-		Element element = getElement();
-		if (element == null)
-			return false;
-		String rel = element.getAttribute("rel");//$NON-NLS-1$
-		if (rel == null || !rel.equalsIgnoreCase("stylesheet"))//$NON-NLS-1$
-			return false;
-		String type = element.getAttribute("type");//$NON-NLS-1$
-		if (type != null && !type.equalsIgnoreCase("text/css"))//$NON-NLS-1$
-			return false;
-		String href = element.getAttribute("href");//$NON-NLS-1$
-		if (href == null || href.length() == 0)
-			return false;
-		return true;
-	}
-
-	/**
-	 */
-	private ICSSModel retrieveModel() {
-		if (!isValidAttribute()) {
-			return null;
-		}
-
-		// null,attr check is done in isValidAttribute()
-		Element element = getElement();
-		String href = element.getAttribute("href");//$NON-NLS-1$
-
-		IDOMModel baseModel = ((IDOMNode) element).getModel();
-		if (baseModel == null)
-			return null;
-		Object id = baseModel.getId();
-		if (!(id instanceof String))
-			return null;
-		//String base = (String)id;
-
-		// get ModelProvideAdapter
-		IModelProvideAdapter adapter = (IModelProvideAdapter) ((INodeNotifier) getElement()).getAdapterFor(ModelProvideAdapterClass);
-
-		URLModelProvider provider = new URLModelProvider();
-		try {
-			IStructuredModel newModel = provider.getModelForRead(baseModel, href);
-			if (newModel == null)
-				return null;
-			if (!(newModel instanceof ICSSModel)) {
-				newModel.releaseFromRead();
-				return null;
-			}
-
-			// notify adapter
-			if (adapter != null)
-				adapter.modelProvided(newModel);
-
-			return (ICSSModel) newModel;
-		}
-		catch (UnsupportedEncodingException e) {
-		}
-		catch (IOException e) {
-		}
-
-		return null;
-	}
-
-	/**
-	 */
-	protected void setModel(ICSSModel model) {
-		ICSSModel oldModel = getExistingModel();
-		if (model == oldModel)
-			return;
-		super.setModel(model);
-		if (this.replaceModel)
-			this.replaceModel = false;
-		if (oldModel != null)
-			oldModel.removeStyleListener(this);
-		if (model != null)
-			model.addStyleListener(this);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleAdapterFactory.java
deleted file mode 100644
index 83318df..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleAdapterFactory.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetListAdapter;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- */
-public class StyleAdapterFactory implements INodeAdapterFactory {
-
-	private static StyleAdapterFactory instance = null;
-
-	//	private static String CSS_CONTENT_TYPE = "text/css";//$NON-NLS-1$
-	/**
-	 */
-	private StyleAdapterFactory() {
-		super();
-	}
-
-	/**
-	 */
-	public INodeAdapter adapt(INodeNotifier notifier) {
-		if (notifier == null)
-			return null;
-
-		Node node = (Node) notifier;
-		short nodeType = node.getNodeType();
-		if (nodeType == Node.DOCUMENT_NODE) {
-			INodeAdapter adapter = notifier.getExistingAdapter(IStyleSheetListAdapter.class);
-			if (adapter != null)
-				return adapter;
-			HTMLDocumentAdapter newAdapter = new HTMLDocumentAdapter();
-			newAdapter.setDocument((Document) node);
-			notifier.addAdapter(newAdapter);
-			return newAdapter;
-		}
-		if (nodeType != Node.ELEMENT_NODE)
-			return null;
-
-		Element element = (Element) node;
-		String tagName = element.getTagName();
-		if (tagName.equalsIgnoreCase(HTML40Namespace.ElementName.STYLE)) {
-			if (!isTagAvailable(element.getOwnerDocument(), HTML40Namespace.ElementName.STYLE)) {
-				return null;
-			}
-			//		String type = element.getAttribute(HTML40Namespace.ATTR_NAME_TYPE);
-			//		if (type != null && ! type.equalsIgnoreCase(CSS_CONTENT_TYPE)) {
-			//			return null;
-			//		}
-			INodeAdapter adapter = notifier.getExistingAdapter(IStyleSheetAdapter.class);
-			if (adapter != null)
-				return adapter;
-			StyleElementAdapter newAdapter = new StyleElementAdapter();
-			newAdapter.setElement(element);
-			notifier.addAdapter(newAdapter);
-			return newAdapter;
-		}
-		else if (tagName.equalsIgnoreCase(HTML40Namespace.ElementName.LINK)) {
-			if (!isTagAvailable(element.getOwnerDocument(), HTML40Namespace.ElementName.LINK)) {
-				return null;
-			}
-			INodeAdapter adapter = notifier.getExistingAdapter(IStyleSheetAdapter.class);
-			if (adapter != null)
-				return adapter;
-			LinkElementAdapter newAdapter = new LinkElementAdapter();
-			newAdapter.setElement(element);
-			notifier.addAdapter(newAdapter);
-			return newAdapter;
-		}
-
-		INodeAdapter adapter = notifier.getExistingAdapter(IStyleDeclarationAdapter.class);
-		if (adapter != null)
-			return adapter;
-
-		if (!isAttributeAvailable(element, HTML40Namespace.ATTR_NAME_STYLE)) {
-			return null;
-		}
-		StyleAttrAdapter newAdapter = new StyleAttrAdapter();
-		newAdapter.setElement(element);
-		notifier.addAdapter(newAdapter);
-		return newAdapter;
-	}
-
-	/**
-	 */
-	public synchronized static StyleAdapterFactory getInstance() {
-		if (instance == null)
-			instance = new StyleAdapterFactory();
-		return instance;
-	}
-
-	/**
-	 */
-	public boolean isFactoryForType(Object type) {
-		return (type == IStyleSheetAdapter.class || type == IStyleDeclarationAdapter.class || type == IStyleSheetListAdapter.class);
-	}
-
-	public void release() {
-		// default is to do nothing
-	}
-
-	private static boolean isTagAvailable(Document document, String elementName) {
-		ModelQuery modelQuery = ModelQueryUtil.getModelQuery(document);
-		if (modelQuery != null) {
-			CMDocument cmdoc = modelQuery.getCorrespondingCMDocument(document);
-			CMNamedNodeMap map = cmdoc.getElements();
-			if ((CMElementDeclaration) map.getNamedItem(elementName) != null) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	private static boolean isAttributeAvailable(Element element, String attrName) {
-		ModelQuery modelQuery = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-		if (modelQuery != null) {
-			CMElementDeclaration decl = modelQuery.getCMElementDeclaration(element);
-			if (decl != null) {
-				CMNamedNodeMap map = decl.getAttributes();
-				if ((CMAttributeDeclaration) map.getNamedItem(attrName) != null) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Overriding Object's clone() method
-	 */
-	public INodeAdapterFactory copy() {
-		return getInstance();
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleAttrAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleAttrAdapter.java
deleted file mode 100644
index db14d1c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleAttrAdapter.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-
-
-
-import org.eclipse.wst.css.core.internal.parser.CSSSourceParser;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.css.CSSStyleDeclaration;
-
-/**
- */
-public class StyleAttrAdapter extends AbstractCSSModelAdapter implements IStructuredDocumentListener, IStyleDeclarationAdapter {
-
-	private boolean ignoreNotification = false;
-	private final static String STYLE = "style";//$NON-NLS-1$
-
-	/**
-	 */
-	StyleAttrAdapter() {
-		super();
-	}
-
-	/**
-	 */
-	public ICSSModel getModel() {
-		ICSSModel model = getExistingModel();
-		if (model == null && isModelNecessary()) {
-			model = createModel();
-			if (model == null)
-				return null;
-			
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			if (structuredDocument == null)
-				return null;
-
-			RegionParser parser = structuredDocument.getParser();
-			if (parser instanceof CSSSourceParser) {
-				((CSSSourceParser)parser).setParserMode(CSSSourceParser.MODE_DECLARATION);
-			} else {
-				return null;
-			}
-			
-			structuredDocument.addDocumentChangedListener(this);
-
-			setModel(model); // need to set before valueChanged()
-			valueChanged();
-		}
-		if (model != null && !isModelNecessary()) {
-			model = null;
-			valueChanged();
-		}
-		return model;
-	}
-
-	/**
-	 */
-	public CSSStyleDeclaration getStyle() {
-		ICSSModel model = getModel();
-		if (model == null)
-			return null;
-		return (CSSStyleDeclaration) model.getDocument();
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type
-	 * allows it to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return (type == IStyleDeclarationAdapter.class);
-	}
-
-	/**
-	 */
-	public void newModel(NewDocumentEvent event) {
-		if (event == null)
-			return;
-		if (event.getOriginalRequester() == this)
-			return;
-
-		setValue();
-	}
-
-	/**
-	 */
-	public void noChange(NoChangeEvent structuredDocumentEvent) {
-	}
-
-	/**
-	 */
-	public void nodesReplaced(StructuredDocumentRegionsReplacedEvent event) {
-		if (event == null)
-			return;
-		if (event.getOriginalRequester() == this)
-			return;
-
-		setValue();
-	}
-
-	/**
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		if (this.ignoreNotification)
-			return;
-
-		if (eventType != INodeNotifier.CHANGE)
-			return;
-		Attr attr = (Attr) changedFeature;
-		if (attr == null)
-			return;
-		String name = attr.getName();
-		if (name.equalsIgnoreCase(STYLE)) {
-			valueChanged();
-		}
-	}
-
-	/**
-	 */
-	public void regionChanged(RegionChangedEvent event) {
-		if (event == null)
-			return;
-		if (event.getOriginalRequester() == this)
-			return;
-
-		setValue();
-	}
-
-	/**
-	 */
-	public void regionsReplaced(RegionsReplacedEvent event) {
-		if (event == null)
-			return;
-		if (event.getOriginalRequester() == this)
-			return;
-
-		setValue();
-	}
-
-	/**
-	 */
-	private void setValue() {
-		Element element = getElement();
-		if (element == null)
-			return;
-		ICSSModel model = getExistingModel();
-		if (model == null)
-			return;
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (structuredDocument == null)
-			return;
-
-		String value = null;
-		IStructuredDocumentRegionList flatNodes = structuredDocument.getRegionList();
-		if (flatNodes != null) {
-			int count = flatNodes.getLength();
-			if (count > 0) {
-				StringBuffer buffer = new StringBuffer();
-				for (int i = 0; i < count; i++) {
-					IStructuredDocumentRegion flatNode = flatNodes.item(i);
-					if (flatNode == null)
-						continue;
-					buffer.append(flatNode.getText());
-				}
-				value = buffer.toString();
-			}
-		}
-
-		this.ignoreNotification = true;
-		if (value == null || value.length() == 0) {
-			element.removeAttribute(STYLE);
-		}
-		else {
-			Attr attr = element.getAttributeNode(STYLE);
-			if (attr != null) {
-				((IDOMNode) attr).setValueSource(value);
-			}
-			else {
-				Document document = element.getOwnerDocument();
-				attr = document.createAttribute(STYLE);
-				((IDOMNode) attr).setValueSource(value);
-				element.setAttributeNode(attr);
-			}
-		}
-		this.ignoreNotification = false;
-
-		notifyStyleChanged(element);
-	}
-
-	/**
-	 */
-	private void valueChanged() {
-		Element element = getElement();
-		if (element == null)
-			return;
-		if (!isModelNecessary()) { // removed
-			setModel(null);
-
-			notifyStyleChanged(element);
-			return;
-		}
-
-		ICSSModel model = getExistingModel();
-		if (model == null)
-			return; // defer
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (structuredDocument == null)
-			return; // error
-
-		String value = null;
-		Attr attr = element.getAttributeNode(org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.ATTR_NAME_STYLE);
-		if (attr != null)
-			value = ((IDOMNode) attr).getValueSource();
-		structuredDocument.setText(this, value);
-
-		notifyStyleChanged(element);
-	}
-
-	/**
-	 * @return boolean
-	 */
-	private boolean isModelNecessary() {
-		return getElement() != null && getElement().getAttributeNode(org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.ATTR_NAME_STYLE) != null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleElementAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleElementAdapter.java
deleted file mode 100644
index 73e378f..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleElementAdapter.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-
-
-
-import org.eclipse.wst.css.core.internal.provisional.adapters.IModelProvideAdapter;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetListAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- */
-public class StyleElementAdapter extends AbstractStyleSheetAdapter implements IStructuredDocumentListener {
-
-	private boolean replaceModel = true;
-	private boolean ignoreNotification = false;
-
-	/**
-	 */
-	protected StyleElementAdapter() {
-		super();
-	}
-
-	/**
-	 * Preparation of applying changes from CSS sub-model to HTML model
-	 */
-	private void changeStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return;
-		Element element = getElement();
-		if (element == null)
-			return;
-		ICSSModel model = getExistingModel();
-		if (model == null)
-			return;
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (structuredDocument == null)
-			return;
-
-		// get old content length
-		Node child = element.getFirstChild();
-		if (child == null || child.getNodeType() != Node.TEXT_NODE)
-			return;
-		IDOMNode content = (IDOMNode) child;
-		int oldLength = content.getEndOffset() - content.getStartOffset();
-
-		// get new content length
-		int newLength = 0;
-		IStructuredDocumentRegionList flatNodes = structuredDocument.getRegionList();
-		if (flatNodes != null) {
-			int count = flatNodes.getLength();
-			if (count > 0) {
-				IStructuredDocumentRegion last = flatNodes.item(count - 1);
-				if (last != null)
-					newLength = last.getEnd();
-			}
-		}
-
-		int offset = flatNode.getStart();
-		int end = flatNode.getEnd();
-		int diff = oldLength - newLength;
-		int length = end - offset + diff;
-		String data = flatNode.getText();
-
-		replaceData(offset, length, data);
-	}
-
-	/**
-	 * Apply changes from HTML model to CSS sub-model
-	 */
-	private void contentChanged() {
-		Element element = getElement();
-		if (element == null)
-			return;
-		ICSSModel model = getExistingModel();
-		if (model == null)
-			return;
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (structuredDocument == null)
-			return;
-
-		String data = null;
-		Node child = element.getFirstChild();
-		if (child != null && child.getNodeType() == Node.TEXT_NODE && child.getNextSibling() == null) {
-			data = child.getNodeValue();
-		}
-		if (data == null)
-			data = "";//$NON-NLS-1$
-
-		// minimize replace range
-		int start = 0, end = 0;
-		String oldData = structuredDocument.get();
-		if (oldData == null)
-			oldData = "";//$NON-NLS-1$
-
-		// search differenct character position from first
-		for (; start < oldData.length() && start < data.length(); start++)
-			if (oldData.charAt(start) != data.charAt(start))
-				break;
-
-		if (start == oldData.length() && start == data.length())
-			return; // no change
-		else if (start == oldData.length()) {
-			structuredDocument.replaceText(getRequesterH2C(), start, 0, data.substring(start)); // append text to last
-		}
-		else if (start == data.length()) {
-			structuredDocument.replaceText(getRequesterH2C(), start, oldData.length() - start, ""); // remove text of last //$NON-NLS-1$
-		}
-		else {
-			// search differenct character position from last
-			for (; start < oldData.length() - end && start < data.length() - end; end++) {
-				if (oldData.charAt(oldData.length() - end - 1) != data.charAt(data.length() - end - 1))
-					break;
-			}
-			structuredDocument.replaceText(getRequesterH2C(), start, oldData.length() - end - start, data.substring(start, data.length() - end));
-		}
-
-	}
-
-	/**
-	 */
-	public ICSSModel getModel() {
-		ICSSModel model = getExistingModel();
-		if (this.replaceModel) {
-			ICSSModel oldModel = model;
-			model = createModel();
-
-			setModel(model); // need to set before contentChanged()
-			contentChanged();
-
-			if (oldModel != null) {
-				// get ModelProvideAdapter
-				IModelProvideAdapter adapter = (IModelProvideAdapter) ((INodeNotifier) getElement()).getAdapterFor(IModelProvideAdapter.class);
-				if (adapter != null) {
-					adapter.modelRemoved(oldModel);
-				}
-			}
-
-			this.replaceModel = false;
-		}
-		return model;
-	}
-
-	/**
-	 */
-	protected boolean isValidAttribute() {
-		Element element = getElement();
-		if (element == null) {
-			return false;
-		}
-		String type = element.getAttribute(HTML40Namespace.ATTR_NAME_TYPE);
-		if (type != null && type.length() > 0 &&!type.equalsIgnoreCase("text/css")) { //$NON-NLS-1$
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 */
-	protected ICSSModel createModel() {
-		if (!isValidAttribute()) {
-			return null;
-		}
-
-		ICSSModel model = super.createModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (structuredDocument == null)
-			return null;
-		structuredDocument.addDocumentChangedListener(this);
-
-		return model;
-	}
-
-	/**
-	 */
-	//  public ICSSModel getModel() {
-	//  	ICSSModel model = getExistingModel();
-	//  	if (model == null) {
-	//  		model = createModel();
-	//  		if (model == null) return null;
-	//  		IStructuredDocument structuredDocument = model.getStructuredDocument();
-	//  		if (structuredDocument == null) return null;
-	//  		structuredDocument.addModelChangedListener(this);
-	//  		setModel(model); // need to set before contentChanged()
-	//  		contentChanged();
-	//  	}
-	//  	return model;
-	//  }
-	/**
-	 */
-	private Object getRequesterH2C() {
-		return (getElement() != null && ((IDOMNode) getElement()).getModel() != null) ? (Object) ((IDOMNode) getElement()).getModel() : this;
-	}
-
-	/**
-	 */
-	private Object getRequesterC2H() {
-		return (getModel() != null) ? (Object) getModel() : this;
-	}
-
-	/**
-	 * Implementing IStructuredDocumentListener's method
-	 * Event from CSS Flat Model
-	 */
-	public void newModel(NewDocumentEvent event) {
-		if (event == null)
-			return;
-		if (event.getOriginalRequester() == getRequesterH2C())
-			return;
-		IStructuredDocument structuredDocument = event.getStructuredDocument();
-		if (structuredDocument == null)
-			return;
-		IStructuredDocumentRegionList flatNodes = structuredDocument.getRegionList();
-		if (flatNodes == null)
-			return;
-
-		replaceStructuredDocumentRegions(flatNodes, null);
-	}
-
-	/**
-	 * Implementing IStructuredDocumentListener's method
-	 * Event from CSS Flat Model
-	 */
-	public void noChange(NoChangeEvent structuredDocumentEvent) {
-	}
-
-	/**
-	 * Implementing IStructuredDocumentListener's method
-	 * Event from CSS Flat Model
-	 */
-	public void nodesReplaced(StructuredDocumentRegionsReplacedEvent event) {
-		if (event == null)
-			return;
-		if (event.getOriginalRequester() == getRequesterH2C())
-			return;
-		IStructuredDocumentRegionList oldStructuredDocumentRegions = event.getOldStructuredDocumentRegions();
-		IStructuredDocumentRegionList newStructuredDocumentRegions = event.getNewStructuredDocumentRegions();
-		if (oldStructuredDocumentRegions == null && newStructuredDocumentRegions == null)
-			return;
-
-		replaceStructuredDocumentRegions(newStructuredDocumentRegions, oldStructuredDocumentRegions);
-	}
-
-	/**
-	 * Overriding INodeAdapter's method
-	 * Event from <STYLE> element
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		if (this.ignoreNotification)
-			return;
-
-		if (eventType == INodeNotifier.ADD || eventType == INodeNotifier.REMOVE || eventType == INodeNotifier.CONTENT_CHANGED) {
-			contentChanged();
-		}
-		else if (eventType == INodeNotifier.CHANGE) {
-			Attr attr = (Attr) changedFeature;
-			if (attr == null)
-				return;
-			String name = attr.getName();
-			if (name.equalsIgnoreCase("type")) { //$NON-NLS-1$
-				this.replaceModel = true;
-
-				Element element = getElement();
-				if (element == null) {
-					return;
-				}
-				Document document = element.getOwnerDocument();
-				if (document == null) {
-					return;
-				}
-				HTMLDocumentAdapter adapter = (HTMLDocumentAdapter) ((INodeNotifier) document).getAdapterFor(IStyleSheetListAdapter.class);
-				if (adapter != null) {
-					adapter.childReplaced();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Implementing IStructuredDocumentListener's method
-	 * Event from CSS Flat Model
-	 */
-	public void regionChanged(RegionChangedEvent event) {
-		if (event == null)
-			return;
-		if (event.getOriginalRequester() == getRequesterH2C())
-			return;
-		IStructuredDocumentRegion flatNode = event.getStructuredDocumentRegion();
-		if (flatNode == null)
-			return;
-
-		changeStructuredDocumentRegion(flatNode);
-	}
-
-	/**
-	 * Implementing IStructuredDocumentListener's method
-	 * Event from CSS Flat Model
-	 */
-	public void regionsReplaced(RegionsReplacedEvent event) {
-		if (event == null)
-			return;
-		if (event.getOriginalRequester() == getRequesterH2C())
-			return;
-		IStructuredDocumentRegion flatNode = event.getStructuredDocumentRegion();
-		if (flatNode == null)
-			return;
-
-		changeStructuredDocumentRegion(flatNode);
-	}
-
-	/**
-	 * Apply changes from CSS sub-model to HTML model
-	 */
-	private void replaceData(int offset, int length, String data) {
-		IDOMNode element = (IDOMNode) getElement();
-		if (element == null)
-			return;
-		IDOMModel ownerModel = element.getModel();
-		if (ownerModel == null)
-			return;
-		IStructuredDocument structuredDocument = ownerModel.getStructuredDocument();
-		if (structuredDocument == null)
-			return;
-		IStructuredDocumentRegion flatNode = element.getStartStructuredDocumentRegion();
-		if (flatNode == null)
-			return;
-
-		int contentOffset = flatNode.getEndOffset();
-		if (data == null)
-			data = "";//$NON-NLS-1$
-
-		this.ignoreNotification = true;
-		structuredDocument.replaceText(getRequesterC2H(), contentOffset + offset, length, data);
-		this.ignoreNotification = false;
-	}
-
-	/**
-	 * Preparation of applying changes from CSS sub-model to HTML model
-	 */
-	private void replaceStructuredDocumentRegions(IStructuredDocumentRegionList newStructuredDocumentRegions, IStructuredDocumentRegionList oldStructuredDocumentRegions) {
-		int offset = 0;
-		int length = 0;
-		if (oldStructuredDocumentRegions != null) {
-			int count = oldStructuredDocumentRegions.getLength();
-			if (count > 0) {
-				IStructuredDocumentRegion first = oldStructuredDocumentRegions.item(0);
-				if (first != null)
-					offset = first.getStart();
-				IStructuredDocumentRegion last = oldStructuredDocumentRegions.item(count - 1);
-				if (last != null)
-					length = last.getEnd() - offset;
-			}
-		}
-		String data = null;
-		if (newStructuredDocumentRegions != null) {
-			int count = newStructuredDocumentRegions.getLength();
-			if (count > 0) {
-				StringBuffer buffer = new StringBuffer();
-				for (int i = 0; i < count; i++) {
-					IStructuredDocumentRegion flatNode = newStructuredDocumentRegions.item(i);
-					if (flatNode == null)
-						continue;
-					buffer.append(flatNode.getText());
-					if (i == 0)
-						offset = flatNode.getStart();
-				}
-				data = buffer.toString();
-			}
-		}
-
-		replaceData(offset, length, data);
-	}
-
-	/**
-	 */
-	protected void setModel(ICSSModel model) {
-		ICSSModel oldModel = getExistingModel();
-		if (model == oldModel)
-			return;
-		super.setModel(model);
-		if (oldModel != null)
-			oldModel.removeStyleListener(this);
-		if (model != null)
-			model.addStyleListener(this);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleListener.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleListener.java
deleted file mode 100644
index bc8d16f..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleListener.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-
-
-
-/**
- */
-public interface StyleListener {
-
-	/**
-	 */
-	void styleChanged();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/URLHelper.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/URLHelper.java
deleted file mode 100644
index 9413d68..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/URLHelper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-
-/**
- * @deprecated 
- */
-public class URLHelper extends org.eclipse.wst.css.core.internal.util.URLHelper {
-
-	/**
-	 * @param baseUrl
-	 */
-	public URLHelper(String baseUrl) {
-		super(baseUrl);
-	}
-
-	/**
-	 * @param baseUrl
-	 * @param docRoot
-	 */
-	public URLHelper(String baseUrl, String docRoot) {
-		super(baseUrl, docRoot);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/URLModelProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/URLModelProvider.java
deleted file mode 100644
index 83baf5b..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/URLModelProvider.java
+++ /dev/null
@@ -1,445 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.htmlcss;
-
-
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.UnsupportedCharsetException;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeConstants;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingRule;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.util.PathHelper;
-import org.eclipse.wst.sse.core.internal.util.ProjectResolver;
-import org.eclipse.wst.sse.core.internal.util.URIResolver;
-import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-// TODO when this class is removed from .core, PathHelper and URLHelper class
-// also can be removed.
-
-/**
- */
-public class URLModelProvider {
-
-	private static final int GET_MODEL_FOR_READ = 1;
-	//	private static final int GET_NEW_MODEL_FOR_READ = 2;
-	private static final int GET_MODEL_FOR_EDIT = 3;
-	//	private static final int GET_NEW_MODEL_FOR_EDIT = 4;
-	//	private static final int READ_BUFFER_SIZE = 4096;
-	// IModelManager
-	private IModelManager modelManager = null;
-
-	/**
-	 */
-	public URLModelProvider() {
-		super();
-
-		// obtain model manager
-		modelManager = StructuredModelManager.getModelManager();
-	}
-
-	/**
-	 * Calculate ID from a filename. This must be same as
-	 * FileModelProvider.calculateId(IFile)
-	 */
-	private static String calculateId(IPath fullIPath) {
-		return fullIPath.toString();
-	}
-
-	/**
-	 * <code>baseModel</code>: the model containing the link
-	 * <code>ref</code>: the link URL string
-	 */
-	private IStructuredModel getCommonModelFor(final IStructuredModel baseModel, final String ref, final int which) throws IOException {
-		// first, create absolute url
-		String absURL = resolveURI(baseModel, ref, true);
-		if ((absURL == null) || (absURL.length() == 0)) {
-			return null;
-		}
-
-		// need to remove file:// scheme if necessary
-		try {
-			final java.net.URL aURL = new java.net.URL(absURL);
-			// An actual URL was given, only file:/// is supported
-			// resolve it by finding the file it points to
-			if (!aURL.getProtocol().equals("platform")) { //$NON-NLS-1$
-				if (aURL.getProtocol().equals("file") && (aURL.getHost().equals("localhost") || aURL.getHost().length() == 0)) {//$NON-NLS-2$//$NON-NLS-1$
-					absURL = aURL.getFile();
-					final IPath ipath = new Path(absURL);
-					//  if path has a device, and if it begins with
-					// IPath.SEPARATOR, remove it
-					final String device = ipath.getDevice();
-					if ((device != null) && (device.length() > 0)) {
-						if (device.charAt(0) == IPath.SEPARATOR) {
-							final String newDevice = device.substring(1);
-							absURL = ipath.setDevice(newDevice).toString();
-						}
-					}
-
-				}
-			}
-		}
-		catch (java.net.MalformedURLException mfuExc) {
-		}
-
-
-		// next, decide project
-		IProject project = null;
-		final IPath fullIPath = new Path(absURL);
-		IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
-		IContainer container = workspace.getContainerForLocation(fullIPath);
-		if (container != null) {
-			// fullIPath doesn't exist in workspace
-			project = container.getProject();
-		}
-
-		// If HTML document has a link to an extern CSS which is not in
-		// IProject
-		// workspace.getContainerForLoation() may return null. We need to take
-		// care
-		// of this case
-
-		// now, get absURL's IFile
-		if ((project != null) && (project.getLocation().isPrefixOf(fullIPath) == false)) {
-			// it's at outside of Project
-			return null;
-		}
-
-		IStructuredModel model = null;
-		if (project != null) {
-			IPath filePath = fullIPath.removeFirstSegments(project.getLocation().segmentCount());
-			IFile file = (filePath != null && !filePath.isEmpty()) ? project.getFile(filePath) : null;
-			if (file == null) {
-				return null;
-			}
-
-			// obtain model
-			if (which == GET_MODEL_FOR_EDIT) {
-				model = getModelForEdit(file);
-			}
-			else if (which == GET_MODEL_FOR_READ) {
-				model = getModelForRead(file);
-			}
-
-			// setting synchronization stamp is IModelManager's client's
-			// responsibility
-			if (model != null && model.getSynchronizationStamp() == IResource.NULL_STAMP)
-				model.resetSynchronizationStamp(file);
-		}
-		else {
-			String id = null;
-			InputStream inStream = null;
-			// obtain resolver
-			URIResolver resolver = (project != null) ? (URIResolver) project.getAdapter(URIResolver.class) : null;
-			if (resolver == null) {
-				// ProjectResolver can take care of the case if project is
-				// null.
-				resolver = new ProjectResolver(project);
-			}
-			if (resolver == null) {
-				return null;
-			}
-
-			// there is no project. we can't expect IProject help to create
-			// id/inputStream
-			java.io.File file = fullIPath.toFile();
-
-			// obatin id
-			id = calculateId(fullIPath);
-
-			// obtain InputStream
-			try {
-				inStream = new FileInputStream(file);
-			}
-			catch (FileNotFoundException fnfe) {
-				// the file does not exist, or we don't have read permission
-				return null;
-			}
-
-			// obtain model
-			try {
-				if (which == GET_MODEL_FOR_EDIT) {
-					model = getModelManager().getModelForEdit(id, inStream, resolver);
-				}
-				else if (which == GET_MODEL_FOR_READ) {
-					model = getModelManager().getModelForRead(id, inStream, resolver);
-				}
-			}
-			catch (UnsupportedEncodingException ue) {
-			}
-			catch (IOException ioe) {
-			}
-			finally {
-				// close now !
-				if (inStream != null) {
-					inStream.close();
-				}
-			}
-		}
-
-
-		// set locationid
-		if (model != null && model.getBaseLocation() == null) {
-			model.setBaseLocation(fullIPath.toString());
-		}
-
-		return model;
-	}
-
-	/**
-	 * <code>baseModel</code>: the model containing the link
-	 * <code>ref</code>: the link URL string
-	 */
-	public IStructuredModel getModelForEdit(IStructuredModel baseModel, String ref) throws IOException {
-		return getCommonModelFor(baseModel, ref, GET_MODEL_FOR_EDIT);
-	}
-
-	/**
-	 */
-	private IStructuredModel getModelForEdit(IFile file) throws IOException {
-		if (file == null)
-			return null;
-		IModelManager manager = getModelManager();
-
-		// create a fake InputStream
-		IStructuredModel model = null;
-		try {
-			model = manager.getModelForEdit(file);
-		}
-		catch (UnsupportedCharsetException ex) {
-			try {
-				model = manager.getModelForEdit(file, EncodingRule.FORCE_DEFAULT);
-			}
-			catch (IOException ioe) {
-			}
-			catch (CoreException ce) {
-			}
-		}
-		catch (CoreException ce) {
-		}
-		return model;
-	}
-
-	/**
-	 * <code>baseModel</code>: the model containing the link
-	 * <code>ref</code>: the link URL string
-	 */
-	public IStructuredModel getModelForRead(IStructuredModel baseModel, String ref) throws UnsupportedEncodingException, IOException {
-		return getCommonModelFor(baseModel, ref, GET_MODEL_FOR_READ);
-	}
-
-	/**
-	 */
-	private IStructuredModel getModelForRead(IFile file) throws IOException {
-		if (file == null)
-			return null;
-		IModelManager manager = getModelManager();
-
-		// create a fake InputStream
-		IStructuredModel model = null;
-		try {
-			model = manager.getModelForRead(file);
-		}
-		catch (UnsupportedCharsetException ex) {
-			try {
-				model = manager.getModelForRead(file, EncodingRule.FORCE_DEFAULT);
-			}
-			catch (IOException ioe) {
-			}
-			catch (CoreException ce) {
-			}
-		}
-		catch (CoreException ce) {
-		}
-		return model;
-	}
-
-	/**
-	 */
-	private IModelManager getModelManager() {
-		return modelManager;
-	}
-
-	public IStructuredModel getNewModelForEdit(IFile iFile) {
-		if (iFile == null)
-			return null;
-		IModelManager manager = getModelManager();
-		if (manager == null)
-			return null;
-
-		IStructuredModel model = null;
-		try {
-			model = manager.getNewModelForEdit(iFile, false);
-		}
-		catch (IOException ex) {
-		}
-		catch (ResourceInUse riu) {
-		}
-		catch (ResourceAlreadyExists rae) {
-		}
-		catch (CoreException ce) {
-		}
-		return model;
-	}
-
-	public IStructuredModel getNewModelForRead(IFile iFile) {
-		if (iFile == null)
-			return null;
-		IModelManager manager = getModelManager();
-		if (manager == null)
-			return null;
-
-		IStructuredModel model = null;
-		try {
-			model = manager.getNewModelForEdit(iFile, false);
-		}
-		catch (IOException ex) {
-		}
-		catch (ResourceInUse riu) {
-		}
-		catch (ResourceAlreadyExists rae) {
-		}
-		catch (CoreException ce) {
-		}
-		return model;
-	}
-
-	/**
-	 * Utility to check the model is HTML family or not
-	 */
-	static private boolean isHTMLFamily(IStructuredModel model) {
-		if (model instanceof IDOMModel) {
-			IDOMDocument document = ((IDOMModel) model).getDocument();
-			DocumentTypeAdapter adapter = (DocumentTypeAdapter) document.getAdapterFor(DocumentTypeAdapter.class);
-			if (adapter != null)
-				return adapter.hasFeature(HTMLDocumentTypeConstants.HTML);
-		}
-		return false;
-	}
-
-	/**
-	 * <code>baseModel</code>: the model containing the link
-	 * <code>ref</code>: the link URL string
-	 * <code>resolveCrossProjectLinks</code>: If resolveCrossProjectLinks
-	 * is set to true, then this method will properly resolve the URI if it is
-	 * a valid URI pointing to another (appropriate) project.
-	 */
-	public static String resolveURI(IStructuredModel baseModel, String ref, boolean resolveCrossProjectLinks) {
-		if (baseModel == null)
-			return null;
-		// for HTML, 'href' attribute value of BASE element
-		// should be used, if exists any
-		String baseHref = null;
-		// dmw_TODO needs to be changed to handle a content model
-		// of HTML or XHTML
-		if (isHTMLFamily(baseModel)) {
-			final IDOMModel xmlmodel = (IDOMModel) baseModel;
-			final IDOMDocument doc = xmlmodel.getDocument();
-			// look for <BASE> w/ href
-			final NodeList nl = doc.getElementsByTagName("BASE");//$NON-NLS-1$
-			if ((nl != null) && (nl.getLength() > 0)) {
-				// per each <BASE>
-				for (int i = 0; i < nl.getLength(); i++) {
-					final Node baseNode = nl.item(i);
-					if (baseNode != null) {
-						// get all attrs
-						final NamedNodeMap attrNodes = baseNode.getAttributes();
-						if (attrNodes != null) {
-							final Node attrNode = attrNodes.getNamedItem("HREF");//$NON-NLS-1$
-							if (attrNode != null) {
-								// found href=""
-								final String attrValue = attrNode.getNodeValue();
-								if (attrValue != null) {
-									baseHref = attrValue.trim();
-								}
-							}
-						}
-					}
-					// what if there are multiple <BASE> tags ??
-					if (baseHref != null) {
-						break;
-					}
-				}
-			}
-		}
-
-		// get resolver in Model
-		final URIResolver resolver = baseModel.getResolver();
-
-		// resolve to absolute url
-		final String absurl = (resolver != null) ? ((baseHref != null) ? resolver.getLocationByURI(ref, baseHref, resolveCrossProjectLinks) : resolver.getLocationByURI(ref, resolveCrossProjectLinks)) : null;
-		if ((resolver != null) && (absurl == null) && (ref != null) && (ref.trim().length() > 0) && (ref.trim().charAt(0) == '/')) {
-			// to reach here means :
-			//    ref is a Docroot relative
-			//    resolver can't resolve ref
-			// so that href is a broken and should not create model
-			return null;
-		}
-		if ((absurl != null) && (absurl.length() > 0)) {
-			return absurl;
-		}
-
-		// maybe ref is at outside of the Project
-		// obtain docroot;
-		final IContainer container = (resolver != null) ? resolver.getRootLocation() : null;
-		String docroot = null;
-		if (container != null) {
-			docroot = container.getLocation().toString();
-		}
-		if (docroot == null) {
-			docroot = baseModel.getBaseLocation();
-		}
-		if (docroot == null) {
-			// should not be
-			return null;
-		}
-
-		// obtain document url
-		String modelBaseLocation = baseModel.getBaseLocation();
-		if ((modelBaseLocation == null) || (modelBaseLocation.length() == 0)) {
-			// fallback...
-			modelBaseLocation = baseModel.getId();
-		}
-		if ((modelBaseLocation == null) || (modelBaseLocation.length() == 0)) {
-			// i can't resolve uri !
-			return null;
-		}
-
-		// resolve url
-		URLHelper helper = new URLHelper(PathHelper.getContainingFolderPath(modelBaseLocation), PathHelper.getContainingFolderPath(PathHelper.appendTrailingURLSlash(docroot)));
-		return helper.toAbsolute(ref);
-	}
-
-}
-
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java
deleted file mode 100644
index e000a05..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelhandler;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSelectorAdapter;
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
-import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeAdapterFactory;
-import org.eclipse.wst.html.core.internal.document.HTMLModelParserAdapterFactory;
-import org.eclipse.wst.html.core.internal.htmlcss.HTMLStyleSelectorAdapterFactory;
-import org.eclipse.wst.html.core.internal.htmlcss.StyleAdapterFactory;
-import org.eclipse.wst.html.core.internal.modelquery.ModelQueryAdapterFactoryForEmbeddedHTML;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockTagParser;
-import org.eclipse.wst.sse.core.internal.ltk.parser.JSPCapableParser;
-import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.util.Assert;
-import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter;
-import org.eclipse.wst.xml.core.internal.document.ModelParserAdapter;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-public class EmbeddedHTML implements EmbeddedTypeHandler {
-
-	public String ContentTypeID_EmbeddedHTML = "org.eclipse.wst.html.core.internal.contenttype.EmbeddedHTML"; //$NON-NLS-1$
-	private List supportedMimeTypes;
-
-	/**
-	 * Constructor for EmbeddedHTML.
-	 */
-	public EmbeddedHTML() {
-		super();
-	}
-
-	/**
-	 * Convenience method to add tag names using BlockMarker object
-	 */
-	private void addHTMLishTag(BlockTagParser parser, String tagname) {
-		BlockMarker bm = new BlockMarker(tagname, null, DOMRegionContext.BLOCK_TEXT, false);
-		parser.addBlockMarker(bm);
-	}
-
-	/**
-	 * @see EmbeddedContentType#getFamilyId()
-	 */
-	public String getFamilyId() {
-		return ModelHandlerForHTML.AssociatedContentTypeID;
-	}
-
-	/*
-	 * Only "model side" embedded factories can be added here.
-	 */
-	public List getAdapterFactories() {
-		List factories = new ArrayList();
-		factories.add(new ModelQueryAdapterFactoryForEmbeddedHTML());
-		// factories.addAll(PluginContributedFactoryReader.getInstance().getFactories(this));
-		return factories;
-	}
-
-	/*
-	 * @see EmbeddedContentType#initializeParser(RegionParser)
-	 */
-	public void initializeParser(JSPCapableParser parser) {
-		addHTMLishTag(parser, "script"); //$NON-NLS-1$
-		addHTMLishTag(parser, "style"); //$NON-NLS-1$
-	}
-
-	public List getSupportedMimeTypes() {
-		if (supportedMimeTypes == null) {
-			supportedMimeTypes = new ArrayList();
-			supportedMimeTypes.add("text/html"); //$NON-NLS-1$
-			supportedMimeTypes.add("text/xhtml"); //$NON-NLS-1$
-			supportedMimeTypes.add("application/xhtml+xml"); //$NON-NLS-1$
-			supportedMimeTypes.add("application/xml"); //$NON-NLS-1$
-			supportedMimeTypes.add("text/vnd.wap.wml"); //$NON-NLS-1$
-		}
-		return supportedMimeTypes;
-	}
-
-	public void initializeFactoryRegistry(FactoryRegistry registry) {
-		Assert.isNotNull(registry);
-
-		INodeAdapterFactory factory = null;
-		if (!registry.contains(DocumentTypeAdapter.class)) {
-			factory = new HTMLDocumentTypeAdapterFactory();
-			registry.addFactory(factory);
-		}
-		if (!registry.contains(ModelParserAdapter.class)) {
-			factory = HTMLModelParserAdapterFactory.getInstance();
-			registry.addFactory(factory);
-		}
-		if (!registry.contains(IStyleSelectorAdapter.class)) {
-
-			factory = HTMLStyleSelectorAdapterFactory.getInstance();
-			registry.addFactory(factory);
-		}
-		if (!registry.contains(IStyleSheetAdapter.class)) {
-
-			factory = StyleAdapterFactory.getInstance();
-			registry.addFactory(factory);
-		}
-
-	}
-
-	public void uninitializeFactoryRegistry(FactoryRegistry registry) {
-		Assert.isNotNull(registry);
-
-		// ISSUE: should these factories be released? Or just 
-		// removed from this registry, because we are getting ready to
-		// re-add them?
-		INodeAdapterFactory factory = null;
-		if (!registry.contains(DocumentTypeAdapter.class)) {
-			factory = registry.getFactoryFor(DocumentTypeAdapter.class);
-			factory.release();
-			registry.removeFactory(factory);
-		}
-		if (!registry.contains(ModelParserAdapter.class)) {
-			factory = registry.getFactoryFor(ModelParserAdapter.class);
-			factory.release();
-			registry.removeFactory(factory);
-		}
-		if (!registry.contains(IStyleSelectorAdapter.class)) {
-			factory = registry.getFactoryFor(IStyleSelectorAdapter.class);
-			factory.release();
-			registry.removeFactory(factory);
-		}
-		if (!registry.contains(IStyleSheetAdapter.class)) {
-			factory = registry.getFactoryFor(IStyleSheetAdapter.class);
-			factory.release();
-			registry.removeFactory(factory);
-		}
-
-	}
-
-	public void uninitializeParser(JSPCapableParser parser) {
-		// I'm assuming block markers are unique based on name only
-		// we add these as full BlockMarkers, but remove based on name alone.
-		parser.removeBlockMarker("script"); //$NON-NLS-1$
-		parser.removeBlockMarker("script"); //$NON-NLS-1$
-	}
-
-	public EmbeddedTypeHandler newInstance() {
-		return new EmbeddedHTML();
-	}
-
-	/**
-	 * will someday be controlled via extension point
-	 */
-	public boolean isDefault() {
-		return true;
-	}
-
-	public boolean canHandleMimeType(String mimeType) {
-		return getSupportedMimeTypes().contains(mimeType);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/ModelHandlerForHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/ModelHandlerForHTML.java
deleted file mode 100644
index 06cc15a..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/ModelHandlerForHTML.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelhandler;
-
-import org.eclipse.wst.html.core.internal.encoding.HTMLDocumentCharsetDetector;
-import org.eclipse.wst.html.core.internal.encoding.HTMLDocumentLoader;
-import org.eclipse.wst.html.core.internal.encoding.HTMLModelLoader;
-import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.AbstractModelHandler;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.provisional.IModelLoader;
-
-public class ModelHandlerForHTML extends AbstractModelHandler implements IModelHandler {
-	/** 
-	 * Needs to match what's in plugin registry. 
-	 * In fact, can be overwritten at run time with 
-	 * what's in registry! (so should never be 'final')
-	 */
-	static String AssociatedContentTypeID = "org.eclipse.wst.html.core.htmlsource"; //$NON-NLS-1$
-	/**
-	 * Needs to match what's in plugin registry. 
-	 * In fact, can be overwritten at run time with 
-	 * what's in registry! (so should never be 'final')
-	 */
-	private static String ModelHandlerID_HTML = "org.eclipse.wst.html.core.modelhandler"; //$NON-NLS-1$
-
-
-	public ModelHandlerForHTML() {
-		super();
-		setId(ModelHandlerID_HTML);
-		setAssociatedContentTypeId(AssociatedContentTypeID);
-	}
-
-	public IModelLoader getModelLoader() {
-		return new HTMLModelLoader();
-	}
-
-	public IDocumentCharsetDetector getEncodingDetector() {
-		return new HTMLDocumentCharsetDetector();
-	}
-
-	public IDocumentLoader getDocumentLoader() {
-		return new HTMLDocumentLoader();
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMAttributeDeclarationBuddySystem.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMAttributeDeclarationBuddySystem.java
deleted file mode 100644
index ae41f91..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMAttributeDeclarationBuddySystem.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-
-/**
- */
-class CMAttributeDeclarationBuddySystem extends CMNodeBuddySystem implements CMAttributeDeclaration {
-
-
-	public CMAttributeDeclarationBuddySystem(CMAttributeDeclaration self, CMAttributeDeclaration buddy, boolean isXHTML) {
-		super(self, buddy, isXHTML);
-	}
-
-	/*
-	 * @see CMAttributeDeclaration#getAttrName()
-	 */
-	public String getAttrName() {
-		return getSelf().getAttrName();
-	}
-
-	/*
-	 * @see CMAttributeDeclaration#getAttrType()
-	 */
-	public CMDataType getAttrType() {
-		return getSelf().getAttrType();
-	}
-
-	/*
-	 * @see CMAttributeDeclaration#getDefaultValue()
-	 * @deprecated in superclass
-	 */
-	public String getDefaultValue() {
-		return getSelf().getDefaultValue();
-	}
-
-	/*
-	 * @see CMAttributeDeclaration#getEnumAttr()
-	 * @deprecated in superclass
-	 */
-	public Enumeration getEnumAttr() {
-		return getSelf().getEnumAttr();
-	}
-
-	/*
-	 * @see CMAttributeDeclaration#getUsage()
-	 */
-	public int getUsage() {
-		return getSelf().getUsage();
-	}
-
-	private CMAttributeDeclaration getSelf() {
-		return (CMAttributeDeclaration) self;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMDocumentForBuddySystem.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMDocumentForBuddySystem.java
deleted file mode 100644
index 0f8f13e..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMDocumentForBuddySystem.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory;
-import org.eclipse.wst.html.core.internal.contentmodel.ssi.SSICMDocumentFactory;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType;
-
-/**
- */
-class CMDocumentForBuddySystem extends CMNodeBuddySystem implements CMDocument {
-
-
-	private static CMDocument getHTMLCMDocument() {
-		return HTMLCMDocumentFactory.getCMDocument(CMDocType.HTML_DOC_TYPE);
-	}
-
-	class Elements extends CMNamedNodeMapForBuddySystem {
-		public Elements(CMNamedNodeMap elements, boolean isXHTML) {
-			super(isXHTML);
-			makeBuddySystem(elements);
-			addSSIDecls();
-		}
-
-		protected String getKeyName(CMNode original) {
-			CMElementDeclaration edecl = getDecl(original);
-			if (edecl == null)
-				return null;
-			return edecl.getElementName();
-		}
-
-		protected CMNode createBuddySystem(CMNode original) {
-			CMElementDeclaration edecl = getDecl(original);
-			return new CMElementDeclarationBuddySystem(edecl, isXHTML());
-		}
-
-		private CMElementDeclaration getDecl(CMNode cmnode) {
-			if (cmnode == null)
-				return null;
-			if (cmnode.getNodeType() != CMNode.ELEMENT_DECLARATION)
-				return null;
-			return (CMElementDeclaration) cmnode;
-		}
-
-		private void addSSIDecls() {
-			CMDocument ssi = SSICMDocumentFactory.getCMDocument();
-			if (ssi == null)
-				return;
-			CMNamedNodeMap elements = ssi.getElements();
-			Iterator i = elements.iterator();
-			while (i.hasNext()) {
-				CMElementDeclaration decl = (CMElementDeclaration) i.next();
-				if (decl == null)
-					continue;
-				put(decl.getElementName(), decl);
-			}
-		}
-	}
-
-	private Elements elements = null;
-
-	public CMDocumentForBuddySystem(CMDocument self, boolean isXHTML) {
-		super(self, getHTMLCMDocument(), isXHTML);
-	}
-
-	/*
-	 * @see CMDocument#getElements()
-	 */
-	public CMNamedNodeMap getElements() {
-		if (elements != null)
-			return elements;
-		CMDocument cmdoc = getSelf();
-		if (cmdoc == null)
-			return null;
-		elements = new Elements(cmdoc.getElements(), isXHTML);
-		return elements;
-	}
-
-	/*
-	 * @see CMDocument#getEntities()
-	 */
-	public CMNamedNodeMap getEntities() {
-		CMDocument cmdoc = getSelf();
-		if (cmdoc == null)
-			return null;
-		return cmdoc.getEntities();
-	}
-
-	/*
-	 * @see CMDocument#getNamespace()
-	 */
-	public CMNamespace getNamespace() {
-		CMDocument cmdoc = getSelf();
-		if (cmdoc == null)
-			return null;
-		return cmdoc.getNamespace();
-	}
-
-	private CMDocument getSelf() {
-		if (self.getNodeType() != CMNode.DOCUMENT)
-			return null;
-		return (CMDocument) self;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMElementDeclarationBuddySystem.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMElementDeclarationBuddySystem.java
deleted file mode 100644
index c71b4e0..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMElementDeclarationBuddySystem.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory;
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType;
-
-/**
- */
-class CMElementDeclarationBuddySystem extends CMNodeBuddySystem implements CMElementDeclaration {
-
-
-	private static CMDocument htmlcm = HTMLCMDocumentFactory.getCMDocument(CMDocType.HTML_DOC_TYPE);
-
-	private static CMElementDeclaration getHTMLCMElemDecl(CMElementDeclaration original) {
-		CMElementDeclaration buddy = null;
-		if (htmlcm != null) {
-			CMNamedNodeMap elems = htmlcm.getElements();
-			if (elems != null) {
-				buddy = (CMElementDeclaration) elems.getNamedItem(original.getElementName());
-			}
-		}
-		return buddy;
-	}
-
-	private class Attrs extends CMNamedNodeMapForBuddySystem {
-		private CMNamedNodeMap buddyAttrs = null;
-
-		public Attrs(CMNamedNodeMap attrs, CMNamedNodeMap buddyAttrs, boolean isXHTML) {
-			super(isXHTML);
-			this.buddyAttrs = buddyAttrs;
-			makeBuddySystem(attrs);
-		}
-
-		protected String getKeyName(CMNode original) {
-			CMAttributeDeclaration adecl = getDecl(original);
-			if (adecl == null)
-				return null;
-			return adecl.getAttrName();
-		}
-
-		protected CMNode createBuddySystem(CMNode original) {
-			CMAttributeDeclaration adecl = getDecl(original);
-			if (adecl == null)
-				return null;
-			CMAttributeDeclaration buddy = null;
-			if (buddyAttrs != null) {
-				buddy = (CMAttributeDeclaration) buddyAttrs.getNamedItem(adecl.getAttrName());
-			}
-			return new CMAttributeDeclarationBuddySystem(adecl, buddy, isXHTML());
-		}
-
-		private CMAttributeDeclaration getDecl(CMNode cmnode) {
-			if (cmnode == null)
-				return null;
-			if (cmnode.getNodeType() != CMNode.ATTRIBUTE_DECLARATION)
-				return null;
-			return (CMAttributeDeclaration) cmnode;
-		}
-	}
-
-	private Attrs attributes = null;
-
-	public CMElementDeclarationBuddySystem(CMElementDeclaration self, boolean isXHTML) {
-		super(self, getHTMLCMElemDecl(self), isXHTML);
-	}
-
-	/*
-	 * @see CMElementDeclaration#getAttributes()
-	 */
-	public CMNamedNodeMap getAttributes() {
-		if (attributes != null)
-			return attributes;
-		CMElementDeclaration edecl = getSelf();
-		if (edecl == null)
-			return null;
-		CMElementDeclaration htmlDecl = getBuddy();
-		CMNamedNodeMap htmlAttrs = (htmlDecl == null) ? null : htmlDecl.getAttributes();
-		attributes = new Attrs(edecl.getAttributes(), htmlAttrs, isXHTML);
-		return attributes;
-	}
-
-	/*
-	 * @see CMElementDeclaration#getContent()
-	 */
-	public CMContent getContent() {
-		CMElementDeclaration edecl = getSelf();
-		if (edecl == null)
-			return null;
-		return edecl.getContent();
-	}
-
-	/*
-	 * @see CMElementDeclaration#getContentType()
-	 */
-	public int getContentType() {
-		CMElementDeclaration edecl = getSelf();
-		if (edecl == null)
-			return CMElementDeclaration.ANY;
-		return edecl.getContentType();
-	}
-
-	/*
-	 * @see CMElementDeclaration#getElementName()
-	 */
-	public String getElementName() {
-		CMElementDeclaration edecl = getSelf();
-		if (edecl == null)
-			return null;
-		return edecl.getElementName();
-	}
-
-	/*
-	 * @see CMElementDeclaration#getDataType()
-	 */
-	public CMDataType getDataType() {
-		CMElementDeclaration edecl = getSelf();
-		if (edecl == null)
-			return null;
-		return edecl.getDataType();
-	}
-
-	/*
-	 * @see CMElementDeclaration#getLocalElements()
-	 */
-	public CMNamedNodeMap getLocalElements() {
-		CMElementDeclaration edecl = getSelf();
-		if (edecl == null)
-			return null;
-		return edecl.getLocalElements();
-	}
-
-	/*
-	 * @see CMContent#getMaxOccur()
-	 */
-	public int getMaxOccur() {
-		CMElementDeclaration edecl = getSelf();
-		if (edecl == null)
-			return -1;
-		return edecl.getMaxOccur();
-	}
-
-	/*
-	 * @see CMContent#getMinOccur()
-	 */
-	public int getMinOccur() {
-		CMElementDeclaration edecl = getSelf();
-		if (edecl == null)
-			return -1;
-		return edecl.getMinOccur();
-	}
-
-	/*
-	 * @see CMNode#supports(String)
-	 */
-	public boolean supports(String propertyName) {
-		if (isXHTML && propertyName.equals(HTMLCMProperties.OMIT_TYPE))
-			return true;
-		return super.supports(propertyName);
-	}
-
-	/*
-	 * @see CMNode#getProperty(String)
-	 */
-	public Object getProperty(String propertyName) {
-		if (isXHTML && propertyName.equals(HTMLCMProperties.OMIT_TYPE))
-			return HTMLCMProperties.Values.OMIT_NONE;
-		return super.getProperty(propertyName);
-	}
-
-	private CMElementDeclaration getSelf() {
-		if (self.getNodeType() != CMNode.ELEMENT_DECLARATION)
-			return null;
-		return (CMElementDeclaration) self;
-	}
-
-	private CMElementDeclaration getBuddy() {
-		if (buddy == null)
-			return null;
-		if (buddy.getNodeType() != CMNode.ELEMENT_DECLARATION)
-			return null;
-		return (CMElementDeclaration) buddy;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMNamedNodeMapForBuddySystem.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMNamedNodeMapForBuddySystem.java
deleted file mode 100644
index 643daa6..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMNamedNodeMapForBuddySystem.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- */
-abstract class CMNamedNodeMapForBuddySystem implements CMNamedNodeMap {
-
-
-	private boolean isXHTML = false;
-	private Hashtable map = new Hashtable();
-
-	/**
-	 * Constructor of CMNamedNodeMapForBuddySystem.
-	 * CAUTION: Each derived class must call 'makeBuddySystem' method in its
-	 * constructor to build up its contents.
-	 */
-	public CMNamedNodeMapForBuddySystem(boolean isXHTML) {
-		super();
-		this.isXHTML = isXHTML;
-	}
-
-	/*
-	 * @see CMNamedNodeMap#getLength()
-	 */
-	public int getLength() {
-		return map.size();
-	}
-
-	/*
-	 * @see CMNamedNodeMap#getNamedItem(String)
-	 */
-	public CMNode getNamedItem(String name) {
-		String key = canonicalName(name);
-		if (!map.containsKey(key))
-			return null;
-		return (CMNode) map.get(key);
-	}
-
-	/*
-	 * @see CMNamedNodeMap#item(int)
-	 */
-	public CMNode item(int index) {
-		Iterator iter = iterator();
-		while (iter.hasNext()) {
-			Object node = iter.next();
-			if (--index < 0)
-				return (CMNode) node;
-		}
-		return null;
-	}
-
-	/*
-	 * @see CMNamedNodeMap#iterator()
-	 */
-	public Iterator iterator() {
-		return map.values().iterator();
-	}
-
-	/* package scope. */
-	void put(String name, CMNode cmnode) {
-		if (name == null || cmnode == null)
-			return;
-		map.put(canonicalName(name), cmnode);
-	}
-
-	abstract protected String getKeyName(CMNode original);
-
-	abstract protected CMNode createBuddySystem(CMNode original);
-
-	protected boolean isXHTML() {
-		return isXHTML;
-	}
-
-	/**
-	 * Each derived class must call this method in its constructor
-	 * to build up its contents.
-	 */
-	protected void makeBuddySystem(CMNamedNodeMap original) {
-		Iterator i = original.iterator();
-		if (i == null)
-			return;
-		while (i.hasNext()) {
-			CMNode org = (CMNode) i.next();
-			String key = getKeyName(org);
-			CMNode newNode = createBuddySystem(org);
-			put(key, newNode);
-		}
-	}
-
-	private String canonicalName(String name) {
-		return name.toUpperCase();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMNodeBuddySystem.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMNodeBuddySystem.java
deleted file mode 100644
index b7a8be7..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMNodeBuddySystem.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- */
-class CMNodeBuddySystem implements CMNode {
-
-
-	protected boolean isXHTML = false;
-	protected CMNode self = null;
-	protected CMNode buddy = null;
-
-	public CMNodeBuddySystem(CMNode self, CMNode buddy, boolean isXHTML) {
-		super();
-		this.self = self;
-		this.buddy = buddy;
-		this.isXHTML = isXHTML;
-	}
-
-	/*
-	 * @see CMNode#getNodeName()
-	 */
-	public String getNodeName() {
-		return self.getNodeName();
-	}
-
-	/*
-	 * @see CMNode#getNodeType()
-	 */
-	public int getNodeType() {
-		return self.getNodeType();
-	}
-
-	/*
-	 * @see CMNode#supports(String)
-	 */
-	public boolean supports(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE))
-			return true;
-		if (propertyName.equals(HTMLCMProperties.IS_XHTML))
-			return true;
-		if (buddy == null)
-			return false;
-		return buddy.supports(propertyName);
-	}
-
-	/*
-	 * @see CMNode#getProperty(String)
-	 */
-	public Object getProperty(String propertyName) {
-		if (propertyName.equals(HTMLCMProperties.SHOULD_IGNORE_CASE)) {
-			return new Boolean(!isXHTML);
-		}
-		if (propertyName.equals(HTMLCMProperties.IS_XHTML)) {
-			return new Boolean(isXHTML);
-		}
-
-		if (buddy == null || (!buddy.supports(propertyName)))
-			return null;
-		return buddy.getProperty(propertyName);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/DocumentQuery.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/DocumentQuery.java
deleted file mode 100644
index e72c263..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/DocumentQuery.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.ranges.Range;
-
-/**
- */
-public interface DocumentQuery {
-
-	/**
-	 * isRenderRoot() returns true if - node is BODY element (both explicit
-	 * and implicit) - node is portalhtml:body element - node is Document node
-	 * and the document is treated as fragment (with BODY context) Note that
-	 * in editing a fragment file, Document node should be treated as a
-	 * substitute of BODY element.
-	 */
-	boolean isRenderRoot(Node node);
-
-	/**
-	 * isHeadCorrespondent() returns true if - node is HEAD element (both
-	 * explicit and implicit) - node is portalhtml:head element - node is
-	 * Document node and the document is treated as fragment (with HEAD
-	 * context) Note that in editing a fragment file (with HEAD context),
-	 * Document node should be treated as a substitute of HEAD element.
-	 */
-	boolean isHeadCorrespondent(Node node);
-
-	/**
-	 * Implicit BODY element will be gone in V6 SED model. So page designer
-	 * provides an API to get a range whose content nodes are rendered in
-	 * design view. getRenderRootRange() returns - a range from BODY's first
-	 * to its last (if the document has BODY element) - a range form
-	 * Document's first to its last (if the document is fragment with BODY
-	 * context) - null (if the document is fragment with HEAD context) [The
-	 * following cases will be supported since V6] - a range from a custom
-	 * tag's first to its last (if the document has a custom tag which
-	 * generates BODY element at runtime) - a range from Document's
-	 * appropirate offset to its last (if the document does not have explicit
-	 * BODY/HTML) - a range from HTML element's appropriate offset to its last
-	 * (if the document does not have explicit BODY but have explicit HTML)
-	 * 
-	 * @param doc
-	 * @return
-	 */
-	Range getRenderRootRange(Document doc);
-
-	/**
-	 * Implicit HEAD element will be gone in V6 SED model. So page designer
-	 * provides an API to get a range whose content nodes are treated as HEAD
-	 * element's child. getHeadCorrespondentRange() returns - a range from
-	 * HEAD's first to its last (if the document has HEAD element) - a range
-	 * form Document's first to its last (if the document is fragment with
-	 * HEAD context) - null (if the document is fragment with BODY context)
-	 * [The following cases will be supported since V6] - a range from a
-	 * custom tag's first to its last (if the document has a custom tag which
-	 * generates HEAD element at runtime) - a range from Document's first to
-	 * appropirate offset (if the document does not have explicit HEAD/HTML) -
-	 * a range from HTML element's first to appropriate offset (if the
-	 * document does not have explicit HEAD but have explicit HTML)
-	 * 
-	 * @param doc
-	 * @return
-	 */
-	Range getHeadCorrespondentRange(Document doc);
-
-	/**
-	 * getRenderRootNode() with [create=false] returns - BODY element if this
-	 * document is not fragment and has BODY element - null if this document
-	 * is not fragment and does not have BODY element - Document node if this
-	 * document is fragment with BODY context - null if this document is
-	 * fragment with HEAD context [The following cases will be supported since
-	 * V6] - a custom tag which generates BODY tag at runtime - Document node
-	 * or HTML element if this document is not fragment but does not have
-	 * explicit BODY element getRenderRootNode() with [create=true] returns -
-	 * BODY element if this document is not fragment and has BODY element (no
-	 * modifictation) - newly created BODY element if this document is not
-	 * fragment but does not have BODY element - Document node if this
-	 * document is fragment with BODY context (no modifictation) [The
-	 * following cases will be supported since V6] - a custom tag which
-	 * generates BODY tag at runtime (no modifictation) - newly created BODY
-	 * element if this document is not fragment but does not have explicit
-	 * BODY element getRenderRootNode() throws HTMLCommandException (since V6)
-	 * if - this document is fragment with HEAD context and - "create"
-	 * parameter is true Note that in editing a fragment file, Document node
-	 * should be treated as a substitute of BODY element.
-	 * 
-	 * @param childOrDocument
-	 * @param create
-	 * @return
-	 */
-	Node getRenderRootNode(Node childOrDocument, boolean create);
-
-	/**
-	 * getHeadCorrespondentNode() with [create=false] returns - HEAD element
-	 * if this document is not fragment and has HEAD element - null if this
-	 * document is not fragment and does not have HEAD element - Document node
-	 * if this document is fragment with HEAD context - null if this document
-	 * is fragment with BODY context [The following cases will be supported
-	 * since V6] - a custom tag which generates HEAD tag at runtime - Document
-	 * node or HTML element if this document is not fragment but does not have
-	 * explicit HEAD element getHeadCorrespondentNode() with [create=true]
-	 * returns - HEAD element if this document is not fragment and has HEAD
-	 * element (no modifictation) - newly created HEAD element if this
-	 * document is not fragment but does not have HEAD element - Document node
-	 * if this document is fragment with HEAD context (no modifictation) [The
-	 * following cases will be supported since V6] - a custom tag which
-	 * generates HEAD tag at runtime (no modifictation) - newly created HEAD
-	 * element if this document is not fragment but does not have explicit
-	 * HEAD element getHeadCorrespondentNode() throws HTMLCommandException
-	 * (since V6) if - this document is fragment with BODY context and -
-	 * "create" parameter is true Note that in editing a fragment file,
-	 * Document node should be treated as a substitute of HEAD element.
-	 * 
-	 * @param childOrDocument
-	 * @param create
-	 * @return
-	 */
-	Node getHeadCorrespondentNode(Node childOrDocument, boolean create);
-
-	/**
-	 * getHtmlCorrespondentNode() throws HTMLCommandException (since V6) if -
-	 * this document is fragment and "create" parameter is true
-	 * 
-	 * @param childOrDocument
-	 * @param create
-	 * @return
-	 */
-	Node getHtmlCorrespondentNode(Node childOrDocument, boolean create);
-
-	/**
-	 * This inner class is intended for insertion target. please use this like
-	 * the following : DocumentQuery.InsertionTarget ins;
-	 * ins.getParent().insertBefore(youInsertionNode, ins.getRef());
-	 */
-	public class InsertionTarget {
-		private final Node parent;
-		private final Node ref;
-
-		public InsertionTarget(Node parent, Node ref) {
-			this.parent = parent;
-			this.ref = ref;
-		}
-
-		public Node getParent() {
-			return parent;
-		}
-
-		public Node getRef() {
-			return ref;
-		}
-	}
-
-	/**
-	 * getHeadInsertionTarget() returns appropriate insetion target location
-	 * for HEAD child tags such as <script>, <style>, <meta>etc. Basically
-	 * this function returns <HEAD>tag's the last position. Note that this
-	 * would not create actual <HEAD>tag when the document does not have it.
-	 * <HEAD>is omittable tag so this function returns appropriate position
-	 * to which implicit <HEAD>can be inserted, if the document has no
-	 * <HEAD>.
-	 * 
-	 * @param doc
-	 * @return
-	 */
-	InsertionTarget getHeadInsertionTarget(Document doc);
-
-	/**
-	 * getPageInsertionTarget() returns appropriate insetion target location
-	 * for page-level markups, such as JSP directives, usebean tags or <html>
-	 * tag. Basically this function returns just before <HTML>tag. Note that
-	 * this would not create actual <HTML>tag when the document does not have
-	 * it. In such case, this function returns a position just before the
-	 * meaningful tags such as HTML/JSP elements.
-	 * 
-	 * @param doc
-	 * @return
-	 */
-	InsertionTarget getPageInsertionTarget(Document doc);
-
-	/**
-	 * isFragment() returns whether the document is fragment or complete
-	 * document
-	 * 
-	 * @param doc
-	 * @return
-	 */
-	boolean isFragment(Document doc);
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapter.java
deleted file mode 100644
index 23e396d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-
-/**
- */
-public interface ElementDeclarationAdapter extends INodeAdapter {
-
-	/**
-	 */
-	CMElementDeclaration getDeclaration();
-
-	/**
-	 */
-	void setDeclaration(CMElementDeclaration declaration);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapterFactory.java
deleted file mode 100644
index a4981cb..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapterFactory.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-/**
- */
-public class ElementDeclarationAdapterFactory implements INodeAdapterFactory {
-
-	private static ElementDeclarationAdapterFactory instance = null;
-
-	/**
-	 */
-	private ElementDeclarationAdapterFactory() {
-		super();
-	}
-
-	/**
-	 */
-	public INodeAdapter adapt(INodeNotifier notifier) {
-		if (notifier == null)
-			return null;
-		INodeAdapter adapter = notifier.getExistingAdapter(ElementDeclarationAdapter.class);
-		if (adapter != null)
-			return adapter;
-		adapter = new HTMLElementDeclarationAdapter();
-		notifier.addAdapter(adapter);
-		return adapter;
-	}
-
-	/**
-	 */
-	public synchronized static ElementDeclarationAdapterFactory getInstance() {
-		if (instance == null)
-			instance = new ElementDeclarationAdapterFactory();
-		return instance;
-	}
-
-	/**
-	 */
-	public boolean isFactoryForType(Object type) {
-		return (type == ElementDeclarationAdapter.class);
-	}
-
-	public void release() {
-		// default is to do nothing
-	}
-
-	/**
-	 * Overriding copy method
-	 */
-	public INodeAdapterFactory copy() {
-		return getInstance();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HMQUtil.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HMQUtil.java
deleted file mode 100644
index 42ddb16..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HMQUtil.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public final class HMQUtil {
-
-	private final static Vector nullVector = new Vector();
-
-	/* HMQUtil class must not instantiate. */
-	private HMQUtil() {
-		super();
-	}
-
-	/* gather all element declarations in inclusion of each parent of the target. 
-	 * the inclusion of the target is also gathered. */
-	public static Collection getInclusions(Element target) {
-		if (target == null)
-			return nullVector;
-		Collection inclusions = gatherInclusions(getAncestorDeclarations(target));
-
-		Hashtable availables = new Hashtable();
-		Iterator iter = inclusions.iterator();
-		while (iter.hasNext()) {
-			CMContent inclusion = (CMContent) iter.next();
-			switch (inclusion.getNodeType()) {
-				case CMNode.GROUP :
-					extractDeclarations(availables, (CMGroup) inclusion);
-					break;
-				case CMNode.ELEMENT_DECLARATION :
-					addInclusion(availables, (CMElementDeclaration) inclusion);
-					break;
-			}
-		}
-
-		return availables.values();
-	}
-
-	private static Collection getAncestorDeclarations(Element target) {
-		Vector ancestors = new Vector();
-
-		Document doc = target.getOwnerDocument();
-		ModelQuery query = ModelQueryUtil.getModelQuery(doc);
-		CMElementDeclaration decl = query.getCMElementDeclaration(target);
-		ancestors.add(decl);
-
-		Element parent = getParent(target);
-		while (parent != null) {
-			decl = query.getCMElementDeclaration(parent);
-			if (decl != null)
-				ancestors.add(decl);
-			parent = getParent(parent);
-		}
-		return ancestors;
-	}
-
-	private static void addInclusion(Hashtable availables, CMElementDeclaration decl) {
-		String name = decl.getElementName();
-		if (availables.containsKey(name))
-			return;
-		availables.put(name, decl);
-	}
-
-	private static Collection gatherInclusions(Collection ancestors) {
-		Vector inclusions = new Vector();
-		Iterator iter = ancestors.iterator();
-		while (iter.hasNext()) {
-			CMElementDeclaration decl = (CMElementDeclaration) iter.next();
-			if (decl.supports(HTMLCMProperties.INCLUSION)) {
-				CMContent inclusion = (CMContent) decl.getProperty(HTMLCMProperties.INCLUSION);
-				if (inclusion != null)
-					inclusions.add(inclusion);
-			}
-		}
-		return inclusions;
-	}
-
-	private static Element getParent(Node target) {
-		Node parent = target.getParentNode();
-		while (parent != null) {
-			if (parent.getNodeType() == Node.ELEMENT_NODE)
-				return (Element) parent;
-			parent = parent.getParentNode();
-		}
-		return null;
-	}
-
-	private static void extractDeclarations(Hashtable availables, CMGroup group) {
-		CMNodeList content = group.getChildNodes();
-		for (int i = 0; i < content.getLength(); i++) {
-			CMNode cmn = content.item(i);
-			if (cmn == null || cmn.getNodeType() != CMNode.ELEMENT_DECLARATION)
-				continue;
-			addInclusion(availables, (CMElementDeclaration) cmn);
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLElementDeclarationAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLElementDeclarationAdapter.java
deleted file mode 100644
index 8797f54..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLElementDeclarationAdapter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-
-/**
- */
-public class HTMLElementDeclarationAdapter implements ElementDeclarationAdapter {
-
-	private CMElementDeclaration declaration = null;
-
-	/**
-	 */
-	public HTMLElementDeclarationAdapter() {
-		super();
-	}
-
-	/**
-	 */
-	public CMElementDeclaration getDeclaration() {
-		return this.declaration;
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type
-	 * allows it to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return (type == ElementDeclarationAdapter.class);
-	}
-
-	/**
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-	}
-
-	/**
-	 */
-	public void setDeclaration(CMElementDeclaration declaration) {
-		this.declaration = declaration;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryAssociationProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryAssociationProvider.java
deleted file mode 100644
index e1a0d98..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryAssociationProvider.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.SimpleAssociationProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-
-/**
- */
-public class HTMLModelQueryAssociationProvider extends SimpleAssociationProvider {
-
-	/**
-	 * @param modelQueryCMProvider org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryCMProvider
-	 */
-	public HTMLModelQueryAssociationProvider(CMDocumentCache cache, URIResolver idResolver) {
-		super(new HTMLModelQueryCMProvider(cache, idResolver));
-	}
-
-	// MIWA: We cannot cache a CMElementDeclaration any more.  Because, when the DOCTYPE
-	// was changed, CMDocument would be changed.  Then, a cached CMElementDeclaration
-	// would be invalid.  If some performance problems occurs, we consider a smarter
-	// cache mechanism.
-	//
-	//	public CMElementDeclaration getCMElementDeclaration(Element element) {
-	//		// check if element declaration is cached
-	//		INodeNotifier notifier = (INodeNotifier) element;
-	//		ElementDeclarationAdapter adapter = (ElementDeclarationAdapter) notifier.getExistingAdapter(ElementDeclarationAdapter.class);
-	//		if (adapter != null)
-	//			return adapter.getDeclaration();
-	//
-	//		CMElementDeclaration decl = super.getCMElementDeclaration(element);
-	//
-	//		// cache HTML element declaration only
-	//		if (decl != null && decl instanceof HTMLElementDeclaration) {
-	//			IAdapterFactory factory = ElementDeclarationAdapterFactory.getInstance();
-	//			adapter = (ElementDeclarationAdapter) factory.adapt(notifier);
-	//			if (adapter != null)
-	//				adapter.setDeclaration(decl);
-	//		}
-	//
-	//		return decl;
-	//	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryCMProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryCMProvider.java
deleted file mode 100644
index 53ac1d9..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryCMProvider.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-
-import java.util.Hashtable;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory;
-import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeEntry;
-import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeRegistry;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryCMProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Node;
-
-/**
- * CMDocument provider for HTML and XHTML documents.
- */
-public class HTMLModelQueryCMProvider implements ModelQueryCMProvider {
-
-
-	private static CMDocument staticHTML = HTMLCMDocumentFactory.getCMDocument(CMDocType.HTML_DOC_TYPE);
-	private static CMDocument staticCHTML = HTMLCMDocumentFactory.getCMDocument(CMDocType.CHTML_DOC_TYPE);
-	private static HTMLDocumentTypeRegistry doctypeRegistry = HTMLDocumentTypeRegistry.getInstance();
-	private static Hashtable buddyCache = new Hashtable();
-
-	private XHTMLAssociationProvider xhtmlassoc = null;
-
-	public HTMLModelQueryCMProvider(CMDocumentCache cache, URIResolver idResolver) {
-		super();
-		xhtmlassoc = new XHTMLAssociationProvider(cache, idResolver);
-	}
-
-	/**
-	 * Returns the CMDocument that corresponds to the DOM Node.
-	 * or null if no CMDocument is appropriate for the DOM Node.
-	 */
-	public CMDocument getCorrespondingCMDocument(Node node) {
-		IDOMDocument owner = getOwnerXMLDocument(node);
-		if (owner == null)
-			return null;
-
-		String pid = getPublicId(owner);
-		if (pid == null)
-			return staticHTML;
-
-		HTMLDocumentTypeEntry entry = doctypeRegistry.getEntry(pid);
-		if (entry == null)
-			return staticHTML;
-
-		pid = entry.getPublicId();
-		CMDocument dtdcm = xhtmlassoc.getXHTMLCMDocument(pid, entry.getSystemId());
-		if (dtdcm == null) {
-			if (pid != null && pid.equals(HTMLDocumentTypeRegistry.CHTML_PUBLIC_ID)) {
-				return staticCHTML;
-			}
-			return staticHTML;
-		}
-
-		CMDocument buddycm = (CMDocument) buddyCache.get(pid);
-		if (buddycm != null)
-			return buddycm;
-
-		buddycm = new CMDocumentForBuddySystem(dtdcm, entry.isXMLType());
-		buddyCache.put(pid, buddycm);
-		return buddycm;
-	}
-
-	// private methods
-	private IDOMDocument getOwnerXMLDocument(Node node) {
-		if (node == null)
-			return null;
-		Document owner = (node.getNodeType() == Node.DOCUMENT_NODE) ? (Document) node : node.getOwnerDocument();
-		if (owner == null)
-			return null;
-		if (!(owner instanceof IDOMDocument))
-			return null;
-		return (IDOMDocument) owner;
-	}
-
-	private String getPublicId(IDOMDocument doc) {
-		if (doc == null)
-			return null;
-		DocumentType doctype = doc.getDoctype();
-		return (doctype != null) ? doctype.getPublicId() : doc.getDocumentTypeId();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java
deleted file mode 100644
index 8786484..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.ModelQueryImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.MovableModelQuery;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class HTMLModelQueryImpl extends ModelQueryImpl implements MovableModelQuery {
-
-	protected CMDocumentCache fCache = null;
-
-	public HTMLModelQueryImpl(CMDocumentCache cache, URIResolver idResolver) {
-		super(new HTMLModelQueryAssociationProvider(cache, idResolver));
-		fCache = cache;
-	}
-
-	public List getAvailableContent(Element element, CMElementDeclaration ed, int includeOptions) {
-		List originalCandidates = super.getAvailableContent(element, ed, includeOptions);
-		if ((includeOptions & INCLUDE_CHILD_NODES) == 0)
-			return originalCandidates;
-		// When the target document is XHTML, it is waste to find inclusions,
-		// since inclusion is available in HTML only.
-		if (!ed.supports(HTMLCMProperties.IS_XHTML))
-			return originalCandidates;
-		
-		Boolean isXhtml = Boolean.FALSE;
-		isXhtml = (Boolean) ed.getProperty(HTMLCMProperties.IS_XHTML);
-		if (isXhtml != null && isXhtml.booleanValue())
-			return originalCandidates;
-
-		// OK, the target is surely a HTML element, so it may have inclusion.
-		// Try to find it.
-		Vector candidates = new Vector(originalCandidates);
-
-		switch (ed.getContentType()) {
-			case CMElementDeclaration.ANY :
-			case CMElementDeclaration.ELEMENT :
-			case CMElementDeclaration.MIXED :
-				// do enumerate inclusions.
-				candidates.addAll(HMQUtil.getInclusions(element));
-				break;
-			case CMElementDeclaration.EMPTY :
-			case CMElementDeclaration.PCDATA :
-			case CMElementDeclaration.CDATA :
-			default :
-				// should not add any inclusions.
-				// so, nothing to do here.
-				break;
-		}
-		// If the current element does not available, it is impossible
-		// to filter out exclusion.
-		if (element == null)
-			return candidates;
-
-		// Now, the time to check exclusion.
-		Vector content = new Vector(candidates.size());
-		for (int i = 0; i < candidates.size(); i++) {
-			CMElementDeclaration candidate = (CMElementDeclaration) candidates.elementAt(i);
-			if (candidate == null)
-				continue;
-			if (isExcluded(candidate, element))
-				continue;
-			content.add(candidate);
-		}
-
-		return content;
-	}
-
-	/**
-	 * @see MovableModelQuery#setIdResolver(IdResolver)
-	 */
-	public void setIdResolver(URIResolver newIdResolver) {
-		modelQueryAssociationProvider = new HTMLModelQueryAssociationProvider(fCache, newIdResolver);
-	}
-
-	// utilities
-	private static boolean isExcluded(CMElementDeclaration candidate, Element target) {
-		CMNamedNodeMap prohibited = getProhibitedAncestors(candidate);
-		if (prohibited == null)
-			return false;
-		Element parent = target;
-		while (parent != null) {
-			CMNode pdec = prohibited.getNamedItem(parent.getNodeName());
-			if (pdec != null)
-				return true;
-			parent = getExplicitParentElement(parent);
-		}
-		return false;
-	}
-
-	private static CMNamedNodeMap getProhibitedAncestors(CMElementDeclaration dec) {
-		if (!dec.supports(HTMLCMProperties.PROHIBITED_ANCESTORS))
-			return null;
-		return (CMNamedNodeMap) dec.getProperty(HTMLCMProperties.PROHIBITED_ANCESTORS);
-	}
-
-	/* get an ancestor element ignoring implicit ones. */
-	private static Element getExplicitParentElement(Node child) {
-		if (child == null)
-			return null;
-
-		Node p = child.getParentNode();
-		while (p != null) {
-			if (p.getNodeType() == Node.ELEMENT_NODE) {
-				if (p instanceof IDOMElement) {
-					if (((IDOMElement) p).isImplicitTag()) {
-						p = p.getParentNode();
-						continue;
-					}
-				}
-				return (Element) p;
-			}
-			p = p.getParentNode();
-		}
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForEmbeddedHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForEmbeddedHTML.java
deleted file mode 100644
index c5fe198..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForEmbeddedHTML.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-
-public class ModelQueryAdapterFactoryForEmbeddedHTML extends ModelQueryAdapterFactoryForHTML {
-
-
-	/**
-	 * Constructor for ModelQueryAdapterFactoryForEmbeddedHTML.
-	 */
-	public ModelQueryAdapterFactoryForEmbeddedHTML() {
-		this(ModelQueryAdapter.class, false);
-	}
-
-	/**
-	 * Constructor for ModelQueryAdapterFactoryForEmbeddedHTML.
-	 * @param adapterKey
-	 * @param registerAdapters
-	 */
-	protected ModelQueryAdapterFactoryForEmbeddedHTML(Object adapterKey, boolean registerAdapters) {
-		super(adapterKey, registerAdapters);
-	}
-
-	/**
-	 * @see org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory#adapt(INodeNotifier)
-	 */
-	public INodeAdapter adapt(INodeNotifier object) {
-		if (object == null)
-			return null;
-		return adaptNew(object);
-	}
-
-	public Object clone() throws CloneNotSupportedException {
-
-		return new ModelQueryAdapterFactoryForEmbeddedHTML(this.adapterKey, this.shouldRegisterAdapter);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForHTML.java
deleted file mode 100644
index 53fffd1..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForHTML.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-
-
-import java.io.File;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.IModelStateListener;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.core.internal.modelquery.XMLCatalogIdResolver;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapterImpl;
-
-/**
- * Creates a ModelQueryAdapter for HTML models
- */
-public class ModelQueryAdapterFactoryForHTML extends AbstractAdapterFactory implements IModelStateListener {
-
-	protected ModelQueryAdapterImpl modelQueryAdapterImpl;
-	protected IStructuredModel stateNotifier = null;
-
-	/**
-	 * ModelQueryAdapterFactoryForHTML constructor comment.
-	 */
-	public ModelQueryAdapterFactoryForHTML() {
-		this(ModelQueryAdapter.class, true);
-	}
-
-	/**
-	 * ModelQueryAdapterFactoryForHTML constructor comment.
-	 * 
-	 * @param adapterKey
-	 *            java.lang.Object
-	 * @param registerAdapters
-	 *            boolean
-	 */
-	public ModelQueryAdapterFactoryForHTML(Object adapterKey, boolean registerAdapters) {
-		super(adapterKey, registerAdapters);
-	}
-
-	/**
-	 * createAdapter method comment.
-	 */
-	protected INodeAdapter createAdapter(INodeNotifier target) {
-
-		if (Debug.displayInfo)
-			System.out.println("-----------------------ModelQueryAdapterFactoryForHTML.createAdapter" + target); //$NON-NLS-1$
-		if (modelQueryAdapterImpl == null) {
-			if (target instanceof IDOMNode) {
-				IDOMNode xmlNode = (IDOMNode) target;
-				IStructuredModel model = stateNotifier = xmlNode.getModel();
-				stateNotifier.addModelStateListener(this);
-				String baseLocation = null;
-				String modelsBaseLocation = model.getBaseLocation();
-				if (modelsBaseLocation != null) {
-					File file = new Path(modelsBaseLocation).toFile();
-					if (file.exists()) {
-						baseLocation = file.getAbsolutePath();
-					}
-					else {
-						IPath basePath = new Path(model.getBaseLocation());
-						IPath derivedPath = null;
-						if (basePath.segmentCount() > 1)
-							derivedPath = ResourcesPlugin.getWorkspace().getRoot().getFile(basePath).getLocation();
-						else
-							derivedPath = ResourcesPlugin.getWorkspace().getRoot().getLocation().append(basePath);
-						if (derivedPath != null) {
-							baseLocation = derivedPath.toString();
-						}
-					}
-				}
-				if (Debug.displayInfo)
-					System.out.println("----------------ModelQueryAdapterFactoryForHTML... baseLocation : " + baseLocation); //$NON-NLS-1$
-
-				CMDocumentCache cmDocumentCache = new CMDocumentCache();
-				URIResolver idResolver = new XMLCatalogIdResolver(baseLocation, model.getResolver());
-				ModelQuery modelQuery = new HTMLModelQueryImpl(cmDocumentCache, idResolver);
-				modelQuery.setEditMode(ModelQuery.EDIT_MODE_UNCONSTRAINED);
-				modelQueryAdapterImpl = new ModelQueryAdapterImpl(cmDocumentCache, modelQuery, idResolver);
-			}
-		}
-		return modelQueryAdapterImpl;
-	}
-
-	protected void updateResolver(IStructuredModel model) {
-		String baseLocation = model.getBaseLocation();
-		IFile baseFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(model.getBaseLocation()));
-		if (baseFile != null) {
-			baseLocation = baseFile.getLocation().toString();
-		}
-		modelQueryAdapterImpl.setIdResolver(new XMLCatalogIdResolver(baseLocation, model.getResolver()));
-	}
-
-	/**
-	 * @see IModelStateListener#modelAboutToBeChanged(IStructuredModel)
-	 */
-	public void modelAboutToBeChanged(IStructuredModel model) {
-	}
-
-	/**
-	 * @see IModelStateListener#modelChanged(IStructuredModel)
-	 */
-	public void modelChanged(IStructuredModel model) {
-	}
-
-	/**
-	 * @see IModelStateListener#modelDirtyStateChanged(IStructuredModel,
-	 *      boolean)
-	 */
-	public void modelDirtyStateChanged(IStructuredModel model, boolean isDirty) {
-	}
-
-	/**
-	 * @see IModelStateListener#modelResourceDeleted(IStructuredModel)
-	 */
-	public void modelResourceDeleted(IStructuredModel model) {
-	}
-
-	/**
-	 * @see IModelStateListener#modelResourceMoved(IStructuredModel,
-	 *      IStructuredModel)
-	 */
-	public void modelResourceMoved(IStructuredModel oldModel, IStructuredModel newModel) {
-		stateNotifier.removeModelStateListener(this);
-		stateNotifier = newModel;
-		updateResolver(stateNotifier);
-		stateNotifier.addModelStateListener(this);
-	}
-
-	public void release() {
-		super.release();
-		if (stateNotifier != null)
-			stateNotifier.removeModelStateListener(this);
-		stateNotifier = null;
-		if (modelQueryAdapterImpl != null)
-			modelQueryAdapterImpl.release();
-	}
-
-	public INodeAdapterFactory copy() {
-
-		return new ModelQueryAdapterFactoryForHTML(this.adapterKey, this.shouldRegisterAdapter);
-	}
-
-	public void modelAboutToBeReinitialized(IStructuredModel structuredModel) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void modelReinitialized(IStructuredModel structuredModel) {
-		updateResolver(structuredModel);		
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/XHTMLAssociationProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/XHTMLAssociationProvider.java
deleted file mode 100644
index f9d1e2f..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/XHTMLAssociationProvider.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.modelquery;
-
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.XMLAssociationProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.w3c.dom.Document;
-
-/**
- * A Class to provide an association between XHTML documents and DTDs for
- * XHTML. This class is intended to be used only in HTMLModelQueryCMProvider.
- */
-/*
- * This class closely resemble XMLModelQueryAssociationProvider.
- */
-class XHTMLAssociationProvider extends XMLAssociationProvider {
-
-	protected URIResolver idResolver = null;
-	private String fCachedGrammerURI;
-	private String fCachedPublicID;
-	private String fCachedSystemID;
-	private static final boolean USE_QUICK_CACHE = true;
-
-	public XHTMLAssociationProvider(CMDocumentCache cache, URIResolver idResolver) {
-		super(cache);
-		this.idResolver = idResolver;
-	}
-
-	/**
-	 * 
-	 * @param publicId
-	 * @param systemId
-	 * @return
-	 */
-	public CMDocument getXHTMLCMDocument(String publicId, String systemId) {
-		String grammerURI = null;
-		if (USE_QUICK_CACHE) { 
-			// In parsing a document, we get many identiical requests to this
-			// method, so instead of looking up (resolving) grammerURI each
-			// time,
-			// we'll just return previously cached one. Probably not worth
-			// have a
-			// more complex cache than that.
-			if (fCachedGrammerURI != null && fCachedPublicID.equals(publicId) && fCachedSystemID.equals(systemId)) {
-				grammerURI = fCachedGrammerURI;
-			}
-			else {
-				grammerURI = idResolver.resolve(null, publicId, systemId);
-				fCachedGrammerURI = grammerURI;
-				fCachedPublicID = publicId;
-				fCachedSystemID = systemId;
-			}
-		}
-		else {
-			grammerURI = idResolver.resolve(null, publicId, systemId);
-		}
-
-		if (grammerURI == null)
-			return null;
-		
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=88896
-		// previously called the deprecated 2 argument form of getCMDocument, which eventually
-		// resulted in empty string for type, which I don't think the infrastructure was prepared 
-		// for. So, I deleted deprecated methods, and switched to null. 
-		// 'null' means to "create based on uri"
-		// and 'dtd' would work to mean load only those registered as dtd's
-		// CMDocument cmDocument = documentManager.getCMDocument(publicId, grammerURI);
-		//CMDocument cmDocument = documentManager.getCMDocument(publicId, grammerURI, "dtd");
-		CMDocument cmDocument = documentManager.getCMDocument(publicId, grammerURI, null);
-		return cmDocument;
-	}
-
-	/**
-	 */
-	protected String resolveGrammarURI(Document document, String publicId, String systemId) {
-		return idResolver.resolve(null, publicId, systemId);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/preferences/HTMLCorePreferenceInitializer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/preferences/HTMLCorePreferenceInitializer.java
deleted file mode 100644
index 1683e1c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/preferences/HTMLCorePreferenceInitializer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.sse.core.internal.encoding.CommonCharsetNames;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-
-/**
- * Sets default values for HTML Core preferences
- */
-public class HTMLCorePreferenceInitializer extends AbstractPreferenceInitializer {
-
-	public void initializeDefaultPreferences() {
-		IEclipsePreferences node = new DefaultScope().getNode(HTMLCorePlugin.getDefault().getBundle().getSymbolicName());
-
-		// formatting preferences
-		node.putInt(HTMLCorePreferenceNames.LINE_WIDTH, 72);
-		node.putBoolean(HTMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES, false);
-		node.put(HTMLCorePreferenceNames.INDENTATION_CHAR, HTMLCorePreferenceNames.TAB);
-		node.putInt(HTMLCorePreferenceNames.INDENTATION_SIZE, 1);
-		node.putBoolean(HTMLCorePreferenceNames.SPLIT_MULTI_ATTRS, false);
-
-		// cleanup preferences
-		node.putInt(HTMLCorePreferenceNames.CLEANUP_TAG_NAME_CASE, HTMLCorePreferenceNames.ASIS);
-		node.putInt(HTMLCorePreferenceNames.CLEANUP_ATTR_NAME_CASE, HTMLCorePreferenceNames.ASIS);
-		// node.putBoolean(HTMLCorePreferenceNames.COMPRESS_EMPTY_ELEMENT_TAGS,
-		// true);
-		node.putBoolean(HTMLCorePreferenceNames.INSERT_REQUIRED_ATTRS, true);
-		node.putBoolean(HTMLCorePreferenceNames.INSERT_MISSING_TAGS, true);
-		node.putBoolean(HTMLCorePreferenceNames.QUOTE_ATTR_VALUES, true);
-		node.putBoolean(HTMLCorePreferenceNames.FORMAT_SOURCE, true);
-		node.putBoolean(HTMLCorePreferenceNames.CONVERT_EOL_CODES, false);
-
-		// code generation preferences
-		node.put(CommonEncodingPreferenceNames.INPUT_CODESET, ""); //$NON-NLS-1$
-		String defaultEnc = "UTF-8";//$NON-NLS-1$
-		String systemEnc = System.getProperty("file.encoding"); //$NON-NLS-1$
-		if (systemEnc != null) {
-			defaultEnc = CommonCharsetNames.getPreferredDefaultIanaName(systemEnc, "UTF-8");//$NON-NLS-1$
-		}
-		node.put(CommonEncodingPreferenceNames.OUTPUT_CODESET, defaultEnc);
-		node.put(CommonEncodingPreferenceNames.END_OF_LINE_CODE, ""); //$NON-NLS-1$
-
-		node.putInt(HTMLCorePreferenceNames.TAG_NAME_CASE, HTMLCorePreferenceNames.LOWER);
-		node.putInt(HTMLCorePreferenceNames.ATTR_NAME_CASE, HTMLCorePreferenceNames.LOWER);
-	}
-}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/preferences/HTMLCorePreferenceNames.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/preferences/HTMLCorePreferenceNames.java
deleted file mode 100644
index 90e1d78..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/preferences/HTMLCorePreferenceNames.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.preferences;
-
-/**
- * Common preference keys used by HTML core
- * 
- * @plannedfor 1.0
- */
-public class HTMLCorePreferenceNames {
-	private HTMLCorePreferenceNames() {
-		// empty private constructor so users cannot instantiate class
-	}
-
-	/**
-	 * The maximum width of a line before a line split is needed.
-	 * <p>
-	 * Value is of type <code>Integer</code>.
-	 * </p>
-	 */
-	public static final String LINE_WIDTH = "lineWidth";//$NON-NLS-1$
-
-	/**
-	 * Indicates if all blanks lines should be cleared during formatting.
-	 * Blank lines will be kept when false.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String CLEAR_ALL_BLANK_LINES = "clearAllBlankLines";//$NON-NLS-1$
-
-	/**
-	 * The number of #INDENTATION_CHAR for 1 indentation.
-	 * <p>
-	 * Value is of type <code>Integer</code>.
-	 * </p>
-	 */
-	public static final String INDENTATION_SIZE = "indentationSize";//$NON-NLS-1$
-
-	/**
-	 * The character used for indentation.
-	 * <p>
-	 * Value is of type <code>String</code>.<br />
-	 * Possible values: {TAB, SPACE}
-	 * </p>
-	 */
-	public static final String INDENTATION_CHAR = "indentationChar";//$NON-NLS-1$
-
-	/**
-	 * Possible value for the preference #INDENTATION_CHAR. Indicates to use
-	 * tab character when formatting.
-	 * 
-	 * @see #SPACE
-	 * @see #INDENTATION_CHAR
-	 */
-	public static final String TAB = "tab"; //$NON-NLS-1$
-
-	/**
-	 * Possible value for the preference #INDENTATION_CHAR. Indicates to use
-	 * space character when formatting.
-	 * 
-	 * @see #TAB
-	 * @see #INDENTATION_CHAR
-	 */
-	public static final String SPACE = "space"; //$NON-NLS-1$
-
-	/**
-	 * Indicates if tags with multiple attributes should be formatted
-	 * (splitting each attr on a new line).
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String SPLIT_MULTI_ATTRS = "splitMultiAttrs";//$NON-NLS-1$
-
-	/**
-	 * Indicates whether or not cleanup processor should format source.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String FORMAT_SOURCE = "formatSource";//$NON-NLS-1$
-
-	/**
-	 * Indicates whether or not empty elements should be compressed during
-	 * cleanup.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String COMPRESS_EMPTY_ELEMENT_TAGS = "compressEmptyElementTags";//$NON-NLS-1$
-
-	/**
-	 * Indicates whether or not to insert required attributes during cleanup.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String INSERT_REQUIRED_ATTRS = "insertRequiredAttrs";//$NON-NLS-1$
-
-	/**
-	 * Indicates whether or not to insert missing tags during cleanup.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String INSERT_MISSING_TAGS = "insertMissingTags";//$NON-NLS-1$
-
-	/**
-	 * Indicates whether or not to quote all attribute values during cleanup.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String QUOTE_ATTR_VALUES = "quoteAttrValues";//$NON-NLS-1$
-
-	/**
-	 * Indicates whether or not to convert all line delimiters during cleanup.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String CONVERT_EOL_CODES = "convertEOLCodes";//$NON-NLS-1$
-
-	/**
-	 * Indicates the line delimiter to use during cleanup if converting line
-	 * delimiters.
-	 * <p>
-	 * Value is of type <code>String</code>.<br />
-	 * Possible values: {CR, CRLF, LF, NO_TRANSLATION}
-	 * </p>
-	 * 
-	 */
-	public static final String CLEANUP_EOL_CODE = "cleanupEOLCode";//$NON-NLS-1$
-
-	/**
-	 * Indicates case to use on all tag names during cleanup.
-	 * <p>
-	 * Value is of type <code>Integer</code>.<br />
-	 * Possible values: {LOWER, UPPER, ASIS}
-	 * </p>
-	 */
-	public static final String CLEANUP_TAG_NAME_CASE = "cleanupTagNameCase";//$NON-NLS-1$
-
-	/**
-	 * Indicates case to use on all attribute names during cleanup.
-	 * <p>
-	 * Value is of type <code>Integer</code>.<br />
-	 * Possible values: {LOWER, UPPER, ASIS}
-	 * </p>
-	 */
-	public static final String CLEANUP_ATTR_NAME_CASE = "cleanupAttrNameCase";//$NON-NLS-1$
-
-	/**
-	 * Preferred markup case for tag names in code generation
-	 * <p>
-	 * Value is of type <code>Integer</code>.<br />
-	 * Possible values: {LOWER, UPPER}
-	 * </p>
-	 */
-	public static final String TAG_NAME_CASE = "tagNameCase";//$NON-NLS-1$
-
-	/**
-	 * Preferred markup case for attribute names in code generation
-	 * <p>
-	 * Value is of type <code>Integer</code>.<br />
-	 * Possible values: {LOWER, UPPER}
-	 * </p>
-	 */
-	public static final String ATTR_NAME_CASE = "attrNameCase";//$NON-NLS-1$
-
-	/**
-	 * Possible value for the preference #TAG_NAME_CASE or #ATTR_NAME_CASE.
-	 * Indicates to leave case as is.
-	 * 
-	 * @see #LOWER
-	 * @see #UPPER
-	 * @see #TAG_NAME_CASE
-	 * @see #ATTR_NAME_CASE
-	 */
-	public static final int ASIS = 0;
-
-	/**
-	 * Possible value for the preference #TAG_NAME_CASE or #ATTR_NAME_CASE.
-	 * Indicates to make name lowercase.
-	 * 
-	 * @see #ASIS
-	 * @see #UPPER
-	 * @see #TAG_NAME_CASE
-	 * @see #ATTR_NAME_CASE
-	 */
-	public static final int LOWER = 1;
-
-	/**
-	 * Possible value for the preference #TAG_NAME_CASE or #ATTR_NAME_CASE.
-	 * Indicates to make name uppercase.
-	 * 
-	 * @see #LOWER
-	 * @see #ASIS
-	 * @see #TAG_NAME_CASE
-	 * @see #ATTR_NAME_CASE
-	 */
-	public static final int UPPER = 2;
-}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTML40Namespace.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTML40Namespace.java
deleted file mode 100644
index 9c944f0..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTML40Namespace.java
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLCMProperties.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLCMProperties.java
deleted file mode 100644
index 5396cd6..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLCMProperties.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.provisional;
-
-
-/**
- * HTMLCMProperties defines all property names and pre-defined values in HTML CM.
- * All of those properties can be retreived from element declarations of HTML CM
- * via CMNode#getProperty(String propName).
- */
-public interface HTMLCMProperties {
-
-	/**
-	 * "shouldIgnoreCase" returns java.lang.Boolean object.
-	 */
-	public static final String SHOULD_IGNORE_CASE = "shouldIgnoreCase";//$NON-NLS-1$
-	/**
-	 * "shouldKeepSpace" returns java.lang.Boolean object.
-	 */
-	public static final String SHOULD_KEEP_SPACE = "shouldKeepSpace";//$NON-NLS-1$
-	/**
-	 * "indentChildSource" returns java.lang.Boolean object.
-	 */
-	public static final String SHOULD_INDENT_CHILD_SOURCE = "shouldIndentChildSource";//$NON-NLS-1$
-	/**
-	 * "terminators" returns java.util.Iterator (an array of String objects).
-	 */
-	public static final String TERMINATORS = "terminators";//$NON-NLS-1$
-	/**
-	 * "contentHint" returns CMElementDeclaration instnace.
-	 */
-	public static final String CONTENT_HINT = "contentHint";//$NON-NLS-1$
-	/**
-	 * "prohibitedAncestors" returns org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap.
-	 */
-	public static final String PROHIBITED_ANCESTORS = "prohibitedAncestors";//$NON-NLS-1$
-	/**
-	 * "isJSP" returns java.lang.Boolean object.
-	 */
-	public static final String IS_JSP = "isJSP";//$NON-NLS-1$
-	/**
-	 * "isXHTML" returns java.lang.Boolean object.
-	 */
-	public static final String IS_XHTML = "isXHTML";//$NON-NLS-1$
-	/**
-	 * "isSSI" returns java.lang.Boolean object.
-	 */
-	public static final String IS_SSI = "isSSI";//$NON-NLS-1$
-	/**
-	 * "lineBreakHint" returns String (one of pre-defined values in Values).
-	 */
-	public static final String LINE_BREAK_HINT = "lineBreakHint";//$NON-NLS-1$
-	/**
-	 * "layoutType" returns String (one of pre-defined values in Values).
-	 */
-	public static final String LAYOUT_TYPE = "layoutType";//$NON-NLS-1$
-	/**
-	 * "tagInfo" returns String (documentation for this element).
-	 */
-	public static final String TAGINFO = "tagInfo";//$NON-NLS-1$
-	/**
-	 * "omitType" returns String (one of pre-defined values in Values).
-	 */
-	public static final String OMIT_TYPE = "omitType";//$NON-NLS-1$
-	/**
-	 * "inclusion" returns org.eclipse.wst.xml.core.internal.contentmodel.CMContent.
-	 */
-	public static final String INCLUSION = "inclusion";//$NON-NLS-1$
-	/**
-	 * "isScriptable" returns java.lang.Boolean object.
-	 */
-	public static final String IS_SCRIPTABLE = "isScriptable"; //$NON-NLS-1$
-
-	public static interface Values {
-		/*
-		 * for LINE_BREAK_HINT = "lineBreakHint".
-		 */
-		public static final String BREAK_NONE = "breakNone";//$NON-NLS-1$
-		public static final String BREAK_AFTER_START = "breakAfterStart";//$NON-NLS-1$
-		public static final String BREAK_BEFORE_START_AND_AFTER_END = "breakBeforeStartAndAfterEnd";//$NON-NLS-1$
-		/*
-		 * for LAYOUT_TYPE = "layoutType"
-		 */
-		public static final String LAYOUT_BLOCK = "layoutBlock";//$NON-NLS-1$
-		/** BR */
-		public static final String LAYOUT_BREAK = "layoutBreak";//$NON-NLS-1$
-		/** Hidden object; like HTML or HEAD */
-		public static final String LAYOUT_HIDDEN = "layoutHidden";//$NON-NLS-1$
-		public static final String LAYOUT_NONE = "layoutNone";//$NON-NLS-1$
-		/** No wrap object; like IMG, APPLET,... */
-		public static final String LAYOUT_OBJECT = "layoutObject";//$NON-NLS-1$
-		public static final String LAYOUT_WRAP = "layoutWrap";//$NON-NLS-1$
-		/*
-		 * for OMIT_TYPE = "omitType"
-		 */
-		/** Not ommisible. */
-		public static final String OMIT_NONE = "omitNone";//$NON-NLS-1$
-		/** Both tags are ommisible. */
-		public static final String OMIT_BOTH = "omitBoth";//$NON-NLS-1$
-		/** The end tag is ommisible. */
-		public static final String OMIT_END = "omitEnd";//$NON-NLS-1$
-		/** The end tag is ommitted when created. */
-		public static final String OMIT_END_DEFAULT = "omitEndDefault";//$NON-NLS-1$
-		/** The end tag must be omitted. */
-		public static final String OMIT_END_MUST = "omitEndMust";//$NON-NLS-1$
-
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLFilesPreferenceNames.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLFilesPreferenceNames.java
deleted file mode 100644
index fe2b4ea..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLFilesPreferenceNames.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.provisional;
-
-import org.eclipse.core.runtime.IProduct;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * @deprecated not used in WTP
- */
-public interface HTMLFilesPreferenceNames {
-
-	static final String DEFAULT_SUFFIX = "defaultSuffix";//$NON-NLS-1$
-	static final String HTML_SUFFIX = "html";//$NON-NLS-1$
-	static final String GENERATE_DOCUMENT_TYPE = "generateDocumentType";//$NON-NLS-1$
-	static final String GENERATE_GENERATOR = "generateGenerator";//$NON-NLS-1$
-	// added this as a potential way to handle changing
-	// product names "up" the stack. Note, not declared final 
-	// to avoid getting 'inlined' by compiler.
-	static IProduct product = Platform.getProduct();
-	// Platform.getProduct() is spec'd so it might return null.
-	// Its expected for any final product it would not be, so we'll return 
-	// "WTP" for development/interim builds. No need to translate. 
-	static String GENERATOR = (product == null) ? "WTP": product.getName(); //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLFormatContraints.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLFormatContraints.java
deleted file mode 100644
index a4cde9f..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLFormatContraints.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.provisional;
-
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatContraints;
-
-/**
- * @deprecated
- * Please un-deprecate this if Page Designer thinks they are needed.
- */
-public interface HTMLFormatContraints extends IStructuredFormatContraints {
-	/**
-	 * @deprecated
-	 * 	It's very hard to keep the available line width accurate.
-	 * 	Sometimes a node wants to start on a new line, sometimes it doesn't.
-	 * 	It's best for the node to figure out the available line width on the fly.
-	 */
-	int getAvailableLineWidth();
-
-	/**
-	 * @deprecated
-	 * 	It's very hard to keep the available line width accurate.
-	 * 	Sometimes a node wants to start on a new line, sometimes it doesn't.
-	 * 	It's best for the node to figure out the available line width on the fly.
-	 */
-	void setAvailableLineWidth(int availableLineWidth);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/PreferenceNames.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/PreferenceNames.java
deleted file mode 100644
index 530c28d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/PreferenceNames.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.provisional;
-
-
-public interface PreferenceNames {
-
-	String TRUE = "true"; //$NON-NLS-1$
-	String FALSE = "false"; //$NON-NLS-1$
-	String YES = "yes"; //$NON-NLS-1$
-	String NO = "no"; //$NON-NLS-1$
-
-
-	String SETTINGS = "settings"; //$NON-NLS-1$
-
-	String TREEVIEW = "treeview"; //$NON-NLS-1$
-	String DEFAULT_DEPTH = "defaultdepth"; //$NON-NLS-1$
-
-	String ASIS = "as-is"; //$NON-NLS-1$
-	String LOWER = "lower"; //$NON-NLS-1$
-	String UPPER = "upper"; //$NON-NLS-1$
-
-	String PREFERRED_CASE = "preferred-case"; //$NON-NLS-1$
-	String TAGNAME = "tagname"; //$NON-NLS-1$
-	String ATTRIBUTENAME = "attributename"; //$NON-NLS-1$
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/contenttype/ContentTypeIdForHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/contenttype/ContentTypeIdForHTML.java
deleted file mode 100644
index d01304d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/contenttype/ContentTypeIdForHTML.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.html.core.internal.provisional.contenttype;
-
-/**
- * The value of the contenttype id field must match what is specified in
- * plugin.xml file. Note: this value is intentially set with default protected
- * method so it will not be inlined.
- */
-
-public class ContentTypeIdForHTML {
-	/**
-	 * The value of the contenttype id field must match what is specified in
-	 * plugin.xml file. Note: this value is intentially not declared as final,
-	 * so it will not be inlined.
-	 */
-	public final static String ContentTypeID_HTML = getConstantString();
-
-	/**
-	 * Don't allow instantiation.
-	 */
-	private ContentTypeIdForHTML() {
-		super();
-	}
-
-	static String getConstantString() {
-		return "org.eclipse.wst.html.core.htmlsource"; //$NON-NLS-1$
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/text/IHTMLPartitionTypes.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/text/IHTMLPartitionTypes.java
deleted file mode 100644
index a8131c6..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/text/IHTMLPartitionTypes.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.wst.html.core.internal.provisional.text;
-
-
-/**
- * This interface is not intended to be implemented. It defines the partition
- * types for HTML. Clients should reference the partition type Strings defined
- * here directly.
- * 
- * @plannedfor 1.0
- */
-public interface IHTMLPartitionTypes {
-
-	String HTML_DEFAULT = "org.eclipse.wst.html.HTML_DEFAULT"; //$NON-NLS-1$
-	String HTML_DECLARATION = "org.eclipse.wst.html.HTML_DECLARATION"; //$NON-NLS-1$
-	String HTML_COMMENT = "org.eclipse.wst.html.HTML_COMMENT"; //$NON-NLS-1$
-
-	String SCRIPT = "org.eclipse.wst.html.SCRIPT"; //$NON-NLS-1$
-	String STYLE = "org.eclipse.wst.html.STYLE"; //$NON-NLS-1$
-
-	// ISSUE: I think meta tag areas are here too?
-}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/text/StructuredTextPartitionerForHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/text/StructuredTextPartitionerForHTML.java
deleted file mode 100644
index 3153e81..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/text/StructuredTextPartitionerForHTML.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.text;
-
-import java.util.Locale;
-
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.wst.css.core.internal.provisional.text.ICSSPartitionTypes;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.html.core.internal.provisional.text.IHTMLPartitionTypes;
-import org.eclipse.wst.sse.core.internal.parser.ForeignRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredTextPartitioner;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.text.rules.IStructuredTypedRegion;
-import org.eclipse.wst.sse.core.internal.util.ScriptLanguageKeys;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-
-/**
- * Document partitioner for HTML. Client-side scripts of type JavaScript are
- * reported as ST_SCRIPT, all others for <script language="foo" type="foo2">
- * as SCRIPT.language:FOO and SCRIPT.type:FOO2.
- */
-public class StructuredTextPartitionerForHTML extends StructuredTextPartitionerForXML implements IStructuredTextPartitioner {
-
-	private final static String[] configuredContentTypes = new String[]{IHTMLPartitionTypes.HTML_DEFAULT, IHTMLPartitionTypes.HTML_DECLARATION, IHTMLPartitionTypes.HTML_COMMENT, IHTMLPartitionTypes.SCRIPT, ICSSPartitionTypes.STYLE};
-
-	public static final String JAVASCRIPT = "javascript"; //$NON-NLS-1$
-	public static final String JAVASCRIPT_APPLICATION = "application/x-javascript"; //$NON-NLS-1$
-
-	public StructuredTextPartitionerForHTML() {
-		super();
-	}
-
-	public IStructuredTypedRegion createPartition(int offset, int length, String type) {
-		if (type == IHTMLPartitionTypes.SCRIPT) {
-			IStructuredDocumentRegion node = fStructuredDocument.getRegionAtCharacterOffset(offset);
-			if (node != null) {
-				String stype = getScriptingPartitionType(node);
-				return super.createPartition(offset, length, stype);
-			}
-		}
-		return super.createPartition(offset, length, type);
-	}
-
-	protected void setInternalPartition(int offset, int length, String type) {
-		String localType = type;
-		if (type == IHTMLPartitionTypes.SCRIPT) {
-			IStructuredDocumentRegion node = fStructuredDocument.getRegionAtCharacterOffset(offset);
-			if (node != null) {
-				localType = getScriptingPartitionType(node);
-			}
-		}
-		super.setInternalPartition(offset, length, localType);
-	}
-
-	private String getScriptingPartitionType(IStructuredDocumentRegion coreNode) {
-		String language = null;
-		String type = null;
-		String result = IHTMLPartitionTypes.SCRIPT;
-		IStructuredDocumentRegion node = coreNode;
-		ITextRegion attrNameRegion = null;
-		while (node != null && isValidScriptingRegionType(node.getType())) {
-			node = node.getPrevious();
-		}
-
-		ITextRegionList regions = node.getRegions();
-		if (regions.size() > 4 && regions.get(1).getType() == DOMRegionContext.XML_TAG_NAME) {
-			ITextRegion potentialLanguageRegion = regions.get(1);
-			String potentialLanguageString = node.getText(potentialLanguageRegion);
-			if (potentialLanguageString.equalsIgnoreCase(HTML40Namespace.ElementName.SCRIPT)) {
-				for (int i = 0; i < regions.size(); i++) {
-					ITextRegion region = regions.get(i);
-					String regionType = region.getType();
-					if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME)
-						attrNameRegion = region;
-					else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-						String attrName = node.getText(attrNameRegion);
-						if (attrName.equalsIgnoreCase(HTML40Namespace.ATTR_NAME_LANGUAGE))
-							language = StringUtils.strip(node.getText(region));
-						else if (attrName.equalsIgnoreCase(HTML40Namespace.ATTR_NAME_TYPE)) {
-							type = StringUtils.strip(node.getText(region));
-							break;
-						}
-						attrNameRegion = null;
-					}
-				}
-			}
-		}
-		if (type != null)
-			result = lookupScriptType(type);
-		else if (language != null)
-			result = lookupScriptLanguage(language);
-		return result;
-	}
-
-	private boolean isValidScriptingRegionType(String type) {
-		return type == DOMRegionContext.BLOCK_TEXT || type == DOMRegionContext.XML_CDATA_OPEN || type == DOMRegionContext.XML_CDATA_TEXT || type == DOMRegionContext.XML_CDATA_CLOSE;
-	}
-
-	protected void initLegalContentTypes() {
-		fSupportedTypes = getConfiguredContentTypes();
-	}
-
-	private String lookupScriptType(String type) {
-		for (int i = 0; i < ScriptLanguageKeys.JAVASCRIPT_MIME_TYPE_KEYS.length; i++)
-			if (ScriptLanguageKeys.JAVASCRIPT_MIME_TYPE_KEYS[i].equalsIgnoreCase(type))
-				return IHTMLPartitionTypes.SCRIPT;
-		return IHTMLPartitionTypes.SCRIPT + ".type." + type.toUpperCase(Locale.ENGLISH); //$NON-NLS-1$
-	}
-
-	private String lookupScriptLanguage(String language) {
-		for (int i = 0; i < ScriptLanguageKeys.JAVASCRIPT_LANGUAGE_KEYS.length; i++)
-			if (ScriptLanguageKeys.JAVASCRIPT_LANGUAGE_KEYS[i].equalsIgnoreCase(language))
-				return IHTMLPartitionTypes.SCRIPT;
-		return IHTMLPartitionTypes.SCRIPT + ".language." + language.toUpperCase(Locale.ENGLISH); //$NON-NLS-1$
-	}
-
-	public String getPartitionType(ITextRegion region, int offset) {
-		String result = null;
-		if (region.getType() == DOMRegionContext.XML_COMMENT_TEXT || region.getType() == DOMRegionContext.XML_COMMENT_OPEN)
-			result = IHTMLPartitionTypes.HTML_COMMENT;
-		else if (region.getType() == DOMRegionContext.XML_DOCTYPE_DECLARATION || region.getType() == DOMRegionContext.XML_DECLARATION_OPEN)
-			result = IHTMLPartitionTypes.HTML_DECLARATION;
-		else
-			result = super.getPartitionType(region, offset);
-		return result;
-	}
-
-	public String getPartitionTypeBetween(IStructuredDocumentRegion previousNode, IStructuredDocumentRegion nextNode) {
-		
-		ITextRegion previousStartTagNameRegion = null;
-		ITextRegion nextEndTagNameRegion = null;
-		
-		ITextRegion[] regions = previousNode.getRegions().toArray();
-		for (int i = 0; i < regions.length; i++) {
-			if(regions[i].getType() == DOMRegionContext.XML_TAG_NAME) {
-				previousStartTagNameRegion = regions[i];
-				break;
-			}
-		}
-		regions = nextNode.getRegions().toArray();
-		for (int i = 0; i < regions.length; i++) {
-			if(regions[i].getType() == DOMRegionContext.XML_TAG_NAME) {
-				nextEndTagNameRegion = regions[i];
-				break;
-			}
-		}
-		
-		if(previousStartTagNameRegion == null || nextEndTagNameRegion == null)
-			return IHTMLPartitionTypes.HTML_DEFAULT;
-		
-		String name1 = previousNode.getText(previousStartTagNameRegion);
-		String name2 = nextNode.getText(nextEndTagNameRegion);
-		if (name1.equalsIgnoreCase(HTML40Namespace.ElementName.SCRIPT) && name2.equalsIgnoreCase(HTML40Namespace.ElementName.SCRIPT))
-			//			return ST_SCRIPT;
-			return getScriptingPartitionType(fStructuredDocument.getRegionAtCharacterOffset(previousNode.getStartOffset(previousStartTagNameRegion)));
-		else if (name1.equalsIgnoreCase(HTML40Namespace.ElementName.STYLE) && name2.equalsIgnoreCase(HTML40Namespace.ElementName.STYLE))
-			return ICSSPartitionTypes.STYLE;
-		return super.getPartitionTypeBetween(previousNode, nextNode);
-	}
-
-
-	protected String getPartitionType(ForeignRegion region, int offset) {
-		String tagname = region.getSurroundingTag();
-		String result = null;
-		// tagname should not be null,
-		// but see https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=4911
-		if (tagname == null) {
-			result = getUnknown();
-		}
-		else if (tagname.equalsIgnoreCase(HTML40Namespace.ElementName.SCRIPT))
-			result = IHTMLPartitionTypes.SCRIPT;
-		else if (tagname.equalsIgnoreCase(HTML40Namespace.ElementName.STYLE))
-			result = ICSSPartitionTypes.STYLE;
-		else
-			result = super.getPartitionType(region, offset);
-
-		return result;
-	}
-
-	public String getDefaultPartitionType() {
-		return IHTMLPartitionTypes.HTML_DEFAULT;
-	}
-
-	public IDocumentPartitioner newInstance() {
-		return new StructuredTextPartitionerForHTML();
-	}
-
-	/**
-	 * @return
-	 */
-	public static String[] getConfiguredContentTypes() {
-		return configuredContentTypes;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/AbstractErrorInfo.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/AbstractErrorInfo.java
deleted file mode 100644
index b9b4d93..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/AbstractErrorInfo.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-abstract class AbstractErrorInfo implements ErrorInfo, ErrorState {
-
-
-	private int state = NONE_ERROR;
-	private Segment seg = null;
-
-	public AbstractErrorInfo(int state, Segment seg) {
-		super();
-		this.state = state;
-		this.seg = seg;
-	}
-
-	abstract public String getHint();
-
-	abstract public short getTargetType();
-
-	public int getLength() {
-		return (seg == null) ? 0 : seg.getLength();
-	}
-
-	public int getOffset() {
-		return (seg == null) ? 0 : seg.getOffset();
-	}
-
-	public int getState() {
-		return this.state;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CMUtil.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CMUtil.java
deleted file mode 100644
index a8af2e5..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CMUtil.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.modelquery.HMQUtil;
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-final class CMUtil {
-
-	/**
-	 * Never instantiate!
-	 */
-	private CMUtil() {
-		super();
-	}
-
-	/**
-	 * You cannot always retrieve HTMLElementDeclaration via an Element instance.
-	 * Because, it occasionally a JSP custom tag. -- 9/7/2001
-	 */
-	public static CMElementDeclaration getDeclaration(Element target) {
-		Document doc = target.getOwnerDocument();
-		ModelQuery query = ModelQueryUtil.getModelQuery(doc);
-		return query.getCMElementDeclaration(target);
-	}
-
-	/**
-	 */
-	public static boolean isCaseSensitive(CMElementDeclaration decl) {
-		if (decl == null || (!decl.supports(HTMLCMProperties.SHOULD_IGNORE_CASE)))
-			return false;
-		return !((Boolean) decl.getProperty(HTMLCMProperties.SHOULD_IGNORE_CASE)).booleanValue();
-	}
-
-	/**
-	 */
-	private static boolean isChild(CMContent content, CMElementDeclaration target) {
-		switch (content.getNodeType()) {
-			case CMNode.ELEMENT_DECLARATION :
-				if (isWholeTagOmissible((CMElementDeclaration) content))
-					if (isChild(((CMElementDeclaration) content).getContent(), target))
-						return true;
-				return isSameDeclaration((CMElementDeclaration) content, target);
-			case CMNode.GROUP :
-				CMNodeList children = ((CMGroup) content).getChildNodes();
-				for (int i = 0; i < children.getLength(); i++) {
-					CMNode child = children.item(i);
-					switch (child.getNodeType()) {
-						case CMNode.ELEMENT_DECLARATION :
-							if (isWholeTagOmissible((CMElementDeclaration) child))
-								if (isChild(((CMElementDeclaration) child).getContent(), target))
-									return true;
-							if (isSameDeclaration((CMElementDeclaration) child, target))
-								return true;
-							continue; // Go next child.
-						case CMNode.GROUP :
-							if (isChild((CMContent) child, target))
-								return true;
-							continue; // Go next child.
-						default :
-							continue; // Go next child.
-					}
-				}
-		}
-		return false;
-	}
-
-	/**
-	 */
-	public static boolean isEndTagOmissible(CMElementDeclaration decl) {
-		if (!(decl.supports(HTMLCMProperties.OMIT_TYPE)))
-			return false;
-		String omitType = (String) decl.getProperty(HTMLCMProperties.OMIT_TYPE);
-		return !omitType.equals(HTMLCMProperties.Values.OMIT_NONE);
-	}
-
-	/**
-	 */
-	public static boolean isWholeTagOmissible(CMElementDeclaration decl) {
-		if (!(decl.supports(HTMLCMProperties.OMIT_TYPE)))
-			return false;
-		String omitType = (String) decl.getProperty(HTMLCMProperties.OMIT_TYPE);
-		return omitType.equals(HTMLCMProperties.Values.OMIT_BOTH);
-	}
-	
-	/**
-	 */
-	public static boolean isJSP(CMElementDeclaration decl) {
-		if (!decl.supports(HTMLCMProperties.IS_JSP))
-			return false;
-		return ((Boolean) decl.getProperty(HTMLCMProperties.IS_JSP)).booleanValue();
-	}
-
-	/**
-	 */
-	public static boolean isXHTML(CMElementDeclaration decl) {
-		if (!decl.supports(HTMLCMProperties.IS_XHTML))
-			return false;
-		return ((Boolean) decl.getProperty(HTMLCMProperties.IS_XHTML)).booleanValue();
-	}
-
-	/**
-	 * The method to distinguish HTML and XHTML from other mark up.
-	 * This method returns true if the target is,
-	 * (1) not JSP,
-	 * (2) not SSI.
-	 */
-	public static boolean isHTML(CMElementDeclaration decl) {
-		return (!isJSP(decl)) && (!isSSI(decl));
-	}
-
-	/**
-	 */
-	private static boolean isSameDeclaration(CMElementDeclaration aDec, CMElementDeclaration otherDec) {
-		return aDec.getElementName() == otherDec.getElementName();
-	}
-
-	/**
-	 */
-	public static boolean isSSI(CMElementDeclaration edec) {
-		if (edec == null)
-			return false;
-		if (!edec.supports(HTMLCMProperties.IS_SSI))
-			return false;
-		return ((Boolean) edec.getProperty(HTMLCMProperties.IS_SSI)).booleanValue();
-	}
-
-	/**
-	 * Call this method only when the parent content type is one of
-	 * the following: ANY, ELEMENT, or MIXED.
-	 */
-	public static boolean isValidChild(CMElementDeclaration parent, CMElementDeclaration child) {
-		if (parent == null || child == null)
-			return false;
-		if (isHTML(parent) && (!isHTML(child)))
-			return true;
-		CMContent content = parent.getContent();
-		if (content == null)
-			return false;
-		return isChild(content, child);
-	}
-
-	public static boolean isForeign(Element target) {
-		if (!(target instanceof IDOMElement))
-			return true;
-		IDOMElement element = (IDOMElement) target;
-		return !element.isGlobalTag();
-	}
-
-	/**
-	 * This method returns true if all of the following conditions are met:
-	 * (1) value type is ENUM,
-	 * (2) only one value is defined in the enumeration,
-	 * (3) the value has same name to the attribute name.
-	 */
-	public static boolean isBooleanAttr(CMAttributeDeclaration adec) {
-		CMDataType attrtype = adec.getAttrType();
-		if (attrtype == null)
-			return false;
-		if (attrtype.getDataTypeName() != CMDataType.ENUM)
-			return false;
-		String[] values = attrtype.getEnumeratedValues();
-		if (values.length != 1)
-			return false;
-		return values[0].equals(adec.getAttrName());
-	}
-
-	public static boolean isValidInclusion(CMElementDeclaration decl, Element parent) {
-		Iterator iter = HMQUtil.getInclusions(parent).iterator();
-		while (iter.hasNext()) {
-			CMElementDeclaration inclusion = (CMElementDeclaration) iter.next();
-			if (isSameDeclaration(decl, inclusion))
-				return true;
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CompositeValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CompositeValidator.java
deleted file mode 100644
index 0ad2128..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CompositeValidator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.validate.ValidationAdapter;
-import org.eclipse.wst.sse.core.internal.validate.ValidationReporter;
-import org.eclipse.wst.xml.core.internal.validate.ValidationComponent;
-
-abstract class CompositeValidator extends ValidationComponent {
-
-	protected Vector components = new Vector();
-
-	/**
-	 * CompositeValidator constructor comment.
-	 */
-	public CompositeValidator() {
-		super();
-	}
-
-	/**
-	 */
-	public void setReporter(ValidationReporter reporter) {
-		super.setReporter(reporter);
-
-		Iterator i = components.iterator();
-		while (i.hasNext()) {
-			ValidationAdapter component = (ValidationAdapter) i.next();
-			if (component == null)
-				continue;
-			component.setReporter(reporter);
-		}
-	}
-
-	/**
-	 */
-	public void validate(IndexedRegion node) {
-		Iterator i = components.iterator();
-		while (i.hasNext()) {
-			ValidationComponent component = (ValidationComponent) i.next();
-			if (component == null)
-				continue;
-			component.validate(node);
-		}
-	}
-
-	/**
-	 */
-	void add(ValidationComponent validator) {
-		components.add(validator);
-	}
-
-	/**
-	 * This method registers all components in 'validators'.
-	 * Each derivative must call this methid in its constructor.
-	 */
-	protected void register(ValidationComponent[] validators) {
-		for (int i = 0; i < validators.length; i++) {
-			if (validators[i] != null)
-				add(validators[i]);
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/DocumentPropagatingValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/DocumentPropagatingValidator.java
deleted file mode 100644
index 1bb7a86..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/DocumentPropagatingValidator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.validate.ValidationAdapter;
-import org.eclipse.wst.sse.core.internal.validate.ValidationReporter;
-import org.eclipse.wst.xml.core.internal.validate.AbstractPropagatingValidator;
-import org.eclipse.wst.xml.core.internal.validate.ValidationComponent;
-
-class DocumentPropagatingValidator extends AbstractPropagatingValidator {
-
-
-	private ValidationComponent validator = new HTMLSimpleDocumentValidator();
-	private ElementPropagatingValidator propagatee = new ElementPropagatingValidator();
-
-	public DocumentPropagatingValidator() {
-		super();
-	}
-
-	public void validate(IndexedRegion node) {
-		getPropagatee().setReporter(this.reporter);
-		super.validate(node);
-	}
-
-	public boolean isAdapterForType(Object type) {
-		return (type == DocumentPropagatingValidator.class || super.isAdapterForType(type));
-	}
-
-	public void setReporter(ValidationReporter reporter) {
-		super.setReporter(reporter);
-		validator.setReporter(reporter);
-		propagatee.setReporter(reporter);
-	}
-
-	protected final ValidationComponent getPropagatee() {
-		return propagatee;
-	}
-
-	protected final ValidationAdapter getValidator() {
-		return validator;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ElementPropagatingValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ElementPropagatingValidator.java
deleted file mode 100644
index 5b83741..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ElementPropagatingValidator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-
-import org.eclipse.wst.sse.core.internal.validate.ValidationAdapter;
-import org.eclipse.wst.sse.core.internal.validate.ValidationReporter;
-import org.eclipse.wst.xml.core.internal.validate.AbstractPropagatingValidator;
-import org.eclipse.wst.xml.core.internal.validate.ValidationComponent;
-
-class ElementPropagatingValidator extends AbstractPropagatingValidator {
-
-
-	private ValidationComponent validator = new HTMLSimpleValidator();
-
-	public ElementPropagatingValidator() {
-		super();
-	}
-
-	public boolean isAdapterForType(Object type) {
-		return (type == ElementPropagatingValidator.class || super.isAdapterForType(type));
-	}
-
-	public void setReporter(ValidationReporter reporter) {
-		super.setReporter(reporter);
-		validator.setReporter(reporter);
-	}
-
-	protected ValidationComponent getPropagatee() {
-		return this;
-	}
-
-	protected ValidationAdapter getValidator() {
-		return validator;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ErrorInfo.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ErrorInfo.java
deleted file mode 100644
index 34b430e..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ErrorInfo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-
-
-interface ErrorInfo {
-
-	public String getHint();
-
-	public int getLength();
-
-	public int getOffset();
-
-	public int getState();
-
-	public short getTargetType();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ErrorInfoImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ErrorInfoImpl.java
deleted file mode 100644
index 6026c2c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ErrorInfoImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-final class ErrorInfoImpl extends AbstractErrorInfo {
-
-	private Node target = null;
-
-	//	private Segment seg = null;
-	/**
-	 */
-	public ErrorInfoImpl(int state, Segment errorSeg, Node target) {
-		super(state, errorSeg);
-		this.target = target;
-	}
-
-	/**
-	 */
-	public String getHint() {
-		switch (target.getNodeType()) {
-			case Node.ATTRIBUTE_NODE :
-				switch (getState()) {
-					case UNDEFINED_VALUE_ERROR :
-					case MISMATCHED_VALUE_ERROR :
-					case UNCLOSED_ATTR_VALUE :
-						//D210422
-						return ((Attr) target).getValue();
-					default :
-						return target.getNodeName();
-				}
-			case Node.TEXT_NODE :
-				return ((Text) target).getData();
-			case Node.ELEMENT_NODE :
-			default :
-				return target.getNodeName();
-		}
-	}
-
-	public short getTargetType() {
-		return target.getNodeType();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ErrorState.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ErrorState.java
deleted file mode 100644
index f725940..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ErrorState.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-
-
-interface ErrorState {
-	static final int NONE_ERROR = 0;
-	// generic error
-	static final int UNDEFINED_NAME_ERROR = 11;
-	static final int UNDEFINED_VALUE_ERROR = 12;
-	static final int MISMATCHED_VALUE_ERROR = 13;
-	// format error
-	static final int FORMAT_ERROR_LEVEL = 100;
-	static final int INVALID_NAME_ERROR = 101;
-	static final int INVALID_CHAR_ERROR = 102;
-	static final int MISMATCHED_ERROR = 103;
-	static final int MISMATCHED_END_TAG_ERROR = 104;
-	static final int MISSING_START_TAG_ERROR = 105;
-	static final int MISSING_END_TAG_ERROR = 106;
-	static final int UNNECESSARY_END_TAG_ERROR = 107;
-	static final int INVALID_ATTR_ERROR = 108;
-	static final int INVALID_DIRECTIVE_ERROR = 109;
-	static final int UNCLOSED_TAG_ERROR = 110;
-	static final int UNCLOSED_END_TAG_ERROR = 111;
-	static final int INVALID_EMPTY_ELEMENT_TAG = 112;
-	static final int UNCLOSED_ATTR_VALUE = 113; //D210422
-	// layout error
-	static final int LAYOUT_ERROR_LEVEL = 1000;
-	static final int INVALID_CONTENT_ERROR = 1001;
-	static final int DUPLICATE_ERROR = 1002;
-	static final int COEXISTENCE_ERROR = 1003;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/FMUtil.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/FMUtil.java
deleted file mode 100644
index c16984c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/FMUtil.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-final class FMUtil {
-
-	public final static int SEG_NONE = 0;
-	public final static int SEG_WHOLE_TAG = 1;
-	public final static int SEG_START_TAG = 2;
-	public final static int SEG_END_TAG = 3;
-
-	/**
-	 */
-	private FMUtil() {
-		super();
-	}
-
-	/**
-	 */
-	public final static Segment getSegment(IDOMNode target, int segType) {
-		if (target == null)
-			return new Segment(0, 0);
-		Segment seg = null;
-		IStructuredDocumentRegion startTag = null;
-		IStructuredDocumentRegion endTag = null;
-		switch (segType) {
-			case SEG_WHOLE_TAG :
-				startTag = target.getFirstStructuredDocumentRegion();
-				if (startTag != null) {
-					endTag = target.getLastStructuredDocumentRegion();
-					seg = new Segment(startTag, endTag);
-				}
-				else {
-					int startOffset = target.getStartOffset();
-					int endOffset = target.getEndOffset();
-					seg = new Segment(startOffset, endOffset - startOffset);
-				}
-				break;
-			case SEG_START_TAG :
-				startTag = target.getStartStructuredDocumentRegion();
-				if (startTag != null) {
-					seg = new Segment(startTag);
-				}
-				else {
-					seg = new Segment(target.getStartOffset(), 0);
-				}
-				break;
-			case SEG_END_TAG :
-				endTag = target.getEndStructuredDocumentRegion();
-				if (endTag != null) {
-					seg = new Segment(endTag);
-				}
-				else {
-					seg = new Segment(target.getEndOffset(), 0);
-				}
-				break;
-			case SEG_NONE :
-			default :
-				return new Segment(0, 0);
-		}
-		return seg;
-	}
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLAttributeValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLAttributeValidator.java
deleted file mode 100644
index 63f5831..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLAttributeValidator.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-
-
-import java.util.Iterator;
-
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-public class HTMLAttributeValidator extends PrimeValidator {
-
-	private static final int REGION_NAME = 1;
-	private static final int REGION_VALUE = 2;
-	// <<D210422
-	private static final char SINGLE_QUOTE = '\'';
-	private static final char DOUBLE_QUOTE = '\"';
-
-	// D210422
-	/**
-	 * HTMLAttributeValidator constructor comment.
-	 */
-	public HTMLAttributeValidator() {
-		super();
-	}
-
-	/**
-	 */
-	private Segment getErrorSegment(IDOMNode errorNode, int regionType) {
-		ITextRegion rgn = null;
-		switch (regionType) {
-			case REGION_NAME :
-				rgn = errorNode.getNameRegion();
-				break;
-			case REGION_VALUE :
-				rgn = errorNode.getValueRegion();
-				break;
-			default :
-				// nothing to do.
-				break;
-		}
-		if (rgn != null) {
-			if (errorNode instanceof IDOMAttr) {
-				IDOMElement ownerElement = (IDOMElement) ((IDOMAttr) errorNode).getOwnerElement();
-				if (ownerElement != null) {
-					int regionStartOffset = ownerElement.getFirstStructuredDocumentRegion().getStartOffset(rgn);
-					int regionLength = rgn.getLength();
-					return new Segment(regionStartOffset, regionLength);
-				}
-			}
-		}
-		return new Segment(errorNode.getStartOffset(), 0);
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type allows it
-	 * to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return ((type == HTMLAttributeValidator.class) || super.isAdapterForType(type));
-	}
-
-	/**
-	 */
-	public void validate(IndexedRegion node) {
-		Element target = (Element) node;
-		if (CMUtil.isForeign(target))
-			return;
-		CMElementDeclaration edec = CMUtil.getDeclaration(target);
-		if (edec == null)
-			return;
-		CMNamedNodeMap declarations = edec.getAttributes();
-
-		NamedNodeMap attrs = target.getAttributes();
-		for (int i = 0; i < attrs.getLength(); i++) {
-			int rgnType = REGION_NAME;
-			int state = ErrorState.NONE_ERROR;
-			Attr a = (Attr) attrs.item(i);
-			// D203637; If the target attr has prefix, the validator should
-			// not
-			// warn about it. That is, just ignore. It is able to check
-			// whether
-			// an attr has prefix or not by calling XMLAttr#isGlobalAttr().
-			// When a attr has prefix (not global), it returns false.
-			boolean isXMLAttr = a instanceof IDOMAttr;
-			if (isXMLAttr) {
-				IDOMAttr xmlattr = (IDOMAttr) a;
-				if (!xmlattr.isGlobalAttr())
-					continue; // skip futher validation and begin next loop.
-			}
-
-			CMAttributeDeclaration adec = (CMAttributeDeclaration) declarations.getNamedItem(a.getName());
-			if (adec == null) {
-				// No attr declaration was found. That is, the attr name is
-				// undefined.
-				// but not regard it as undefined name if it includes JSP
-				if (hasJSPRegion(((IDOMNode) a).getNameRegion())) {
-					rgnType = REGION_NAME;
-					state = ErrorState.UNDEFINED_NAME_ERROR;
-				}
-			}
-			else {
-				// The attr declaration was found.
-				// At 1st, the name should be checked.
-				if (CMUtil.isHTML(edec) && (!CMUtil.isXHTML(edec))) {
-					// If the target element is pure HTML (not XHTML), some
-					// attributes
-					// might be written in boolean format. It should be check
-					// specifically.
-					if (CMUtil.isBooleanAttr(adec) && ((IDOMAttr) a).hasNameOnly())
-						continue; // OK, keep going. No more check is needed
-					// against this attr.
-				}
-				else {
-					// If the target is other than pure HTML (JSP or XHTML),
-					// the name
-					// must be checked exactly (ie in case sensitive way).
-					String actual = a.getName();
-					String desired = adec.getAttrName();
-					if (!actual.equals(desired)) { // case mismatch
-						rgnType = REGION_NAME;
-						state = ErrorState.MISMATCHED_ERROR;
-					}
-				}
-				// Then, the value must be checked.
-				if (state == ErrorState.NONE_ERROR) { // Need more check.
-					// Now, the value should be checked, if the type is ENUM.
-					CMDataType attrType = adec.getAttrType();
-					String actualValue = a.getValue();
-					if (attrType.getImpliedValueKind() == CMDataType.IMPLIED_VALUE_FIXED) {
-						// Check FIXED value.
-						String validValue = attrType.getImpliedValue();
-						if (!actualValue.equals(validValue)) {
-							rgnType = REGION_VALUE;
-							state = ErrorState.UNDEFINED_VALUE_ERROR;
-						}
-					}
-					else {
-						String[] candidates = attrType.getEnumeratedValues();
-						if (candidates != null && candidates.length > 0) {
-							// several candidates are found.
-							boolean found = false;
-							for (int index = 0; index < candidates.length; index++) {
-								String candidate = candidates[index];
-								// At 1st, compare ignoring case.
-								if (actualValue.equalsIgnoreCase(candidate)) {
-									found = true;
-									if (CMUtil.isCaseSensitive(edec) && (!actualValue.equals(candidate))) {
-										rgnType = REGION_VALUE;
-										state = ErrorState.MISMATCHED_VALUE_ERROR;
-									}
-									break; // exit the loop.
-								}
-							}
-							if (!found) {
-								// No candidate was found. That is,
-								// actualValue is invalid.
-								// but not regard it as undefined value if it
-								// includes JSP.
-								if (hasJSPRegion(((IDOMNode) a).getValueRegion())) {
-									rgnType = REGION_VALUE;
-									state = ErrorState.UNDEFINED_VALUE_ERROR;
-								}
-							}
-						}
-					}
-				}
-				// <<D210422
-				if (state == ErrorState.NONE_ERROR) { // Need more check.
-					if (isXMLAttr) {
-						String source = ((IDOMAttr) a).getValueRegionText();
-						if (source != null) {
-							char firstChar = source.charAt(0);
-							char lastChar = source.charAt(source.length() - 1);
-							if (isQuote(firstChar) || isQuote(lastChar)) {
-								if (lastChar != firstChar) {
-									rgnType = REGION_VALUE;
-									state = ErrorState.UNCLOSED_ATTR_VALUE;
-								}
-							}
-						}
-					}
-				}
-				// D210422
-			}
-			if (state != ErrorState.NONE_ERROR) {
-				Segment seg = getErrorSegment((IDOMNode) a, rgnType);
-				if (seg != null)
-					reporter.report(MessageFactory.createMessage(new ErrorInfoImpl(state, seg, a)));
-			}
-		}
-	}
-
-	/**
-	 */
-	private boolean hasJSPRegion(ITextRegion container) {
-		if (!(container instanceof ITextRegionContainer))
-			return false;
-		ITextRegionList regions = ((ITextRegionContainer) container).getRegions();
-		if (regions == null)
-			return false;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			if (region == null)
-				continue;
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_TAG_OPEN || (isNextedTagName(regionType)))
-				return true;
-		}
-		return false;
-	}
-
-    /**
-     * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-     * way for expedency. Should be evolved in future to depend on "nestedContext".
-     */
-	private boolean isNextedTagName(String regionType) {
-		final String JSP_SCRIPTLET_OPEN = "JSP_SCRIPTLET_OPEN"; //$NON-NLS-1$
-		final String JSP_EXPRESSION_OPEN = "JSP_EXPRESSION_OPEN"; //$NON-NLS-1$
-		final String JSP_DECLARATION_OPEN = "JSP_DECLARATION_OPEN"; //$NON-NLS-1$
-		final String JSP_DIRECTIVE_OPEN = "JSP_DIRECTIVE_OPEN"; //$NON-NLS-1$
-
-		boolean result = regionType.equals(JSP_SCRIPTLET_OPEN) || regionType.equals(JSP_EXPRESSION_OPEN) || regionType.equals(JSP_DECLARATION_OPEN) || regionType.equals(JSP_DIRECTIVE_OPEN);
-		return result;
-	}
-
-	// <<D214022
-	private boolean isQuote(char c) {
-		return (c == SINGLE_QUOTE) || (c == DOUBLE_QUOTE);
-	}
-	// D210422
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLDocumentContentValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLDocumentContentValidator.java
deleted file mode 100644
index 026e6d2..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLDocumentContentValidator.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class HTMLDocumentContentValidator extends PrimeValidator {
-
-
-	private final static class Division {
-		private Vector explicitHtmls = new Vector();
-		private Vector rest = new Vector();
-
-		public Division(Document document, NodeList children) {
-			String rootTagName = getRootTagName(document);
-			for (int i = 0; i < children.getLength(); i++) {
-				Node child = children.item(i);
-				if (isHtmlTag(child, rootTagName)) {
-					explicitHtmls.add(child);
-				}
-				else {
-					rest.add(child);
-				}
-			}
-		}
-
-		public boolean hasExplicitHtmls() {
-			return explicitHtmls.size() > 0;
-		}
-
-		public List getExplicitHtmls() {
-			return explicitHtmls;
-		}
-
-		public Iterator getRestNodes() {
-			return rest.iterator();
-		}
-
-		/* utilities */
-		private static boolean isHtmlTag(Node node, String tagName) {
-			if (node.getNodeType() != Node.ELEMENT_NODE)
-				return false;
-			return ((Element) node).getTagName().equalsIgnoreCase(tagName);
-		}
-
-		private static String getRootTagName(Document document) {
-			DocumentTypeAdapter adapter = (DocumentTypeAdapter) ((IDOMDocument) document).getAdapterFor(DocumentTypeAdapter.class);
-			if (adapter != null) {
-				DocumentType docType = adapter.getDocumentType();
-				if (docType != null) {
-					return docType.getName();
-				}
-			}
-
-			return HTML40Namespace.ElementName.HTML;
-		}
-	}
-
-	/**
-	 * HTMLDocumentContentValidator constructor comment.
-	 */
-	public HTMLDocumentContentValidator() {
-		super();
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type allows it
-	 * to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return ((type == HTMLDocumentContentValidator.class) || super.isAdapterForType(type));
-	}
-
-	/**
-	 */
-	public void validate(IndexedRegion node) {
-		// isFragment check should be more intelligent.
-		boolean isFragment = true;
-
-		Document target = (Document) node;
-		NodeList children = target.getChildNodes();
-		if (children == null)
-			return;
-
-		Division division = new Division(target, children);
-		if (division.hasExplicitHtmls()) {
-			isFragment = false;
-
-			List explicits = division.getExplicitHtmls();
-			if (explicits.size() > 1) {
-				for (int i = 1; i < explicits.size(); i++) {
-					Element html = (Element) explicits.get(i);
-					// report error (duplicate)
-					Segment errorSeg = FMUtil.getSegment((IDOMNode) html, FMUtil.SEG_START_TAG);
-					if (errorSeg != null)
-						reporter.report(MessageFactory.createMessage(new ErrorInfoImpl(ErrorState.DUPLICATE_ERROR, errorSeg, html)));
-				}
-			}
-		}
-		validateContent(division.getRestNodes(), isFragment);
-	}
-
-	/*
-	 * This methods validate nodes other than HTML elements.
-	 */
-	private void validateContent(Iterator children, boolean isFragment) {
-		boolean foundDoctype = false;
-		while (children.hasNext()) {
-			IDOMNode child = (IDOMNode) children.next();
-
-			int error = ErrorState.NONE_ERROR;
-			int segType = FMUtil.SEG_WHOLE_TAG;
-
-			switch (child.getNodeType()) {
-				case Node.ELEMENT_NODE :
-					if (!isFragment) {
-						Element childElem = (Element) child;
-						CMElementDeclaration ced = CMUtil.getDeclaration(childElem);
-						// Undefined element is valid.
-						if (ced == null)
-							continue;
-						// JSP (includes custom tags) and SSI are valid.
-						if (CMUtil.isForeign(childElem) || CMUtil.isSSI(ced))
-							continue; // Defect 186774
-
-						// report error (invalid content)
-						error = ErrorState.INVALID_CONTENT_ERROR;
-						// mark the whole start tag as error.
-						segType = FMUtil.SEG_START_TAG;
-					}
-					break;
-				case Node.TEXT_NODE :
-					if (!isFragment) {
-						// TEXT node is valid when it contains white space
-						// characters only.
-						// Otherwise, it is invalid content.
-						if (((IDOMText) child).isElementContentWhitespace())
-							continue;
-						error = ErrorState.INVALID_CONTENT_ERROR;
-						segType = FMUtil.SEG_WHOLE_TAG;
-					}
-					break;
-				case Node.DOCUMENT_TYPE_NODE :
-					// DOCTYPE is also valid when it appears once and only
-					// once.
-					if (!foundDoctype) {
-						foundDoctype = true;
-						continue;
-					}
-					error = ErrorState.DUPLICATE_ERROR;
-					segType = FMUtil.SEG_WHOLE_TAG;
-					break;
-				case Node.COMMENT_NODE :
-				// always valid.
-				case Node.PROCESSING_INSTRUCTION_NODE :
-					continue;
-				default :
-					if (!isFragment) {
-						error = ErrorState.INVALID_CONTENT_ERROR;
-						segType = FMUtil.SEG_WHOLE_TAG;
-					}
-					break;
-			}
-			if (error != ErrorState.NONE_ERROR) {
-				Segment errorSeg = FMUtil.getSegment(child, segType);
-				if (errorSeg != null)
-					reporter.report(MessageFactory.createMessage(new ErrorInfoImpl(error, errorSeg, child)));
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementAncestorValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementAncestorValidator.java
deleted file mode 100644
index 6ae5e13..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementAncestorValidator.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-
-
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Element;
-
-public class HTMLElementAncestorValidator extends PrimeValidator {
-
-	/**
-	 * HTMLElementAncestorValidator constructor comment.
-	 */
-	public HTMLElementAncestorValidator() {
-		super();
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type
-	 * allows it to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return ((type == HTMLElementAncestorValidator.class) || super.isAdapterForType(type));
-	}
-
-	/**
-	 * Check exclusion which is defined in only HTML DTD (SGML).
-	 */
-	public void validate(IndexedRegion node) {
-		Element target = (Element) node;
-		if (CMUtil.isForeign(target))
-			return;
-		CMElementDeclaration dec = CMUtil.getDeclaration(target);
-		if (dec == null)
-			return; // cannot validate.
-		if (!CMUtil.isHTML(dec))
-			return; // no need to validate
-		if (!dec.supports(HTMLCMProperties.PROHIBITED_ANCESTORS))
-			return; // cannot validate.
-		CMNamedNodeMap prohibited = (CMNamedNodeMap) dec.getProperty(HTMLCMProperties.PROHIBITED_ANCESTORS);
-		if (prohibited.getLength() <= 0)
-			return; // no prohibited ancestors.
-
-		Element parent = SMUtil.getParentElement(target);
-		while (parent != null) {
-			CMNode pdec = prohibited.getNamedItem(parent.getNodeName());
-			if (pdec != null) { // prohibited element is found in ancestors.
-				Segment errorSeg = FMUtil.getSegment((IDOMNode) node, FMUtil.SEG_START_TAG);
-				if (errorSeg != null)
-					reporter.report(MessageFactory.createMessage(new ErrorInfoImpl(ErrorState.INVALID_CONTENT_ERROR, errorSeg, target)));
-				break; // If one prohibited ancestor is found, it's enough.
-			}
-			parent = SMUtil.getParentElement(parent);
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementContentValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementContentValidator.java
deleted file mode 100644
index 8ec0839..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementContentValidator.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class HTMLElementContentValidator extends PrimeValidator {
-
-	/**
-	 * HTMLElementContentValidator constructor comment.
-	 */
-	public HTMLElementContentValidator() {
-		super();
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type allows it
-	 * to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return ((type == HTMLElementContentValidator.class) || super.isAdapterForType(type));
-	}
-
-	/**
-	 */
-	public void validate(IndexedRegion node) {
-		Element target = (Element) node;
-		if (CMUtil.isForeign(target))
-			return;
-
-		validateContent(target, target.getChildNodes());
-	}
-
-	private void validateContent(Element parent, NodeList children) {
-		for (int i = 0; i < children.getLength(); i++) {
-			Node child = children.item(i);
-			if (child == null)
-				continue;
-
-			// perform actual validation
-			validateNode(parent, child);
-		}
-	}
-
-	// private int countExplicitSiblings(Element parent, String tagName) {
-	// NodeList children = parent.getChildNodes();
-	// int count = 0;
-	// for (int i = 0; i < children.getLength(); i++) {
-	// Node child = children.item(i);
-	// if (child.getNodeType() != Node.ELEMENT_NODE)
-	// continue;
-	// if (tagName.equalsIgnoreCase(((Element) child).getTagName())) {
-	// count++;
-	// }
-	// }
-	// return count;
-	// }
-
-	/*
-	 * The implementation of the following method is practical but accurate.
-	 * The accurate maximum occurence should be retreive from the content
-	 * model. However, it is useful enough, since almost implicit elements are
-	 * HTML, HEAD, or BODY.
-	 */
-	// private int getMaxOccur(Element parent, String childTag) {
-	// return 1;
-	// }
-	private void validateNode(Element target, Node child) {
-		// NOTE: If the target element is 'UNKNOWN', that is, it has no
-		// element declaration, the content type of the element should be
-		// regarded as 'ANY'. -- 9/10/2001
-		int contentType = CMElementDeclaration.ANY;
-		CMElementDeclaration edec = CMUtil.getDeclaration(target);
-		if (edec != null)
-			contentType = edec.getContentType();
-
-		int error = ErrorState.NONE_ERROR;
-		int segType = FMUtil.SEG_WHOLE_TAG;
-
-		switch (child.getNodeType()) {
-			case Node.ELEMENT_NODE :
-				Element childElem = (Element) child;
-				// Defect 200321:
-				// This validator cares only HTML/XHTML elements. If a child
-				// is
-				// an element of foreign markup languages, just ignore it.
-				if (CMUtil.isForeign(childElem))
-					return;
-
-				CMElementDeclaration ced = CMUtil.getDeclaration((Element) child);
-				// Defect 186774: If a child is not one of HTML elements,
-				// it should be regarded as a valid child regardless the
-				// type of the parent content model. -- 10/12/2001
-				if (ced == null || CMUtil.isSSI(ced) || (!CMUtil.isHTML(ced)))
-					return;
-
-				switch (contentType) {
-					case CMElementDeclaration.ANY :
-						// Keep going.
-						return;
-					case CMElementDeclaration.ELEMENT :
-					case CMElementDeclaration.MIXED :
-						if (ced == null)
-							return;
-						if (CMUtil.isValidChild(edec, ced))
-							return;
-						// Now, it is the time to check inclusion, unless the
-						// target
-						// document is not a XHTML.
-						if (!CMUtil.isXHTML(edec)) {
-							// pure HTML
-							if (CMUtil.isValidInclusion(ced, target))
-								return;
-						}
-						error = ErrorState.INVALID_CONTENT_ERROR;
-						break;
-					default :
-						error = ErrorState.INVALID_CONTENT_ERROR;
-						break;
-				}
-				// Mark the whole START tag as an error segment.
-				segType = FMUtil.SEG_START_TAG;
-				break;
-			case Node.TEXT_NODE :
-				switch (contentType) {
-					case CMElementDeclaration.ANY :
-					case CMElementDeclaration.MIXED :
-					case CMElementDeclaration.PCDATA :
-					case CMElementDeclaration.CDATA :
-						// D184339
-						// Keep going.
-						return;
-					case CMElementDeclaration.ELEMENT :
-					case CMElementDeclaration.EMPTY :
-						if (((IDOMText) child).isElementContentWhitespace())
-							return;
-						error = ErrorState.INVALID_CONTENT_ERROR;
-						break;
-					default :
-						error = ErrorState.INVALID_CONTENT_ERROR;
-						break;
-				}
-				// Mark the whole node as an error segment.
-				segType = FMUtil.SEG_WHOLE_TAG;
-				break;
-			case Node.COMMENT_NODE :
-			case Node.PROCESSING_INSTRUCTION_NODE :
-				if (contentType != CMElementDeclaration.EMPTY)
-					return;
-				error = ErrorState.INVALID_CONTENT_ERROR;
-				// Mark the whole node as an error segment.
-				segType = FMUtil.SEG_WHOLE_TAG;
-				break;
-			default :
-				error = ErrorState.INVALID_CONTENT_ERROR;
-				// Mark the whole node as an error segment.
-				segType = FMUtil.SEG_WHOLE_TAG;
-				break;
-		}
-		if (error != ErrorState.NONE_ERROR) {
-			Segment errorSeg = FMUtil.getSegment((IDOMNode) child, segType);
-			if (errorSeg != null)
-				reporter.report(MessageFactory.createMessage(new ErrorInfoImpl(error, errorSeg, child)));
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLSimpleDocumentValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLSimpleDocumentValidator.java
deleted file mode 100644
index f9a9392..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLSimpleDocumentValidator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-
-import org.eclipse.wst.xml.core.internal.validate.ValidationComponent;
-
-class HTMLSimpleDocumentValidator extends CompositeValidator {
-
-	/**
-	 * HTMLSimpleDocumentValidator constructor comment.
-	 */
-	public HTMLSimpleDocumentValidator() {
-		super();
-
-		ValidationComponent[] validators = new ValidationComponent[2];
-
-		validators[0] = new HTMLDocumentContentValidator();
-		validators[1] = new SyntaxValidator();
-
-		register(validators);
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type
-	 * allows it to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return ((type == HTMLSimpleDocumentValidator.class) || super.isAdapterForType(type));
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLSimpleValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLSimpleValidator.java
deleted file mode 100644
index ff2a5e1..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLSimpleValidator.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-
-import org.eclipse.wst.xml.core.internal.validate.ValidationComponent;
-
-class HTMLSimpleValidator extends CompositeValidator {
-
-	/**
-	 * HTMLSimpleValidator constructor comment.
-	 */
-	public HTMLSimpleValidator() {
-		super();
-
-		ValidationComponent[] validators = new ValidationComponent[5];
-
-		validators[0] = new HTMLAttributeValidator();
-		validators[1] = new HTMLElementContentValidator();
-		validators[2] = new SyntaxValidator();
-		validators[3] = new HTMLElementAncestorValidator();
-		validators[4] = new NamespaceValidator();
-
-		register(validators);
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type
-	 * allows it to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return ((type == HTMLSimpleValidator.class) || super.isAdapterForType(type));
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLValidationAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLValidationAdapterFactory.java
deleted file mode 100644
index 7b50886..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLValidationAdapterFactory.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.validate.ValidationAdapter;
-import org.w3c.dom.Node;
-
-public class HTMLValidationAdapterFactory extends AbstractAdapterFactory {
-
-	private static HTMLValidationAdapterFactory instance = null;
-
-	/**
-	 * HTMLValidationAdapterFactory constructor comment.
-	 */
-	public HTMLValidationAdapterFactory() {
-		super(ValidationAdapter.class, true);
-	}
-
-	/**
-	 * HTMLValidationAdapterFactory constructor comment.
-	 * @param adapterKey java.lang.Object
-	 * @param registerAdapters boolean
-	 */
-	public HTMLValidationAdapterFactory(Object adapterKey, boolean registerAdapters) {
-		super(adapterKey, registerAdapters);
-	}
-
-	/**
-	 */
-	protected INodeAdapter createAdapter(INodeNotifier target) {
-		Node node = (Node) target;
-		switch (node.getNodeType()) {
-			case Node.DOCUMENT_NODE :
-				return new DocumentPropagatingValidator();
-			case Node.ELEMENT_NODE :
-				return new ElementPropagatingValidator();
-			default :
-				return new NullValidator();
-		}
-	}
-
-	/**
-	 */
-	public synchronized static HTMLValidationAdapterFactory getInstance() {
-		if (instance != null)
-			return instance;
-		instance = new HTMLValidationAdapterFactory();
-		return instance;
-	}
-
-	/**
-	 * Overriding Object's clone() method
-	 * This is used in IModelManager's IStructuredModel copying.
-	 */
-	public INodeAdapterFactory copy() {
-		return getInstance();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/MessageFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/MessageFactory.java
deleted file mode 100644
index c60b51c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/MessageFactory.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-import java.util.Hashtable;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.html.core.internal.HTMLCoreMessages;
-import org.eclipse.wst.html.core.internal.Logger;
-import org.eclipse.wst.sse.core.internal.validate.ValidationMessage;
-import org.w3c.dom.Node;
-
-class MessageFactory implements ErrorState {
-
-
-	private static class ErrorTable {
-		private class Packet {
-			public Packet(String msg, int severity) {
-				this.msg = msg;
-				this.severity = severity;
-			}
-
-			public String getMessage() {
-				return msg;
-			}
-
-			public int getSeverity() {
-				return severity;
-			}
-
-			private String msg = null;
-			private int severity = -1;
-		}
-
-		public ErrorTable() {
-		}
-
-		public void put(int state, String msg, int severity) {
-			Packet packet = new Packet(msg, severity);
-			map.put(new Integer(state), packet);
-		}
-
-		public String getMessage(int state) {
-			return getPacket(state).getMessage();
-		}
-
-		public int getSeverity(int state) {
-			return getPacket(state).getSeverity();
-		}
-
-		private Packet getPacket(int state) {
-			return (Packet) map.get(new Integer(state));
-		}
-
-		private Hashtable map = new Hashtable();
-	}
-
-	private static interface NodeType {
-		static final int ATTRIBUTE = 0;
-		static final int ELEMENT = 1;
-		static final int DOCUMENT_TYPE = 2;
-		static final int TEXT = 3;
-		static final int COMMENT = 4;
-		static final int CDATA_SECTION = 5;
-		static final int PROCESSING_INSTRUCTION = 6;
-		static final int ENTITY_REFERENCE = 7;
-
-		static final int MAX_TYPE = 8;
-	}
-
-	// error messages
-	private static final String MSG_NO_ERROR = HTMLCoreMessages.No_error__UI_;
-	private static final String MSG_UNDEFINED_ATTR_ERROR = HTMLCoreMessages.Undefined_attribute_name___ERROR_;
-	private static final String MSG_UNDEFINED_VALUE_ERROR = HTMLCoreMessages.Undefined_attribute_value__ERROR_;
-	private static final String MSG_DUPLICATE_ATTR_ERROR = HTMLCoreMessages.Multiple_values_specified__ERROR_;
-	private static final String MSG_MISMATCHED_ATTR_ERROR = HTMLCoreMessages.Attribute_name___0___uses__ERROR_;
-	private static final String MSG_INVALID_ATTR_ERROR = HTMLCoreMessages.Invalid_attribute_name___0_ERROR_;
-	private static final String MSG_ATTR_NO_VALUE_ERROR = HTMLCoreMessages.Invalid_attribute___0____ERROR_;
-	private static final String MSG_INVALID_CONTENT_ERROR = HTMLCoreMessages.Invalid_location_of_tag____ERROR_;
-	private static final String MSG_DUPLICATE_TAG_ERROR = HTMLCoreMessages.Duplicate_tag___0____ERROR_;
-	private static final String MSG_MISSING_START_TAG_ERROR = HTMLCoreMessages.No_start_tag____0_____ERROR_;
-	private static final String MSG_MISSING_END_TAG_ERROR = HTMLCoreMessages.No_end_tag_____0_____ERROR_;
-	private static final String MSG_UNNECESSARY_END_TAG_ERROR = HTMLCoreMessages.End_tag_____0____not_neede_ERROR_;
-	private static final String MSG_UNDEFINED_TAG_ERROR = HTMLCoreMessages.Unknown_tag___0____ERROR_;
-	private static final String MSG_MISMATCHED_TAG_ERROR = HTMLCoreMessages.Tag_name___0___uses_wrong__ERROR_;
-	private static final String MSG_INVALID_TAG_ERROR = HTMLCoreMessages.Invalid_tag_name___0____ERROR_;
-	private static final String MSG_INVALID_DIRECTIVE_ERROR = HTMLCoreMessages.Invalid_JSP_directive___0__ERROR_;
-	private static final String MSG_INVALID_TEXT_ERROR = HTMLCoreMessages.Invalid_text_string___0____ERROR_;
-	private static final String MSG_INVALID_CHAR_ERROR = HTMLCoreMessages.Invalid_character_used_in__ERROR_;
-	private static final String MSG_UNKNOWN_ERROR = HTMLCoreMessages.Unknown_error__ERROR_;
-	private static final String MSG_UNCLOSED_START_TAG_ERROR = HTMLCoreMessages.Start_tag____0____not_clos_ERROR_;
-	private static final String MSG_UNCLOSED_END_TAG_ERROR = HTMLCoreMessages.End_tag_____0____not_close_ERROR_;
-	private static final String MSG_MISMATCHED_ATTR_VALUE_ERROR = HTMLCoreMessages.Attribute_value___0___uses_ERROR_;
-	private static final String MSG_UNCLOSED_COMMENT_ERROR = HTMLCoreMessages.Comment_not_closed__ERROR_;
-	private static final String MSG_UNCLOSED_DOCTYPE_ERROR = HTMLCoreMessages.DOCTYPE_declaration_not_cl_ERROR_;
-	private static final String MSG_UNCLOSED_PI_ERROR = HTMLCoreMessages.Processing_instruction_not_ERROR_;
-	private static final String MSG_UNCLOSED_CDATA_SECTION_ERROR = HTMLCoreMessages.CDATA_section_not_closed__ERROR_;
-	private static final String MSG_INVALID_EMPTY_ELEMENT_TAG = HTMLCoreMessages._ERROR_Tag___0___should_be_an_empty_element_tag_1;
-	private static final String MSG_UNCLOSED_ATTR_VALUE_ERROR = HTMLCoreMessages._ERROR_Attribute_value___0___not_closed__1;
-	private static ErrorTable[] errTables = new ErrorTable[NodeType.MAX_TYPE];
-
-	static {
-		for (int i = 0; i < NodeType.MAX_TYPE; i++) {
-			errTables[i] = new ErrorTable();
-		}
-		// NOTE: The severities are just stub.  They must be reviewed.
-		// -- 8/30/2001
-
-		// attribute error map
-		ErrorTable attrTable = errTables[NodeType.ATTRIBUTE];// short hand
-		attrTable.put(NONE_ERROR, MSG_NO_ERROR, 0);
-		attrTable.put(UNDEFINED_NAME_ERROR, MSG_UNDEFINED_ATTR_ERROR, ValidationMessage.WARNING);
-		attrTable.put(UNDEFINED_VALUE_ERROR, MSG_UNDEFINED_VALUE_ERROR, ValidationMessage.WARNING);
-		attrTable.put(MISMATCHED_ERROR, MSG_MISMATCHED_ATTR_ERROR, ValidationMessage.WARNING);
-		attrTable.put(INVALID_NAME_ERROR, MSG_INVALID_ATTR_ERROR, ValidationMessage.WARNING);
-		attrTable.put(INVALID_ATTR_ERROR, MSG_ATTR_NO_VALUE_ERROR, ValidationMessage.WARNING);
-		attrTable.put(DUPLICATE_ERROR, MSG_DUPLICATE_ATTR_ERROR, ValidationMessage.WARNING);
-		attrTable.put(MISMATCHED_VALUE_ERROR, MSG_MISMATCHED_ATTR_VALUE_ERROR, ValidationMessage.ERROR);
-		//<<D210422
-		attrTable.put(UNCLOSED_ATTR_VALUE, MSG_UNCLOSED_ATTR_VALUE_ERROR, ValidationMessage.WARNING);
-		//D210422
-		// element error map
-		ErrorTable elemTable = errTables[NodeType.ELEMENT];// short hand
-		elemTable.put(NONE_ERROR, MSG_NO_ERROR, 0);
-		elemTable.put(UNDEFINED_NAME_ERROR, MSG_UNDEFINED_TAG_ERROR, ValidationMessage.WARNING);
-		elemTable.put(INVALID_NAME_ERROR, MSG_INVALID_TAG_ERROR, ValidationMessage.ERROR);
-		elemTable.put(MISMATCHED_ERROR, MSG_MISMATCHED_TAG_ERROR, ValidationMessage.WARNING);
-		elemTable.put(MISMATCHED_END_TAG_ERROR, MSG_MISMATCHED_TAG_ERROR, ValidationMessage.ERROR);
-		elemTable.put(MISSING_START_TAG_ERROR, MSG_MISSING_START_TAG_ERROR, ValidationMessage.ERROR);
-		elemTable.put(MISSING_END_TAG_ERROR, MSG_MISSING_END_TAG_ERROR, ValidationMessage.WARNING);
-		elemTable.put(UNNECESSARY_END_TAG_ERROR, MSG_UNNECESSARY_END_TAG_ERROR, ValidationMessage.WARNING);
-		elemTable.put(INVALID_DIRECTIVE_ERROR, MSG_INVALID_DIRECTIVE_ERROR, ValidationMessage.ERROR);
-		elemTable.put(INVALID_CONTENT_ERROR, MSG_INVALID_CONTENT_ERROR, ValidationMessage.WARNING);
-		elemTable.put(DUPLICATE_ERROR, MSG_DUPLICATE_TAG_ERROR, ValidationMessage.WARNING);
-		elemTable.put(COEXISTENCE_ERROR, MSG_INVALID_CONTENT_ERROR, ValidationMessage.WARNING);
-		elemTable.put(UNCLOSED_TAG_ERROR, MSG_UNCLOSED_START_TAG_ERROR, ValidationMessage.ERROR);
-		elemTable.put(UNCLOSED_END_TAG_ERROR, MSG_UNCLOSED_END_TAG_ERROR, ValidationMessage.ERROR);
-		elemTable.put(INVALID_EMPTY_ELEMENT_TAG, MSG_INVALID_EMPTY_ELEMENT_TAG, ValidationMessage.WARNING);
-
-		// document type error map
-		ErrorTable docTable = errTables[NodeType.DOCUMENT_TYPE];// short hand
-		docTable.put(NONE_ERROR, MSG_NO_ERROR, 0);
-		docTable.put(DUPLICATE_ERROR, MSG_DUPLICATE_TAG_ERROR, ValidationMessage.ERROR);
-		docTable.put(INVALID_CONTENT_ERROR, MSG_INVALID_CONTENT_ERROR, ValidationMessage.WARNING);
-		docTable.put(UNCLOSED_TAG_ERROR, MSG_UNCLOSED_DOCTYPE_ERROR, ValidationMessage.ERROR);
-
-		// text error map
-		ErrorTable textTable = errTables[NodeType.TEXT];
-		textTable.put(NONE_ERROR, MSG_NO_ERROR, 0);
-		textTable.put(INVALID_CONTENT_ERROR, MSG_INVALID_TEXT_ERROR, ValidationMessage.WARNING);
-		textTable.put(INVALID_CHAR_ERROR, MSG_INVALID_CHAR_ERROR, ValidationMessage.WARNING);
-
-		// comment error map
-		ErrorTable commTable = errTables[NodeType.COMMENT];
-		commTable.put(NONE_ERROR, MSG_NO_ERROR, 0);
-		commTable.put(INVALID_CONTENT_ERROR, MSG_INVALID_CONTENT_ERROR, ValidationMessage.WARNING);
-		commTable.put(UNCLOSED_TAG_ERROR, MSG_UNCLOSED_COMMENT_ERROR, ValidationMessage.ERROR);
-
-		// cdata section error map
-		ErrorTable cdatTable = errTables[NodeType.CDATA_SECTION];
-		cdatTable.put(NONE_ERROR, MSG_NO_ERROR, 0);
-		cdatTable.put(INVALID_CONTENT_ERROR, MSG_INVALID_CONTENT_ERROR, ValidationMessage.WARNING);
-		cdatTable.put(UNCLOSED_TAG_ERROR, MSG_UNCLOSED_CDATA_SECTION_ERROR, ValidationMessage.ERROR);
-
-		// processing instruction error map
-		ErrorTable piTable = errTables[NodeType.PROCESSING_INSTRUCTION];
-		piTable.put(NONE_ERROR, MSG_NO_ERROR, 0);
-		piTable.put(INVALID_CONTENT_ERROR, MSG_INVALID_CONTENT_ERROR, ValidationMessage.WARNING);
-		piTable.put(UNCLOSED_TAG_ERROR, MSG_UNCLOSED_PI_ERROR, ValidationMessage.ERROR);
-
-		// entity reference error map
-		ErrorTable erTable = errTables[NodeType.ENTITY_REFERENCE];
-		erTable.put(NONE_ERROR, MSG_NO_ERROR, 0);
-		erTable.put(UNDEFINED_NAME_ERROR, MSG_UNDEFINED_TAG_ERROR, ValidationMessage.WARNING);
-		erTable.put(INVALID_CONTENT_ERROR, MSG_INVALID_CONTENT_ERROR, ValidationMessage.WARNING);
-	}
-
-	/**
-	 */
-	public static ValidationMessage createMessage(ErrorInfo info) {
-		String errorMsg = getErrorMessage(info);
-		int errorSeverity = getErrorSeverity(info);
-		return new ValidationMessage(errorMsg, info.getOffset(), info.getLength(), errorSeverity);
-	}
-
-	private static String getErrorMessage(ErrorInfo info) {
-		ErrorTable tab = getErrorTable(info.getTargetType());
-		if (tab == null)
-			return MSG_UNKNOWN_ERROR;
-
-		String template = tab.getMessage(info.getState());
-		Object[] arguments = {info.getHint()};
-		String s = null;
-		try {
-			s = NLS.bind(template, arguments);
-		}
-		catch (IllegalArgumentException e) {
-			Logger.logException(e);
-			s = template + ":" + arguments.toString(); //$NON-NLS-1$
-		}
-		return s;
-	}
-
-	/**
-	 */
-	private static int getErrorSeverity(ErrorInfo info) {
-		ErrorTable tab = getErrorTable(info.getTargetType());
-		if (tab == null)
-			return 0;
-		return tab.getSeverity(info.getState());
-	}
-
-	private static ErrorTable getErrorTable(short nodetype) {
-		ErrorTable tab = null;
-		switch (nodetype) {
-			case Node.ATTRIBUTE_NODE :
-				tab = errTables[NodeType.ATTRIBUTE];
-				break;
-			case Node.ELEMENT_NODE :
-				tab = errTables[NodeType.ELEMENT];
-				break;
-			case Node.DOCUMENT_TYPE_NODE :
-				tab = errTables[NodeType.DOCUMENT_TYPE];
-				break;
-			case Node.TEXT_NODE :
-				tab = errTables[NodeType.TEXT];
-				break;
-			case Node.COMMENT_NODE :
-				tab = errTables[NodeType.COMMENT];
-				break;
-			case Node.CDATA_SECTION_NODE :
-				tab = errTables[NodeType.CDATA_SECTION];
-				break;
-			case Node.PROCESSING_INSTRUCTION_NODE :
-				tab = errTables[NodeType.PROCESSING_INSTRUCTION];
-				break;
-			case Node.ENTITY_REFERENCE_NODE :
-				tab = errTables[NodeType.ENTITY_REFERENCE];
-				break;
-			default :
-				return null;
-		}
-		return tab;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NamespaceValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NamespaceValidator.java
deleted file mode 100644
index bda5f6f..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NamespaceValidator.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-public class NamespaceValidator extends PrimeValidator implements ErrorState {
-
-	private final static String XMLNS_PREFIX = "xmlns";//$NON-NLS-1$
-	private final static String NS_SEPARATOR = ":";//$NON-NLS-1$
-
-	public NamespaceValidator() {
-		super();
-	}
-
-	public boolean isAdapterForType(Object type) {
-		return ((type == NamespaceValidator.class) || super.isAdapterForType(type));
-	}
-
-	public void validate(IndexedRegion node) {
-		Element target = (Element) node;
-		if (isXMLElement(target) && hasUnknownPrefix(target)) {
-			IDOMElement e = (IDOMElement) target;
-			if (!isValidPrefix(e.getPrefix(), target) && !e.isCommentTag()) {
-				// report unknown tag error.
-				Segment errorSeg = FMUtil.getSegment(e, FMUtil.SEG_START_TAG);
-				if (errorSeg != null)
-					reporter.report(MessageFactory.createMessage(new ErrorInfoImpl(UNDEFINED_NAME_ERROR, errorSeg, e)));
-			}
-		}
-		// (2) check prefix of each attr 
-		NamedNodeMap attrs = target.getAttributes();
-		for (int i = 0; i < attrs.getLength(); i++) {
-			Node n = attrs.item(i);
-			if (!(n instanceof IDOMAttr))
-				continue;
-			IDOMAttr a = (IDOMAttr) n;
-			String prefix = a.getPrefix();
-			if ((prefix != null) && isUnknownAttr(a, target)) {
-				// The attr has unknown prefix.  So, check it.
-				if (!isValidPrefix(prefix, target)) {
-					// report unknown attr error.
-					ITextRegion r = a.getNameRegion();
-					if (r == null)
-						continue;
-					int a_offset = a.getNameRegionStartOffset();
-					int a_length = a.getNameRegion().getLength();
-					reporter.report(MessageFactory.createMessage(new ErrorInfoImpl(UNDEFINED_NAME_ERROR, new Segment(a_offset, a_length), a)));
-				}
-			}
-		}
-	}
-
-	// private methods	
-	private boolean isXMLElement(Element target) {
-		return target instanceof IDOMElement;
-	}
-
-	private boolean hasUnknownPrefix(Element target) {
-		return isUnknownElement(target) && CMUtil.isForeign(target);
-	}
-
-	private boolean isUnknownElement(Element target) {
-		CMElementDeclaration dec = CMUtil.getDeclaration(target);
-		return dec == null;
-	}
-
-	private boolean isUnknownAttr(IDOMAttr attr, Element target) {
-		CMElementDeclaration dec = CMUtil.getDeclaration(target);
-		if (dec == null)
-			return true; // unknown.
-		CMNamedNodeMap adecls = dec.getAttributes();
-		CMAttributeDeclaration adec = (CMAttributeDeclaration) adecls.getNamedItem(attr.getName());
-		return adec == null;
-	}
-
-	private boolean isValidPrefix(String prefix, Element e) {
-		if (prefix.equals(XMLNS_PREFIX))
-			return true; // "xmlns:foo" attr is always valid.
-
-		// (1) check the element has the namespace definition or not.
-		if (isValidPrefixWithinElement(prefix, e))
-			return true;
-
-		// (2) check ancestors of the element have the namespace definition or not.
-		Element parent = SMUtil.getParentElement(e);
-		while (parent != null) {
-			if (isValidPrefixWithinElement(prefix, parent))
-				return true;
-			parent = SMUtil.getParentElement(parent);
-		}
-		return false;
-	}
-
-	private boolean isValidPrefixWithinElement(String prefix, Element e) {
-		String ns = XMLNS_PREFIX + NS_SEPARATOR + prefix;
-		NamedNodeMap attrs = e.getAttributes();
-		for (int i = 0; i < attrs.getLength(); i++) {
-			Node n = attrs.item(i);
-			if (n == null)
-				continue;
-			if (n.getNodeType() != Node.ATTRIBUTE_NODE)
-				continue;
-			if (ns.equals(((Attr) n).getName()))
-				return true;
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NullValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NullValidator.java
deleted file mode 100644
index fb1f93c..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NullValidator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.validate.ValidationReporter;
-import org.eclipse.wst.xml.core.internal.validate.ValidationComponent;
-
-/**
- * NullValidator class is intended to be a replacement of null
- * for ValidationComponent type.
- */
-final class NullValidator extends ValidationComponent {
-
-	public NullValidator() {
-		super();
-	}
-
-	public void validate(IndexedRegion node) {
-		return;
-	}
-
-	public void setReporter(ValidationReporter reporter) {
-		return;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/PrimeValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/PrimeValidator.java
deleted file mode 100644
index b44f258..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/PrimeValidator.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-
-
-import org.eclipse.wst.xml.core.internal.validate.ValidationComponent;
-
-abstract class PrimeValidator extends ValidationComponent {
-
-	/**
-	 * PrimeValidator constructor comment.
-	 */
-	public PrimeValidator() {
-		super();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SMUtil.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SMUtil.java
deleted file mode 100644
index 6bf6fed..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SMUtil.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-final class SMUtil {
-
-	private SMUtil() {
-		super();
-	}
-
-	/* get an ancestor element ignoring implicit ones. */
-	public static Element getParentElement(Node child) {
-		if (child == null)
-			return null;
-
-		Node p = child.getParentNode();
-		while (p != null) {
-			if (p.getNodeType() == Node.ELEMENT_NODE) {
-				return (Element) p;
-			}
-			p = p.getParentNode();
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/Segment.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/Segment.java
deleted file mode 100644
index b9fd37e..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/Segment.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-public class Segment {
-
-	private int offset = 0;
-	private int length = 0;
-
-	/**
-	 */
-	public Segment(int offset, int length) {
-		super();
-		this.offset = offset;
-		this.length = length;
-	}
-
-	public Segment(IStructuredDocumentRegion region) {
-		super();
-		this.offset = region.getStartOffset();
-		this.length = region.getLength();
-	}
-
-	/**
-	 * NOTE: 'start' and 'end' must be the start and end of the contiguous regions.
-	 * Otherwise, this class cannot work correctly.
-	 */
-	public Segment(IStructuredDocumentRegion start, IStructuredDocumentRegion end) {
-		super();
-		this.offset = start.getStartOffset();
-		int endOffset = (end == null) ? start.getEndOffset() : end.getEndOffset();
-		this.length = endOffset - this.offset;
-	}
-
-	//public Segment(ITextRegion start, ITextRegion end) {
-	//	super();
-	//	this.offset = start.getStartOffset();
-	//	int endOffset = (end == null) ? start.getEndOffset() : end.getEndOffset();
-	//	this.length = endOffset - this.offset;
-	//}
-	/**
-	 */
-	public int getLength() {
-		return this.length;
-	}
-
-	/**
-	 */
-	public int getOffset() {
-		return this.offset;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java
deleted file mode 100644
index ae6ac8d..0000000
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.internal.validate;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeEntry;
-import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeRegistry;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException;
-import org.eclipse.wst.xml.core.internal.document.SourceValidator;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-class SyntaxValidator extends PrimeValidator implements ErrorState {
-
-
-	static private boolean isValidRegion(ITextRegion rgn) {
-		String type = rgn.getType();
-		if (type == null)
-			return false; // no type is invalid.
-		if (type == DOMRegionContext.XML_END_TAG_OPEN || type == DOMRegionContext.XML_TAG_NAME || type == DOMRegionContext.XML_TAG_CLOSE) {
-			return true;
-		}
-		return false;
-	}
-
-	static private String getTagName(IStructuredDocumentRegion tag) {
-		ITextRegionList regions = tag.getRegions();
-		Iterator iter = regions.iterator();
-		while (iter.hasNext()) {
-			ITextRegion rgn = (ITextRegion) iter.next();
-			if (rgn.getType() == DOMRegionContext.XML_TAG_NAME)
-				return tag.getText(rgn);
-		}
-		return "";//$NON-NLS-1$
-	}
-
-	static private boolean isEmptyContent(CMElementDeclaration decl) {
-		return (decl != null) && (decl.getContentType() == CMElementDeclaration.EMPTY);
-	}
-
-	public SyntaxValidator() {
-		super();
-	}
-
-	public boolean isAdapterForType(Object type) {
-		return ((type == SyntaxValidator.class) || super.isAdapterForType(type));
-	}
-
-	class ElementInfo {
-		public ElementInfo() {
-			super();
-		}
-
-		public IDOMElement target = null;
-		public CMElementDeclaration decl = null;
-		public IStructuredDocumentRegion startTag = null;
-		public IStructuredDocumentRegion endTag = null;
-		public boolean hasStartTag = false;
-		public boolean hasEndTag = false;
-		public boolean isXHTML = false;
-	}
-
-	public void validate(IndexedRegion indexedNode) {
-		Node node = (Node) indexedNode;
-		validateChildren(node);
-
-		if (node.getNodeType() != Node.ELEMENT_NODE)
-			return;
-		if (!(node instanceof IDOMElement))
-			return;
-
-		ElementInfo info = new ElementInfo();
-		info.target = (IDOMElement) node;
-
-		// gather information to validate from target at once.
-		getInfo(info);
-
-		if (info.target.isGlobalTag()) {
-			validateTags(info);
-			validateNames(info);
-			if (info.decl != null && info.isXHTML) {
-				validateTagCase(info);
-			}
-		}
-	}
-
-	private void getInfo(ElementInfo info) {
-		info.decl = CMUtil.getDeclaration(info.target);
-		info.startTag = info.target.getStartStructuredDocumentRegion();
-		info.endTag = info.target.getEndStructuredDocumentRegion();
-
-		info.hasStartTag = (info.startTag != null);
-		info.hasEndTag = (info.endTag != null);
-
-		Document doc = info.target.getOwnerDocument();
-		if (!(doc instanceof IDOMDocument))
-			return;
-		String typeid = ((IDOMDocument) doc).getDocumentTypeId();
-		if (typeid != null) {
-			HTMLDocumentTypeEntry entry = HTMLDocumentTypeRegistry.getInstance().getEntry(typeid);
-			info.isXHTML = (entry != null && entry.isXMLType());
-		}
-	}
-
-	class TagErrorInfoImpl extends AbstractErrorInfo {
-		private String hint = null;
-
-		public TagErrorInfoImpl(int state, IStructuredDocumentRegion tag, String hint) {
-			super(state, new Segment(tag));
-			this.hint = hint;
-		}
-
-		public String getHint() {
-			return hint;
-		}
-
-		public short getTargetType() {
-			return Node.ELEMENT_NODE;
-		}
-	}
-
-	private boolean isEndTagCorrupted(ElementInfo info) {
-		ITextRegionList regions = info.endTag.getRegions();
-		if (regions == null || regions.isEmpty())
-			return false;
-		Iterator iter = regions.iterator();
-		while (iter.hasNext()) {
-			ITextRegion rgn = (ITextRegion) iter.next();
-			if (!isValidRegion(rgn))
-				return true; // found invalid region type.
-		}
-		return false; // all regions are valid.
-	}
-
-	private String getEndTagFullText(ElementInfo info) {
-		String hint = "";//$NON-NLS-1$
-		ITextRegionList regions = info.endTag.getRegions();
-		Iterator iter = regions.iterator();
-		while (iter.hasNext()) {
-			ITextRegion rgn = (ITextRegion) iter.next();
-			String type = rgn.getType();
-			if (type == null)
-				continue;
-			if (type == DOMRegionContext.XML_END_TAG_OPEN || type == DOMRegionContext.XML_TAG_CLOSE)
-				continue;
-			hint += info.endTag.getFullText(rgn);
-		}
-		return hint;
-	}
-
-	private void reportCorruptedEndTagError(ElementInfo info) {
-		String hint = getEndTagFullText(info);
-		TagErrorInfoImpl error = new TagErrorInfoImpl(UNDEFINED_NAME_ERROR, info.endTag, hint);
-		this.reporter.report(MessageFactory.createMessage(error));
-	}
-
-	private void validateTags(ElementInfo info) {
-		if (info.hasStartTag) {
-			if (!info.target.isStartTagClosed()) {
-				// Mark the whole START tag as an error segment.
-				Segment errorSeg = new Segment(info.startTag);
-				report(UNCLOSED_TAG_ERROR, errorSeg, info.target);
-			}
-		}
-		else {
-			if (info.hasEndTag) {
-				if (info.decl != null) {
-					if (CMUtil.isHTML(info.decl) && !info.target.hasChildNodes()) {
-						if (info.target.isContainer()) {
-							// Set the error mark to the start of the element.
-							Segment errorSeg = new Segment(info.target.getStartOffset(), 0);
-							report(MISSING_START_TAG_ERROR, errorSeg, info.target);
-						}
-						else {
-							// Mark the whole END tag as an error segment.
-							Segment errorSeg = new Segment(info.endTag);
-							report(UNNECESSARY_END_TAG_ERROR, errorSeg, info.target);
-						}
-					}
-					else if (info.isXHTML) {
-						Segment errorSeg = new Segment(info.target.getStartOffset(), 0);
-						report(MISSING_START_TAG_ERROR, errorSeg, info.target);
-					}
-				}
-			}
-		}
-
-		if (info.hasEndTag) {
-			if (!info.target.isClosed()) {
-				// Set the whole END tag as error segment.
-				Segment errorSeg = new Segment(info.endTag);
-				report(UNCLOSED_END_TAG_ERROR, errorSeg, info.target);
-			}
-		}
-		else {
-			if (info.isXHTML) { // XHTML
-				if (!info.target.isEmptyTag()) {
-					if (isEmptyContent(info.decl)) {
-						// EMPTY element should be written in <.../> form.
-						Segment errorSeg = FMUtil.getSegment(info.target, FMUtil.SEG_START_TAG);
-						report(INVALID_EMPTY_ELEMENT_TAG, errorSeg, info.target);
-					}
-					else {
-						// end tag is required.
-						Segment errorSeg = new Segment(info.target.getEndOffset(), 0);
-						report(MISSING_END_TAG_ERROR, errorSeg, info.target);
-					}
-				}
-			}
-			else { // HTML
-				if (info.hasStartTag) {
-					if (info.decl != null && CMUtil.isHTML(info.decl) && !info.target.isEmptyTag() && !CMUtil.isEndTagOmissible(info.decl)) {
-						// Set the error mark to the end of the element.
-						Segment errorSeg = new Segment(info.target.getEndOffset(), 0);
-						report(MISSING_END_TAG_ERROR, errorSeg, info.target);
-					}
-				}
-			}
-		}
-	}
-
-	/* perform validation about tag name definition. */
-	private void validateNames(ElementInfo info) {
-		boolean corrupted = info.hasEndTag && isEndTagCorrupted(info);
-		if (info.decl == null) {
-			// If no declaration is retrieved, the target is really
-			// unknown element.
-			if (!info.hasStartTag && corrupted) {
-				reportCorruptedEndTagError(info);
-			}
-			else {
-				Segment errorSeg = FMUtil.getSegment(info.target, FMUtil.SEG_START_TAG);
-				report(UNDEFINED_NAME_ERROR, errorSeg, info.target);
-			}
-		}
-		else {
-			// Even if a declaration could be retrieved, if the end
-			// tag is corrupted, it should be reported as undefined
-			// name. (D202493)
-			if (corrupted) {
-				reportCorruptedEndTagError(info);
-			}
-		}
-	}
-
-	/* perform validation tag case only for XHTML document */
-	private void validateTagCase(ElementInfo info) {
-		String declared = info.decl.getElementName();
-		String startTagName = "";//$NON-NLS-1$
-		String endTagName = "";//$NON-NLS-1$
-		if (declared == null)
-			return;
-
-		// start tag
-		if (info.hasStartTag) {
-			startTagName = getTagName(info.startTag);
-			if (!declared.equals(startTagName)) {
-				TagErrorInfoImpl error = new TagErrorInfoImpl(MISMATCHED_ERROR, info.startTag, startTagName);
-				this.reporter.report(MessageFactory.createMessage(error));
-			}
-		}
-		// end tag
-		if (info.hasEndTag) {
-			endTagName = getTagName(info.endTag);
-			if (!info.hasStartTag || (!endTagName.equals(startTagName))) {
-				if (!declared.equals(endTagName)) {
-					TagErrorInfoImpl error = new TagErrorInfoImpl(MISMATCHED_ERROR, info.endTag, endTagName);
-					this.reporter.report(MessageFactory.createMessage(error));
-				}
-			}
-		}
-	}
-
-	private void validateChildren(Node target) {
-		if ((target.getNodeType() == Node.ELEMENT_NODE) && CMUtil.isForeign((Element) target))
-			return;
-
-		for (Node child = target.getFirstChild(); child != null; child = child.getNextSibling()) {
-			switch (child.getNodeType()) {
-				case Node.TEXT_NODE :
-					{
-						IDOMNode text = (IDOMNode) child;
-						int charOffset = validateTextSource(text);
-						if (charOffset >= 0) {
-							charOffset += text.getStartOffset();
-							Segment errorSeg = new Segment(charOffset, 1);
-							if (errorSeg != null)
-								report(INVALID_CHAR_ERROR, errorSeg, text);
-						}
-						break;
-					}
-				case Node.COMMENT_NODE :
-				case Node.DOCUMENT_TYPE_NODE :
-				case Node.PROCESSING_INSTRUCTION_NODE :
-				case Node.CDATA_SECTION_NODE :
-					{
-						IDOMNode tag = (IDOMNode) child;
-						if (!tag.isClosed()) {
-							Segment errorSeg = FMUtil.getSegment(tag, FMUtil.SEG_WHOLE_TAG);
-							if (errorSeg != null)
-								report(UNCLOSED_TAG_ERROR, errorSeg, tag);
-						}
-						break;
-					}
-				default :
-					break;
-			}
-		}
-	}
-
-	private int validateTextSource(IDOMNode text) {
-		try {
-			SourceValidator validator = new SourceValidator(text);
-			validator.validateSource(text.getSource());
-		}
-		catch (InvalidCharacterException ex) {
-			return ex.getOffset();
-		}
-		return -1;
-	}
-
-	private void report(int state, Segment errorSeg, Node node) {
-		ErrorInfo info = new ErrorInfoImpl(state, errorSeg, node);
-		reporter.report(MessageFactory.createMessage(info));
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.core/.classpath b/bundles/org.eclipse.wst.xml.core/.classpath
deleted file mode 100644
index 4cc194c..0000000
--- a/bundles/org.eclipse.wst.xml.core/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-contentmodel"/>
-	<classpathentry kind="src" path="src-validation"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-catalog"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.xml.core/.cvsignore b/bundles/org.eclipse.wst.xml.core/.cvsignore
deleted file mode 100644
index 6d578ae..0000000
--- a/bundles/org.eclipse.wst.xml.core/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-build.xml
-xmlmodel.jar
-org.eclipse.wst.xml.core_1.0.0.jar
-@dot
diff --git a/bundles/org.eclipse.wst.xml.core/.options b/bundles/org.eclipse.wst.xml.core/.options
deleted file mode 100644
index e80df84..0000000
--- a/bundles/org.eclipse.wst.xml.core/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-org.eclipse.wst.xml.core/debug=true
-org.eclipse.wst.xml.core/debug/tracefilter=
diff --git a/bundles/org.eclipse.wst.xml.core/.project b/bundles/org.eclipse.wst.xml.core/.project
deleted file mode 100644
index c417514..0000000
--- a/bundles/org.eclipse.wst.xml.core/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.core</name>
-	<comment></comment>
-	<projects></projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.xml.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.xml.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4575c79..0000000
--- a/bundles/org.eclipse.wst.xml.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,69 +0,0 @@
-#Tue Jul 05 01:42:27 EDT 2005

-eclipse.preferences.version=1

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.deprecation=ignore

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled

-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error

-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=ignore

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=ignore

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=ignore

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-org.eclipse.jdt.core.incompleteClasspath=error

diff --git a/bundles/org.eclipse.wst.xml.core/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.xml.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 2535c48..0000000
--- a/bundles/org.eclipse.wst.xml.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Jul 05 01:42:27 EDT 2005
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/bundles/org.eclipse.wst.xml.core/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.xml.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 42fb716..0000000
--- a/bundles/org.eclipse.wst.xml.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,14 +0,0 @@
-#Fri May 27 23:56:32 EDT 2005
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.xml.core/DevTimeSupport/HeadParsers/XML10Names.jFlex b/bundles/org.eclipse.wst.xml.core/DevTimeSupport/HeadParsers/XML10Names.jFlex
deleted file mode 100644
index c33e65b..0000000
--- a/bundles/org.eclipse.wst.xml.core/DevTimeSupport/HeadParsers/XML10Names.jFlex
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*nlsXXX*/
-package org.eclipse.wst.xml.core.internal.parser;
-
-
-
-%%
-
-%table
-%public
-%final
-%class XML10Names
-%function isValidXML10Name
-%type boolean
-%unicode
-%ignorecase
-%buffer 2048
-%apiprivate
-
-S = (\x20 | \x09 | \x0D | \x0A)
-
-BaseChar = [\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\u0131\u0134-\u013E\u0141-\u0148\u014A-\u017E\u0180-\u01C3\u01CD-\u01F0\u01F4-\u01F5\u01FA-\u0217\u0250-\u02A8\u02BB-\u02C1\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03CE\u03D0-\u03D6\u03DA\u03DC\u03DE\u03E0\u03E2-\u03F3\u0401-\u040C\u040E-\u044F\u0451-\u045C\u045E-\u0481\u0490-\u04C4\u04C7-\u04C8\u04CB-\u04CC\u04D0-\u04EB\u04EE-\u04F5\u04F8-\u04F9\u0531-\u0556\u0559\u0561-\u0586\u05D0-\u05EA\u05F0-\u05F2\u0621-\u063A\u0641-\u064A\u0671-\u06B7\u06BA-\u06BE\u06C0-\u06CE\u06D0-\u06D3\u06D5\u06E5-\u06E6\u0905-\u0939\u093D\u0958-\u0961\u0985-\u098C\u098F-\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09DC-\u09DD\u09DF-\u09E1\u09F0-\u09F1\u0A05-\u0A0A\u0A0F-\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32-\u0A33\u0A35-\u0A36\u0A38-\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8B\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2-\u0AB3\u0AB5-\u0AB9\u0ABD\u0AE0\u0B05-\u0B0C\u0B0F-\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32-\u0B33\u0B36-\u0B39\u0B3D\u0B5C-\u0B5D\u0B5F-\u0B61\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99-\u0B9A\u0B9C\u0B9E-\u0B9F\u0BA3-\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB5\u0BB7-\u0BB9\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C60-\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CDE\u0CE0-\u0CE1\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D28\u0D2A-\u0D39\u0D60-\u0D61\u0E01-\u0E2E\u0E30\u0E32-\u0E33\u0E40-\u0E45\u0E81-\u0E82\u0E84\u0E87-\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA-\u0EAB\u0EAD-\u0EAE\u0EB0\u0EB2-\u0EB3\u0EBD\u0EC0-\u0EC4\u0F40-\u0F47\u0F49-\u0F69\u10A0-\u10C5\u10D0-\u10F6\u1100\u1102-\u1103\u1105-\u1107\u1109\u110B-\u110C\u110E-\u1112\u113C\u113E\u1140\u114C\u114E\u1150\u1154-\u1155\u1159\u115F-\u1161\u1163\u1165\u1167\u1169\u116D-\u116E\u1172-\u1173\u1175\u119E\u11A8\u11AB\u11AE-\u11AF\u11B7-\u11B8\u11BA\u11BC-\u11C2\u11EB\u11F0\u11F9\u1E00-\u1E9B\u1EA0-\u1EF9\u1F00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2126\u212A-\u212B\u212E\u2180-\u2182\u3041-\u3094\u30A1-\u30FA\u3105-\u312C\uAC00-\uD7A3]
-
-Ideographic = [\u4E00-\u9FA5\u3007\u3021-\u3029]
-
-CombiningChar = [\u0300-\u0345\u0360-\u0361\u0483-\u0486\u0591-\u05A1\u05A3-\u05B9\u05BB-\u05BD\u05BF\u05C1-\u05C2\u05C4\u064B-\u0652\u0670\u06D6-\u06DC\u06DD-\u06DF\u06E0-\u06E4\u06E7-\u06E8\u06EA-\u06ED\u0901-\u0903\u093C\u093E-\u094C\u094D\u0951-\u0954\u0962-\u0963\u0981-\u0983\u09BC\u09BE\u09BF\u09C0-\u09C4\u09C7-\u09C8\u09CB-\u09CD\u09D7\u09E2-\u09E3\u0A02\u0A3C\u0A3E\u0A3F\u0A40-\u0A42\u0A47-\u0A48\u0A4B-\u0A4D\u0A70-\u0A71\u0A81-\u0A83\u0ABC\u0ABE-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0B01-\u0B03\u0B3C\u0B3E-\u0B43\u0B47-\u0B48\u0B4B-\u0B4D\u0B56-\u0B57\u0B82-\u0B83\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD7\u0C01-\u0C03\u0C3E-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55-\u0C56\u0C82-\u0C83\u0CBE-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5-\u0CD6\u0D02-\u0D03\u0D3E-\u0D43\u0D46-\u0D48\u0D4A-\u0D4D\u0D57\u0E31\u0E34-\u0E3A\u0E47-\u0E4E\u0EB1\u0EB4-\u0EB9\u0EBB-\u0EBC\u0EC8-\u0ECD\u0F18-\u0F19\u0F35\u0F37\u0F39\u0F3E\u0F3F\u0F71-\u0F84\u0F86-\u0F8B\u0F90-\u0F95\u0F97\u0F99-\u0FAD\u0FB1-\u0FB7\u0FB9\u20D0-\u20DC\u20E1\u302A-\u302F\u3099\u309A]
-
-Digit =  [\u0030-\u0039\u0660-\u0669\u06F0-\u06F9\u0966-\u096F\u09E6-\u09EF\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F\u0BE7-\u0BEF\u0C66-\u0C6F\u0CE6-\u0CEF\u0D66-\u0D6F\u0E50-\u0E59\u0ED0-\u0ED9\u0F20-\u0F29]
-
-Extender = [\u00B7\u02D0\u02D1\u0387\u0640\u0E46\u0EC6\u3005\u3031-\u3035\u309D-\u309E\u30FC-\u30FE]
-
-Letter = ({BaseChar} | {Ideographic})
-
-NameChar = ({Letter} | {Digit} | . | - | _ | : | {CombiningChar} | {Extender})
-
-Name = ({Letter} | _ | : ) ({NameChar})*
-
-
-
-%{
-
-	/**
-	 * Creates a new scanner
-	 */
-	public XML10Names() {
-		this.zzReader = null;
-	}
-
-	public boolean isValidXML10Name(String stringToCheck) {
-		boolean result = false;
-		yyreset(new java.io.StringReader(stringToCheck));
-		try {
-			result = isValidXML10Name();
-		}
-		catch (java.io.IOException e) {
-			// should be impossible with strings, but if occurs, just means
-			// "not"
-			result = false;
-		}
-		return result;
-	}
-
-%}
-
-
-
-
-%%
-
-<YYINITIAL>
-{
-
-	// don't match if contains trailing or embedded space
-	{Name} {S}+         {return false;}
-	{Name} {S}+ {Name}  {return false;}
-
-	{Name}              {return true;}
-
-	// match anything should come last
-	.                   {return false;}
-
-}
-
-
-// this rule always in effect
-<<EOF>>
-{
-	{return false;}
-}
-
-
diff --git a/bundles/org.eclipse.wst.xml.core/DevTimeSupport/HeadParsers/XMLHeadTokenizer.jFlex b/bundles/org.eclipse.wst.xml.core/DevTimeSupport/HeadParsers/XMLHeadTokenizer.jFlex
deleted file mode 100644
index ff50a31..0000000
--- a/bundles/org.eclipse.wst.xml.core/DevTimeSupport/HeadParsers/XMLHeadTokenizer.jFlex
+++ /dev/null
@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*nlsXXX*/
-package org.eclipse.wst.xml.core.internal.contenttype;
-import java.io.IOException;
-import java.io.Reader;
-
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
-
-
-%%
-
-%{
-
-
-	private boolean hasMore = true;
-	private final static int MAX_TO_SCAN = 8000;
-	StringBuffer string = new StringBuffer();
-	// state stack for easier state handling
-	private IntStack fStateStack = new IntStack();
-	private String valueText = null;
-
-
-	public XMLHeadTokenizer() {
-		super();
-	}
-
-	  public void reset (Reader in) {
-                /* the input device */
-                zzReader = in;
-
-                /* the current state of the DFA */
-                zzState = 0;
-
-                /* the current lexical state */
-                zzLexicalState = YYINITIAL;
-
-                /* this buffer contains the current text to be matched and is
-                 the source of the yytext() string */
-                java.util.Arrays.fill(zzBuffer, (char)0);
-
-                /* the textposition at the last accepting state */
-                zzMarkedPos = 0;
-
-                /* the textposition at the last state to be included in yytext */
-                zzPushbackPos = 0;
-
-                /* the current text position in the buffer */
-                zzCurrentPos = 0;
-
-                /* startRead marks the beginning of the yytext() string in the buffer */
-                zzStartRead = 0;
-
-                /**
-                 * endRead marks the last character in the buffer, that has been read
-                 * from input
-                 */
-                zzEndRead = 0;
-
-                /* number of newlines encountered up to the start of the matched text */
-                yyline = 0;
-
-                /* the number of characters up to the start of the matched text */
-                yychar = 0;
-
-                /**
-                 * the number of characters from the last newline up to the start
-                 * of the matched text
-                 */
-                yycolumn = 0;
-
-                /**
-                 * yy_atBOL == true <=> the scanner is currently at the beginning
-                 * of a line
-                 */
-                zzAtBOL = true;
-
-                /* yy_atEOF == true <=> the scanner has returned a value for EOF */
-                zzAtEOF = false;
-
-                /* denotes if the user-EOF-code has already been executed */
-                zzEOFDone = false;
-
-
-                fStateStack.clear();
-
-                hasMore = true;
-  		
-  	}
-
-
-	public final HeadParserToken getNextToken() throws IOException {
-		String context = null;
-		context = primGetNextToken();
-		HeadParserToken result = null;
-		if (valueText != null) {
-			result = createToken(context, yychar, valueText);
-			valueText = null;
-		} else {
-			result = createToken(context, yychar, yytext());
-		}
-		return result;
-	}
-
-	public final boolean hasMoreTokens() {
-		return hasMore && yychar < MAX_TO_SCAN;
-	}
-	private void pushCurrentState() {
-		fStateStack.push(yystate());
-
-	}
-
-	private void popState() {
-		yybegin(fStateStack.pop());
-	}
-	
-	private HeadParserToken createToken(String context, int start, String text) {
-		return new HeadParserToken(context, start, text);
-	}	
-
-%}
-
-%eof{
-	hasMore=false;
-%eof}
-
-%public
-%class XMLHeadTokenizer
-%function primGetNextToken
-%type String
-%char
-%unicode
-%ignorecase 
-//%debug
-%switch
-%buffer 8192
-
-UTF16BE = \xFE\xFF
-UTF16LE = \xFF\xFE
-UTF83ByteBOM = \xEF\xBB\xBF
-
-//SpaceChar = [\x20\x09]
-
-// [3] S ::= (0x20 | 0x9 | 0xD | 0xA)+
-S = [\x20\x09\x0D\x0A]
-
-BeginAttribeValue = {S}* \= {S}*
-
-LineTerminator = \r|\n
-
-
-%state ST_XMLDecl
-%state QuotedAttributeValue
-%state DQ_STRING
-%state SQ_STRING
-%state UnDelimitedString
-
-%%
-
-
-<YYINITIAL>  
-{
-	// force to start at beginning of line (^) and at beginning of file (yychar == 0)
-	^{UTF16BE}   		{if (yychar == 0 ) {hasMore = false; return EncodingParserConstants.UTF16BE;}}
-	^{UTF16LE}   		{if (yychar == 0 ) {hasMore = false; return EncodingParserConstants.UTF16LE;}}
-	^{UTF83ByteBOM}   	{if (yychar == 0 ) {hasMore = false; return EncodingParserConstants.UTF83ByteBOM;}}
-	
-	// force to be started on first line, but we do allow preceeding spaces
-	^ {S}* "<\?xml" {S}+ {if (yychar == 0 ) {yybegin(ST_XMLDecl); return XMLHeadTokenizerConstants.XMLDeclStart;}}
-	
-}	
-	
-<ST_XMLDecl> 
-{
-	"version" {BeginAttribeValue} {pushCurrentState(); yybegin(QuotedAttributeValue); return XMLHeadTokenizerConstants.XMLDeclVersion;}
-	"encoding" {BeginAttribeValue} {pushCurrentState(); yybegin(QuotedAttributeValue); return XMLHeadTokenizerConstants.XMLDelEncoding;}
-	// note the "forced end" (via 'hasMore=false') once the end of XML Declaration found
-	// This is since non-ascii chars may follow and may cause IOExceptions which would not occur once stream is 
-	// read with incorrect encoding (such as if platform encoding is in effect until true encoding detected). 
-	"\?>"    {yybegin(YYINITIAL); hasMore = false; return XMLHeadTokenizerConstants.XMLDeclEnd;}
-}	
-
-	
-
-<QuotedAttributeValue>
-{
-	\"                      { yybegin(DQ_STRING); string.setLength(0); }
-	\'			{ yybegin(SQ_STRING); string.setLength(0); }
-	// in this state, anything other than a space character can start an undelimited string
-	{S}*.           { yypushback(1); yybegin(UnDelimitedString); string.setLength(0);}
-
-}	
-
-
-<DQ_STRING>
-{
-
-	\"                      { popState(); valueText = string.toString(); return EncodingParserConstants.StringValue; }
-  	{LineTerminator}        { yypushback(1);popState(); valueText = string.toString(); return EncodingParserConstants.InvalidTerminatedStringValue;}
-	"\?>"			{ yypushback(2); popState(); valueText = string.toString(); return EncodingParserConstants.InvalidTerminatedStringValue;}
-	'<'			{ yypushback(1);popState(); valueText = string.toString(); return EncodingParserConstants.InvalidTerminatedStringValue;}
-	.			{ string.append( yytext() ); }
-
-
-}
-
-<SQ_STRING>
-{
-
-	\'                      { popState(); valueText = string.toString(); return EncodingParserConstants.StringValue;}
-  	{LineTerminator}        { yypushback(1);popState(); valueText = string.toString(); return EncodingParserConstants.InvalidTerminatedStringValue;}
-	"%>"			{ yypushback(2);popState(); valueText = string.toString(); return EncodingParserConstants.InvalidTerminatedStringValue;}
-	'<'			{ yypushback(1);popState(); valueText = string.toString(); return EncodingParserConstants.InvalidTerminatedStringValue;}
-	.			{ string.append( yytext() ); }
-
-
-}
-
-<UnDelimitedString>
-{
-
-	{S}                     { yypushback(1);popState(); valueText = string.toString(); return EncodingParserConstants.UnDelimitedStringValue; }
-  	{LineTerminator}        { yypushback(1);popState(); valueText = string.toString(); return EncodingParserConstants.InvalidTerminatedStringValue;}
-	"\?>"			{ yypushback(2);popState(); valueText = string.toString(); return EncodingParserConstants.InvalidTerminatedStringValue;}
-	'<'	
-	{ yypushback(1);popState(); valueText = string.toString(); return EncodingParserConstants.InvalidTerminatedStringValue;}
-	// these are a bit special, since we started an undelimit string, but found a quote ... probably indicates a missing beginning quote
-	\'			{ yypushback(1);popState(); valueText = string.toString(); return EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue;}
-	
-	\"			{ yypushback(1);popState(); valueText = string.toString(); return EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue;}
-	
-	.			{ string.append( yytext() ); }
-
-}
-
-// The "match anything" rule should always be in effect except for when looking for end of string
-// (That is, remember to update state list if/when new states added)
-<YYINITIAL, ST_XMLDecl, QuotedAttributeValue>
-{
-// this is the fallback (match "anything") rule  (for this scanner, input is ignored, and position advanced, if not recognized)
-.|\n              {if (yychar > MAX_TO_SCAN) {hasMore=false; return EncodingParserConstants.MAX_CHARS_REACHED;}}
-}
-
-// this rule always in effect
-<<EOF>>         {hasMore = false; return EncodingParserConstants.EOF;}
-
-	
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.core/DevTimeSupport/buildNames.xml b/bundles/org.eclipse.wst.xml.core/DevTimeSupport/buildNames.xml
deleted file mode 100644
index 6d97563..0000000
--- a/bundles/org.eclipse.wst.xml.core/DevTimeSupport/buildNames.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="tokenizer" default="XML10Names">
-	
-	<!-- Note: for Eclipse env., the JFlex 1.4 jar should be added 
-	to the ant global entries  -->
-	<taskdef classname="JFlex.anttask.JFlexTask" name="jflex" />
-		
-	<target name="init">
-		<property name="src.file" value="XML10Names.jFlex"/>			
-		<property name="src.dir" value="HeadParsers"/>
-		<property name="dest.dir" value="../src"/>
-		<!-- touch causes to always build, remove for real 'make' behavior -->
-		<touch file="${src.dir}/${src.file}"/>
-					
-	</target>
-
-	<target name="XML10Names" depends="init">
-		<antcall target="run-jflex"/>
-	</target>
-
-	<target name="run-jflex" depends="init">
-		<jflex
-	    	file="${src.dir}/${src.file}"
-	    	destdir="${dest.dir}"
-			verbose="true"
-			nobak="true"
-			time="on"
-	    />
-	</target>
-	
-
-</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.core/DevTimeSupport/buildParser.xml b/bundles/org.eclipse.wst.xml.core/DevTimeSupport/buildParser.xml
deleted file mode 100644
index 49619df..0000000
--- a/bundles/org.eclipse.wst.xml.core/DevTimeSupport/buildParser.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="tokenizer" default="HeadTokenizer">
-	
-	<!-- Note: for Eclipse env., the JFlex 1.4 jar should be added 
-	to the ant global entries  -->
-	<taskdef classname="JFlex.anttask.JFlexTask" name="jflex" />
-		
-	<target name="init">
-		<property name="src.file" value="XMLHeadTokenizer.jFlex"/>			
-		<property name="src.dir" value="HeadParsers"/>
-		<property name="dest.dir" value="../src"/>
-		<!-- touch causes to always build, remove for real 'make' behavior -->
-		<touch file="${src.dir}/${src.file}"/>
-					
-	</target>
-
-	<target name="HeadTokenizer" depends="init">
-		<antcall target="run-jflex"/>
-	</target>
-
-	<target name="run-jflex" depends="init">
-		<jflex
-	    	file="${src.dir}/${src.file}"
-	    	destdir="${dest.dir}"
-			verbose="true"
-			nobak="true"
-			time="on"
-	    />
-	</target>
-	
-
-</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 5f6846d..0000000
--- a/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,62 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xml.core; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.wst.xml.core.internal.XMLCorePlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.core.internal,
- org.eclipse.wst.xml.core.internal.catalog,
- org.eclipse.wst.xml.core.internal.catalog.provisional,
- org.eclipse.wst.xml.core.internal.cleanup,
- org.eclipse.wst.xml.core.internal.commentelement,
- org.eclipse.wst.xml.core.internal.commentelement.impl,
- org.eclipse.wst.xml.core.internal.commentelement.util,
- org.eclipse.wst.xml.core.internal.contentmodel,
- org.eclipse.wst.xml.core.internal.contentmodel.annotation,
- org.eclipse.wst.xml.core.internal.contentmodel.basic,
- org.eclipse.wst.xml.core.internal.contentmodel.factory,
- org.eclipse.wst.xml.core.internal.contentmodel.internal.annotation,
- org.eclipse.wst.xml.core.internal.contentmodel.internal.modelqueryimpl,
- org.eclipse.wst.xml.core.internal.contentmodel.internal.util,
- org.eclipse.wst.xml.core.internal.contentmodel.modelquery,
- org.eclipse.wst.xml.core.internal.contentmodel.modelquery.extension,
- org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl,
- org.eclipse.wst.xml.core.internal.contentmodel.util,
- org.eclipse.wst.xml.core.internal.contenttype,
- org.eclipse.wst.xml.core.internal.document,
- org.eclipse.wst.xml.core.internal.encoding,
- org.eclipse.wst.xml.core.internal.modelhandler,
- org.eclipse.wst.xml.core.internal.modelquery,
- org.eclipse.wst.xml.core.internal.parser,
- org.eclipse.wst.xml.core.internal.parser.regions,
- org.eclipse.wst.xml.core.internal.preferences,
- org.eclipse.wst.xml.core.internal.propagate,
- org.eclipse.wst.xml.core.internal.provisional,
- org.eclipse.wst.xml.core.internal.provisional.contentmodel,
- org.eclipse.wst.xml.core.internal.provisional.contenttype,
- org.eclipse.wst.xml.core.internal.provisional.document,
- org.eclipse.wst.xml.core.internal.provisional.format,
- org.eclipse.wst.xml.core.internal.provisional.text,
- org.eclipse.wst.xml.core.internal.regions,
- org.eclipse.wst.xml.core.internal.ssemodelquery,
- org.eclipse.wst.xml.core.internal.tasks,
- org.eclipse.wst.xml.core.internal.text,
- org.eclipse.wst.xml.core.internal.text.rules,
- org.eclipse.wst.xml.core.internal.validate,
- org.eclipse.wst.xml.core.internal.validation,
- org.eclipse.wst.xml.core.internal.validation.core,
- org.eclipse.wst.xml.core.internal.validation.core.logging,
- org.w3c.dom,
- org.w3c.dom.ranges,
- org.w3c.dom.traversal
-Require-Bundle: org.apache.xerces;visibility:=reexport,
- org.eclipse.wst.sse.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.core.filebuffers,
- org.eclipse.text,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.wst.validation
-Eclipse-AutoStart: true; exceptions="org.eclipse.wst.xml.core.internal.contenttype"
diff --git a/bundles/org.eclipse.wst.xml.core/README.txt b/bundles/org.eclipse.wst.xml.core/README.txt
deleted file mode 100644
index ffa6466..0000000
--- a/bundles/org.eclipse.wst.xml.core/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-THe XML specific model implementation.
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.core/about.html b/bundles/org.eclipse.wst.xml.core/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.wst.xml.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.core/build.properties b/bundles/org.eclipse.wst.xml.core/build.properties
deleted file mode 100644
index e1af014..0000000
--- a/bundles/org.eclipse.wst.xml.core/build.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Jens Lukowski/Innoopract - initial renaming/restructuring
-#     
-###############################################################################
-bin.includes = plugin.xml,\
-               .options,\
-               extensions.xml,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               about.html
-bin.excludes = bin/**,\
-               @dot/**,\
-               temp.folder/**
-src.includes = extensions.xml,\
-               component.xml,\
-               build.properties,\
-               schema/,\
-               DevTimeSupport/
-source.. =	   src-catalog, \
-			   src-contentmodel/,\
-			   src-validation/,\
-               src/
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.core/component.xml b/bundles/org.eclipse.wst.xml.core/component.xml
deleted file mode 100644
index f4cf978..0000000
--- a/bundles/org.eclipse.wst.xml.core/component.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.xml">
-        <component-depends unrestricted="true"></component-depends>
-        <plugin id="org.eclipse.wst.xml.core" />
-        <plugin id="org.eclipse.wst.xml.ui" />
-		<plugin id="org.apache.xerces" />
-        <plugin id="org.eclipse.wst.xml.uriresolver" />
-        <plugin id="org.eclipse.wst.xml.uriresolver.ui" />
-        <plugin id="org.eclipse.wst.xml.validation" />
-
-
-</component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.core/plugin.properties b/bundles/org.eclipse.wst.xml.core/plugin.properties
deleted file mode 100644
index e1cdf41..0000000
--- a/bundles/org.eclipse.wst.xml.core/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Jens Lukowski/Innoopract - initial renaming/restructuring
-#     
-###############################################################################
-providerName=Eclipse.org
-pluginName=Structured Source XML Model
-nlFeatureName=Structured Source XML Model NL Support
-Structured_XML_Document_Factory_Extension.name=Structured XML Document Factory Extension
-XML_Content_Type_Extension_Element.name=XML (Illformed)
-# contentmodel strings
-Content_Model_Document_Factories_Extension.name=Content Model Document Factories
-Content_Model_Annotation_Files_Extension.name=Content Model Annotation Files
-Model_Query_Extension.name=Model Query Extension
-XML_Catalog_Contributions_Extension_Point.name=XML Catalog Contributions Extension Point
-XML_Catalog_Contributor_Extension_Point.name=XML Catalog Contributor Extension Point
-XSL_Content_Type_Extension_Element.name=XSL
-XMI_Content_Type=XMI
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.core/plugin.xml b/bundles/org.eclipse.wst.xml.core/plugin.xml
deleted file mode 100644
index 915be0f..0000000
--- a/bundles/org.eclipse.wst.xml.core/plugin.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension point="org.eclipse.wst.sse.core.modelHandler">
-		<modelHandler
-			default="true"
-			class="org.eclipse.wst.xml.core.internal.modelhandler.ModelHandlerForXML"
-			associatedContentTypeId="org.eclipse.core.runtime.xml"
-			id="org.eclipse.wst.xml.core.internal.modelhandler">
-		</modelHandler>
-	</extension>
-	<extension point="org.eclipse.wst.sse.core.modelHandler">
-		<modelHandler
-			default="true"
-			class="org.eclipse.wst.xml.core.internal.modelhandler.ModelHandlerForXML"
-			associatedContentTypeId="org.eclipse.wst.xml.core.xmlsource"
-			id="org.eclipse.wst.xml.core.internal.modelhandler2">
-		</modelHandler>
-	</extension>
-	
-	<extension point="org.eclipse.wst.sse.core.embeddedTypeHandler">
-		<embeddedTypeHandler
-			class="org.eclipse.wst.xml.core.internal.modelhandler.EmbeddedXML">
-		</embeddedTypeHandler>
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.core.taskscanner">
-		<scanner
-			id="org.eclipse.wst.xml.core.internal.tasks.XMLFileTaskScanner"
-			class="org.eclipse.wst.xml.core.internal.tasks.XMLFileTaskScanner"
-			contentTypeIds="org.eclipse.core.runtime.xml" />
-	</extension>
-	 
-   <!-- Here we define a new extension point.  This extension point is used
-        to programmatically contribute catalog entries to the XML Catalog. -->
-   <extension-point id="catalogContributions" name="%XML_Catalog_Contributions_Extension_Point.name" schema="schema/catalogContributions.exsd"/>
-
-	<!-- This extension point is deprecated, org.eclipse.wst.xml.core.catalogContributions should be used 
-		to contribute catalog entries to the XML Catalog. -->
-	<extension-point
-		id="catalogContributor"
-		name="%XML_Catalog_Contributor_Extension_Point.name"
-		schema="schema/catalogContributor.exsd" />
-
-   <!-- This extension point extenends the Common Extensbile URI Resolver so that
-        the XML Catalog can participare in resolving processes. -->
-   <extension point="org.eclipse.wst.common.uriresolver.resolverExtensions">
-      <resolverExtension
-            stage="postnormalization"
-            class="org.eclipse.wst.xml.core.internal.catalog.XMLCatalogURIResolverExtension">
-      </resolverExtension>
-   </extension>
-
-	<extension
-		point="org.eclipse.core.filebuffers.documentCreation"
-		id="org.eclipse.wst.xml.core.documentfactories"
-		name="%Structured_XML_Document_Factory_Extension.name">
-		<factory
-			contentTypeId="org.eclipse.core.runtime.xml"
-			class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory" />
-	</extension>
-	<extension
-		point="org.eclipse.core.filebuffers.documentCreation"
-		id="org.eclipse.wst.xml.core.documentfactories2"
-		name="%Structured_XML_Document_Factory_Extension.name">
-		<factory
-			contentTypeId="org.eclipse.wst.xml.core.xmlsource"
-			class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory" />
-	</extension>
-	<extension point="org.eclipse.team.core.fileTypes">
-		<fileTypes
-			type="text"
-			extension="xsl">
-		</fileTypes>
-		<fileTypes
-			type="text"
-			extension="xslt">
-		</fileTypes>
-		<fileTypes
-			type="text"
-			extension="dadx">
-		</fileTypes>
-		<fileTypes
-			type="text"
-			extension="wsdl">
-		</fileTypes>
-		<fileTypes
-			type="text"
-			extension="nst">
-		</fileTypes>
-		<fileTypes
-			type="text"
-			extension="xmi">
-		</fileTypes>
-		<fileTypes
-			type="text"
-			extension="xsd">
-		</fileTypes>
-	</extension>
-	
-	<extension point="org.eclipse.wst.sse.core.formatProcessors">
-		<processor
-			class="org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML"
-			contentTypeId="org.eclipse.core.runtime.xml">
-		</processor>
-	</extension>
-
-	<extension point="org.eclipse.core.runtime.contentTypes">
-		<content-type
-			file-extensions="xml,xsl,xslt,wsdl,xsd,exsd,xmi"
-			priority="low"
-			name="%XML_Content_Type_Extension_Element.name"
-			id="xmlsource"
-			base-type="org.eclipse.core.runtime.text"
-			default-charset="UTF-8">
-			<describer
-				class="org.eclipse.wst.xml.core.internal.contenttype.ContentDescriberForXML" />
-		</content-type>
-	</extension>
-
-	<extension point="org.eclipse.core.runtime.contentTypes">
-		<content-type
-			file-extensions="xsl,xslt"
-			priority="high"
-			name="%XSL_Content_Type_Extension_Element.name"
-			id="xslsource"
-			base-type="org.eclipse.core.runtime.xml"
-			default-charset="UTF-8">
-		</content-type>
-	</extension>
-
-	<!--  https://bugs.eclipse.org/bugs/show_bug.cgi?id=103083 -->\
-	<!--  FYI: this xmi type *should* be defined in EMF, but, since isn't
-			we will here. In future versions is could be removed -->
-	<extension point="org.eclipse.core.runtime.contentTypes">
-		<content-type
-			file-extensions="xmi"
-			priority="low"
-			name="%XMI_Content_Type"
-			id="xmisource"
-			base-type="org.eclipse.core.runtime.xml">
-		</content-type>
-	</extension>
-
-	<!-- initialize xml core preferences -->
-	<extension point="org.eclipse.core.runtime.preferences">
-		<initializer
-			class="org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceInitializer" />
-	</extension>
-
-	<extension-point
-		name="%Content_Model_Document_Factories_Extension.name"
-		id="documentFactories" />
-
-	<extension-point
-		name="%Model_Query_Extension.name"
-		id="modelQueryExtensions" />
-
-	<extension-point
-		name="%Content_Model_Annotation_Files_Extension.name"
-		id="annotationFiles" />	
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.xml.core/schema/catalogContributions.exsd b/bundles/org.eclipse.wst.xml.core/schema/catalogContributions.exsd
deleted file mode 100644
index 13bcf6c..0000000
--- a/bundles/org.eclipse.wst.xml.core/schema/catalogContributions.exsd
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.xml.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.xml.core" id="catalogContributions" name="%XML_Catalog_Contributtions_Extension_Point.name"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <documentation>
-            This extension poing allows to specifiy entries for XML Catalog.  Catalog entries have format specified in http://www.oasis-open.org/committees/entity/spec.html.  
-Each catalog extension consists of a single catalogContribution element.
-Old catalog entires form defined with catalogContributor tag are still supported, but deprecated, and should be replaced with the new format for catalog entries.
-         </documentation>
-      </annotation>
-      <complexType>
-         <choice>
-            <element ref="catalogContribution"/>
-         </choice>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  org.eclipse.wst.xml.uriresolver.catalogContributions
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  Id of the extension, optional.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  Name of the extension, optional.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="catalogContribution">
-      <annotation>
-         <documentation>
-            The catalogContribution element may have id, and it is just a container for the contributed catalog entries.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="public" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="system" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="uri" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="nextCatalog" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  Id of the catalog to which entries will be added. Could be &quot;default&quot;, and if ommited, entries are added to the default workspace catalog.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="public">
-      <annotation>
-         <documentation>
-            The public element associates a URI reference with the public identitier portion of an external identifier.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-         </sequence>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  Id of the element, optional.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="publicId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The public identifier portion of an external identifier.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="uri" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The value of the uri attribute could be relative to the plugin.xml file, use platform:/ or file:/ protocols.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="webURL" type="string">
-            <annotation>
-               <documentation>
-                  Alternative Web address for the public ID
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="system">
-      <annotation>
-         <documentation>
-            The system elements associates a URI reference with the system identifier of an external identifier
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-         </sequence>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  Id of the element, optional.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="systemId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The system identifier portion of an external identifier.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="uri" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The value of the uri attribute could be relative to the plugin.xml file, use platform:/ or file:/ protocols.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="uri">
-      <annotation>
-         <documentation>
-            The uri element associates a URI reference with the a URI reference that is not part of an external identifier.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-         </sequence>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  Id of the element, optional.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="uri" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The value of the uri attribute could be relative to the plugin.xml file, use platform:/ or file:/ protocols.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A URI reference that is not part of an external identitier.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="nextCatalog">
-      <annotation>
-         <documentation>
-            The nextCatalog elements indicate additional catalog entry file(s) to be considered during the process of resolution.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  Id of the element, optional.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="catalog" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The value of the uri attribute could be relative to the plugin.xml file, use platform:/ or file:/ protocols.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         WTP 1.0 M5
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         &lt;extension point=&quot;org.eclipse.wst.xml.uriresolver.catalogContributions&quot;&gt;
-   &lt;catalogContribution&gt; 
-           &lt;system 
-               systemId=&quot;http://schemas.xmlsoap.org/wsdl/&quot;
-               uri=&quot;data/xsd/wsdl.xml&quot; &gt; 
-               &lt;property name=&quot;webURL&quot; value=&quot;http://schemas.xmlsoap.org/wsdl/&quot;/&gt;
-              &lt;/system&gt;
-           &lt;uri
-               name=&quot;http://schemas.xmlsoap.org/wsdl/soap/&quot; 
-               uri=&quot;data/xsd/soap.xsd&quot;/&gt; 
-         &lt;public
-               publicId=&quot;http://www.w3.org/1999/XSL/Transform&quot;
-               uri=&quot;data/xsd/XSLSchema.xsd&quot;&gt;
-               &lt;property name=&quot;webURL&quot; value=&quot;http://schemas.xmlsoap.org/wsdl/&quot;/&gt;
-              &lt;/public&gt;
-          &lt;nextCatalog
-               id=&quot;nestedCatalog&quot; 
-               catalog=&quot;data/catalog1.xml&quot;/&gt; 
-       &lt;/catalogContribution&gt; 
- &lt;/extension&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2002 IBM Corporation and others.
-All rights reserved.   This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-
-Contributors: IBM
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/Catalog.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/Catalog.java
deleted file mode 100644
index 1c8c0bb..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/Catalog.java
+++ /dev/null
@@ -1,556 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.catalog;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogElement;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEvent;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogListener;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-public class Catalog implements ICatalog
-{
-
-	class CatalogLS
-	{
-		public void load()
-		{
-		}
-
-		public void save()
-		{
-			try
-			{
-				new CatalogWriter().write(Catalog.this, location);
-			} catch (Exception e)
-			{
-				Logger.logException(e);
-			}
-		}
-	}
-
-	class DefaultCatalogLS extends CatalogLS
-	{
-		public void load()
-		{
-			NextCatalog userCatalogReference = new NextCatalog();
-			userCatalogReference.setId(XMLCorePlugin.USER_CATALOG_ID);
-			userCatalogReference.setCatalogLocation(USER_CATALOG_FILE);
-			addCatalogElement(userCatalogReference);
-
-			NextCatalog systemCatalogReference = new NextCatalog();
-			systemCatalogReference.setId(XMLCorePlugin.SYSTEM_CATALOG_ID);
-			systemCatalogReference.setCatalogLocation(SYSTEM_CATALOG_FILE);
-			addCatalogElement(systemCatalogReference);
-
-			/*
-			 * Here we save the file in order to 'reflect' the catalog that
-			 * we've created from plugin extensions to disk. The 'default'
-			 * catalog is only ever written to disk and never read from disk.
-			 */
-			save();
-		}
-	}
-
-	class InternalResolver
-	{
-		protected Map publicMap = new HashMap();
-
-		protected Map systemMap = new HashMap();
-
-		protected Map uriMap = new HashMap();
-
-		InternalResolver()
-		{
-			for (Iterator i = catalogElements.iterator(); i.hasNext();)
-			{
-				ICatalogElement catalogElement = (ICatalogElement) i.next();
-				if (catalogElement.getType() == ICatalogElement.TYPE_ENTRY)
-				{
-					ICatalogEntry entry = (ICatalogEntry) catalogElement;
-					Map map = getEntryMap(entry.getEntryType());
-					map.put(entry.getKey(), entry);
-				}
-			}
-		}
-
-		private Map getEntryMap(int entryType)
-		{
-			Map map = systemMap;
-			switch (entryType)
-			{
-			case ICatalogEntry.ENTRY_TYPE_PUBLIC:
-				map = publicMap;
-				break;
-			case ICatalogEntry.ENTRY_TYPE_URI:
-				map = uriMap;
-				break;
-			default:
-				break;
-			}
-			return map;
-		}
-
-		protected String getMappedURI(Map map, String key)
-		{
-			CatalogEntry entry = (CatalogEntry) map.get(key);
-			if(entry == null) return null;
-			String uri = entry.getURI();
-			try
-			{
-                // TODO CS : do we really want to resolve these here?
-                // I'm guessing we should return the 'platform:' form of the URI
-                // to the caller.
-                if (uri.startsWith("platform:"))
-                {  
-				  URL entryURL = new URL(entry.getAbsolutePath(uri));                
-				  uri = Platform.resolve(entryURL).toString();
-                  
-                  // we need to ensure URI's are of form "file:///D:/XXX" and NOT  
-                  // "file:D:/XXX".  Otherwise the EMF URI class gets confused
-                  // (see bug 103607) 
-                  String FILE_SCHEME = "file:";
-                  if (uri.startsWith(FILE_SCHEME) && !uri.startsWith(FILE_SCHEME + "/"))
-                  {
-                    uri = FILE_SCHEME + "///" + uri.substring(FILE_SCHEME.length());
-                  }  
-                }  
-                return uri; 
-			} catch (IOException e)
-			{
-				return null;
-			}
-		}
-
-		public String resolvePublic(String publicId, String systemId)
-				throws MalformedURLException, IOException
-		{
-			String result = getMappedURI(publicMap, publicId);
-			if (result == null)
-			{
-				result = getMappedURI(systemMap, systemId);
-			}
-			// our clients used to pass namespace in place of public id, so we need to check uri map for those
-			if (result == null)
-			{
-				result = getMappedURI(uriMap, publicId);
-			}
-			if (result == null)
-			{
-				result = resolveSubordinateCatalogs(
-						ICatalogEntry.ENTRY_TYPE_PUBLIC, publicId, systemId);
-			}
-			return result;
-		}
-
-		public String resolveSystem(String systemId)
-				throws MalformedURLException, IOException
-		{
-			String result = getMappedURI(systemMap, systemId);
-			if (result == null)
-			{
-				result = resolveSubordinateCatalogs(
-						ICatalogEntry.ENTRY_TYPE_SYSTEM, null, systemId);
-			}
-			return result;
-		}
-
-		public String resolveURI(String uri) throws MalformedURLException,
-				IOException
-		{
-			String result = getMappedURI(uriMap, uri);
-			if (result == null)
-			{
-				result = resolveSubordinateCatalogs(
-						ICatalogEntry.ENTRY_TYPE_URI, null, uri);
-			}
-			return result;
-		}
-	}
-
-	class SystemCatalogLS extends CatalogLS
-	{
-		public void load()
-		{
-			new CatalogContributorRegistryReader(Catalog.this).readRegistry();
-
-			/*
-			 * Here we save the file in order to 'reflect' the catalog that
-			 * we've created from plugin extensions to disk. 
-			 * The 'system' catalog is only ever written to disk and never read from disk.
-			 */
-			save();
-		}
-	}
-
-	class UserCatalogLS extends CatalogLS
-	{
-		public void load()
-		{
-			InputStream inputStream = null;
-			try
-			{
-				URL url = new URL(location);
-				inputStream = url.openStream();
-				boolean oldNotificationEnabled = isNotificationEnabled();
-				setNotificationEnabled(false);
-				clear();
-				try
-				{
-					CatalogReader.read(Catalog.this, inputStream);
-				} finally
-				{
-					setNotificationEnabled(oldNotificationEnabled);
-				}
-				notifyChanged();
-			} catch (Exception e)
-			{
-			} finally
-			{
-				if (inputStream != null)
-				{
-					try
-					{
-						inputStream.close();
-					} catch (Exception e)
-					{
-					}
-				}
-			}
-		}
-	}
-
-	public static final String DEFAULT_CATALOG_FILE = "default_catalog.xml";
-
-	public static final String SYSTEM_CATALOG_FILE = "system_catalog.xml";
-
-	public static final String USER_CATALOG_FILE = "user_catalog.xml";
-
-	protected String base;
-
-	protected List catalogElements = new ArrayList();
-
-	protected CatalogLS catalogLS;
-
-	protected String id;
-
-	protected InternalResolver internalResolver;
-
-	protected boolean isNotificationEnabled;
-
-	protected List listenerList = new ArrayList();
-
-	protected String location;
-
-	protected CatalogSet resourceSet;
-
-	public Catalog(CatalogSet catalogResourceSet, String id, String location)
-	{
-		this.resourceSet = catalogResourceSet;
-		this.id = id;
-		this.location = location;
-
-		if (XMLCorePlugin.DEFAULT_CATALOG_ID.equals(id))
-		{
-			catalogLS = new DefaultCatalogLS();
-		} else if (XMLCorePlugin.SYSTEM_CATALOG_ID.equals(id))
-		{
-			catalogLS = new SystemCatalogLS();
-		} else
-		{
-			catalogLS = new UserCatalogLS();
-		}
-	}
-
-	public void addCatalogElement(ICatalogElement element)
-	{
-		catalogElements.add(element);
-		element.setOwnerCatalog(this);
-		internalResolver = null;
-		notifyAddElement(element);
-	}
-
-	public void addEntriesFromCatalog(ICatalog catalog)
-	{
-		try
-		{
-			setNotificationEnabled(false);
-			if (catalog != null)
-			{
-				ICatalogElement[] entries = ((Catalog)catalog).getCatalogElements();
-				for (int i = 0; i < entries.length; i++)
-				{
-					CatalogElement clone = (CatalogElement)((CatalogElement)entries[i]).clone();
-					addCatalogElement(clone);
-				}
-			} else
-			{
-				Logger.log(Logger.ERROR, "argument was null in Catalog.addEntriesFromCatalog");
-			}
-		} finally
-		{
-			setNotificationEnabled(true);
-		}
-		internalResolver = null;
-		notifyChanged();
-	}
-
-	public void addListener(ICatalogListener listener)
-	{
-		listenerList.add(listener);
-	}
-
-	public void clear()
-	{
-		catalogElements.clear();
-		internalResolver = null;
-		notifyChanged();
-	}
-
-	public ICatalogElement createCatalogElement(int type)
-	{
-		switch (type)
-		{
-		case ICatalogElement.TYPE_ENTRY:
-			return new CatalogEntry();
-		case ICatalogElement.TYPE_NEXT_CATALOG:
-			return new NextCatalog();
-		case ICatalogEntry.ENTRY_TYPE_PUBLIC:
-			return new CatalogEntry(ICatalogEntry.ENTRY_TYPE_PUBLIC);
-		case ICatalogEntry.ENTRY_TYPE_SYSTEM:
-			return new CatalogEntry(ICatalogEntry.ENTRY_TYPE_SYSTEM);
-		case ICatalogEntry.ENTRY_TYPE_URI:
-			return new CatalogEntry(ICatalogEntry.ENTRY_TYPE_URI);
-		default:
-			return new CatalogElement(type);
-		}
-	}
-
-	public String getBase()
-	{
-		return base;
-	}
-
-	private List getCatalogElements(int type)
-	{
-		List result = new ArrayList();
-		ICatalogElement[] elements = (ICatalogElement[]) catalogElements
-				.toArray(new ICatalogElement[catalogElements.size()]);
-		for (int i = 0; i < elements.length; i++)
-		{
-			ICatalogElement element = elements[i];
-			if (element.getType() == type)
-			{
-				result.add(element);
-			}
-		}
-		return result;
-	}
-
-	public ICatalogEntry[] getCatalogEntries()
-	{
-		List result = getCatalogElements(ICatalogElement.TYPE_ENTRY);
-		return (ICatalogEntry[]) result
-				.toArray(new ICatalogEntry[result.size()]);
-	}
-
-	protected CatalogSet getCatalogSet()
-	{
-		return resourceSet;
-	}
-
-	public String getId()
-	{
-		return id;
-	}
-
-	public String getLocation()
-	{
-		return location;
-	}
-
-	public INextCatalog[] getNextCatalogs()
-	{
-		List result = getCatalogElements(ICatalogElement.TYPE_NEXT_CATALOG);
-		return (INextCatalog[]) result.toArray(new INextCatalog[result.size()]);
-	}
-
-	protected InternalResolver getOrCreateInternalResolver()
-	{
-		if (internalResolver == null)
-		{
-			internalResolver = new InternalResolver();
-		}
-		return internalResolver;
-	}
-
-	protected boolean isNotificationEnabled()
-	{
-		return isNotificationEnabled;
-	}
-
-	public void load() throws IOException
-	{
-		catalogLS.load();
-	}
-
-	protected void notifyAddElement(ICatalogElement entry)
-	{
-		if (isNotificationEnabled)
-		{
-			ICatalogEvent event = new CatalogEvent(this, entry,
-					ICatalogEvent.ELEMENT_ADDED);
-			notifyListeners(event);
-		}
-	}
-
-	protected void notifyChanged()
-	{
-		ICatalogEvent event = new CatalogEvent(this, null,
-				ICatalogEvent.CHANGED);
-		notifyListeners(event);
-	}
-
-	protected void notifyListeners(ICatalogEvent event)
-	{
-		List list = new ArrayList();
-		list.addAll(listenerList);
-		for (Iterator i = list.iterator(); i.hasNext();)
-		{
-			ICatalogListener listener = (ICatalogListener) i.next();
-			listener.catalogChanged(event);
-		}
-	}
-
-	protected void notifyRemoveElement(ICatalogElement element)
-	{
-		if (isNotificationEnabled)
-		{
-			ICatalogEvent event = new CatalogEvent(this, element,
-					ICatalogEvent.ELEMENT_REMOVED);
-			notifyListeners(event);
-		}
-	}
-
-	public void removeCatalogElement(ICatalogElement element)
-	{
-		catalogElements.remove(element);
-		internalResolver = null;
-		notifyRemoveElement(element);
-		
-	}
-
-	public void removeListener(ICatalogListener listener)
-	{
-		listenerList.remove(listener);
-	}
-
-	public String resolvePublic(String publicId, String systemId)
-			throws MalformedURLException, IOException
-	{
-		return getOrCreateInternalResolver().resolvePublic(publicId, systemId);
-	}
-
-	protected String resolveSubordinateCatalogs(int entryType, String publicId,
-			String systemId) throws MalformedURLException, IOException
-	{
-		String result = null;
-		INextCatalog[] nextCatalogs = getNextCatalogs();
-		for (int i = 0; i < nextCatalogs.length; i++)
-		{
-			INextCatalog nextCatalog = nextCatalogs[i];
-			ICatalog catalog = nextCatalog.getReferencedCatalog();
-			if (catalog != null)
-			{
-				switch (entryType)
-				{
-				case ICatalogEntry.ENTRY_TYPE_PUBLIC:
-					result = catalog.resolvePublic(publicId, systemId);
-					break;
-				case ICatalogEntry.ENTRY_TYPE_SYSTEM:
-					result = catalog.resolveSystem(systemId);
-					break;
-				case ICatalogEntry.ENTRY_TYPE_URI:
-					result = catalog.resolveURI(systemId);
-					break;
-				default:
-					break;
-				}
-				if (result != null)
-				{
-					return result;
-				}
-			}
-		}
-		return null;
-	}
-
-	public String resolveSystem(String systemId) throws MalformedURLException,
-			IOException
-	{
-		return getOrCreateInternalResolver().resolveSystem(systemId);
-	}
-
-	public String resolveURI(String uri) throws MalformedURLException,
-			IOException
-	{
-		return getOrCreateInternalResolver().resolveURI(uri);
-	}
-
-	public void save() throws IOException
-	{
-		catalogLS.save();
-	}
-
-	public void setBase(String base)
-	{
-		this.base = base;
-	}
-
-	public void setId(String id)
-	{
-		this.id = id;
-	}
-
-	public void setLocation(String location)
-	{
-		this.location = location;
-	}
-
-	protected void setNotificationEnabled(boolean b)
-	{
-		isNotificationEnabled = b;
-	}
-
-	public ICatalogElement[] getCatalogElements()
-	{
-		return (ICatalogElement[]) catalogElements.toArray(new ICatalogElement[catalogElements.size()]);
-	}
-	
-
-	
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogContributorRegistryReader.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogContributorRegistryReader.java
deleted file mode 100644
index 3646987..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogContributorRegistryReader.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.xml.core.internal.catalog;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.InvalidRegistryObjectException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.XMLCoreMessages;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogElement;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-import org.osgi.framework.Bundle;
-
-public class CatalogContributorRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "catalogContributions";
-  protected static final String TAG_CONTRIBUTION = "catalogContribution";
-  /*
-   * this is a sample exptension 
-   * <extension point="org.eclipse.wst.xml.core.catalogContributions"> 
-   * <catalogContribution>
-   *    <uri
-   *             name="http://schemas.xmlsoap.org/wsdl/soap/" 
-   *             uri="xsd/soap.xsd"/> 
-   *   	<public
-   *          publicId="-//W3C//DTD XHTML 1.1//EN"
-   *          uri="dtds/xhtml11-flat.dtd"/> 
-   *  	<nextCatalog id="nestedCatalog" catalog="data/catalog1.xml"/> 
-   *  </catalogContribution> 
-   *  </extension>
-   *  
-   *  Deprecated:
-   *  <extension point="org.eclipse.wst.xml.uriresolver.catalogContributor">
-      <catalogContributor catalogId="default">
-        <mappingInfo key="http://www.w3.org/2001/XMLSchema" uri="platform:/plugin/org.eclipse.xsd/cache/www.w3.org/2001/XMLSchema.xsd"/>
-      </catalogContributor>
-    </extension>
-   */
-  protected ICatalog catalog;
-
-  protected String declaringExtensionId;
-  
-  protected CatalogContributorRegistryReader(ICatalog aCatalog)
-  {
-    catalog = aCatalog;
-  }
-
-  /**
-   * read from plugin registry and parse it.
-   */
-  protected void readRegistry()
-  {
-    IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
-    IExtensionPoint point = pluginRegistry.getExtensionPoint(XMLCorePlugin.getDefault().getBundle().getSymbolicName(), EXTENSION_POINT_ID);
-    if (point != null)
-    {
-      IConfigurationElement[] elements = point.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        readElement(elements[i]);
-      }
-    }
-    // compatability extension point processing start 
-    IExtensionPoint deprecatedEP = pluginRegistry.getExtensionPoint(XMLCorePlugin.getDefault().getBundle().getSymbolicName(), CompatabilityConstants.EXTENSION_POINT_ID);
-    if (point != null)
-    {
-      IConfigurationElement[] elements = deprecatedEP.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-    	  readElement(elements[i]);
-      }
-    }
-	//  compatability extension point processing end 
-  }
-  
-  public static String resolvePath(URL platformURL, String path) 
-  {         
-    if (path.startsWith("platform:/plugin"))
-    {
-      // this is the speclial case, where the resource is located relative 
-      // to another plugin (not the one that declares the extension point)
-      //
-		URL resolvedURL;
-		try
-		{
-			resolvedURL = Platform.resolve(new URL(path));
-			return resolvedURL.toString();
-		} catch (IOException e)
-		{
-			return path;
-		}
-      
-    }
-    else
-    {  
-      // this is the typical case, where the resource is located relative
-      // to the plugin that declares the extension point
-      //
-		try
-		{
-			URL resolvedURL = Platform.resolve(platformURL);
-			URL absoluteURL = new URL(resolvedURL, path);
-			return absoluteURL.toString();
-		} catch (IOException e)
-		{
-			return path;
-		}
-    }  
-  }
-  
-  public static URL getPlatformURL(String pluginId){
-	  Bundle bundle = Platform.getBundle(pluginId);
-		if (bundle != null)
-		{
-			URL bundleEntry = bundle.getEntry("/");
-			
-			if(bundleEntry != null){
-				try
-				{
-					return Platform.resolve(bundleEntry);
-				} catch (IOException e)
-				{
-					Logger.logException(e);
-				}
-			}
-		}
-		return null;
-  }
-
-  private String resolvePath(String path)
-  {
-	  return resolvePath(getPlatformURL(declaringExtensionId), path);
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    try
-    {
-	  declaringExtensionId = element.getDeclaringExtension().getNamespace();
-    }
-    catch (InvalidRegistryObjectException e)
-    {
-      Logger.logException(e);
-    }
-    
-    if (TAG_CONTRIBUTION.equals(element.getName())){
-    	IConfigurationElement[] mappingInfoElementList = element.getChildren(OASISCatalogConstants.TAG_PUBLIC);
-    	processMappingInfoElements(mappingInfoElementList);
-    	mappingInfoElementList = element.getChildren(OASISCatalogConstants.TAG_SYSTEM);
-    	processMappingInfoElements(mappingInfoElementList);
-    	mappingInfoElementList = element.getChildren(OASISCatalogConstants.TAG_URI);
-    	processMappingInfoElements(mappingInfoElementList);
-    	IConfigurationElement[] nextCatalogElementList = element.getChildren(OASISCatalogConstants.TAG_NEXT_CATALOG);
-    	processNextCatalogElements(nextCatalogElementList);
-    	mappingInfoElementList = element.getChildren(CompatabilityConstants.TAG_MAPPING_INFO);
-    	processCompatabilityElement(mappingInfoElementList);
-    }
-    // compatability extension point processing start 
-    else if (CompatabilityConstants.TAG_CONTRIBUTOR.equals(element.getName())){
-	    IConfigurationElement[] mappingInfoElementList = element.getChildren(CompatabilityConstants.TAG_MAPPING_INFO);
-    	processCompatabilityElement(mappingInfoElementList);
-    }
-	//  compatability extension point processing end 
-  }
-
-  private void processMappingInfoElements(IConfigurationElement[] childElementList)
-  {
-    if (catalog == null)
-      return;
-    for (int i = 0; i < childElementList.length; i++)
-    {
-      IConfigurationElement childElement = childElementList[i];
-      String name = childElement.getName();
-      String key = null;
-	
-      int type = ICatalogEntry.ENTRY_TYPE_PUBLIC;
-      if (OASISCatalogConstants.TAG_PUBLIC.equals(name))
-      {
-        key = childElement.getAttribute(OASISCatalogConstants.ATTR_PUBLIC_ID);
-      }
-      else if (OASISCatalogConstants.TAG_SYSTEM.equals(name))
-      {
-        key = childElement.getAttribute(OASISCatalogConstants.ATTR_SYSTEM_ID);
-        type = ICatalogEntry.ENTRY_TYPE_SYSTEM;
-      }
-      else if (OASISCatalogConstants.TAG_URI.equals(name))
-      {
-        key = childElement.getAttribute(OASISCatalogConstants.ATTR_NAME);
-        type = ICatalogEntry.ENTRY_TYPE_URI;
-      }
-      else if (OASISCatalogConstants.TAG_NEXT_CATALOG.equals(name))
-      {
-        processNextCatalogElements(new IConfigurationElement[]{childElement});
-        continue;
-      }
-      if (key == null || key.equals(""))
-      {
-         Logger.log(Logger.ERROR, XMLCoreMessages.Catalog_entry_key_not_set);
-        continue;
-      }
-      String entryURI = childElement.getAttribute(OASISCatalogConstants.ATTR_URI); // mandatory
-      if (entryURI == null || entryURI.equals(""))
-      {
-       Logger.log(Logger.ERROR, XMLCoreMessages.Catalog_entry_uri_not_set);
-        continue;
-      }
-      ICatalogElement catalogElement = catalog.createCatalogElement(type);
-      if (catalogElement instanceof ICatalogEntry)
-      {
-        ICatalogEntry entry = (ICatalogEntry) catalogElement;
-        entry.setKey(key);
-		String resolvedPath = resolvePath(entryURI);
-		entry.setURI(resolvedPath);
-        String id = childElement.getAttribute(OASISCatalogConstants.ATTR_ID); // optional
-        if (id != null && !id.equals(""))
-        {
-          entry.setId(id);
-        }
-      }
-      // process any other attributes
-      for (int j = 0; j < childElement.getAttributeNames().length; j++)
-      {
-        String attrName = childElement.getAttributeNames()[j];
-        if (!attrName.equals(OASISCatalogConstants.ATTR_URI) && !attrName.equals(OASISCatalogConstants.ATTR_NAME) && !attrName.equals(OASISCatalogConstants.ATTR_PUBLIC_ID)
-            && !attrName.equals(OASISCatalogConstants.ATTR_SYSTEM_ID) && !attrName.equals(OASISCatalogConstants.ATTR_CATALOG) && !attrName.equals(OASISCatalogConstants.ATTR_ID)
-            && !attrName.equals(OASISCatalogConstants.ATTR_BASE))
-        {
-          String attrValue = childElement.getAttribute(attrName);
-          if (attrValue != null && !attrValue.equals(""))
-          {
-            catalogElement.setAttributeValue(attrName, attrValue);
-          }
-        }
-      }
-      catalog.addCatalogElement(catalogElement);
-    }
-  }
-
-  private void processNextCatalogElements(IConfigurationElement[] childElementList)
-  {
-    if (catalog == null)
-      return;
-    for (int i = 0; i < childElementList.length; i++)
-    {
-      IConfigurationElement childElement = childElementList[i];
-      String location = childElement.getAttribute(OASISCatalogConstants.ATTR_CATALOG); // mandatory
-      if (location == null || location.equals(""))
-      {
-        Logger.log(Logger.ERROR, XMLCoreMessages.Catalog_next_catalog_location_uri_not_set);
-        continue;
-      }
-      INextCatalog nextCatalog = new NextCatalog();
-	  String resolvedPath = resolvePath(location);
-      nextCatalog.setCatalogLocation(resolvedPath);
-	  String id = childElement.getAttribute(OASISCatalogConstants.ATTR_ID);
-	  if (id != null && !id.equals(""))
-      { 
-		  nextCatalog.setId(id);
-      }
-      catalog.addCatalogElement(nextCatalog);
-    }
-  }
-  
-  //compatability extension point processing start 
-  private void processCompatabilityElement(IConfigurationElement[] childElementList)
-  {
-	  if (catalog == null)
-	      return;
-        for (int i = 0; i < childElementList.length; i++)
-        {
-          try
-          {
-            IConfigurationElement childElement = childElementList[i];
-            String key = childElement.getAttribute(CompatabilityConstants.ATT_KEY);
-            String path = childElement.getAttribute(CompatabilityConstants.ATT_URI.toLowerCase());
-            String uri = resolvePath(path);
-            if (uri != null)
-            {  
-              String typeName = childElement.getAttribute(CompatabilityConstants.ATT_TYPE);
-              int type = ICatalogEntry.ENTRY_TYPE_PUBLIC;
-              if (typeName != null)
-              {
-                if (typeName.compareToIgnoreCase("SYSTEM") == 0)
-                {
-                  type = ICatalogEntry.ENTRY_TYPE_SYSTEM;
-                }
-                else{
-                    type = uri.endsWith("xsd") ? ICatalogEntry.ENTRY_TYPE_URI : ICatalogEntry.ENTRY_TYPE_PUBLIC;
-                }
-              }
-              else
-              { 
-            	  if(key.endsWith("xsd")){
-            		  type = ICatalogEntry.ENTRY_TYPE_SYSTEM;
-            	  }
-            	  else if(uri.endsWith("xsd")){
-                      type = ICatalogEntry.ENTRY_TYPE_URI; 
-            	  }
-              }
-			  ICatalogElement catalogElement = catalog.createCatalogElement(type);
-		      if (catalogElement instanceof ICatalogEntry)
-		      {
-		        ICatalogEntry entry = (ICatalogEntry) catalogElement;
-		        entry.setKey(key);
-				entry.setURI(uri);
-		        String id = childElement.getAttribute(CompatabilityConstants.ATT_ID); // optional
-		        if (id != null && !id.equals(""))
-		        {
-		          entry.setId(id);
-		        }
-			    String webAddress = childElement.getAttribute(CompatabilityConstants.ATT_WEB_URL);
-				if (webAddress != null && !webAddress.equals(""))
-		        {
-				   entry.setAttributeValue(ICatalogEntry.ATTR_WEB_URL, webAddress);
-		        }
-		      }
-			  	catalog.addCatalogElement(catalogElement);
-            } 
-          }
-          catch (Exception e)
-          {
-          }
-        }
-  }
-  
-  interface CompatabilityConstants
-  {
-	  public static final String PLUGIN_ID = "org.eclipse.wst.xml.uriresolver";
-	  public static final String EXTENSION_POINT_ID = "catalogContributor";
-	  public static final String TAG_CONTRIBUTOR = "catalogContributor";
-	  public static final String ATT_CATALOG_ID = "catalogId";
-	  public static final String TAG_MAPPING_INFO = "mappingInfo";
-	  public static final String ATT_KEY = "key";
-	  public static final String ATT_URI = "uri";
-	  public static final String ATT_WEB_URL = "webURL";
-	  public static final String ATT_TYPE = "type";
-	  public static final String ATT_ID = "id";
-  }
-  //compatability extension point processing end 
- 
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogElement.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogElement.java
deleted file mode 100644
index 2c2bb7c..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogElement.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.eclipse.wst.xml.core.internal.catalog;
-
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogElement;
-
-
-public class CatalogElement implements ICatalogElement
-{
-	int type;
-
-	String id;
-
-	Map attributes = new HashMap();
-
-	ICatalog ownerCatalog;
-
-	public CatalogElement(int aType)
-	{
-		super();
-		type = aType;
-	}
-
-	public int getType()
-	{
-		return type;
-	}
-
-	public String getAttributeValue(String name)
-	{
-		return (String) attributes.get(name);
-	}
-
-	public void setAttributeValue(String name, String value)
-	{
-		attributes.put(name, value);
-	}
-
-	public String[] getAttributes()
-	{
-		Collection c = attributes.values();
-		String[] result = new String[c.size()];
-		attributes.keySet().toArray(result);
-		return result;
-	}
-
-	public String getId()
-	{
-		return id;
-	}
-
-	public void setId(String id)
-	{
-		this.id = id;
-	}
-
-	public ICatalog getOwnerCatalog()
-	{
-		return ownerCatalog;
-	}
-
-	public void setOwnerCatalog(ICatalog catalog)
-	{
-		this.ownerCatalog = catalog;
-	}
-
-	protected static String makeAbsolute(String baseLocation, String location)
-	{
-		URL local = null;
-		location = location.replace('\\', '/');
-		try
-		{
-			URL baseURL = new URL(baseLocation);
-			local = new URL(baseURL, location);
-		} catch (MalformedURLException e)
-		{
-		}
-
-		if (local != null)
-		{
-			return local.toString();
-		} else
-		{
-			return location;
-		}
-	}
-
-	public String getAbsolutePath(String path)
-	{
-		try
-		{
-			URI uri = new URI(path);
-			if (uri.isAbsolute())
-			{
-				return path;
-			}
-		} catch (URISyntaxException e)
-		{
-		}
-
-		String result = path;
-		Catalog catalog = (Catalog) getOwnerCatalog();
-		if (catalog != null)
-		{
-			String base = catalog.getBase();
-			if (base == null || base.equals(""))
-			{
-				base = catalog.getLocation();
-			}
-			result = makeAbsolute(base, path);
-		}
-		return result;
-	}
-	
-	  /*
-	   * Since we don't have events notifications for entry properties, clone()
-	   * could allow to copy and edit entry and then replace it in catalog. Entry
-	   * replacement will signal ICatalogEvent @return
-	   */
-	  public Object clone()
-	  {
-		ICatalogElement element = ownerCatalog.createCatalogElement(type);
-	    String[] attributes = getAttributes();   
-	    for (int i = 0; i < attributes.length; i++)
-	    {
-	      String attrName = attributes[i];
-	      String attrValue = getAttributeValue(attrName);
-	      element.setAttributeValue(attrName, attrValue);
-	    }
-		element.setOwnerCatalog(ownerCatalog);
-		element.setId(id);
-	    return element;
-	  }
-
-	
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogEntry.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogEntry.java
deleted file mode 100644
index acb37c3..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogEntry.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.wst.xml.core.internal.catalog;
-
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogElement;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-
-public class CatalogEntry extends CatalogElement implements ICatalogEntry, Cloneable
-{
-  int entryType = ICatalogEntry.ENTRY_TYPE_PUBLIC;
-  String key;
-  String uri;
-
-  protected CatalogEntry(int anEntryType)
-  {
-    super(ICatalogElement.TYPE_ENTRY);
-    entryType = anEntryType;
-  }
-
-  protected CatalogEntry()
-  {
-    super(ICatalogElement.TYPE_ENTRY);
-  }
-
-  public void setEntryType(int value)
-  {
-    entryType = value;
-  }
-
-  public int getEntryType()
-  {
-    return entryType;
-  }
-
-  public void setKey(String value)
-  {
-    key = value;
-  }
-
-  public String getKey()
-  {
-    return key;
-  }
-
-  public String getURI()
-  {
-    return uri;
-  }
-  
-  public void setURI(String value)
-  {
-    uri = value;
-  }
-
-  public Object clone()
-  {
-    CatalogEntry entry = (CatalogEntry)super.clone();
-	entry.setEntryType(entryType);
-    entry.setKey(key);
-    entry.setURI(uri);
-    return entry;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogEvent.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogEvent.java
deleted file mode 100644
index a860bb2..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogEvent.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.xml.core.internal.catalog;
-
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogElement;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEvent;
-
-
-public class CatalogEvent implements ICatalogEvent
-{
-  protected ICatalog catalog;
-  protected ICatalogElement catalogElement;
-  protected int eventType;
-
-  public CatalogEvent(Catalog catalog, ICatalogElement element, int eventType)
-  {
-    this.catalog = catalog;
-    this.catalogElement = element;
-    this.eventType = eventType;
-  }
-
-  public ICatalog getCatalog()
-  {
-    return catalog;
-  }
-
-  public ICatalogElement getCatalogElement()
-  {
-    return catalogElement;
-  }
-
-  public int getEventType()
-  {
-    return eventType;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogReader.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogReader.java
deleted file mode 100644
index b875041..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogReader.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package org.eclipse.wst.xml.core.internal.catalog;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Stack;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.XMLCoreMessages;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogElement;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * 
- * 
- */
-public final class CatalogReader
-{
-  public static void read(Catalog xmlCatalog, InputStream input) throws IOException
-  {
-    try
-    {
-      SAXParserFactory factory = SAXParserFactory.newInstance();
-      factory.setNamespaceAware(true);
-      SAXParser parser = factory.newSAXParser();
-      parser.parse(new InputSource(input), new CatalogContentHandler(xmlCatalog));
-    }
-    catch (ParserConfigurationException e)
-    {
-      Logger.logException(e);
-    }
-    catch (SAXException e)
-    {
-      Logger.logException(e);
-    }
-  }
-  protected static class CatalogContentHandler extends DefaultHandler
-  {
-    protected Catalog catalog;
-    protected Stack baseURIStack = new Stack();
-
-    public CatalogContentHandler(Catalog xmlCatalog)
-    {
-      this.catalog = xmlCatalog;
-      baseURIStack.push(xmlCatalog.getBase());
-    }
-
-    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException
-    {
-      // set base
-      String base = attributes.getValue("", OASISCatalogConstants.ATTR_BASE);
-      if (base != null && !base.equals(""))
-      {
-          baseURIStack.push(base);    
-      }
-
-	  // processing for backward compatability start
-	  if (localName.equals(CompatabilityConstants.TAG_USER_ENTRY))
-      {
-		int type = ICatalogEntry.ENTRY_TYPE_PUBLIC;
-        String typeName = attributes.getValue("", CompatabilityConstants.ATT_TYPE);
-        if (typeName != null)
-        {
-          if (typeName.compareToIgnoreCase("SYSTEM") == 0)
-          {
-            type = ICatalogEntry.ENTRY_TYPE_SYSTEM;
-          }
-        }
-		  ICatalogElement catalogElement = catalog.createCatalogElement(type);
-	      if (catalogElement instanceof CatalogEntry)
-	      {
-	        CatalogEntry catalogEntry = (CatalogEntry) catalogElement;
-		    String key = attributes.getValue("", CompatabilityConstants.ATT_ID);   		    
-	        catalogEntry.setKey(key);
-	        String entryUri = attributes.getValue("", CompatabilityConstants.ATT_URI);   
-	        catalogEntry.setURI(entryUri);  
-	        String webURL = attributes.getValue("", CompatabilityConstants.ATT_WEB_URL);
-			if (webURL != null)
-			{
-				catalogEntry.setAttributeValue(
-						ICatalogEntry.ATTR_WEB_URL, webURL);
-			}
-	      }
-		  catalog.addCatalogElement(catalogElement);
-		  return;
-      }
-	  //  processing for backward compatability start
-      
-	  int type = ICatalogEntry.ENTRY_TYPE_PUBLIC;
-	  String key = null;
-	 //dw String catalogId = attributes.getValue("", OASISCatalogConstants.ATTR_ID);
-      if (OASISCatalogConstants.TAG_PUBLIC.equals(localName))
-      {
-        key = attributes.getValue("", OASISCatalogConstants.ATTR_PUBLIC_ID);
-      }
-      else if (OASISCatalogConstants.TAG_SYSTEM.equals(localName))
-      {
-        key = attributes.getValue("", OASISCatalogConstants.ATTR_SYSTEM_ID);
-        type = ICatalogEntry.ENTRY_TYPE_SYSTEM;
-      }
-      else if (OASISCatalogConstants.TAG_URI.equals(localName))
-      {
-        key = attributes.getValue("", OASISCatalogConstants.ATTR_NAME);
-        type = ICatalogEntry.ENTRY_TYPE_URI;
-      }
-      else if (OASISCatalogConstants.TAG_NEXT_CATALOG.equals(localName))
-      {
-        String nextCatalogId = attributes.getValue("", OASISCatalogConstants.ATTR_ID);
-
-        String location = attributes.getValue("", OASISCatalogConstants.ATTR_CATALOG);   
-        NextCatalog delegate = new NextCatalog();
-        delegate.setCatalogLocation(location);  
-        delegate.setId(nextCatalogId);
-        catalog.addCatalogElement(delegate);
-        return;
-      }
-      else{
-    	  // do not handle other entries
-    	  return;
-      }
-      if (key == null || key.equals(""))
-      {
-        Logger.log(Logger.ERROR, XMLCoreMessages.Catalog_entry_key_not_set);
-        return;
-      }
-      String entryURI = attributes.getValue("", OASISCatalogConstants.ATTR_URI); // mandatory
-      if (entryURI == null || entryURI.equals(""))
-      {
-        Logger.log(Logger.ERROR, XMLCoreMessages.Catalog_entry_uri_not_set);
-        return;
-      }
- 
-      ICatalogElement catalogElement = catalog.createCatalogElement(type);
-      if (catalogElement instanceof CatalogEntry)
-      {
-        CatalogEntry catalogEntry = (CatalogEntry) catalogElement;
-        catalogEntry.setKey(key); 
-        catalogEntry.setURI(entryURI);     
-      }
-      // process any other attributes
-      for (int j = 0; j < attributes.getLength(); j++)
-      {
-        String attrName = attributes.getLocalName(j);
-        if (!attrName.equals(OASISCatalogConstants.ATTR_URI) && !attrName.equals(OASISCatalogConstants.ATTR_NAME) && !attrName.equals(OASISCatalogConstants.ATTR_PUBLIC_ID)
-            && !attrName.equals(OASISCatalogConstants.ATTR_SYSTEM_ID) && !attrName.equals(OASISCatalogConstants.ATTR_CATALOG) && !attrName.equals(OASISCatalogConstants.ATTR_ID)
-            && !attrName.equals(OASISCatalogConstants.ATTR_BASE))
-        {
-          String attrValue = attributes.getValue(attrName);
-          if (attrValue != null && !attrValue.equals(""))
-          {
-            catalogElement.setAttributeValue(attrName, attrValue);
-          }
-        }
-      }
-      catalog.addCatalogElement(catalogElement);
-
-    }
-
-    public void endElement(String uri, String localName, String qName) throws SAXException
-    {
-      if (baseURIStack.size() > 0)
-      {
-        baseURIStack.pop();
-      }
-    }
-    
-  }  
-  
-  // for backward compatability
-  interface CompatabilityConstants{
-	  
-	  public static final String TAG_ID_XML_CATALOG_SETTINGS = "XMLCatalogSettings";
-	  public static final String TAG_ID_USER_ENTRIES = "UserEntries";
-	  public static final String TAG_USER_ENTRY = "UserEntry";
-	  public static final String ATT_TYPE = "TYPE";
-	  public static final String ATT_ID = "ID";
-	  public static final String ATT_URI = "URI";
-	  public static final String ATT_WEB_URL = "WEB_URL";
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogSet.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogSet.java
deleted file mode 100644
index f0587df..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogSet.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- */
-package org.eclipse.wst.xml.core.internal.catalog;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.wst.xml.core.internal.Logger;
-
-
-
-public class CatalogSet {
-	protected Map uriResourceMap = new HashMap();
-	protected Map catalogPersistenceLocations = new HashMap();
-
-	// protected boolean isPluginEnvironment = false;
-
-	public CatalogSet() {
-		super();
-	}
-
-	public Catalog lookupOrCreateCatalog(String id, String uri) {
-		Catalog catalog = getCatalog(id, uri);
-		if (catalog == null) {
-			boolean ok = true;
-			catalog = new Catalog(this, id, uri);
-			try {
-				catalog.load();
-			}
-			catch (Exception e) {
-				ok = false;
-				// we catch and log all exceptions, to disallow
-				// one bad extension interfering with others
-				Logger.logException("error loading catalog: " + id + " " + uri, e);
-			}
-			if (ok) {
-				uriResourceMap.put(uri, catalog);
-			}
-		}
-		return catalog;
-	}
-
-	private Catalog getCatalog(String id, String uri) {
-		return (Catalog) uriResourceMap.get(uri);
-	}
-
-	public void putCatalogPersistenceLocation(String logicalURI, String actualURI) {
-		catalogPersistenceLocations.put(logicalURI, actualURI);
-	}
-
-	public String getCatalogPersistenceLocation(String id) {
-		return (String) catalogPersistenceLocations.get(id);
-	}
-	/*
-	 * public boolean isPluginEnvironment() { return isPluginEnvironment; }
-	 * 
-	 * public void setPluginEnvironment(boolean isPluginEnvironment) {
-	 * this.isPluginEnvironment = isPluginEnvironment; }
-	 */
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogWriter.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogWriter.java
deleted file mode 100644
index bfeef82..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogWriter.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package org.eclipse.wst.xml.core.internal.catalog;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Write OASIS XML Catalog format
- * 
- */
-public final class CatalogWriter
-{
-  private Document doc;
-
-  public void write(ICatalog xmlCatalog, String uri) throws FileNotFoundException, IOException
-  {
-    visitCatalog(xmlCatalog);
-    OutputStream outputStream = getOutputStream(uri, true);
-    serialize(outputStream);
-  }
-
-  public void write(ICatalog catalog, OutputStream os) throws FileNotFoundException, IOException
-  {
-    if (catalog != null)
-    {
-      visitCatalog(catalog);
-      serialize(os);
-    }
-  }
-
-  private void visitCatalog(ICatalog xmlCatalog)
-  {
-    try
-    {
-      doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-    }
-    catch (ParserConfigurationException e)
-    {
-      Logger.logException(e);
-    }
-    if (doc == null)
-      return;
-    Element catalogElement = doc.createElementNS(OASISCatalogConstants.namespaceName, OASISCatalogConstants.TAG_CATALOG);
-    doc.appendChild(catalogElement);
-    processCatalogEntries(xmlCatalog, catalogElement);
-    processNextCatalogs(xmlCatalog, catalogElement);
-  }
-
-  private void processCatalogEntries(ICatalog catalog, Element parent)
-  {
-    ICatalogEntry[] catalogEntries = catalog.getCatalogEntries();
-  
-    for (int i = 0; i < catalogEntries.length; i++)
-    {
-      ICatalogEntry entry = catalogEntries[i];
-      String key = entry.getKey();
-      String uri = entry.getURI();
-	  String id = entry.getId();
-	  Element childElement = null;
-	 
-     switch (entry.getEntryType())
-      {
-        case ICatalogEntry.ENTRY_TYPE_PUBLIC :
-          childElement = parent.getOwnerDocument().createElement(OASISCatalogConstants.TAG_PUBLIC);
-          if (childElement != null)
-          {
-            childElement.setAttribute(OASISCatalogConstants.ATTR_PUBLIC_ID, key);
-            childElement.setAttribute(OASISCatalogConstants.ATTR_URI, uri);
-          }
-          break;
-        case ICatalogEntry.ENTRY_TYPE_SYSTEM :
-          childElement = parent.getOwnerDocument().createElement(OASISCatalogConstants.TAG_SYSTEM);
-          if (childElement != null)
-          {
-            childElement.setAttribute(OASISCatalogConstants.ATTR_SYSTEM_ID, key);
-            childElement.setAttribute(OASISCatalogConstants.ATTR_URI, uri);
-          }
-          break;
-        case ICatalogEntry.ENTRY_TYPE_URI :
-          childElement = parent.getOwnerDocument().createElement(OASISCatalogConstants.TAG_URI);
-          if (childElement != null)
-          {
-            childElement.setAttribute(OASISCatalogConstants.ATTR_NAME, key);
-            childElement.setAttribute(OASISCatalogConstants.ATTR_URI, uri);
-          }
-          break;
-        default :
-          break;
-      }
-	  if(childElement != null && id != null && !id.equals("")){
-		  childElement.setAttribute(OASISCatalogConstants.ATTR_ID, id);
-	  }
-      
-      String[] attributes = entry.getAttributes();   
-      for (int j = 0; j < attributes.length; j++)
-      {
-        String attrName = attributes[j];
-        if (attrName != null && !attrName.equals(""))
-        {
-		  String attrValue = entry.getAttributeValue(attrName);
-          if (childElement != null && attrValue != null)
-          {
-            childElement.setAttribute(attrName, attrValue);
-          }
-        }
-      }
-      if (childElement != null)
-      {
-        parent.appendChild(childElement);
-      }
-    }
-  }
-
-  private void processNextCatalogs(ICatalog catalog, Element parent)
-  {
-    // handle catalog entries
-    INextCatalog[] nextCatalogs = catalog.getNextCatalogs();
-    Element childElement = null;
-   //dw String attrValue = null;
-    for (int i = 0; i < nextCatalogs.length; i++)
-    {
-      INextCatalog delegate = nextCatalogs[i];
-      childElement = parent.getOwnerDocument().createElement(OASISCatalogConstants.TAG_NEXT_CATALOG);
-      if (childElement != null)
-      {
-        parent.appendChild(childElement);
-        String location = delegate.getCatalogLocation();
-        if (location != null)
-        {
-          childElement.setAttribute(OASISCatalogConstants.ATTR_CATALOG, location);
-        }
-		 String id = delegate.getId();
-		 if (id != null)
-		 {
-			 childElement.setAttribute(OASISCatalogConstants.ATTR_ID, id);
-		 }
-      }
-    }
-  }
-
-  private void serialize(OutputStream outputStream) throws FileNotFoundException, IOException
-  {
-    if (doc == null)
-      return;
-    try
-    {
-      TransformerFactory transformerFactory = TransformerFactory.newInstance();
-      Transformer transformer = transformerFactory.newTransformer();
-      transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-      transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-      // Unless a width is set, there will be only line breaks but no
-      // indentation.
-      // The IBM JDK and the Sun JDK don't agree on the property name,
-      // so we set them both.
-      //
-      transformer.setOutputProperty("{http://xml.apache.org/xalan}indent-amount", "2");
-      transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-      String encoding = "UTF-8"; // TBD
-      if (encoding != null)
-      {
-        transformer.setOutputProperty(OutputKeys.ENCODING, encoding);
-      }
-      transformer.transform(new DOMSource(doc), new StreamResult(outputStream));
-    }
-    catch (TransformerException e)
-    {
-      Logger.logException(e);
-    }
-  }
-
-  private OutputStream getOutputStream(String uri, boolean overwrite) throws FileNotFoundException, IOException
-  {
-    String filePath = removeProtocol(uri);
-    File file = new File(filePath);
-    if (file.exists() && overwrite)
-    {
-      file.delete();
-    }
-    File parent = file.getParentFile();
-    if (!parent.exists())
-    {
-      parent.mkdirs();
-    }
-    try
-    {
-      file.createNewFile();
-    }
-    catch (IOException e)
-    {
-      Logger.logException(e);
-    }
-    OutputStream stream = new FileOutputStream(filePath);
-    return stream;
-  }
-  
-  protected static String removeProtocol(String uri)
-  {
-    String result = uri;  
-    String protocol_pattenrn = ":";
-    if (uri != null)
-    {
-      int index = uri.indexOf(protocol_pattenrn);
-      if (index > 2)
-      {
-        result = result.substring(index + protocol_pattenrn.length());                 
-      }
-    }
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/NextCatalog.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/NextCatalog.java
deleted file mode 100644
index ad0ddc9..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/NextCatalog.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.wst.xml.core.internal.catalog;
-
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogElement;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-
-
-public class NextCatalog extends CatalogElement implements INextCatalog
-{
-  String location;
-
-  public NextCatalog()
-  {
-    super(ICatalogElement.TYPE_NEXT_CATALOG);
-  }
-    
-  public String getCatalogLocation()
-  {
-    return location;
-  }
-
-  public ICatalog getReferencedCatalog()
-  {
-    return ((Catalog)ownerCatalog).getCatalogSet().lookupOrCreateCatalog(getId(), getAbsolutePath(location));  
-  }
-
-  public void setCatalogLocation(String uri)
-  {
-    location = uri;
-  }
-  
-  public Object clone()
-  {
-	NextCatalog nextCatalog = (NextCatalog)super.clone();
-	nextCatalog.setCatalogLocation(location);
-    return nextCatalog;
-  }
-  
- 
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/OASISCatalogConstants.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/OASISCatalogConstants.java
deleted file mode 100644
index d2ad8f3..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/OASISCatalogConstants.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.eclipse.wst.xml.core.internal.catalog;
-
-public interface OASISCatalogConstants
-{
-  public static final String namespaceName = "urn:oasis:names:tc:entity:xmlns:xml:catalog";
-  /** Types of the catalog entries */
-  /** The CATALOG element name. */
-  public static final String TAG_CATALOG = "catalog";
-  /** The GROUP catalog entry. */
-  public static final String TAG_GROUP = "group";
-  /** The PUBLIC catalog entry. */
-  public static final String TAG_PUBLIC = "public";
-  /** The SYSTEM catalog etnry. */
-  public static final String TAG_SYSTEM = "system";
-  /** The URI catalog entry. */
-  public static final String TAG_URI = "uri";
-  /** The REWRITE_SYSTEM catalog entry. */
-  public static final String TAG_REWRITE_SYSTEM = "rewriteSystem";
-  /** The REWRITE_URI catalog entry. */
-  public static final String TAG_REWRITE_URI = "rewritePublic";
-  /** The DELEGATE_PUBLIC catalog entry. */
-  public static final String TAG_DELEGATE_PUBLIC = "delegatePublic";
-  /** The DELEGATE_SYSTEM catalog entry. */
-  public static final String TAG_DELEGATE_SYSTEM = "delegateSystem";
-  /** The DELEGATE_URI catalog entry. */
-  public static final String TAG_DELEGATE_URI = "delegateUri";
-  /** The NEXT_CATALOG catalog entry. */
-  public static final String TAG_NEXT_CATALOG = "nextCatalog";
-  /** Attributes */
-  /** Attribute id used in all catalog entries */
-  public static final String ATTR_ID = "id";
-  /** Attribute id base in all catalog entries */
-  public static final String ATTR_BASE = "xml:base";
-  /** Attribute id prefere in catalog entries: CATALOG, GROUP */
-  public static final String ATTR_PREFERE = "prefere";
-  /** Attribute used in catalog entries of type: PUBLIC */
-  public static final String ATTR_PUBLIC_ID = "publicId";
-  /**
-   * Attribute used in catalog entries of type: SYSTEM
-   */
-  public static final String ATTR_SYSTEM_ID = "systemId";
-  /**
-   * Attribute used in catalog entries of type: URI
-   */
-  public static final String ATTR_NAME = "name";
-  /**
-   * Attribute used in catalog entries of type: PUBLIC, URI
-   */
-  public static final String ATTR_URI = "uri";
-  /**
-   * Attribute used in catalog entries of type: REWRITE_SYSTEM, DELEGATE_SYSTEM
-   */
-  public static final String ATTR_SYSTEM_ID_START_STRING = "systemIdStartString";
-  /**
-   * Attribute used in catalog entries of type: REWRITE_SYSTEM, REWRITE_URI
-   */
-  public static final String ATTR_REWRITE_PREFIX = "rewritePrefix";
-  /**
-   * Attribute used in catalog entries of type: DELEGATE_PUBLIC
-   */
-  public static final String ATTR_PUBLIC_ID_START_STRING = "publicIdStartString";
-  /**
-   * Attribute used in catalog entries of type: DELEGATE_PUBLIC,
-   * DELEGATE_SYSTEM, DELEGATE_URI, NEXT_CATALOG
-   */
-  public static final String ATTR_CATALOG = "catalog";
-  /**
-   * Attribute used in catalog entries of type: REWRITE_URI, DELEGATE_URI
-   */
-  public static final String ATTR_URI_START_STRING = "uriStartString";
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/XMLCatalogURIResolverExtension.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/XMLCatalogURIResolverExtension.java
deleted file mode 100644
index 0bc4555..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/XMLCatalogURIResolverExtension.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.xml.core.internal.catalog;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverExtension;
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.XMLCoreMessages;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-
-/**
- * This class is used to inject the XMLCatalog resolution behaviour into the
- * Common Extensible URI Resolver. This class is referenced in the XML Catalog
- * plugin's plugin.xml file.
- */
-public class XMLCatalogURIResolverExtension implements URIResolverExtension
-{
-  public String resolve(IFile file, String baseLocation, String publicId, String systemId)
-  {
-    // if we have catalog in a project we may add it
-    // to the catalog manager first
-    ICatalog catalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-    if (catalog == null)
-    {
-      Logger.log(Logger.ERROR_DEBUG, XMLCoreMessages.Catalog_resolution_null_catalog);
-      return null;
-    }
-    String resolved = null;
-    if (systemId != null)
-    {
-      try
-      {
-        resolved = catalog.resolveSystem(systemId);
-        if (resolved == null)
-        {
-          resolved = catalog.resolveURI(systemId);
-        }
-      }
-      catch (MalformedURLException me)
-      {
-        Logger.log(Logger.ERROR_DEBUG, XMLCoreMessages.Catalog_resolution_malformed_url);
-        resolved = null;
-      }
-      catch (IOException ie)
-      {
-        Logger.log(Logger.ERROR_DEBUG, XMLCoreMessages.Catalog_resolution_io_exception);
-        resolved = null;
-      }
-    }
-    if (resolved == null)
-    {
-      if (publicId != null)
-      {
-        // CS : this is a temporary workaround for bug 96772
-        //
-        // For schemas we always use locations where available and only use
-        // namespace when no location is specified.  For XML entities (such as DOCTYPE) 
-        // default always utilize the public catalog entry.
-        //
-        // This lame test below roughly discriminate between schema and XML entities.
-        // TODO (bug 103243) remove this lame test once we move to the new URIResolver API
-        // since the new API is explicit about namespace and publicId
-        // 
-        if (!(systemId != null && systemId.endsWith(".xsd")))
-        {
-          try
-          {
-            resolved = catalog.resolvePublic(publicId, systemId);
-            if (resolved == null)
-            {
-              resolved = catalog.resolveURI(publicId);
-            }
-          }
-          catch (MalformedURLException me)
-          {
-            Logger.log(Logger.ERROR_DEBUG, XMLCoreMessages.Catalog_resolution_malformed_url);
-            resolved = null;
-          }
-          catch (IOException ie)
-          {
-            Logger.log(Logger.ERROR_DEBUG, XMLCoreMessages.Catalog_resolution_io_exception);
-            resolved = null;
-          }
-        }
-      }
-    }
-    return resolved;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/ICatalog.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/ICatalog.java
deleted file mode 100644
index 2d865af..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/ICatalog.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corporation and others.
- * All righorg.eclipse.wst.xml.uriresolver and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.xml.core.internal.catalog.provisional;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-
-
-/**
- * A representation of the model object '<em><b>Catalog</b></em>'.
- * 
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- */
-public interface ICatalog
-{
-    /**
-     * Returns catalog id string
-     * 
-     * @return catalog id string
-     */
-    public String getId();
-    
-    /**
-     * Sets catalog id string
-     * 
-     */
-    public void setId(String id);
-    
-    
-    public void setLocation(String location);
-    public String getLocation();
-    
-    /**
-     * Return the applicable PUBLIC or SYSTEM identifier.
-     * 
-     * <p>
-     * This method searches the Catalog and returns the system identifier
-     * specified for the given system or public identifiers. If no appropriate
-     * PUBLIC or SYSTEM entry is found in the Catalog, null is returned.
-     * </p>
-     * 
-     * @param publicId
-     *            The public identifier to locate in the catalog. Public
-     *            identifiers are normalized before comparison.
-     * @param systemId
-     *            The nominal system identifier for the entity in question (as
-     *            provided in the source document).
-     * 
-     * @throws MalformedURLException
-     *             The formal system identifier of a subordinate catalog cannot
-     *             be turned into a valid URL.
-     * @throws IOException
-     *             Error reading subordinate catalog file.
-     * 
-     * @return The system identifier to use. Note that the nominal system
-     *         identifier is not returned if a match is not found in the
-     *         catalog, instead null is returned to indicate that no match was
-     *         found.
-     */
-    public String resolvePublic(String publicId, String systemId)
-            throws MalformedURLException, IOException;
-
-    /**
-     * Return the applicable SYSTEM system identifier.
-     * 
-     * <p>
-     * If a SYSTEM entry exists in the Catalog for the system ID specified,
-     * return the mapped value.
-     * </p>
-     * 
-     * <p>
-     * On Windows-based operating systems, the comparison between the system
-     * identifier provided and the SYSTEM entries in the Catalog is
-     * case-insensitive.
-     * </p>
-     * 
-     * @param systemId
-     *            The system ID to locate in the catalog.
-     * 
-     * @return The resolved system identifier.
-     * 
-     * @throws MalformedURLException
-     *             The formal system identifier of a subordinate catalog cannot
-     *             be turned into a valid URL.
-     * @throws IOException
-     *             Error reading subordinate catalog file.
-     */
-    public String resolveSystem(String systemId) throws MalformedURLException,
-            IOException;
-
-    /**
-     * Return the applicable URI.
-     * 
-     * <p>
-     * If a URI entry exists in the Catalog for the URI specified, return the
-     * mapped value.
-     * </p>
-     * 
-     * <p>
-     * URI comparison is case sensitive.
-     * </p>
-     * 
-     * @param uri
-     *            The URI to locate in the catalog.
-     * 
-     * @return The resolved URI.
-     * 
-     * @throws MalformedURLException
-     *             The system identifier of a subordinate catalog cannot be
-     *             turned into a valid URL.
-     * @throws IOException
-     *             Error reading subordinate catalog file.
-     */
-    public String resolveURI(String uri) throws MalformedURLException,
-            IOException;
-
-    /**
-     * Adds catalog element to the collection of the catalog elements.
-     * 
-     * @param element -
-     *            catalog element
-     */
-    public void addCatalogElement(ICatalogElement element);
-
-    /**
-     * Removes catalog element from the collection of the catalog elements.
-     * 
-     * @param element -
-     *            catalog element
-     */
-    public void removeCatalogElement(ICatalogElement element);
-
-    /**
-     * Returns an array of catalog elements of type ICatalogElement.TYPE_ENTRY
-     * 
-     * @return an array of catalog elements
-     */
-    public ICatalogEntry[] getCatalogEntries();
-
-    /**
-     * Returns an array of catalog elements of type
-     * ICatalogElement.TYPE_DELEGATE
-     * 
-     * @return an array of catalog elements
-     */
-    public INextCatalog[] getNextCatalogs();
-
-    /**
-     * Returns new catalog element with the specified type. If the type is one
-     * of ELEMENT_TYPE, the result entry will have corresponding interface.
-     * 
-     * @return
-     */
-    public ICatalogElement createCatalogElement(int type);
-
-    /**
-     * Removes all the elements from this catalog.
-     * 
-     */
-    public void clear();
-    
-    //public void load() throws IOException;
-    
-    public void save() throws IOException;
-
-    /*
-     * Loads catalog from the specified location. Expecting OASIS XML Catalog
-     * format
-     * 
-     * @param location -
-     *            uri of the file where catalog will be saved
-
-     * @throws IOException -
-     *             problem loading file
-     * 
-     */
-    //public void load(InputStream inputStream) throws IOException;
-
-    /*
-     * Saves catalog to the specified location in OASIS XML Catalog format
-     * 
-     * @param location -
-     *            uri of the file where catalog will be saved
-
-     * @throws IOException -
-     *             problem saving file
-     * 
-     */
-    //public void save(OutputStream outputStream) throws IOException;
-
-    /**
-     * This method copies all catalog entries from source catalog to this one.
-     * 
-     * @param catalog -
-     *            source catalog
-     * @param includeNested -
-     *            a boolean flag indicating wether to include entries of the
-     *            same type from the nested catalogs
-     */
-    public void addEntriesFromCatalog(ICatalog catalog);
-
-    /**
-     * Adds a listener of the catalog events
-     * 
-     * @param listener -
-     *            listener of the catalog events
-     * @see ICatalogEvent
-     */
-    public void addListener(ICatalogListener listener);
-
-    /**
-     * Removes a listener of the catalog events
-     * 
-     * @param listener -
-     *            listener of the catalog events
-     * @see ICatalogEvent
-     */
-    public void removeListener(ICatalogListener listener);      
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/ICatalogElement.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/ICatalogElement.java
deleted file mode 100644
index bb87d0a..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/ICatalogElement.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.eclipse.wst.xml.core.internal.catalog.provisional;
-
-
-/**
- * 
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- */
-public interface ICatalogElement
-{
-    /** Types of the catalog entries */
-    /** The PUBLIC, URI or SYSTEM Catalog Entry. */
-    public static final int TYPE_ENTRY = 1;
-
-    /** The NEXT_CATALOG Catalog Entry type. */
-    public static final int TYPE_NEXT_CATALOG = 10;
-
-    /**
-     * Returns the value of the '<em><b>Type</b></em>' attribute.
-     * 
-     * @return the value of the '<em>Type</em>' attribute.
-     */
-    int getType();
-
-    /**
-     * Returns the value of the attribute with specified name.
-     * 
-     * @return the value of the attribute with specified name.
-     * @see #setAttributeValue(String)
-     */
-    String getAttributeValue(String name);
-
-    /**
-     * Sets the value of the named attribute.
-     * 
-     * @param name
-     *            the name of the attribute that will be set
-     * @param value
-     *            the new value of the named attribute.
-     * @see #getAttributeValue()
-     */
-    void setAttributeValue(String name, String value);
-
-    /**
-     * Returns an array of attribute names for any dynamic attributes that may exist
-     * 
-     * @return array of attribute names
-     * @see #getAttributeValue()
-     * @see #setAttributeValue(String)
-     */
-    String[] getAttributes();
-    
-    /**
-     * Returns element's id string
-     * 
-     * @return element's id string
-     */
-    public String getId();
-    
-    /**
-     * Sets element's id string
-     * 
-     */
-    public void setId(String id);
-    
-    public void setOwnerCatalog(ICatalog catalog);
-    
-    public ICatalog getOwnerCatalog();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/ICatalogEntry.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/ICatalogEntry.java
deleted file mode 100644
index 80e220a..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/ICatalogEntry.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.eclipse.wst.xml.core.internal.catalog.provisional;
-
-/**
- * 
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- */
-public interface ICatalogEntry extends ICatalogElement
-{
-    /** The SYSTEM Catalog Entry type. */
-    public static final int ENTRY_TYPE_PUBLIC = 2;
-
-    /** The SYSTEM Catalog Entry type. */
-    public static final int ENTRY_TYPE_SYSTEM = 3;
-
-    /** The URI Catalog Entry type. */
-    public static final int ENTRY_TYPE_URI = 4;
-
-    /** Attribute name for Web address of catalog entry */
-    public static final String ATTR_WEB_URL = "webURL";
-
-    /**
-     * 
-     * @param entryType
-     */
-    public void setEntryType(int entryType);
-
-    /**
-     * 
-     * @return
-     */
-    public int getEntryType();
-
-    /**
-     * 
-     * @param key
-     */
-    public void setKey(String key);
-
-    /**
-     * 
-     * @return
-     */
-    public String getKey();
-
-    /**
-     * 
-     * @return
-     */
-    public String getURI();
-
-    /**
-     * 
-     * @param uri
-     */
-    public void setURI(String uri);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/ICatalogEvent.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/ICatalogEvent.java
deleted file mode 100644
index 244e557..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/ICatalogEvent.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.xml.core.internal.catalog.provisional;
-
-
-
-/**
- * 
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- */
-public interface ICatalogEvent
-{
-    /** */
-    public static final int CHANGED = 0;
-
-    public static final int ELEMENT_ADDED = 1;
-
-    /** */
-    public static final int ELEMENT_REMOVED = 2;
-
-    /** */
-    public static final int ELEMENT_CHANGED = 3;
-
-    /**
-     * 
-     * @return
-     */
-    public int getEventType();
-
-    /**
-     * 
-     * @return
-     */
-    public ICatalog getCatalog();
-
-    /**
-     * 
-     * @return
-     */
-    public ICatalogElement getCatalogElement();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/ICatalogListener.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/ICatalogListener.java
deleted file mode 100644
index ad76e8c..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/ICatalogListener.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.xml.core.internal.catalog.provisional;
-
-import java.util.EventListener;
-
-
-/**
- * The clients of the catalog that want to listen to catalog changes should
- * implement this interface.
- * 
- * @see ICatalog, ICatalogEvent,
- * 
- */
-public interface ICatalogListener extends EventListener
-{
-    /**
-     * This method allows to react to catalog events
-     * 
-     * @param event -
-     *            an event that client should react to
-     */
-    public void catalogChanged(ICatalogEvent event);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/INextCatalog.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/INextCatalog.java
deleted file mode 100644
index c33a140..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/provisional/INextCatalog.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.wst.xml.core.internal.catalog.provisional;
-
-
-
-/**
- * 
- * A representation of the nextCatalog OASIS XML catalog element. Object of the
- * class that implements this interface would serve as a reference to the
- * catalog object.
- * 
- * @see ICatalog, ICatalogElement
- * 
- * This interface currently is used only by the catalog itself. Need to find if
- * there are any clients that need it.
- * 
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- */
-public interface INextCatalog extends ICatalogElement
-{
-    /**
-     * Set location of the referenced catalog.
-     * 
-     * @param uri -
-     *            location uri of the referenced catalog
-     */
-    public void setCatalogLocation(String uri);
-
-    /**
-     * Get location uri of the referenced catalog.
-     * 
-     * @return location uri of the referenced catalog
-     */
-    public String getCatalogLocation();
-    
-    public ICatalog getReferencedCatalog();
-
-   
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMAnyElement.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMAnyElement.java
deleted file mode 100644
index c3230ae..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMAnyElement.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel;
-
-/**
- * CMAnyElement interface
- */
-public interface CMAnyElement extends CMContent {
-/**
- * getNamespaceURI method
- * @return java.lang.String
- */
-String getNamespaceURI();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMAttributeDeclaration.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMAttributeDeclaration.java
deleted file mode 100644
index a85cbde..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMAttributeDeclaration.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel;
-
-import java.util.Enumeration;
-
-/**
- * AttributeDeclaration interface
- */
-public interface CMAttributeDeclaration extends CMNode {
-  public static final int OPTIONAL   = 1;
-  public static final int REQUIRED   = 2;
-  public static final int FIXED      = 3;
-  public static final int PROHIBITED = 4;
-/**
- * getAttrName method
- * @return java.lang.String
- */
-String getAttrName();
-/**
- * getAttrType method
- * @return CMDataType
- */
-CMDataType getAttrType();
-/**
- * getDefaultValue method
- * @return java.lang.String
- * @deprecated -- to be replaced in future with additional CMDataType methods (currently found on CMDataTypeHelper)
- */
-String getDefaultValue();
-/**
- * getEnumAttr method
- * @return java.util.Enumeration
- * @deprecated -- to be replaced in future with additional CMDataType methods (currently found on CMDataTypeHelper)
- */
-Enumeration getEnumAttr();
-/**
- * getUsage method
- * @return int
- */
-int getUsage();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMContent.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMContent.java
deleted file mode 100644
index 429bacd..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMContent.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel;
-
-public interface CMContent extends CMNode
-{
-/**
- * getMaxOccur method
- * @return int
- *
- * If -1, it's UNBOUNDED.
- */
-int getMaxOccur();
-/**
- * getMinOccur method
- * @return int
- *
- * If 0, it's OPTIONAL.
- * If 1, it's REQUIRED.
- */
-int getMinOccur();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMDataType.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMDataType.java
deleted file mode 100644
index cdef962..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMDataType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel;
-
-/**
- * CMDataType
- */
-public interface CMDataType extends CMNode {
-    
-  // todo... at some point we should remove these names to
-  // avoid exposing implementation details via the interfaces
-  //
-	static final String CDATA = "CDATA"; //$NON-NLS-1$
-	static final String ID = "ID"; //$NON-NLS-1$
-	static final String IDREF = "IDREF"; //$NON-NLS-1$
-	static final String ENTITY = "ENTITY"; //$NON-NLS-1$
-	static final String ENTITIES = "ENTITIES"; //$NON-NLS-1$
-	static final String NOTATION = "NOTATION"; //$NON-NLS-1$
-	static final String NMTOKEN = "NMTOKEN"; //$NON-NLS-1$
-	static final String NMTOKENS = "NMTOKENS"; //$NON-NLS-1$
-	static final String NUMBER = "NUMBER"; //$NON-NLS-1$
-	static final String URI = "URI"; //$NON-NLS-1$
-	static final String ENUM = "ENUM"; //$NON-NLS-1$
-
-  static final int IMPLIED_VALUE_NONE             = 1;
-  static final int IMPLIED_VALUE_FIXED            = 2;
-  static final int IMPLIED_VALUE_DEFAULT          = 3;
-
-/**
- * getTypeName method
- * @return java.lang.String
- */
-String getDataTypeName();    
-
-/**
- * getImpliedValueKind method
- * @return int
- *
- * Returns one of :
- * IMPLIED_VALUE_NONE, IMPLIED_VALUE_FIXED, IMPLIED_VALUE_DEFAULT.
- */      
-
-int getImpliedValueKind();  
-
-/**
- * getTypeName method
- * @return java.lang.String  
- *
- * Returns the implied value or null if none exists.
- */
-String getImpliedValue();
-
-/**
- * getTypeName method
- * @return java.lang.String[]
- *
- */
-String[] getEnumeratedValues();
-
-/**
- * getTypeName method
- * @return java.lang.String
- *
- * This method returns a suitable default value that can be used when an instance of the data type is created.
- * This returns null of a suitable default is not available.
- */
-String generateInstanceValue();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMDocument.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMDocument.java
deleted file mode 100644
index 74ad25b..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMDocument.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel;
-
-/**
- * CMDocument interface
- */
-public interface CMDocument extends CMNode {
-/**
- * getElements method
- * @return CMNamedNodeMap
- *
- * Returns CMNamedNodeMap of ElementDeclaration
- */
-CMNamedNodeMap getElements();
-/**
- * getEntities method
- * @return CMNamedNodeMap
- *
- * Returns CMNamedNodeMap of EntityDeclaration
- */
-CMNamedNodeMap getEntities();
-/**
- * getNamespace method
- * @return CMNamespace
- */
-CMNamespace getNamespace();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMDocumentation.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMDocumentation.java
deleted file mode 100644
index 477aaec..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMDocumentation.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel;
-
-/**
- * CMDocumentation interface
- */
-public interface CMDocumentation extends CMNode {        
-  public String getValue();
-  public String getLanguage();
-  public String getSource();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMElementDeclaration.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMElementDeclaration.java
deleted file mode 100644
index bd780c5..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMElementDeclaration.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel;
-
-/**
- * CMElementDeclaration interface
- */
-public interface CMElementDeclaration extends CMContent {
-  
-	public static final int ANY = 0;
-	public static final int EMPTY = 1;
-	public static final int ELEMENT = 2;
-	public static final int MIXED = 3;
-	public static final int PCDATA = 4;
-	public static final int CDATA = 5; // todo... clarify this one
-/**
- * getAttributes method
- * @return CMNamedNodeMap
- *
- * Returns CMNamedNodeMap of AttributeDeclaration
- */
-CMNamedNodeMap getAttributes();
-/**
- * getCMContent method
- * @return CMContent
- *
- * Returns the root node of this element's content model.
- * This can be an CMElementDeclaration or a CMGroup
- */
-CMContent getContent();
-/**
- * getContentType method
- * @return int
- *
- * Returns one of :
- * ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA.
- */
-public int getContentType();
-/**
- * getElementName method
- * @return java.lang.String
- */
-String getElementName();
-
-/**
- * getDataType method
- * @return java.lang.String
- */
-CMDataType getDataType();
-
-/**
- * getLocalElements method
- * @return CMNamedNodeMap
- *
- * Returns a list of locally defined elements.
- */
-CMNamedNodeMap getLocalElements();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMEntityDeclaration.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMEntityDeclaration.java
deleted file mode 100644
index 1e00265..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMEntityDeclaration.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel;
-
-/**
- * CMEntityDeclaration interface
- */
-public interface CMEntityDeclaration extends CMNode {
-  
-/**
- * getName method
- * @return java.lang.String
- */
-String getName();
-/**
- * getValue method
- * @return java.lang.String
- */
-String getValue();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMGroup.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMGroup.java
deleted file mode 100644
index d0248d9..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMGroup.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel;
-
-/**
- * CMGroup interface
- */
-public interface CMGroup extends CMContent {
-  
-	static final int ALL = 3;
-	static final int CHOICE = 2;
-	static final int SEQUENCE = 1;
-/**
- * getChildNodes method
- * @return CMNodeList
- *
- * Returns child CMNodeList, which includes ElementDefinition or CMElement.
- */
-CMNodeList getChildNodes();
-
-/**
- * getOperation method
- * @return int
- *
- * Returns one of :
- * ALONE (a), SEQUENCE (a,b), CHOICE (a|b), ALL (a&b).
- */
-int getOperator();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMNamedNodeMap.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMNamedNodeMap.java
deleted file mode 100644
index 260d07c..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMNamedNodeMap.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel;
-import java.util.Iterator;
-/**
- * NamedCMNodeMap
- */
-public interface CMNamedNodeMap {
-/**
- * getLength method
- * @return int
- */
-int getLength();
-/**
- * getNamedItem method
- * @return CMNode
- * @param name java.lang.String
- */
-CMNode getNamedItem(String name);
-/**
- * item method
- * @return CMNode
- * @param index int
- */
-CMNode item(int index);
-
-/**
- *
- */
-Iterator iterator();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMNamespace.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMNamespace.java
deleted file mode 100644
index eca84b8..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMNamespace.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel;
-
-/**
- * CMNamespace interface
- */
-public interface CMNamespace extends CMNode {
-  
-/**
- * getPrefix method
- * @return java.lang.String
- */
-String getPrefix();
-/**
- * getURI method
- * @return java.lang.String
- */
-String getURI();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMNode.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMNode.java
deleted file mode 100644
index af1e1e3..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMNode.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel;
-
-/**
- * CMNode interface
- */
-public interface CMNode {        
-  
-  static final int ANY_ELEMENT           = 1;
-	static final int ATTRIBUTE_DECLARATION = 2;
-	static final int DATA_TYPE             = 3;
-	static final int DOCUMENT              = 4;
-	static final int ELEMENT_DECLARATION   = 5;
-	static final int ENTITY_DECLARATION    = 6;
-	static final int GROUP                 = 7;
-  static final int NAME_SPACE            = 8;
-  static final int DOCUMENTATION         = 9;
-/**
- * getNodeName method
- * @return java.lang.String
- */
-String getNodeName();
-/**
- * getNodeType method
- * @return int
- *
- * Returns one of :
- *
- */
-int getNodeType();
-
-/**
- * supports method
- * @return boolean
- *
- * Returns true if the CMNode supports a specified property
- *
- */
-boolean supports(String propertyName);
-
-/**
- * getProperty method
- * @return java.lang.Object
- *
- * Returns the object property desciped by the propertyName
- *
- */
-Object getProperty(String propertyName); //todo throw unsupported property exception
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMNodeList.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMNodeList.java
deleted file mode 100644
index 46d9b33..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/CMNodeList.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel;
-
-/**
- * CMNodeList interface
- */
-public interface CMNodeList {
-  
-/**
- * getLength method
- * @return int
- */
-int getLength();
-/**
- * item method
- * @return CMNode
- * @param index int
- */
-CMNode item(int index);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/ContentModelManager.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/ContentModelManager.java
deleted file mode 100644
index df00d0e..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/ContentModelManager.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.xml.core.internal.contentmodel;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.xml.core.internal.contentmodel.factory.CMDocumentFactory;
-import org.eclipse.wst.xml.core.internal.contentmodel.factory.CMDocumentFactoryRegistry;
-import org.eclipse.wst.xml.core.internal.contentmodel.factory.CMDocumentFactoryRegistryReader;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.annotation.AnnotationFileRegistry;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.annotation.AnnotationFileRegistryReader;
-
-
-/**
- * ContentModelManager class
- */
-public class ContentModelManager extends Plugin {
-	// private static InferredGrammarFactory inferredGrammarFactory;
-	private CMDocumentFactoryRegistry cmDocumentFactoryRegistry;
-	private AnnotationFileRegistry annotationFileRegistry;
-
-	private static ContentModelManager instance;
-
-	public ContentModelManager() {
-		super();
-	}
-
-	public static ContentModelManager getInstance() {
-		if (instance == null) {
-			instance = new ContentModelManager();
-		}
-		return instance;
-	}
-
-	public CMDocument createCMDocument(String uri, String resourceType) {
-		if (resourceType == null && uri != null) {
-			int index = uri.lastIndexOf("."); //$NON-NLS-1$
-			resourceType = uri.substring(index + 1);
-		}
-
-		if (resourceType != null) {
-			resourceType = resourceType.toLowerCase();
-		}
-		CMDocumentFactory factory = getCMDocumentFactoryRegistry().getFactory(resourceType);
-		return factory != null ? factory.createCMDocument(uri) : null;
-	}
-
-
-	private CMDocumentFactoryRegistry getCMDocumentFactoryRegistry() {
-		if (cmDocumentFactoryRegistry == null) {
-			cmDocumentFactoryRegistry = new CMDocumentFactoryRegistry();
-			new CMDocumentFactoryRegistryReader(cmDocumentFactoryRegistry).readRegistry();
-		}
-		return cmDocumentFactoryRegistry;
-	}
-
-
-	public List getAnnotationFilesInfos(String publicId) {
-		return getAnnotationFileRegistry().getAnnotationFilesInfos(publicId);
-	}
-
-	private AnnotationFileRegistry getAnnotationFileRegistry() {
-		if (annotationFileRegistry == null) {
-			annotationFileRegistry = new AnnotationFileRegistry();
-			new AnnotationFileRegistryReader(annotationFileRegistry).readRegistry();
-		}
-		return annotationFileRegistry;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/annotation/Annotation.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/annotation/Annotation.java
deleted file mode 100644
index e9968a8..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/annotation/Annotation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.annotation;
-
-import java.util.Hashtable;
-import java.util.List;
-         
-/**
- * 
- */
-public class Annotation
-{       
-  protected Hashtable hashtable = new Hashtable();                     
-
-  public Annotation()
-  {
-  }
-
-  public void setSpec(String spec)
-  {
-    hashtable.put("spec", spec); //$NON-NLS-1$
-  }     
-
-  public String getSpec()
-  {
-    return (String)hashtable.get("spec"); //$NON-NLS-1$
-  }
-      
-  public void setProperty(String name, String value)
-  {                             
-    hashtable.put(name, value);
-  }
-
-  public String getProperty(String propertyName)
-  {     
-    return (String)hashtable.get(propertyName);
-  }    
-
-  public List getAttributeList()
-  {
-    return null; // todo
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/annotation/AnnotationMap.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/annotation/AnnotationMap.java
deleted file mode 100644
index 5c94ac8..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/annotation/AnnotationMap.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.xml.core.internal.contentmodel.annotation;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.annotation.AnnotationFileInfo;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.annotation.AnnotationFileParser;
-
-
-/**
- * AnnotationMap
- */
-public class AnnotationMap {
-	protected List list = new Vector();
-	protected Hashtable hashtable = new Hashtable();
-	protected boolean isCaseSensitive = true;
-
-	public AnnotationMap() {
-	}
-
-	public void setCaseSensitive(boolean isCaseSensitive) {
-		this.isCaseSensitive = isCaseSensitive;
-	}
-
-	public void addAnnotation(Annotation annotation) {
-		String spec = annotation.getSpec();
-		if (spec != null) {
-			list.add(annotation);
-			StringTokenizer st = new StringTokenizer(spec, "[]|\t\n\r\f "); //$NON-NLS-1$
-			while (st.hasMoreTokens()) {
-				String cmNodeSpec = st.nextToken();
-				addAnnotationForCMNodeSpec(cmNodeSpec, annotation);
-			}
-		}
-	}
-
-	protected void addAnnotationForCMNodeSpec(String cmNodeSpec, Annotation annotation) {
-		String key = isCaseSensitive ? cmNodeSpec : cmNodeSpec.toLowerCase();
-		List list = (List) hashtable.get(key);
-		if (list == null) {
-			list = new Vector();
-
-			hashtable.put(key, list);
-		}
-		list.add(annotation);
-	}
-
-	public String getProperty(String cmNodeSpec, String propertyName) {
-		String result = null;
-		String key = isCaseSensitive ? cmNodeSpec : cmNodeSpec.toLowerCase();
-		List annotationList = (List) hashtable.get(key);
-		if (annotationList != null) {
-			for (Iterator i = annotationList.iterator(); i.hasNext();) {
-				Annotation annotation = (Annotation) i.next();
-				result = annotation.getProperty(propertyName);
-				if (result != null) {
-					break;
-				}
-			}
-		}
-		return result;
-	}
-
-	public String getProperty(CMNode cmNode, String propertyName) {
-		String result = null;
-		String cmNodeSpec = (String) cmNode.getProperty("spec"); //$NON-NLS-1$
-		if (cmNodeSpec == null) {
-			cmNodeSpec = cmNode.getNodeName();
-		}
-		if (cmNodeSpec != null) {
-			result = getProperty(cmNodeSpec, propertyName);
-		}
-		return result;
-	}
-
-	public List getAnnotations() {
-		return list;
-	}
-
-	public void load(String uri, String bundleId) throws Exception {
-		AnnotationFileParser parser = new AnnotationFileParser();
-		AnnotationFileInfo fileInfo = new AnnotationFileInfo(uri, bundleId);
-		parser.parse(this, fileInfo);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMAnyElementImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMAnyElementImpl.java
deleted file mode 100644
index 9913ae2..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMAnyElementImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.basic;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-
-
-public class CMAnyElementImpl extends CMContentImpl implements CMAnyElement
-{
-  protected String namespaceURI;  
-
-  public CMAnyElementImpl(String namespaceURI)
-  {
-    this.namespaceURI = namespaceURI;
-    minOccur = -1;
-  }             
-
-  public static String computeNodeName(String uri)
-  {
-    return uri != null ? ("any#" + uri) : "any"; //$NON-NLS-1$ //$NON-NLS-2$
-  }
-
-  // implements CMNode
-  //
-  public String getNodeName()
-  {
-    return computeNodeName(namespaceURI);
-  }
- 
-  public int getNodeType()
-  {
-    return ANY_ELEMENT;
-  } 
-
-  // implements CMAnyElement
-  //
-  public String getNamespaceURI()
-  {
-    return namespaceURI;
-  }                     
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMAttributeDeclarationImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMAttributeDeclarationImpl.java
deleted file mode 100644
index 60b2603..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMAttributeDeclarationImpl.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.basic;
-
-import java.util.Enumeration;
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-
-public class CMAttributeDeclarationImpl extends CMNodeImpl implements CMAttributeDeclaration
-{
-  protected CMDataType dataType;
-  protected String nodeName;    
-  protected int usage;  
-  protected CMDocument cmDocument;
-  protected boolean prefixQualification;
-  protected List xsiTypes;
-                
-  public CMAttributeDeclarationImpl(String nodeName, int usage)
-  {
-    this(nodeName, usage, null);
-  }     
-
-  public CMAttributeDeclarationImpl(String nodeName, int usage, CMDataType dataType)
-  {        
-    this.nodeName = nodeName;
-    this.usage = usage;
-    this.dataType = dataType; 
-  }    
-
-  public int getNodeType()
-  {
-    return CMNode.ATTRIBUTE_DECLARATION;
-  }
-
-  public Object getProperty(String propertyName)
-  {
-    Object result = null;   
-    if (propertyName.equals("CMDocument")) //$NON-NLS-1$
-    {
-      result = cmDocument;
-    } 
-    else if (propertyName.equals("XSITypes")) //$NON-NLS-1$
-    {                                      
-      result = xsiTypes;
-    }
-    else if (propertyName.equals("http://org.eclipse.wst/cm/properties/nsPrefixQualification")) //$NON-NLS-1$
-    {
-      result = prefixQualification ? "qualified" : "unqualified"; //$NON-NLS-1$ //$NON-NLS-2$
-    }  
-    else
-    {
-      result = super.getProperty(propertyName);
-    }
-    return result;
-  }
-
-  public void setPrefixQualification(boolean qualified)
-  {
-    prefixQualification = qualified;
-  }              
-
-  public void setXSITypes(List list)
-  {
-    xsiTypes = list;
-  }
-     
-  public void setCMDocument(CMDocument cmDocument)
-  {
-    this.cmDocument = cmDocument;
-  }
-
-  public String getNodeName()
-  {
-    return nodeName;
-  }
-
-  public String getAttrName()
-  {
-    return nodeName;
-  }
-
-  public void setAttrType(CMDataType dataType)
-  {
-    this.dataType = dataType;
-  }
-
-  public CMDataType getAttrType()
-  {
-    return dataType;
-  }
-
-  public int getUsage()
-  {
-    return usage;
-  }
-           
-  /** @deprecated */
-  public String getDefaultValue()
-  {
-    return ""; //$NON-NLS-1$
-  }                 
-
-  /** @deprecated */
-  public Enumeration getEnumAttr()
-  {
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMContentImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMContentImpl.java
deleted file mode 100644
index 69e51df..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMContentImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.basic;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-
-
-public abstract class CMContentImpl extends CMNodeImpl implements CMContent
-{
-  protected int minOccur = 0;
-  protected int maxOccur = -1;       
-                
-  // implements CMContent
-  //
-  public int getMaxOccur()
-  {
-    return maxOccur;
-  }          
- 
-  public int getMinOccur()
-  {
-    return minOccur;
-  }  
-     
-  // implementation specific
-  //
-  public void setMaxOccur(int n)
-  {
-    maxOccur = n;
-  }          
- 
-  public void setMinOccur(int n)
-  {
-    minOccur = n;
-  }                      
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMDataTypeImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMDataTypeImpl.java
deleted file mode 100644
index 6e6df24..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMDataTypeImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.basic;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-public class CMDataTypeImpl extends CMNodeImpl implements CMDataType
-{
-  protected String dataTypeName;
-  protected String[] enumeratedValues;     
-  protected String instanceValue;
-
-  public CMDataTypeImpl(String dataTypeName, String instanceValue)
-  {
-    this.dataTypeName = dataTypeName;
-    this.instanceValue = instanceValue;
-    this.enumeratedValues = new String[0];
-  }
-
-  public CMDataTypeImpl(String dataTypeName, String[] enumeratedValues)
-  {
-    this.dataTypeName = dataTypeName;
-    this.enumeratedValues = enumeratedValues;   
-    this.instanceValue = enumeratedValues[0];
-  }
-
-
-  public int getNodeType()
-  {
-    return CMNode.DATA_TYPE;
-  }
-
-  public String getNodeName()
-  {
-    return getDataTypeName();
-  }
-
-  public String getDataTypeName()
-  {
-    return dataTypeName;
-  }
-
-  public int getImpliedValueKind()
-  {
-    return IMPLIED_VALUE_NONE;
-  }
-
-  public String getImpliedValue()
-  {
-    return null;
-  }
-
-  public String[] getEnumeratedValues()
-  {
-    return enumeratedValues;
-  }
-
-  public String generateInstanceValue()
-  {
-    return instanceValue;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMDocumentImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMDocumentImpl.java
deleted file mode 100644
index 933fcb8..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMDocumentImpl.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.basic;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace;
-
-
-public class CMDocumentImpl extends CMNodeImpl implements CMDocument
-{
-  protected String targetNamespace;
-  protected CMNamedNodeMapImpl elements = new CMNamedNodeMapImpl();
-  protected CMNamedNodeMapImpl localElementPool;
-  protected CMNamedNodeMapImpl anyElements;
-
-  public CMDocumentImpl(String targetNamespace)
-  {
-    this.targetNamespace = targetNamespace;
-  }
-
-  public int getNodeType()
-  {
-    return DOCUMENT;
-  }
-
-  public String getNodeName()
-  {
-    return ""; //$NON-NLS-1$
-  }
- 
-  public Object getProperty(String propertyName)
-  {
-    Object result = null;
-    if (propertyName.equals("http://org.eclipse.wst/cm/properties/targetNamespaceURI")) //$NON-NLS-1$
-    {
-      result = targetNamespace;
-    }                
-    else
-    {
-      result = super.getProperty(propertyName);
-    }
-    return result;
-  }    
-
-  public CMNamedNodeMap getElements()
-  {
-    return elements;
-  }
-
-  public CMNamedNodeMapImpl getAnyElements()
-  { 
-    if (anyElements == null)
-    {
-      anyElements = new CMNamedNodeMapImpl();
-    }
-    return anyElements;
-  }
-  
-  public CMNamedNodeMapImpl getLocalElementPool()
-  { 
-    if (localElementPool == null)
-    {
-      localElementPool = new CMNamedNodeMapImpl();
-    }                 
-    return localElementPool;
-  }
-
-  public CMNamedNodeMap getEntities()
-  {
-    return new CMNamedNodeMapImpl();
-  }
-
-  public CMNamespace getNamespace()
-  {
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMElementDeclarationImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMElementDeclarationImpl.java
deleted file mode 100644
index 9bdf866..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMElementDeclarationImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.basic;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-
-public class CMElementDeclarationImpl extends CMContentImpl implements CMElementDeclaration
-{
-  protected String name;          
-  protected CMDocument cmDocument;
-  protected CMNamedNodeMapImpl attributeMap = new CMNamedNodeMapImpl();
-  protected CMNamedNodeMapImpl localElementMap = new CMNamedNodeMapImpl();
-  protected CMContent content;
-  protected CMDataType dataType;
-  protected boolean isLocal;
-
-  public CMElementDeclarationImpl(CMDocument cmDocument, String name)
-  {                              
-    this.cmDocument = cmDocument;
-    this.name = name;
-  }     
-
-  // implements CMNode
-  //
-  public String getNodeName()
-  {
-    return name;
-  }
- 
-  public int getNodeType()
-  {
-    return ELEMENT_DECLARATION;
-  }
-
-  public Object getProperty(String propertyName)
-  { 
-    Object result = null;               
-    if (propertyName.equals("http://org.eclipse.wst/cm/properties/nsPrefixQualification")) //$NON-NLS-1$
-    {
-      result = isLocal ? "unqualified" : "qualified"; //$NON-NLS-1$ //$NON-NLS-2$
-    }    
-    else if (propertyName.equals("CMDocument")) //$NON-NLS-1$
-    {
-      result = cmDocument;       
-    }    
-    else
-    {
-      result = super.getProperty(propertyName);
-    }
-    return result;
-  }
-                
-  // implements CMElementDeclaration
-  //
-  public CMNamedNodeMap getAttributes()
-  {
-    return attributeMap;
-  }                     
-
-  public CMContent getContent()
-  {
-    return content;
-  }
-
-  public int getContentType()
-  {
-    return MIXED;
-  }            
-
-  public String getElementName()
-  {
-    return name;
-  }
-
-  public CMDataType getDataType()
-  { 
-    return dataType;
-  }
-
-  public CMNamedNodeMap getLocalElements()
-  { 
-    return localElementMap;
-  } 
-    
-  //
-  //
-  public void setContent(CMContent cmContent)
-  {
-    content = cmContent;
-  }                 
-
-  public void setDataType(CMDataType cmDataType)
-  {
-    dataType = cmDataType;
-  }
-
-  public CMNamedNodeMapImpl getAttributeMap()
-  {
-    return attributeMap;
-  }
-
-  public void setLocal(boolean isLocal)
-  {
-    this.isLocal = isLocal;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMEntityDeclarationImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMEntityDeclarationImpl.java
deleted file mode 100644
index af0fcc3..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMEntityDeclarationImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.basic;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMEntityDeclaration;
-
-public class CMEntityDeclarationImpl extends CMNodeImpl implements CMEntityDeclaration
-{
-  protected String name;                         
-  protected String value;
-
-  public CMEntityDeclarationImpl(String name, String value)
-  {
-    this.name = name;
-    this.value = value;
-  }
-
-  public int getNodeType()
-  {
-    return ENTITY_DECLARATION;
-  }
-
-  public String getNodeName()
-  {
-    return name;
-  }
- 
-  public String getName()
-  {
-    return name;
-  }
-
-  public String getValue()
-  {
-    return value;
-  }
-}   
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMGroupImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMGroupImpl.java
deleted file mode 100644
index 8335e1f..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMGroupImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.basic;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-
-public class CMGroupImpl extends CMContentImpl implements CMGroup
-{
-  protected CMNodeList nodeList;                         
-  protected int operator;  
-
-  public CMGroupImpl(CMNodeList nodeList, int operator)
-  {
-    this.nodeList = nodeList;
-    this.operator = operator;
-  }
-
-  public int getNodeType()
-  {
-    return GROUP;
-  }
- 
-  public CMNodeList getChildNodes()
-  {
-    return nodeList;
-  }
-
-  public int getOperator()
-  {
-    return operator;
-  } 
-}   
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMNamedNodeMapImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMNamedNodeMapImpl.java
deleted file mode 100644
index cafef41..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMNamedNodeMapImpl.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.basic;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-
-
-public class CMNamedNodeMapImpl implements CMNamedNodeMap 
-{
-  public static CMNamedNodeMapImpl EMPTY_NAMED_NODE_MAP = new CMNamedNodeMapImpl();
-  protected Hashtable table = new Hashtable();
-
-  /**
-   * CMNamedNodeMapImpl constructor comment.
-   */
-  public CMNamedNodeMapImpl()
-  {
-  	super();
-  }
-
-  /**
-   * getLength method
-   * @return int
-   */
-  public int getLength()
-  {
-  	return table.size();
-  }
-
-  /**
-   * getNamedItem method
-   * @return CMNode
-   * @param name java.lang.String
-   */
-  public CMNode getNamedItem(String name)
-  {
-  	return (CMNode)table.get(name);
-  }
-
-  /**
-   * item method
-   * @return CMNode
-   * @param index int
-   */
-  public CMNode item(int index)
-  {
-    CMNode result = null;
-    int size = table.size();
-    if (index < size)
-    {
-      Enumeration values = table.elements();
-      for(int i = 0; i <= index; i++)
-      {
-        result = (CMNode)values.nextElement();
-      }
-    }
-    return result;
-  }
-  
-  public Hashtable getHashtable()
-  {
-          return table;
-  }
-  
-  public Iterator iterator()
-  {
-          return table.values().iterator();
-  }        
-  
-  public void put(CMNode cmNode)
-  {
-    table.put(cmNode.getNodeName(), cmNode);
-  }
-}
-  
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMNodeImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMNodeImpl.java
deleted file mode 100644
index 5c63598..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMNodeImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.basic;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-
-public abstract class CMNodeImpl implements CMNode
-{            
-  protected boolean isInferred = false;
-   
-  public String getNodeName()
-  {
-    return ""; //$NON-NLS-1$
-  }
- 
-  public boolean supports(String propertyName)
-  {
-    return false;
-  } 
-
-  public Object getProperty(String propertyName)
-  {              
-    Object result = null;
-    if ("isInferred".equals(propertyName)) //$NON-NLS-1$
-    {
-      result = isInferred ? Boolean.TRUE : Boolean.FALSE;
-    }
-    return result;
-  }    
-
-  public void setInferred(boolean isInferred)
-  {
-    this.isInferred = isInferred;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMNodeListImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMNodeListImpl.java
deleted file mode 100644
index bc9b6b9..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/basic/CMNodeListImpl.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.basic;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-
-
-public class CMNodeListImpl implements CMNodeList 
-{
-  public static CMNodeListImpl EMPTY_NODE_LIST = new CMNodeListImpl(Collections.EMPTY_LIST);
-  protected List list;
-
-  public CMNodeListImpl()
-  {
-    this(new Vector());
-  }
-
-  public CMNodeListImpl(List list)
-  {
-    this.list = list;
-  }
-
-  /**
-   * getLength method
-   * @return int
-   */
-  public int getLength()
-  {
-    return list.size();
-  }
-  /**
-   * item method
-   * @return CMNode
-   * @param index int
-   */
-  public CMNode item(int index)
-  {
-    return (CMNode)list.get(index);
-  }
-  
-  public List getList()
-  {
-    return list;
-  }
-  
-  public Iterator iterator()
-  {
-    return list.iterator();
-  }
-  
-  public boolean contains(CMNode cmNode)
-  {
-    return list.contains(cmNode);
-  } 
-  
-  public void add(CMNode cmNode)
-  {
-    list.add(cmNode);
-  }  
-}
-
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/factory/CMDocumentFactory.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/factory/CMDocumentFactory.java
deleted file mode 100644
index 39b540b..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/factory/CMDocumentFactory.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.factory;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-
-// this interface is used to build a grammar document given a local file name
-//
-public interface CMDocumentFactory
-{   
-  public CMDocument createCMDocument(String uri);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/factory/CMDocumentFactoryDescriptor.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/factory/CMDocumentFactoryDescriptor.java
deleted file mode 100644
index c509802..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/factory/CMDocumentFactoryDescriptor.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.factory;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.xml.core.internal.Logger;
-
-
-public class CMDocumentFactoryDescriptor
-{
-  private IConfigurationElement fElement;
-  private CMDocumentFactory factory;
-
-  public CMDocumentFactoryDescriptor(IConfigurationElement element)
-  {
-    this.fElement = element;
-  }
-
-  public CMDocumentFactory getFactory()
-  {
-    if (factory == null)
-    {
-      try
-      {
-        factory = (CMDocumentFactory) fElement.createExecutableExtension("class"); //$NON-NLS-1$
-      }
-      catch (Exception e)
-      {
-        Logger.logException("Exception loading CMDocumentFactory",e); //$NON-NLS-1$
-      }
-    }
-    return factory;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/factory/CMDocumentFactoryRegistry.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/factory/CMDocumentFactoryRegistry.java
deleted file mode 100644
index 3f2db44..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/factory/CMDocumentFactoryRegistry.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.xml.core.internal.contentmodel.factory;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Vector;
-
-/**
- * 
- * 
- */
-public class CMDocumentFactoryRegistry 
-{
-	protected static CMDocumentFactoryRegistry instance;
-
-  private static String DEFAULT_RESOURCE_TYPE = "*"; //$NON-NLS-1$
-
-	protected Map resourceTypeMap = new HashMap();
-
-	protected Vector documentBuilderList = new Vector();
-
-	public CMDocumentFactoryRegistry() {
-	}
-
-	public void putFactory(String resourceType, CMDocumentFactoryDescriptor factoryDescriptor) {
-		resourceTypeMap.put(resourceType, factoryDescriptor);
-	}
-
-	public CMDocumentFactory getFactory(String resourceType) {
-		CMDocumentFactoryDescriptor factoryDescriptor = null;
-		if (resourceType != null) {
-			factoryDescriptor = (CMDocumentFactoryDescriptor) resourceTypeMap.get(resourceType);
-		}
-		if (factoryDescriptor == null) {
-			// (dmw) issue: a default type of '*' means what? registered as
-			// '*' is the way this works now. is that the intent? Or should it
-			// mean registered as any other type?
-			factoryDescriptor = (CMDocumentFactoryDescriptor) resourceTypeMap.get(DEFAULT_RESOURCE_TYPE);
-		}
-		return factoryDescriptor != null ? factoryDescriptor.getFactory() : null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/factory/CMDocumentFactoryRegistryReader.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/factory/CMDocumentFactoryRegistryReader.java
deleted file mode 100644
index 87e2b78..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/factory/CMDocumentFactoryRegistryReader.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.factory;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.internal.Logger;
-
-
-
-
-public class CMDocumentFactoryRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "documentFactories"; //$NON-NLS-1$
-  protected static final String TAG_NAME = "factory"; //$NON-NLS-1$
-  protected static final String ATT_CLASS = "class"; //$NON-NLS-1$
-  protected static final String ATT_TYPE = "type";   //$NON-NLS-1$
-  protected String pluginId, extensionPointId;
-  
-  protected CMDocumentFactoryRegistry registry;
-  
-  public CMDocumentFactoryRegistryReader(CMDocumentFactoryRegistry registry)
-  {
-  	this.registry = registry;
-  }
-
-  public void readRegistry()
-  {
-    String bundleid = "org.eclipse.wst.xml.core"; //$NON-NLS-1$
-    IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(bundleid, EXTENSION_POINT_ID);
-    if (point != null)
-    {
-      IConfigurationElement[] elements = point.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        readElement(elements[i]);
-      }
-    }
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    if (element.getName().equals(TAG_NAME))
-    {
-      String factoryClass = element.getAttribute(ATT_CLASS);
-      String filenameExtensions = element.getAttribute(ATT_TYPE);
-      if (factoryClass != null && filenameExtensions != null)
-      {
-        try
-        {
-          CMDocumentFactoryDescriptor descriptor = new CMDocumentFactoryDescriptor(element);
-          for (StringTokenizer st = new StringTokenizer(filenameExtensions, ","); st.hasMoreTokens(); ) //$NON-NLS-1$
-          {
-          	String token = st.nextToken().trim();
-			registry.putFactory(token, descriptor);	
-          }         
-        }
-        catch (Exception e)
-        {
-			Logger.logException(e);
-        }
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/AnnotationFileInfo.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/AnnotationFileInfo.java
deleted file mode 100644
index 7eab4f2..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/AnnotationFileInfo.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.xml.core.internal.contentmodel.internal.annotation;
-
-/**
- * Contains information about annotation files
- */
-public class AnnotationFileInfo {
-	private String fAnnotationFileLocation;
-	private String fBundleId;
-
-	public AnnotationFileInfo(String annotationFileLocation, String bundleId) {
-		fAnnotationFileLocation = annotationFileLocation;
-		fBundleId = bundleId;
-	}
-
-	/**
-	 * Get the location of the annotation file as originally specified.
-	 * 
-	 * @return String
-	 */
-	public String getAnnotationFileLocation() {
-		return fAnnotationFileLocation;
-	}
-
-	/**
-	 * Get the bundle id where the annotation file is located.
-	 * 
-	 * @return String
-	 */
-	public String getBundleId() {
-		return fBundleId;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/AnnotationFileParser.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/AnnotationFileParser.java
deleted file mode 100644
index 11279e9..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/AnnotationFileParser.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.xml.core.internal.contentmodel.internal.annotation;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.PropertyResourceBundle;
-import java.util.ResourceBundle;
-
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.contentmodel.annotation.Annotation;
-import org.eclipse.wst.xml.core.internal.contentmodel.annotation.AnnotationMap;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-
-/**
- * 
- */
-public class AnnotationFileParser {
-	public static final String TAG_ID_ANNOTATIONS = "abstractGrammarAnnotations"; //$NON-NLS-1$
-	public static final String TAG_ID_ANNOTATION = "annotation"; //$NON-NLS-1$
-	public static final String TAG_ID_PROPERTY = "property"; //$NON-NLS-1$
-
-	/**
-	 * This method is called to parse an annotation file and store the
-	 * contents into an annotationMap
-	 */
-	private void parse(AnnotationMap annotationMap, InputStream input, AnnotationFileInfo fileInfo) throws Exception {
-		// move to Xerces-2.... add 'contextClassLoader' stuff
-		ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
-		try {
-			SAXParserFactory factory = SAXParserFactory.newInstance();
-			factory.setNamespaceAware(true);
-			SAXParser parser = factory.newSAXParser();
-			parser.parse(new InputSource(input), new AnnotationMapContentHandler(annotationMap, fileInfo));
-		}
-		finally {
-			Thread.currentThread().setContextClassLoader(prevClassLoader);
-		}
-	}
-
-	/**
-	 * This method is called to parse an annotation file and store the
-	 * contents into an annotationMap
-	 */
-	public void parse(AnnotationMap map, AnnotationFileInfo fileInfo) throws Exception {
-		InputStream inputStream = null;
-		try {
-			URL url = Platform.find(Platform.getBundle(fileInfo.getBundleId()), Path.fromOSString(fileInfo.getAnnotationFileLocation()));
-			if (url != null) {
-				inputStream = url.openStream();
-				parse(map, inputStream, fileInfo);
-			}
-		}
-		catch (Exception e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-			throw (e);
-		}
-		finally {
-			try {
-				if (inputStream != null) {
-					inputStream.close();
-				}
-			}
-			catch (IOException e) {
-			}
-		}
-	}
-
-	protected class AnnotationMapContentHandler extends DefaultHandler {
-		private AnnotationMap annotationMap;
-		private Annotation currentAnnotation;
-		private String currentPropertyName;
-		private StringBuffer propertyValueBuffer;
-		private ResourceBundle resourceBundle;
-		private AnnotationFileInfo fFileInfo;
-
-		public AnnotationMapContentHandler(AnnotationMap annotationMap, AnnotationFileInfo fileInfo) {
-			this.annotationMap = annotationMap;
-			this.fFileInfo = fileInfo;
-		}
-
-		private URL generatePropertiesFileURL(AnnotationFileInfo fileInfo, String propertiesLocation) {
-			URL propertiesURL = null;
-
-			// prepend $nl$ variable to location
-			IPath annotationPath = Path.fromOSString("$nl$/" + fileInfo.getAnnotationFileLocation()); //$NON-NLS-1$
-			// remove the annotation.xml file
-			IPath annotationFolder = annotationPath.removeLastSegments(1);
-			// append location of propertiles file
-			IPath propertiesFile = annotationFolder.append(propertiesLocation);
-			// append .properties extension if needed
-			if (propertiesFile.getFileExtension() == null)
-				propertiesFile = propertiesFile.addFileExtension("properties"); //$NON-NLS-1$
-			// create a URL out of the properties file location
-			propertiesURL = Platform.find(Platform.getBundle(fileInfo.getBundleId()), propertiesFile);
-			return propertiesURL;
-		}
-
-		public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
-			propertyValueBuffer = new StringBuffer();
-			if (localName.equals(TAG_ID_ANNOTATIONS)) {
-				int attributesLength = attributes.getLength();
-				for (int i = 0; i < attributesLength; i++) {
-					String attributeName = attributes.getLocalName(i);
-					String attributeValue = attributes.getValue(i);
-					if (attributeName.equals("propertiesLocation")) //$NON-NLS-1$
-					{
-						URL bundleURL = generatePropertiesFileURL(fFileInfo, attributeValue);
-						if (bundleURL != null) {
-							InputStream bundleStream = null;
-							try {
-								bundleStream = bundleURL.openStream();
-								resourceBundle = new PropertyResourceBundle(bundleStream);
-							}
-							catch (IOException e) {
-								Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-							}
-							finally {
-								try {
-									if (bundleStream != null)
-										bundleStream.close();
-								}
-								catch (IOException x) {
-									Logger.log(Logger.WARNING_DEBUG, x.getMessage(), x);
-								}
-							}
-						}
-					}
-					else if (attributeName.equals("caseSensitive")) //$NON-NLS-1$
-					{
-						if (attributeValue.trim().equals("false")) //$NON-NLS-1$
-						{
-							annotationMap.setCaseSensitive(false);
-						}
-					}
-				}
-			}
-			else if (localName.equals(TAG_ID_ANNOTATION)) {
-				currentAnnotation = null;
-				String specValue = attributes.getValue("spec"); //$NON-NLS-1$
-				if (specValue != null) {
-					currentAnnotation = new Annotation();
-					currentAnnotation.setSpec(specValue);
-				}
-				annotationMap.addAnnotation(currentAnnotation);
-			}
-			else if (localName.equals(TAG_ID_PROPERTY)) {
-				if (currentAnnotation != null) {
-					currentPropertyName = attributes.getValue("name"); //$NON-NLS-1$
-				}
-			}
-		}
-
-		public void endElement(String uri, String localName, String qName) throws SAXException {
-			if (currentPropertyName != null && currentAnnotation != null) {
-				String propertyValue = propertyValueBuffer.toString();
-				if (propertyValue != null) {
-					if (propertyValue.startsWith("%") && resourceBundle != null) //$NON-NLS-1$
-					{
-						try {
-							propertyValue = resourceBundle.getString(propertyValue.substring(1));
-						}
-						catch (Exception e) {
-							// ignore any exception that occurs while trying
-							// to fetch a resource
-						}
-					}
-					currentAnnotation.setProperty(currentPropertyName, propertyValue);
-				}
-			}
-
-			if (localName.equals(TAG_ID_ANNOTATION)) {
-				currentAnnotation = null;
-			}
-			else if (localName.equals(TAG_ID_PROPERTY)) {
-				currentPropertyName = null;
-			}
-		}
-
-		public void characters(char[] ch, int start, int length) {
-			if (currentPropertyName != null && currentAnnotation != null) {
-				propertyValueBuffer.append(ch, start, length);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/AnnotationFileRegistry.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/AnnotationFileRegistry.java
deleted file mode 100644
index e2d455b..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/AnnotationFileRegistry.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.xml.core.internal.contentmodel.internal.annotation;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * This class is used to associate one or more annotation files with a grammar
- * file.
- * 
- */
-public class AnnotationFileRegistry {
-	private Map map = new HashMap();
-
-	public AnnotationFileRegistry() {
-		new AnnotationFileRegistryReader(this).readRegistry();
-	}
-	
-	public synchronized List getAnnotationFilesInfos(String publicId) {
-		List theList = (List) map.get(publicId);
-		return theList != null ? theList : new ArrayList();
-	}
-		
-	public synchronized void addAnnotationFile(String publicId, AnnotationFileInfo fileInfo) {
-		List fileInfos = (List) map.get(publicId);
-		if (fileInfos == null) {
-			fileInfos = new ArrayList();
-			map.put(publicId, fileInfos);
-		}
-		fileInfos.add(fileInfo);
-	}
-
-	public synchronized void removeAnnotationFile(String publicId, AnnotationFileInfo fileInfo) {
-		List fileInfos = (List) map.get(publicId);
-		if (fileInfos != null) {
-			fileInfos.remove(fileInfo);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/AnnotationFileRegistryReader.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/AnnotationFileRegistryReader.java
deleted file mode 100644
index 896acd6..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/AnnotationFileRegistryReader.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.xml.core.internal.contentmodel.internal.annotation;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.internal.Logger;
-
-
-/**
- * This class reads the plugin manifests and adds each specified gramamr
- * annotation file with the AnnotationProvider
- */
-public class AnnotationFileRegistryReader {
-	protected static final String EXTENSION_POINT_ID = "annotationFiles"; //$NON-NLS-1$
-	protected static final String TAG_NAME = "annotationFile"; //$NON-NLS-1$
-	protected static final String ATT_PUBLIC_ID = "publicId"; //$NON-NLS-1$
-	protected static final String ATT_LOCATION = "location"; //$NON-NLS-1$
-
-	private AnnotationFileRegistry annotationFileRegistry;
-
-	public AnnotationFileRegistryReader(AnnotationFileRegistry annotationFileRegistry) {
-		this.annotationFileRegistry = annotationFileRegistry;
-	}
-
-	/**
-	 * read from plugin registry and parse it.
-	 */
-	public void readRegistry() {
-		IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-		String pluginId = "org.eclipse.wst.xml.core"; //$NON-NLS-1$
-		IExtensionPoint point = extensionRegistry.getExtensionPoint(pluginId, EXTENSION_POINT_ID);
-		if (point != null) {
-			IConfigurationElement[] elements = point.getConfigurationElements();
-			for (int i = 0; i < elements.length; i++) {
-				readElement(elements[i]);
-			}
-		}
-	}
-
-	/**
-	 * readElement() - parse and deal with an extension like:
-	 * 
-	 * <extension
-	 * point="org.eclipse.wst.xml.core.internal.contentmodel.util_implementation">
-	 * <util_implementation class =
-	 * corg.eclipse.wst.baseutil.CMUtilImplementationImpl /> </extension>
-	 */
-	protected void readElement(IConfigurationElement element) {
-		if (element.getName().equals(TAG_NAME)) {
-			String publicId = element.getAttribute(ATT_PUBLIC_ID);
-			String location = element.getAttribute(ATT_LOCATION);
-			if (publicId != null && location != null) {
-				try {
-					String bundleId = element.getNamespace();
-					AnnotationFileInfo fileInfo = new AnnotationFileInfo(location, bundleId);
-					annotationFileRegistry.addAnnotationFile(publicId, fileInfo);
-				}
-				catch (Exception e) {
-					Logger.logException("problem adding annotation file " + location, e); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/AnnotationUtility.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/AnnotationUtility.java
deleted file mode 100644
index 90aeb12..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/AnnotationUtility.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.xml.core.internal.contentmodel.internal.annotation;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.annotation.AnnotationMap;
-
-
-/**
- * 
- */
-public class AnnotationUtility {
-	public static void loadAnnotationsForGrammar(String publicId, CMDocument cmDocument) {
-		List annotationFiles = ContentModelManager.getInstance().getAnnotationFilesInfos(publicId);
-		AnnotationMap map = (AnnotationMap) cmDocument.getProperty("annotationMap"); //$NON-NLS-1$
-		if (map != null) {
-			for (Iterator i = annotationFiles.iterator(); i.hasNext();) {
-				try {
-					AnnotationFileInfo annotationFileInfo = (AnnotationFileInfo) i.next();
-					AnnotationFileParser parser = new AnnotationFileParser();
-					parser.parse(map, annotationFileInfo);
-				}
-				catch (Exception e) {
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/ResourceBundleHelper.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/ResourceBundleHelper.java
deleted file mode 100644
index 6870419..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/ResourceBundleHelper.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.internal.annotation;
-                     
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Platform;
-
-
-public class ResourceBundleHelper
-{
-  public static ResourceBundle getResourceBundle(String resourceURI, Locale targetLocale) throws Exception
-  {
-	  // try to load bundle from the location specified in the resourceURI
-    // we make the assumption that the resourceURI points to the local file system
-         
-    int index = resourceURI.lastIndexOf("/"); //$NON-NLS-1$
-    if (index == -1)
-    {
-      throw new Exception("Invalid resourceURI"); //$NON-NLS-1$
-    }                               
-
-    // Below we set 'resourceDirectory' so that it ends with a '/'.
-    // Here's an excerpt from the ClassLoader Javadoc ...
-    // Any URL that ends with a '/' is assumed to refer to a directory. Otherwise, the URL is assumed
-    // to refer to a JAR file which will be opened as needed. 
-    //
-    String resourceDirectory = resourceURI.substring(0, index + 1);
-    String resourceBundleName = resourceURI.substring(index + 1);
-    
-    // create a class loader with a class path that points to the resource bundle's location
-    //         
-    URL[] classpath = new URL[1];
-    classpath[0] = Platform.resolve(new URL(resourceDirectory));
-	  ClassLoader resourceLoader = new URLClassLoader(classpath, null); 
-       
-  	return ResourceBundle.getBundle(resourceBundleName, targetLocale, resourceLoader);
-	}  
-
-  public static ResourceBundle getResourceBundle(String resourceURI) throws Exception 
-  {
-	  return getResourceBundle(resourceURI, Locale.getDefault());
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/modelqueryimpl/InferredGrammarFactory.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/modelqueryimpl/InferredGrammarFactory.java
deleted file mode 100644
index 59bcfc7..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/modelqueryimpl/InferredGrammarFactory.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.internal.modelqueryimpl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMAnyElementImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMAttributeDeclarationImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMDocumentImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMElementDeclarationImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMGroupImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNamedNodeMapImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNodeListImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDescriptionBuilder;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
- 
-
-public class InferredGrammarFactory
-{                                      
-  public InferredGrammarFactory()
-  {
-  }
-
-  public CMDocument createCMDocument(String uri)
-  {                      
-    CMDocumentImpl cmdocument =new CMDocumentImpl(uri);
-    cmdocument.setInferred(true);
-    return cmdocument;
-  }    
- 
-  public CMElementDeclaration createCMElementDeclaration(CMDocument cmDocument, Element element, boolean isLocal)
-  {
-    String localName = element.getLocalName();                                   
-    CMDocumentImpl cmDocumentImpl = (CMDocumentImpl)cmDocument;
-
-    CMNamedNodeMapImpl elementMap = isLocal ?
-                                    (CMNamedNodeMapImpl)cmDocumentImpl.getLocalElementPool() :
-                                    (CMNamedNodeMapImpl)cmDocumentImpl.getElements();
-
-    CMElementDeclarationImpl ed = (CMElementDeclarationImpl)elementMap.getNamedItem(localName);
-    if (ed == null)
-    {                                                                                          
-      //System.out.println("create ed " + localName);
-      ed = new CMElementDeclarationImpl(cmDocument, localName);
-      ed.setInferred(true);
-      ed.setLocal(isLocal);
-      ed.setMaxOccur(1);
-      CMGroupImpl group = new CMGroupImpl(new CMNodeListImpl(), CMGroup.CHOICE);
-      group.setInferred(true);
-      group.setMinOccur(0);
-      group.setMaxOccur(-1);
-      ed.setContent(group);            
-      elementMap.put(ed);
-    } 
-
-    // lookup or create the attributes
-    //
-    NamedNodeMap attributeMap = element.getAttributes();
-    int attributeMapLength = attributeMap.getLength();
-    for (int i = 0; i < attributeMapLength; i++)
-    {
-      Attr attr = (Attr)attributeMap.item(i);
-      CMAttributeDeclarationImpl ad = (CMAttributeDeclarationImpl)ed.getAttributeMap().getNamedItem(attr.getNodeName());
-      if (ad == null)
-      {     
-        // todo... use an attribute pool to be more efficient?
-        ad = new CMAttributeDeclarationImpl(attr.getNodeName(), CMAttributeDeclaration.OPTIONAL);
-        ad.setInferred(true);
-        ed.getAttributeMap().put(ad);
-      }
-    }
-    return ed;
-  }         
-
-  public void createCMContent(CMDocument parentCMDocument, CMElementDeclaration parentEd, CMDocument childCMDocument, CMElementDeclaration childEd, boolean isLocal, String uri)
-  {
-    // add element to the parent's content
-    // consider all content to be of the form (A | B | C)*    
-    //
-    CMGroupImpl group = (CMGroupImpl)parentEd.getContent();
-    CMNodeListImpl groupChildNodeList = (CMNodeListImpl)group.getChildNodes();
-
-    if (parentCMDocument == childCMDocument)
-    {
-      if (!groupChildNodeList.contains(childEd))
-      {
-        groupChildNodeList.add(childEd);
-      }
-      if (isLocal)
-      {
-        CMNamedNodeMapImpl localElementMap = (CMNamedNodeMapImpl)parentEd.getLocalElements();
-        localElementMap.put(childEd);
-      }
-    }     
-    else
-    {                                                    
-      CMAnyElement cmAnyElement = lookupOrCreateCMAnyElement((CMDocumentImpl)parentCMDocument, uri);
-      if (!groupChildNodeList.contains(cmAnyElement))
-      {
-        groupChildNodeList.add(cmAnyElement);
-      }
-    }      
-  }   
-
-  protected CMAnyElement lookupOrCreateCMAnyElement(CMDocumentImpl parentCMDocument, String uri)
-  {
-    CMNamedNodeMapImpl anyElementMap = parentCMDocument.getAnyElements();
-    CMAnyElementImpl anyElement = (CMAnyElementImpl)anyElementMap.getNamedItem(CMAnyElementImpl.computeNodeName(uri));
-    if (anyElement == null)
-    {                                                                                     
-      //System.out.println("create anyElement " + uri);
-      anyElement = new CMAnyElementImpl(uri);
-      anyElement.setInferred(true);
-      anyElementMap.put(anyElement);
-    }
-    return anyElement;
-  } 
-      
-
-  public void debugPrint(Collection collection)
-  {                
-    for (Iterator iter = collection.iterator(); iter.hasNext(); )
-    {
-      CMDocument cmDocument = (CMDocument)iter.next(); 
-      System.out.println("-----------------------------------------------"); //$NON-NLS-1$
-      System.out.println("cmDocument (" + cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI") +")");  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-      CMNamedNodeMapImpl elementMap = (CMNamedNodeMapImpl)cmDocument.getElements();
-      int size = elementMap.getLength();
-      for (int i = 0; i < size; i++)
-      {
-        CMElementDeclaration ed = (CMElementDeclaration)elementMap.item(i);
-        CMDescriptionBuilder builder = new CMDescriptionBuilder();
-        System.out.println("  ELEMENT " + ed.getNodeName() + " = " + builder.buildDescription(ed)); //$NON-NLS-1$ //$NON-NLS-2$
-      }
-    }
-  }        
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/modelqueryimpl/ModelQueryExtensionDescriptor.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/modelqueryimpl/ModelQueryExtensionDescriptor.java
deleted file mode 100644
index 93e43a1..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/modelqueryimpl/ModelQueryExtensionDescriptor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.wst.xml.core.internal.contentmodel.internal.modelqueryimpl;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.extension.ModelQueryExtension;
-
-;
-/**
- * Describes an extension to the <code>modelQueryExtension</code> extension
- * point.
- * 
- */
-public class ModelQueryExtensionDescriptor
-{
-  private static final String CONTENT_TYPE_ATTRIBUTE = "contentType"; //$NON-NLS-1$
-  private static final String NAMESPACE_ATTRIBUTE = "namespace"; //$NON-NLS-1$
-  private static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
-  private IConfigurationElement configuration;
-  private String contentTypeId;
-  private String namespace;
-  private ModelQueryExtension extension;
-
-  public ModelQueryExtensionDescriptor(IConfigurationElement element)
-  {
-    configuration = element;
-  }
-
-  public ModelQueryExtension createModelQueryExtension() throws CoreException
-  {
-    if (extension == null)
-    {  
-      extension = (ModelQueryExtension) configuration.createExecutableExtension(CLASS_ATTRIBUTE);
-    }  
-    return extension;
-  }
-
-  public String getContentTypeId()
-  {
-    if (contentTypeId == null)
-    {
-      contentTypeId = configuration.getAttribute(CONTENT_TYPE_ATTRIBUTE);
-    }
-    return contentTypeId;
-  }
-
-  public String getNamespace()
-  {
-    if (namespace == null)
-    {
-      namespace = configuration.getAttribute(NAMESPACE_ATTRIBUTE);
-    }
-    return namespace;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/modelqueryimpl/ModelQueryExtensionManagerImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/modelqueryimpl/ModelQueryExtensionManagerImpl.java
deleted file mode 100644
index 81136f0..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/modelqueryimpl/ModelQueryExtensionManagerImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.internal.modelqueryimpl;
-        
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.extension.ModelQueryExtension;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.extension.ModelQueryExtensionManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-
-public class ModelQueryExtensionManagerImpl implements ModelQueryExtensionManager
-{           
-  protected ModelQueryExtensionRegistry modelQueryExtensionRegistry = new ModelQueryExtensionRegistry();
-
-  public List getDataTypeValues(Element element, CMNode cmNode)
-  {    
-    List list = new ArrayList();      
-    String contentTypeId = getContentTypeId(element);
-    String namespace = getNamespace(cmNode);
-    String name = cmNode.getNodeName();
-    
-    for (Iterator i = modelQueryExtensionRegistry.getApplicableExtensions(contentTypeId, namespace).iterator(); i.hasNext();)
-    {
-      ModelQueryExtension extension = (ModelQueryExtension)i.next();
-      String[] values = null;
-      if (cmNode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION)
-      {  
-        values = extension.getAttributeValues(element, namespace, name);
-      }
-      else
-      {
-        values = extension.getElementValues(element, namespace, name);        
-      }
-      if (values != null)
-      {
-        list.addAll(Arrays.asList(values));
-      }  
-    }  
-    return list;  
-  }                               
-
-  public void filterAvailableElementContent(List cmnodes, Element element, CMElementDeclaration ed)
-  {
-    String contentTypeId = getContentTypeId(element);
-    String parentNamespace = element.getNamespaceURI();
-
-	List modelQueryExtensions = modelQueryExtensionRegistry.getApplicableExtensions(contentTypeId, parentNamespace);
-	
-    for (Iterator j = cmnodes.iterator(); j.hasNext(); )
-    {
-      CMNode cmNode = (CMNode)j.next();  
-      String namespace = getNamespace(cmNode);
-      String name = cmNode.getNodeName();
-      
-      boolean include = true;
-      for(int k = 0; k < modelQueryExtensions.size() && include; k++) {
-      {
-          ModelQueryExtension extension = (ModelQueryExtension)modelQueryExtensions.get(k);
-          include = extension.isApplicableChildElement(element, namespace, name);
-          if (!include)
-		  {
-            // remove the cmNode from the list
-            j.remove();
-          }
-        }
-      }
-    }
-  }
-  
-  private String getNamespace(CMNode cmNode)
-  {
-    String namespace = null;
-    CMDocument cmDocument = (CMDocument)cmNode.getProperty("CMDocument"); //$NON-NLS-1$
-    if (cmDocument != null)          
-    {     
-      namespace = (String)cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI");    //$NON-NLS-1$
-    }
-    return namespace;
-  }
-  
-  private String getContentTypeId(Node node)
-  {
-    String contentTypeId = "org.eclipse.core.runtime.xml"; //$NON-NLS-1$
-    if (node instanceof IDOMNode)
-    {
-      IDOMNode domNode = (IDOMNode) node;
-      contentTypeId = domNode.getModel().getContentTypeIdentifier();
-    }   
-    return contentTypeId;
-  } 
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/modelqueryimpl/ModelQueryExtensionRegistry.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/modelqueryimpl/ModelQueryExtensionRegistry.java
deleted file mode 100644
index 63261d3..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/modelqueryimpl/ModelQueryExtensionRegistry.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.contentmodel.internal.modelqueryimpl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.extension.ModelQueryExtension;
-
-public class ModelQueryExtensionRegistry
-{
-  protected static final String EXTENSION_POINT_ID = "modelQueryExtensions"; //$NON-NLS-1$
-  protected static final String TAG_NAME = "modelQueryExtension"; //$NON-NLS-1$
-  private List descriptors;
-
-  public List getApplicableExtensions(String contentTypeId, String namespace)
-  {
-    List list = new ArrayList();
-    if (contentTypeId != null)
-    {
-      ensureExtensionsLoaded();
-      for (Iterator i = descriptors.iterator(); i.hasNext();)
-      {
-        ModelQueryExtensionDescriptor descriptor = (ModelQueryExtensionDescriptor) i.next();
-        if (contentTypeId.equals(descriptor.getContentTypeId()))
-        {
-          if (descriptor.getNamespace() == null ||  descriptor.getNamespace().equals(namespace))
-          {  
-            try
-            {
-              ModelQueryExtension extension = descriptor.createModelQueryExtension();
-              list.add(extension);
-            }
-            catch (CoreException e) {
-            	Logger.logException("problem creating model query extension", e); //$NON-NLS-1$
-            }
-          }  
-        }
-      }
-    }
-    return list;
-  }
-  
-  /*
-   *  TODO : consider providing a non-plugin means add/remove extensions
-   *   
-  public void addExtension(ModelQueryExtension extension)
-  {     
-  }
-
-  public void removeExtension(ModelQueryExtensionDeprecated extension)
-  {
-  }*/
-
-  /**
-   * Reads all extensions.
-   * <p>
-   * This method can be called more than once in order to reload from a changed
-   * extension registry.
-   * </p>
-   */
-  private synchronized void reloadExtensions()
-  {
-    descriptors = new ArrayList();
-    String bundleid = "org.eclipse.wst.xml.core"; //$NON-NLS-1$      
-    IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(bundleid, EXTENSION_POINT_ID);
-    for (int i = 0; i < elements.length; i++)
-    {
-      ModelQueryExtensionDescriptor descriptor = new ModelQueryExtensionDescriptor(elements[i]);
-      descriptors.add(descriptor);
-    }
-  }
-
-  /**
-   * Ensures the extensions have been loaded at least once.
-   */
-  private void ensureExtensionsLoaded()
-  {
-    if (descriptors == null)
-    {
-      reloadExtensions();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/util/CMDataTypeValueHelper.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/util/CMDataTypeValueHelper.java
deleted file mode 100644
index f027bf7..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/util/CMDataTypeValueHelper.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.internal.util;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceTable;
-
-
-public class CMDataTypeValueHelper
-{
-  protected int idCount = 0;
-
-
-  public String getValue(CMAttributeDeclaration ad, NamespaceTable namespaceTable)
-  {
-    String value = null;
-       
-    if (isXSIType(ad))         
-    {       
-      List list = getQualifiedXSITypes(ad, namespaceTable);
-      value = list.size() > 0 ? (String)list.get(0) : null;
-    } 
-
-    // shameless hack
-    //
-    if (value == null)
-    {
-      if (ad.getAttrName().equals("xml:lang"))     //$NON-NLS-1$
-      {
-        value = "EN"; //$NON-NLS-1$
-      }
-    }
-
-    if (value == null)
-    {
-      CMDataType dataType = ad.getAttrType();
-      if (dataType != null)
-      {
-        value = getValue(dataType);
-      }
-    }
-    return value;
-  }
-
-
-  public String getValue(CMDataType dataType)
-  {
-    String value = null;
-    value = dataType.getImpliedValue();
-
-    if (value == null)
-    {
-      String[] values = dataType.getEnumeratedValues();
-      if (values != null && values.length > 0)
-      {
-        value = values[0];
-      }
-    }
-
-    if (value == null)
-    {
-      value = dataType.generateInstanceValue();
-    }               
-
-    // Here is a special case where we handle DTD's ID related datatypes.
-    // These values must be generated/validate by considering the entire xml file
-    // so we can't rely on the 'generateInstanceValue' method.
-    //
-    // todo... find a nicer way to handle this    
-    if (value == null)
-    {
-      String dataTypeName = dataType.getDataTypeName();
-      if (dataTypeName != null)
-      {
-        if (dataTypeName.equals("ID")) //$NON-NLS-1$
-        {
-          value = "idvalue" + idCount++; //$NON-NLS-1$
-        }
-        else if (dataTypeName.equals("IDREF") || dataTypeName.equals("IDREFS")) //$NON-NLS-1$ //$NON-NLS-2$
-        {
-          value = "idvalue0"; //$NON-NLS-1$
-        }
-      }
-    }     
-    return value;
-  } 
-      
-
-  public boolean isValidEmptyValue(CMAttributeDeclaration ad)
-  {    
-    boolean result = true;
-    CMDataType dataType = ad.getAttrType();
-    if (dataType != null)
-    {                                                          
-      String propertyValue = (String)dataType.getProperty("isValidEmptyValue"); //$NON-NLS-1$
-      if (propertyValue != null && propertyValue.equals("false")) //$NON-NLS-1$
-      {
-        result = false;
-      }
-    }   
-    return result;
-  }
-
-
-  public boolean isXSIType(CMAttributeDeclaration ad)
-  {         
-    boolean result = false;
-    if (ad.getNodeName().equals("type"))  //$NON-NLS-1$
-    {
-      CMDocument cmDocument = (CMDocument)ad.getProperty("CMDocument"); //$NON-NLS-1$
-      if (cmDocument != null)
-      {
-        String namespaceName = (String)cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI"); //$NON-NLS-1$
-        if (namespaceName != null && namespaceName.equals("http://www.w3.org/2001/XMLSchema-instance")) //$NON-NLS-1$
-        {           
-          result = true;
-        }
-      }
-    }                   
-    return result;
-  }
-   
-
-  public List getQualifiedXSITypes(CMAttributeDeclaration ad, NamespaceTable table)
-  {          
-    List list = new Vector();                                                 
-                                       
-    List xsiTypes = (List)ad.getProperty("XSITypes"); //$NON-NLS-1$
-    if (xsiTypes != null && xsiTypes.size() > 0)
-    {
-      for (Iterator i = xsiTypes.iterator(); i.hasNext(); )
-      { 
-        String uriQualifiedName = (String)i.next();
-        String[] components = DOMNamespaceHelper.getURIQualifiedNameComponents(uriQualifiedName);  
-        String prefix = table.getPrefixForURI(components[0] != null ? components[0] : ""); //$NON-NLS-1$
-        String typeName = (prefix != null && prefix.length() > 0) ? 
-                           prefix + ":" + components[1] :  //$NON-NLS-1$
-                           components[1];
-        list.add(typeName);
-      }
-    }           
-    return list;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/util/CMValidator.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/util/CMValidator.java
deleted file mode 100644
index 0cb9bd5..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/util/CMValidator.java
+++ /dev/null
@@ -1,1244 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.internal.util;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
-
-
-
-public class CMValidator
-{
-  protected static StringElementContentComparator stringContentComparitor = new StringElementContentComparator();
-  protected Hashtable graphNodeTable = new Hashtable();
-
-  /**
-   * GraphNode
-   */
-  protected static class GraphNode
-  {
-    public String name;
-    public boolean isTerminal;
-    public Vector arcList = new Vector();
-
-    public GraphNode(String name)
-    {
-      this.name = name;
-    }
-
-    public void addArc(Arc arc)
-    {
-      arcList.addElement(arc);
-    }
-
-    public String toString()
-    {
-      return "[GraphNode " + name + "]"; //$NON-NLS-1$ //$NON-NLS-2$
-    }
-  }
-
-
-  /**
-   * Arc
-   */
-  protected static class Arc
-  {
-    public static final int ELEMENT  = 1;
-    public static final int REPEAT   = 2;
-    public static final int OPTIONAL = 3;
-    public static final int PREV_IN  = 4;
-    public static final int OUT_NEXT = 5;
-    public static final int LINK     = 6;
-
-    public int kind;
-    public String name;
-    public GraphNode node;
-    public CMNode cmNode;
-
-    public Arc(int kind, GraphNode node, CMNode cmNode)
-    {
-      this(kind, "", node, cmNode); //$NON-NLS-1$
-    }
-
-    protected Arc(int kind, String name, GraphNode node, CMNode cmNode)
-    {
-      this.name = name;
-      this.kind = kind;
-      this.node = node;
-      this.cmNode = cmNode;
-    }
-  }
-
-
-  /**
-   * GraphGenerator
-   */
-  protected static class GraphGenerator extends CMVisitor
-  {
-    public int indent;
-    public int count;
-    public GraphNode startGraphNode;
-    public Context context;
-
-    protected static class Context
-    {
-      GraphNode from;
-      GraphNode to;
-
-      Context(GraphNode from, GraphNode to)
-      {
-        this.from = from;
-        this.to = to;
-      }
-
-      GraphNode getLastGraphNode()
-      {
-        return (to != null) ? to : from;
-      }
-    }
-
-
-    protected GraphGenerator()
-    {
-      startGraphNode = new GraphNode(getGraphNodeName());
-      context = new Context(startGraphNode, null);
-    }
-
-
-    protected void generateGraph(CMElementDeclaration ed)
-    {
-      int contentType = ed.getContentType();
-
-      if (contentType == CMElementDeclaration.MIXED ||
-          contentType == CMElementDeclaration.ELEMENT)
-      {
-        visitCMNode(ed.getContent());
-      }
-      // CMElementDeclaration.PCDATA... no graph required
-      // CMElementDeclaration.ANY... no graph required
-      context.getLastGraphNode().isTerminal = true;
-    }
-
-
-    protected String getGraphNodeName()
-    {
-      return "n" + count++; //$NON-NLS-1$
-    }
-
-
-    protected GraphNode getStartGraphNode()
-    {
-      return startGraphNode;
-    }
-
-
-    /**
-     *                repeat
-     *             +----#-----+
-     *             |          |
-     *             v          |
-     *  prev --#-> in --'x'-> out --#-> next
-     *  |                               ^
-     *  |                               |
-     *  +----------------#--------------+
-     *                optional
-     *
-     */
-    protected void createArcs(GraphNode in, GraphNode out, CMContent cmContent)
-    {
-      createArcs(in, out, cmContent, false);
-    }
-
-    protected void createArcs(GraphNode in, GraphNode out, CMContent cmContent, boolean isAllGroup)
-    {
-      //println("+createArcs() " + ed.getDescription() + " " + ed.getMinOccur());
-      GraphNode prev = context.from;
-      GraphNode next = new GraphNode(getGraphNodeName());
-
-      prev.addArc(new Arc(Arc.PREV_IN, in, cmContent));
-      out.addArc(new Arc(Arc.OUT_NEXT, next, cmContent));
-
-      if (context.to != null)
-      {
-        next.addArc(new Arc(Arc.LINK, context.to, cmContent));
-      }
-      else
-      {
-        context.from = next;
-      }
-
-      if (cmContent.getMinOccur() == 0)
-      {
-        // todo... should we see if an optional arc has already been added?
-        prev.addArc(new Arc(Arc.OPTIONAL, next, cmContent));
-      }
-
-      if (cmContent.getMaxOccur() == -1 || cmContent.getMaxOccur() > 1 || isAllGroup)
-      {
-        out.addArc(new Arc(Arc.REPEAT, in, cmContent));
-      }
-    }
-
-
-    public void visitCMGroup(CMGroup group)
-    {
-      Context prevContext = context;
-      GraphNode in = new GraphNode("(" + getGraphNodeName()); //$NON-NLS-1$
-      GraphNode out = new GraphNode(")" + getGraphNodeName()); //$NON-NLS-1$
-
-      int groupOperator = group.getOperator();
-      if (groupOperator == CMGroup.SEQUENCE)
-      {
-        context = new Context(in, null);
-        super.visitCMGroup(group);
-        context.from.addArc(new Arc(Arc.LINK, out, group));
-      }
-      else if (groupOperator == CMGroup.CHOICE ||
-               groupOperator == CMGroup.ALL)
-      {
-        context = new Context(in, out);
-        super.visitCMGroup(group);
-      }
-
-      context = prevContext;
-      createArcs(in, out, group, groupOperator == CMGroup.ALL);
-    }
-
-
-    public void visitCMElementDeclaration(CMElementDeclaration ed)
-    {
-      GraphNode in = new GraphNode(getGraphNodeName());
-      GraphNode out = new GraphNode(getGraphNodeName());
-      createArcs(in, out, ed);
-      in.addArc(new Arc(Arc.ELEMENT, ed.getElementName(), out, ed));
-    }
-                            
-
-    public void visitCMAnyElement(CMAnyElement anyElement)
-    {
-      GraphNode in = new GraphNode(getGraphNodeName());
-      GraphNode out = new GraphNode(getGraphNodeName());
-      createArcs(in, out, anyElement);
-      in.addArc(new Arc(Arc.ELEMENT, "any", out, anyElement)); //$NON-NLS-1$
-    }
-  }
-
-  // todo.. implement cache strategy hook, handle name spaces, locals etc.
-  //
-  public GraphNode lookupOrCreateGraph(CMElementDeclaration element)
-  {
-    Object key = element;
-    GraphNode node = (GraphNode)graphNodeTable.get(key);
-    if (node == null)
-    {
-      node = createGraph(element);
-      graphNodeTable.put(key, node);
-    }
-    return node;
-  }
-
-  public GraphNode createGraph(CMElementDeclaration element)
-  {
-    GraphGenerator generator = new GraphGenerator();
-    generator.generateGraph(element);
-    return generator.getStartGraphNode();
-  }
-
-
-  public void printGraph(GraphNode node, Vector namedArcList, Vector unamedArcList, int indent)
-  {
-    //String decoration = node.isTerminal ? " *" : "";
-    //printlnIndented(indent, "GraphNode:" + node.name + decoration);
-
-    indent += 2;
-    for (Enumeration e = node.arcList.elements() ; e.hasMoreElements() ;)
-    {
-      Arc arc = (Arc)e.nextElement();
-      //boolean visit = false;
-      //printlnIndented(indent, "Arc:" + arc.name + " (" + arc.kind + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-      if (arc.kind == Arc.ELEMENT)
-      {
-        //table.add(currentGrammarObject, arc.grammarObject);
-        if (!namedArcList.contains(arc))
-        {
-          namedArcList.add(arc);
-          unamedArcList = new Vector();
-          printGraph(arc.node, namedArcList, unamedArcList, indent + 2);
-        }
-      }
-      else
-      {
-        if (!unamedArcList.contains(arc))
-        {
-          unamedArcList.add(arc);
-          printGraph(arc.node, namedArcList, unamedArcList, indent + 2);
-        }
-      }
-    }
-  }
-
-  public void printGraph(GraphNode node)
-  {
-    printGraph(node, new Vector(), new Vector(), 0);
-  }
-
-
-  public void validateElementList(ElementList list, GraphNode node, ElementContentComparator comparator, Result result, boolean loopFlag)
-  {
-    //println("+validateElementList " + node + " " + list);
-    if (list == null && node.isTerminal)
-    {
-      result.isValid = true;
-    }
-    else
-    {
-      for (Iterator i = node.arcList.iterator(); i.hasNext();)
-      {
-        Arc arc = (Arc)i.next();
-        boolean traverseArc = false;
-        if (arc.kind == Arc.ELEMENT)
-        {
-          if (list != null && comparator.matches(list.head, arc.cmNode))
-          {
-            loopFlag = false;
-            traverseArc = true;
-            list = list.tail; // increment our position in the list
-          }
-        }
-        else if (arc.kind == Arc.REPEAT)
-        {
-          if (!loopFlag)
-          {
-            traverseArc = true;
-          }
-          loopFlag = true;
-        }
-        else
-        {
-          traverseArc = true;
-        }
-
-        if (traverseArc)
-        {
-          // test to see if we can push this arc due to facet constraints
-          //
-          if (result.canPush(arc))
-          {          
-            // see if this arc leads to a correct solution          
-            result.push(arc);
-            validateElementList(list, arc.node, comparator, result, loopFlag);
-            if (result.isValid)
-            {
-              break;
-            }
-            result.pop(arc);
-          }
-        }
-      }
-    }
-  }
-
-
-  /**
-   *
-   */
-  protected static ElementList createElementList(int contentType, List v, ElementContentComparator comparator, Result result)
-  {
-    ElementList first = null;
-    ElementList prev = null;
-
-    int size = v.size();
-    for (int i = 0; i < size; i++)
-    {
-      Object o = v.get(i);
-      if (o != null && !comparator.isIgnorable(o))
-      {
-        if (comparator.isElement(o))
-        {
-          ElementList list = new ElementList();
-          list.head = o;
-
-          if (prev != null)
-          {
-            prev.tail = list;
-          }
-          else
-          {
-            first = list;
-          }
-          prev = list;
-        }
-        else if (contentType == CMElementDeclaration.ELEMENT)
-        {
-          result.isValid = false;
-          result.errorIndex = i;
-          result.errorMessage = "Element can not include PCDATA content"; //$NON-NLS-1$
-        }
-      }
-    }
-    return first;
-  }
-
-  /**
-   *
-   */
-  public void validate(CMElementDeclaration ed, List elementContent, ElementContentComparator comparator, Result result)
-  {
-    int contentType = ed.getContentType();
-
-    if (contentType == CMElementDeclaration.MIXED ||
-        contentType == CMElementDeclaration.ELEMENT)
-    {
-      ElementList elementList = createElementList(contentType, elementContent, comparator, result);
-      if (result.isValid == true)
-      {  
-        // defect 226213 ... elements with a large number of children will cause the recursion based validation
-        // algorithm to stack overflow ... as a quick fix assume any element with a large number of children is valid        
-        if (elementContent.size() < 500)
-        {
-          boolean isGraphValidationNeeded = !(elementList == null && contentType == CMElementDeclaration.MIXED);
-                      
-          // exlicity handle 'All' groups
-          //
-          CMContent content = ed.getContent();
-          if (content.getNodeType() == CMNode.GROUP)
-          {
-            CMGroup group = (CMGroup)content;
-            if (group.getOperator() == CMGroup.ALL)
-            {
-              isGraphValidationNeeded = false;
-              validatAllGroupContent(elementContent, comparator, group, result);                               
-            }              
-          }  
-          
-          if (isGraphValidationNeeded)
-          {
-            // validate the elementList using a graph
-            //
-            result.isValid = false;
-            GraphNode node = lookupOrCreateGraph(ed);
-            validateElementList(elementList, node, comparator, result, false);
-          }
-        }
-      }
-    }
-    else if (contentType == CMElementDeclaration.PCDATA)
-    {
-      int size = elementContent.size();
-      for (int i = 0; i < size; i++)
-      {
-        Object o = elementContent.get(i);
-        if (comparator.isElement(o))
-        {
-          result.isValid = false;
-          result.errorIndex = i;
-          result.errorMessage = "Element may only include PCDATA content"; //$NON-NLS-1$
-          break;
-        }
-      }
-    }
-    else if (contentType == CMElementDeclaration.EMPTY)
-    {
-      int size = elementContent.size();
-      for (int i = 0; i < size; i++)
-      {
-        Object o = elementContent.get(i);
-        if (!comparator.isIgnorable(o))
-        {
-          result.isValid = false;
-          result.errorIndex = i;
-          result.errorMessage = "Element may not contain PCDATA or Element content"; //$NON-NLS-1$
-          break;
-        }
-      }
-    }
-    //else if (contentType == CMElementDeclaration.ANY)
-    // {
-    //   assume elementContent will always be valid for this content type
-    // }
-  }
-    
-  static class ItemCount
-  {
-    int count = 0;    
-  }
-  
-  private void validatAllGroupContent(List elementContent, ElementContentComparator comparator, CMGroup allGroup, Result result) 
-  {
-    boolean isValid = true;
-    boolean isPartiallyValid = true;
-    HashMap map = new HashMap();
-    CMNodeList list = allGroup.getChildNodes();
-    for (int j = list.getLength() - 1; j >= 0; j--)
-    {
-      CMNode node = list.item(j);      
-      if (map.get(node) == null)
-      {  
-        map.put(node, new ItemCount());
-      }  
-    }    
-    int validitionCount = 0;
-    for (Iterator i = elementContent.iterator(); i.hasNext(); validitionCount++)
-    {
-      Object o = i.next();        
-      if (comparator.isElement(o))
-      {              
-        // test to see if the element is listed in the all group
-        //
-        CMNode matchingCMNode = null;
-        for (int j = list.getLength() - 1; j >= 0; j--)
-        {
-          CMNode node = list.item(j);
-          if (comparator.matches(o, node))
-          {
-            matchingCMNode = node;
-            break;
-          }             
-        }                              
-        if (matchingCMNode == null)
-        {     
-          isPartiallyValid = false;
-          isValid = false;
-          break;
-        }
-        else
-        {  
-          // test to see that the element occurs only once
-          //
-          ItemCount itemCount = (ItemCount)map.get(matchingCMNode);
-          if (itemCount != null)
-          {  
-            if (itemCount.count > 0)
-            {
-              // we don't want to allow too many elements!
-              // we consider 'not enough' to be partially valid... but not 'too many'
-              isPartiallyValid = false;
-              break;
-            }  
-            else
-            {
-              itemCount.count++;
-            }  
-          }
-        }  
-      }  
-    }
-    if (isValid)
-    {  
-      for (int j = list.getLength() - 1; j >= 0; j--)
-      {
-        CMNode node = list.item(j);      
-        if (node.getNodeType() == CMNode.ELEMENT_DECLARATION)
-        {  
-          CMContent content = (CMContent)node;
-          ItemCount itemCount = (ItemCount)map.get(node);
-//          System.out.print("content " + content.getNodeName() + " " + content.getMinOccur());
-          if (itemCount.count < content.getMinOccur())
-          {  
-            isValid = false;
-            break;
-          }  
-        }  
-      }
-    }
-    if (result instanceof ElementPathRecordingResult && isPartiallyValid)
-    {
-      ((ElementPathRecordingResult)result).setPartialValidationCount(validitionCount);
-    }  
-    result.isValid = isValid;
-  }  
-  
-  
-  public void getOriginArray(CMElementDeclaration ed, List elementContent, ElementContentComparator comparator, ElementPathRecordingResult result)
-  {
-    CMNode[] cmNodeArray = null;
-    validate(ed, elementContent, comparator, result);
-    if (result.isValid)
-    {
-      CMDataType dataType = ed.getDataType();
-      int size = elementContent.size();
-      cmNodeArray = new CMNode[size];
-      Vector originList = result.getElementOriginList();
-      int originListSize = originList.size(); 
-      int originListIndex = 0;
-      for (int i = 0; i < size; i++)
-      {
-        Object o = elementContent.get(i);
-        if (comparator.isElement(o))
-        {     
-          if (originListIndex < originListSize)
-          {
-            cmNodeArray[i] = (CMNode)originList.get(originListIndex);
-            originListIndex++;
-          }
-        }
-        else if (comparator.isPCData(o))
-        {
-          cmNodeArray[i] = dataType;
-        }
-        // else the CMNode at this index is null
-      }
-      result.setOriginArray(cmNodeArray);
-    }
-  }
-  
-  private void collectNamedArcs(GraphNode node, List namedArcList, int indent)
-  {
-    //printlnIndented(indent, "GraphNode:" + node.name + decoration);
-    indent += 2;
-    for (Iterator i = node.arcList.iterator(); i.hasNext() ;)
-    {
-      Arc arc = (Arc)i.next();
-      //printlnIndented(indent, "Arc:" + arc.name + " (" + arc.kind + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-      if (arc.kind == Arc.ELEMENT)
-      { 
-        if (!namedArcList.contains(arc))
-        {
-          namedArcList.add(arc);
-          collectNamedArcs(arc.node, namedArcList, indent + 2);
-        }
-      }
-      else if (arc.kind != Arc.REPEAT && arc.kind != Arc.OPTIONAL)
-      {
-        collectNamedArcs(arc.node, namedArcList, indent + 2);
-      }
-    }
-  }
-  
-  
-  private List getMatchingArcs(CMElementDeclaration ed, String elementName)
-  {
-    List arcList = new ArrayList();
-    GraphNode graphNode = lookupOrCreateGraph(ed);
-    if (elementName == null)
-    {
-      // here we add the 'root' arc
-      for (Iterator i = graphNode.arcList.iterator(); i.hasNext() ;)
-      {
-        Arc arc = (Arc)i.next();
-        if (arc.kind == Arc.PREV_IN)
-        {
-          arcList.add(arc);
-          break;
-        }  
-      }
-    }
-    else
-    { 
-      List namedArcs = new ArrayList();
-      collectNamedArcs(graphNode, namedArcs, 0);
-      for (Iterator i = namedArcs.iterator(); i.hasNext(); )
-      {
-        Arc arc = (Arc)i.next();
-        if (arc.cmNode != null && elementName.equals(arc.cmNode.getNodeName()))
-        {  
-          arcList.add(arc);
-        }  
-      }  
-    }      
-    return arcList;
-  }
-
-  
-  private void collectNextSiblings(GraphNode node, List nextSiblingList, List namedArcList, List unamedArcList, int indent)
-  {
-    //printlnIndented(indent, "GraphNode:" + node.name + decoration);
-    indent += 2;
-    for (Iterator i = node.arcList.iterator(); i.hasNext(); )
-    {
-      Arc arc = (Arc)i.next();
-      if (arc.kind == Arc.ELEMENT)
-      {       
-        if (!namedArcList.contains(arc))
-        {
-          if (arc.cmNode != null)
-          {  
-            nextSiblingList.add(arc.cmNode);
-            if (arc.cmNode.getNodeType() == CMNode.ELEMENT_DECLARATION ||
-                arc.cmNode.getNodeType() == CMNode.ANY_ELEMENT)
-            {              
-              namedArcList.add(arc);
-              CMContent cmNode = (CMContent)arc.cmNode; 
-              if (cmNode.getMinOccur() == 0)
-              {
-                unamedArcList = new ArrayList();
-                collectNextSiblings(arc.node, nextSiblingList, namedArcList, unamedArcList, indent + 2);
-              }
-            }            
-          }
-        }
-      }  
-      else
-      {
-        if (!unamedArcList.contains(arc))
-        {
-          unamedArcList.add(arc);
-          collectNextSiblings(arc.node, nextSiblingList, namedArcList, unamedArcList, indent + 2);
-        }
-      }
-    }  
-  }
-    
-  public CMNode[] getNextSiblings(CMElementDeclaration ed, String elementName)
-  {
-    List arcList = getMatchingArcs(ed, elementName);
-    List nextSiblingList = new ArrayList();
-    for (Iterator i = arcList.iterator(); i.hasNext(); )
-    {
-      Arc arc = (Arc)i.next();
-      collectNextSiblings(arc.node, nextSiblingList, new ArrayList(), new ArrayList(), 0);      
-    }  
-    CMNode[] result = new CMNode[nextSiblingList.size()];
-    nextSiblingList.toArray(result);    
-    //System.out.print("getNextSibling(" +elementName + ")");
-    //for (int i = 0; i < result.length; i++)
-    //{
-    //  System.out.print("[" + result[i].getNodeName() + "]");
-    //}  
-    //System.out.println();
-    return result;
-  }
-
-  /**
-   *
-   */
-  public static class Result
-  {
-    public boolean isValid = true;
-    public int errorIndex = -1;
-    public String errorMessage;
-    public boolean isRepeatTraversed; // detects if a repeat has been traversed
-
-    public boolean canPush(Arc arc)
-    {
-      return true;
-    }
-    
-    public void push(Arc arc)
-    {
-      // overide this method to record traversed nodes
-    }
-    public void pop(Arc arc)
-    {
-      // overide this method to record traversed nodes
-    }
-    public CMNode[] getOriginArray()
-    {
-      return null;
-    }
-  }
-
-  /**
-   *
-   */
-  public static class ElementPathRecordingResult extends Result
-  {  
-    protected List activeItemCountList = new ArrayList();
-    protected List inactiveItemCountList = new ArrayList();    
-    protected Vector elementOriginStack = new Vector();
-    protected CMNode[] originArray = null;
-    protected int partialValidationCount = 0;
-
-    
-    // this method is used to support facet counts
-    //
-    public boolean canPush(Arc arc)
-    {     
-      boolean result = true;        
-      try
-      {        
-        if (arc.kind == Arc.REPEAT)
-        {          
-          if (arc.cmNode instanceof CMContent)
-          {
-            CMContent content = (CMContent)arc.cmNode;
-            
-            // we only need to do 'special' facet checking if the maxOccurs is > 1
-            // values of '0' and '-1' (unbounded) work 'for free' without any special checking
-            //
-            if (content.getMaxOccur() > 1)
-            {  
-              ItemCount itemCount = (ItemCount)activeItemCountList.get(activeItemCountList.size() - 1);
-              
-              // here we need to compute if we can do another repeat
-              // if we increase the repeat count by '1' will this violate the maxOccurs
-              //
-              if (itemCount.count + 1 >= content.getMaxOccur())
-              {
-                result = false;
-              }
-            }
-            //System.out.println("canPush REPEAT (" + itemCount.count + ")" + content.getNodeName() + " result= " + result);            
-          } 
-        }       
-      }
-      catch (Exception e)
-      {
-        e.printStackTrace();
-      }
-      //System.out.flush();
-      return result;
-    }
-    
-    public void push(Arc arc)
-    {
-      if (arc.kind == Arc.ELEMENT)
-      {
-        //System.out.println("[X]push(" + arc.kind + ")" + arc.cmNode.getNodeName());
-        elementOriginStack.add(arc.cmNode);
-        partialValidationCount = Math.max(elementOriginStack.size(), partialValidationCount);
-      }
-      else if (arc.kind == Arc.PREV_IN)
-      {
-        //System.out.println("[X]push(" + arc.kind + ")" + arc.cmNode.getNodeName());
-        activeItemCountList.add(new ItemCount());   
-      }
-      else if (arc.kind == Arc.OUT_NEXT)
-      {        
-        //System.out.println("[X]push(" + arc.kind + ")" + arc.cmNode.getNodeName() + "[" + arc + "]");
-        int size = activeItemCountList.size();
-        ItemCount itemCount = (ItemCount)activeItemCountList.get(size - 1);
-        activeItemCountList.remove(size - 1);
-        inactiveItemCountList.add(itemCount); 
-      }      
-      else if (arc.kind == Arc.REPEAT)
-      {
-        //System.out.println("[X]push(" + arc.kind + ")" + arc.cmNode.getNodeName());
-        ItemCount itemCount = (ItemCount)activeItemCountList.get(activeItemCountList.size() - 1);
-        itemCount.count++;
-        //System.out.println("repeat(" + itemCount.count + ")" + arc.cmNode.getNodeName());
-      }        
-    }
-
-    public void pop(Arc arc)
-    {
-      if (arc.kind == Arc.ELEMENT)
-      {
-        //System.out.println("[X]pop(" + arc.kind + ")" + arc.cmNode.getNodeName());
-        int size = elementOriginStack.size();
-        elementOriginStack.remove(size - 1);
-      }
-      else if (arc.kind == Arc.PREV_IN)
-      {
-        //System.out.println("[X]pop(" + arc.kind + ")" + arc.cmNode.getNodeName());
-        activeItemCountList.remove(activeItemCountList.size() - 1);        
-      }
-      else if (arc.kind == Arc.OUT_NEXT)
-      {
-        //System.out.println("[X]pop(" + arc.kind + ")" + arc.cmNode.getNodeName());
-        int size = inactiveItemCountList.size();
-        ItemCount itemCount = (ItemCount)inactiveItemCountList.get(size - 1);
-        inactiveItemCountList.remove(size - 1);
-        activeItemCountList.add(itemCount);     
-      }  
-      else if (arc.kind == Arc.REPEAT)
-      {
-        //System.out.println("[X]pop(" + arc.kind + ")" + arc.cmNode.getNodeName());
-        ItemCount itemCount = (ItemCount)activeItemCountList.get(activeItemCountList.size() - 1);
-        itemCount.count--;
-      }     
-    }
-
-    public Vector getElementOriginList()
-    {
-      return elementOriginStack;
-    }
-
-    public CMNode[] getOriginArray()
-    {
-      return originArray;
-    }
-
-    public void setOriginArray(CMNode[] originArray)
-    {
-      this.originArray = originArray;
-    }
-    
-    public int getPartialValidationCount()
-    {
-      return partialValidationCount;
-    }
-
-    public void setPartialValidationCount(int partialValidationCount)
-    {
-      this.partialValidationCount = partialValidationCount;
-    }
-  }  
-
-  /**
-   *
-   */
-  public static class PathRecordingResult extends Result
-  {
-    protected Vector arcList = new Vector();
-
-    public void push(Arc arc)
-    {
-      arcList.add(arc);
-    }
-
-    public void pop(Arc arc)
-    {
-      int size = arcList.size();
-      arcList.remove(size - 1);
-    }
-
-    public List getArcList()
-    {
-      List list = new Vector();
-      for (Iterator iterator = arcList.iterator(); iterator.hasNext(); )
-      {
-        Arc arc = (Arc)iterator.next();
-        if (arc.kind == Arc.ELEMENT)
-        {
-          list.add(arc);
-        }
-      }
-      return list;
-    }
-
-    public MatchModelNode getMatchModel()
-    {
-      MatchModelNodeBuilder builder = new MatchModelNodeBuilder(arcList);
-      builder.buildMatchModel();
-      return builder.getRoot();
-    }
-  }
-
-  /**
-   *
-   */
-  public static class MatchModelNode
-  {
-    public CMNode cmNode;
-    public List children = new Vector();
-    public Object data;
-
-    public MatchModelNode(MatchModelNode parent, CMNode cmNode)
-    {
-      this.cmNode = cmNode;
-    }
-
-    public void printModel(int indent)
-    {
-      //String cmNodeName = cmNode != null ? cmNode.getNodeName() : "null";
-      //printlnIndented(indent, "MatchModelNode : " + cmNodeName);
-      for (Iterator iterator = children.iterator(); iterator.hasNext(); )
-      {
-        MatchModelNode child = (MatchModelNode)iterator.next();
-        child.printModel(indent + 2);
-      }
-    }
-  }
-
-  public static class MatchModelNodeBuilder
-  {
-    protected List arcList;
-    protected List stack = new Vector();
-    protected MatchModelNode root;
-    protected MatchModelNode current;
-
-    public MatchModelNodeBuilder(List arcList)
-    {
-      this.arcList = arcList;
-      root = new MatchModelNode(null, null);
-      push(root);
-    }
-
-    protected void push(MatchModelNode node)
-    {
-      current = node;
-      stack.add(node);
-    }
-
-    protected void pop()
-    {
-      int size = stack.size();
-      stack.remove(size - 1);
-      current = (MatchModelNode)stack.get(size - 2);
-    }
-
-    public boolean isCMGroup(CMNode cmNode)
-    {
-      return cmNode != null && cmNode.getNodeType() == CMNode.GROUP;
-    }
-
-    public void buildMatchModel()
-    {
-      for (Iterator iterator = arcList.iterator(); iterator.hasNext(); )
-      {
-        Arc arc = (Arc)iterator.next();
-
-        if (arc.kind == Arc.ELEMENT)
-        {
-          current.children.add(new MatchModelNode(current, arc.cmNode));
-        }
-        else if (arc.kind == Arc.PREV_IN)
-        {
-          if (isCMGroup(arc.cmNode))
-          {
-            MatchModelNode newModelNode = new MatchModelNode(current, arc.cmNode);
-            current.children.add(newModelNode);
-            push(newModelNode);
-          }
-        }
-        else if (arc.kind == Arc.OUT_NEXT)
-        {
-          if (isCMGroup(arc.cmNode))
-          {
-            pop();
-          }
-        }
-        else if (arc.kind == Arc.REPEAT)
-        {
-          if (isCMGroup(arc.cmNode))
-          {
-            pop();
-            MatchModelNode newModelNode = new MatchModelNode(current, arc.cmNode);
-            current.children.add(newModelNode);
-            push(newModelNode);
-          }
-        }
-      }
-    }
-
-    public MatchModelNode getRoot()
-    {
-      return root;
-    }
-  }
-
-
-  /**
-   *
-   */
-  public interface ElementContentComparator
-  {
-    public boolean isIgnorable(Object o);
-    public boolean isPCData(Object o);
-    public boolean isElement(Object o);
-    public boolean matches(Object o, CMNode cmNode);
-  }
-
-  /**
-   * A linked list
-   */
-  public static class ElementList
-  {
-    protected Object head;
-    protected ElementList tail;
-
-    public static ElementList create(List v)
-    {
-      ElementList first = null;
-      ElementList prev = null;
-
-      for (Iterator iterator = v.iterator(); iterator.hasNext(); )
-      {
-        Object o = iterator.next();
-        if (o != null)
-        {
-          ElementList list = new ElementList();
-          list.head = o;
-
-          if (prev != null)
-          {
-            prev.tail = list;
-          }
-          else
-          {
-            first = list;
-          }
-          prev = list;
-        }
-      }
-      return first;
-    }
-
-
-    public String toString()
-    {
-      String string = "[" + head + "],"; //$NON-NLS-1$ //$NON-NLS-2$
-
-      if (tail != null)
-      {
-        string += tail.toString();
-      }
-
-      return string;
-    }
-  }
-
-  /**
-   * StringElementContentComparator
-   */
-  public static class StringElementContentComparator implements ElementContentComparator
-  {
-    public boolean isIgnorable(Object o)
-    {
-      String string = o.toString();
-      return string.startsWith("!") || string.startsWith("?"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-
-    public boolean isPCData(Object o)
-    {
-      String string = o.toString();
-      return string.startsWith("'") || string.startsWith("\""); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-
-    public boolean isElement(Object o)
-    {
-      return !isIgnorable(o) && !isPCData(o);
-    }
-
-    public boolean matches(Object o, CMNode cmNode)
-    {
-      boolean result = false;
-      if (cmNode.getNodeType() == CMNode.ELEMENT_DECLARATION)
-      { 
-        CMElementDeclaration element = (CMElementDeclaration)cmNode;
-        String name = o.toString();                              
-        int index = name.indexOf("]"); //$NON-NLS-1$
-        if (index != -1)
-        {
-          name = name.substring(index + 1);
-        }
-        result = name.equalsIgnoreCase(element.getElementName());        
-
-        // TODO... here's we consider substitution groups... revisit to see if this should be moved into validator code
-        if (!result)
-        {
-          CMNodeList cmNodeList = (CMNodeList)element.getProperty("SubstitutionGroup");   //$NON-NLS-1$
-          if (cmNodeList != null)
-          {
-            int cmNodeListLength = cmNodeList.getLength();
-            if (cmNodeListLength > 1)
-            {                        
-              for (int i = 0; i < cmNodeListLength; i++)
-              {                                                               
-                CMElementDeclaration alternativeCMElementDeclaration = (CMElementDeclaration)cmNodeList.item(i);
-                String altName = alternativeCMElementDeclaration.getElementName();
-                result = name.equalsIgnoreCase(altName);
-                if (result)
-                {
-                  break;
-                }
-              }
-            }
-          }
-        }         
-      }   
-      else if (cmNode.getNodeType() == CMNode.ANY_ELEMENT)
-      {                                   
-        String string = o.toString();
-        if (string.equals("*")) //$NON-NLS-1$
-        {
-          result = true;
-        }
-        else
-        {
-          CMAnyElement anyElement = (CMAnyElement)cmNode;
-          String anyElementURI = anyElement.getNamespaceURI();    
-          if (anyElementURI != null)
-          {           
-            if (anyElementURI.equals("##any")) //$NON-NLS-1$
-            {                               
-              result = true;
-            }
-            else if (anyElementURI.equals("##other")) //$NON-NLS-1$
-            {     
-              result = true;    
-              CMDocument cmDocument = (CMDocument)anyElement.getProperty("CMDocument");   //$NON-NLS-1$
-              if (cmDocument != null)
-              {
-                String excludedURI = (String)cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI"); //$NON-NLS-1$
-                if (excludedURI != null)
-                { 
-                  String specifiedURI = getURIForContentSpecification(string);
-                  if (specifiedURI != null && excludedURI.equals(specifiedURI))
-                  { 
-                    result = false;
-                  } 
-                }
-              }
-            } 
-            else if (anyElementURI.equals("##targetNamespace")) //$NON-NLS-1$
-            {
-              result = true;
-              CMDocument cmDocument = (CMDocument)anyElement.getProperty("CMDocument");   //$NON-NLS-1$
-              if (cmDocument != null)
-              {     
-                String targetNamespaceURI = (String)cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI"); //$NON-NLS-1$
-                String specifiedURI = getURIForContentSpecification(string);
-                if (specifiedURI != null && !targetNamespaceURI.equals(specifiedURI))
-                { 
-                  result = false;
-                } 
-              }
-            }
-            else  
-            {        
-              result = true;
-              String specifiedURI = getURIForContentSpecification(string);
-              if (specifiedURI != null && !anyElementURI.equals(specifiedURI))
-              { 
-                result = false;
-              }      
-            }
-          }  
-          else 
-          {          
-            result = true;
-          }        
-        }
-      }
-      return result;
-    }     
-    
-
-    protected String getURIForContentSpecification(String specification)
-    {           
-      String result = null;
-      int index = specification.indexOf("]"); //$NON-NLS-1$
-      if (index != -1)
-      {                
-        result = specification.substring(1, index);
-      } 
-      return result;  
-    }
-  }      
-
-  public static List createStringList(String arg[], int startIndex)
-  {
-    Vector v = new Vector();
-    for (int i = startIndex; i < arg.length; i++)
-    {
-      v.add(arg[i]);
-    }
-    return v;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/util/DOMValidator.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/util/DOMValidator.java
deleted file mode 100644
index 8696df4..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/internal/util/DOMValidator.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.internal.util;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-
-/**
- * A special CMValidator that knows about DOMs
- */
-public class DOMValidator extends CMValidator
-{               
-  protected String getNamespaceURI(Node node)
-  {   
-    return DOMNamespaceHelper.getNamespaceURI(node);
-    //return node.getNamespaceURI();
-  }
-          
-
-  //
-  // This is a temporary hack!!
-  //
-  protected String getFallbackNamepaceURI(CMElementDeclaration ed)
-  {   
-    String fallbackNamepaceURI = null;
-    CMDocument cmDocument = (CMDocument)ed.getProperty("CMDocument"); //$NON-NLS-1$
-    if (cmDocument != null)
-    {
-      fallbackNamepaceURI = (String)cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI");   //$NON-NLS-1$
-    }  
-    return fallbackNamepaceURI;
-  }
-
-  /**
-   * Encode the Element's NodeList as a List of strings that the validator recognizes
-   */
-  public List createContentSpecificationList(Element element, CMElementDeclaration ed)
-  {                                                                    
-    boolean isNamespaceAware = isNamespaceAware(ed);
-    Vector v = new Vector();         
-    for (Node childNode = element.getFirstChild(); childNode != null; childNode = childNode.getNextSibling())
-    { 
-      v.add(createContentSpecification(childNode, isNamespaceAware, isNamespaceAware ? getFallbackNamepaceURI(ed) : null));
-    }
-    return v;
-  }
-
-
-  public List createContentSpecificationList(List nodeList, CMElementDeclaration ed)
-  {             
-    boolean isNamespaceAware = isNamespaceAware(ed);
-    Vector v = new Vector();            
- 
-    for (Iterator i = nodeList.iterator(); i.hasNext(); )
-    {
-      Node node = (Node)i.next();
-      v.add(createContentSpecification(node, isNamespaceAware, getFallbackNamepaceURI(ed)));
-    }
-    return v;
-  }
-
-
-  /**
-   * Encode the Node as a string that the validator recognizes
-   */
-  public String createContentSpecification(Node node, boolean isNamespaceAware, String fallbackNamepaceURI)
-  {
-    String result = "!"; //$NON-NLS-1$
-    switch (node.getNodeType())
-    {
-      case Node.ELEMENT_NODE :
-      {  
-        String nodeName = node.getNodeName();  
-        if (nodeName.startsWith("jsp:")) //$NON-NLS-1$
-        {  
-          result = "!"; // treat it as a comment so that it's ignored by the validator //$NON-NLS-1$
-        }
-        else
-        {
-          if (isNamespaceAware)
-          {
-            result = DOMNamespaceHelper.getUnprefixedName(nodeName);
-            String uri = getNamespaceURI(node);
-            if (uri != null)
-            {
-              result = "[" + uri + "]" + result;    //$NON-NLS-1$ //$NON-NLS-2$
-            } 
-            else if (fallbackNamepaceURI != null)
-            {
-              result = "[" + fallbackNamepaceURI + "]" + result;   //$NON-NLS-1$ //$NON-NLS-2$
-            }
-          }  
-          else
-          {
-            result = nodeName;
-          }
-        }        
-        //ContentModelManager.println("result " + result);
-        break;
-      }
-      case Node.PROCESSING_INSTRUCTION_NODE :
-      {
-        result = "?"; //$NON-NLS-1$
-        break;
-      }
-      case Node.COMMENT_NODE :
-      {
-        result = "!"; //$NON-NLS-1$
-        break;
-      }
-      case Node.CDATA_SECTION_NODE :
-      {
-        result = "\"" + node.getNodeName() + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-        break;
-      }
-      case Node.TEXT_NODE :
-      {
-        String data = ((Text)node).getData();
-        // here we test to see if the test node is 'ignorable'
-        if (data != null && data.trim().length() > 0)
-        {
-          result = "\"" + node.getNodeName() + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-        }
-        else
-        {
-          result = "!"; // todo... use another symbol? //$NON-NLS-1$
-        }
-        break;
-      }
-    }
-    return result;
-  }
-
-
-  /**
-   *
-   */
-  public List createContentSpecificationList(CMNode cmNode)
-  {
-    List list = new Vector();
-    switch (cmNode.getNodeType())
-    {
-      case CMNode.ELEMENT_DECLARATION :
-      {         
-        list.add(createContentSpecificationForCMElementDeclaration((CMElementDeclaration)cmNode));   
-        break;
-      }
-      case CMNode.DATA_TYPE :
-      {
-        list.add("\"" + cmNode.getNodeName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-        break;
-      }
-      case CMNode.GROUP :
-      {
-        createContentSpecificationListForCMGroup((CMGroup)cmNode, list);
-        break;
-      }
-      case CMNode.ANY_ELEMENT :
-      {
-        list.add("*"); //$NON-NLS-1$
-        break;
-      }
-      default :
-      {
-        list.add("!"); //$NON-NLS-1$
-      }
-    }
-    return list;
-  }
-     
-
-  /**
-   * 
-   */              
-  protected String createContentSpecificationForCMElementDeclaration(CMElementDeclaration ed)
-  {  
-    CMDocument document = (CMDocument)ed.getProperty("CMDocument"); //$NON-NLS-1$
-    String uri = document != null ? (String)document.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI") : null; //$NON-NLS-1$
-    String string = ed.getNodeName();
-    if (uri != null)
-    {            
-      string = "[" + uri + "]" + string; //$NON-NLS-1$ //$NON-NLS-2$
-    }
-    return string;
-  }
-  
-  /**
-   *
-   */
-  protected void createContentSpecificationListForCMGroup(CMGroup group, List list)
-  {         
-    CMGroupContentVisitor visitor = new CMGroupContentVisitor(group, list);
-    visitor.visitCMNode(group);
-  } 
-     
-  protected class CMGroupContentVisitor extends CMVisitor
-  {  
-    protected CMGroup root;                             
-    protected List list;
-
-    public CMGroupContentVisitor(CMGroup root, List list)
-    {                                        
-      this.root = root;        
-      this.list = list;
-    }
-
-    public void visitCMElementDeclaration(CMElementDeclaration ed)
-    {           
-      if (ed.getMinOccur() > 0)
-      {
-        list.add(createContentSpecificationForCMElementDeclaration(ed));
-      }
-    }       
-
-    public void visitCMAnyElement(CMAnyElement anyElement)
-    {   
-      list.add("*"); //$NON-NLS-1$
-    }
-
-    public void visitCMGroup(CMGroup group)
-    {                              
-      if (group == root || group.getMinOccur() > 0)
-      {
-        int op = group.getOperator();
-        if (op == CMGroup.SEQUENCE)
-        {
-          super.visitCMGroup(group);
-        }
-        else if (op == CMGroup.CHOICE)
-        {
-          CMNodeList nodeList = group.getChildNodes();
-          if (nodeList.getLength() > 0)
-          {
-            visitCMNode(nodeList.item(0));
-          }      
-        }
-      }
-    }
-  }
-
-  public boolean isNamespaceAware(CMElementDeclaration ed)
-  { 
-    return ed != null ? ed.getProperty("http://org.eclipse.wst/cm/properties/isNameSpaceAware") != null : false; //$NON-NLS-1$
-  }
-     
-  /**
-   *
-   */
-  public CMNode[] getOriginArray(CMElementDeclaration ed, Element element)
-  {
-    ElementPathRecordingResult result = new ElementPathRecordingResult();
-    getOriginArray(ed, createContentSpecificationList(element, ed), stringContentComparitor, result);
-    return result.getOriginArray();
-  }
-                   
-  /**
-   *
-   */
-  public MatchModelNode getMatchModel(CMElementDeclaration ed, Element element)
-  {
-    MatchModelNode matchModelNode = null;
-    PathRecordingResult result = new PathRecordingResult();
-    validate(ed, createContentSpecificationList(element, ed), stringContentComparitor, result);
-    if (result.isValid)
-    {
-      matchModelNode = result.getMatchModel();
-    }
-    return matchModelNode;
-  }
-                           
-
-  public List clone(List list)
-  {   
-    List result = new Vector(list.size());
-    result.addAll(list);
-    return result;
-  }
- 
-  /**
-   *
-   */
-  public boolean canInsert(CMElementDeclaration ed, List contentSpecificationList, int insertIndex, CMNode cmNode)
-  {           
-    List clonedList = clone(contentSpecificationList);
-    insert(clonedList, insertIndex, cmNode);
-    boolean result = isPartiallyValid(ed, clonedList);   
-    return result;
-  }  
-
-  /**
-   *
-   */
-  public boolean canInsert(CMElementDeclaration ed, List contentSpecificationList, int insertIndex, List cmNodeList)
-  {              
-    List clonedList = clone(contentSpecificationList);
-    insert(clonedList, insertIndex, cmNodeList);
-    return isValid(ed, clonedList);
-  }  
-
-  /**
-   *
-   */
-  public boolean canRemove(CMElementDeclaration ed, List contentSpecificationList, int startRemoveIndex)
-  {
-    return canRemove(ed, contentSpecificationList, startRemoveIndex, startRemoveIndex);
-  }
-
-  /**
-   *
-   */
-  public boolean canRemove(CMElementDeclaration ed, List contentSpecificationList, int startRemoveIndex, int endRemoveIndex)
-  {
-    List clonedList = clone(contentSpecificationList);
-    remove(clonedList, startRemoveIndex, endRemoveIndex);
-    return isValid(ed, clonedList);
-  }
-                        
-  /**
-   *
-   */
-  public boolean canReplace(CMElementDeclaration ed, List contentSpecificationList, int startRemoveIndex, int endRemoveIndex, CMNode cmNode)
-  {
-    List clonedList = clone(contentSpecificationList);
-    remove(clonedList, startRemoveIndex, endRemoveIndex); 
-    insert(clonedList, startRemoveIndex, cmNode);
-    return isValid(ed, clonedList);
-  }
-
-  /**
-   *
-   */                      
-  public boolean isValid(CMElementDeclaration ed, List contentSpecificationList)
-  {
-    Result result = new Result();
-    validate(ed, contentSpecificationList, stringContentComparitor, result);
-    return result.isValid;
-  }
-
-  public boolean isPartiallyValid(CMElementDeclaration ed, List contentSpecificationList)
-  {
-    CMValidator.ElementPathRecordingResult result = new CMValidator.ElementPathRecordingResult();
-    validate(ed, contentSpecificationList, stringContentComparitor, result);
-    int count = getElementCount(contentSpecificationList);
-    //System.out.println("elementOriginList " + result.getPartialValidationCount() + "vs" + count);
-    return result.getPartialValidationCount() >= count;
-  }  
-  
-  public int getElementCount(List contentSpecificationList)
-  {
-    int count = 0;
-    for (Iterator i = contentSpecificationList.iterator(); i.hasNext(); )
-    {
-      if (stringContentComparitor.isElement(i.next()))
-      {
-        count++;
-      }  
-    }  
-    return count;
-  }
-
-  protected Result validate(CMElementDeclaration ed, Element element)
-  {
-    Result result = new Result();
-    validate(ed, createContentSpecificationList(element, ed), stringContentComparitor, result);
-    return result;
-  }
-
-
-  protected void remove(List stringList, int startRemoveIndex, int endRemoveIndex)
-  {
-    if (startRemoveIndex != -1)
-    {
-      for (int i = startRemoveIndex; i <= endRemoveIndex; i++)
-      {
-        stringList.remove(i);
-      }
-    }
-  }
-
-  protected void insert(List stringList, int insertIndex, CMNode cmNode)
-  {
-    if (insertIndex != -1)
-    {
-      stringList.addAll(insertIndex, createContentSpecificationList(cmNode));
-    }
-  }
-
-  protected void insert(List stringList, int insertIndex, List cmNodeList)
-  {
-    if (insertIndex != -1)
-    {
-      int insertListSize = cmNodeList.size();
-      for (int i = insertListSize - 1; i >= 0; i--)
-      {
-        CMNode cmNode = (CMNode)cmNodeList.get(i);
-        stringList.addAll(insertIndex, createContentSpecificationList(cmNode));
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentManager.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentManager.java
deleted file mode 100644
index 8c4a7b6..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentManager.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.xml.core.internal.contentmodel.modelquery;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-
-
-/**
- * The CMDocumentManager can be visualized as a table of CMDocument
- * references, each with a corresponding entry in a CMDocument cache. The
- * CMDocumentManager also performs the task of loading CMDocuments providing
- * support for synchronous and asynchronous loading.
- * 
- * publicIdTable CMDocumentCache ---------------------------
- * --------------------------------------- | publicId | resolvedURI | -> |
- * resolvedURI | status | CMDocument | ---------------------------
- * --------------------------------------- | (null) | file:/x.dtd | |
- * file:/x.dtd | loading | (null) | ---------------------------
- * --------------------------------------- | http:/... | file:/y.xsd | |
- * file:/y.xsd | loaded | | ---------------------------
- * ---------------------------------------
- * 
- */
-public interface CMDocumentManager {
-	/**
-	 * This property specifies WHEN CMDocuments are loaded. Setting this
-	 * property to true allows the CMDocumentManager to load CMDocuments on
-	 * demand. Settings this property a false puts the onus on the client to
-	 * call addCMDocumentReference() to explicity trigger a load. This allows
-	 * the client to control exactly when loading should take place. )
-	 */
-	public static final String PROPERTY_AUTO_LOAD = "autoLoad"; //$NON-NLS-1$
-
-	/**
-	 * This property specifies HOW CMDocuments are loaded. When set to false,
-	 * the getCMDocument() method will load the CMDocument synchronously and
-	 * return a CMDocument object when loading is successful. When set to
-	 * true, the getCMDocument() will load the CMDocument asynchronously and
-	 * will immediately return null. When loading is complete, the
-	 * CMDocumentManager will inform its listeners that the CMDocument has
-	 * been loaded.
-	 */
-	public static final String PROPERTY_ASYNC_LOAD = "asyncLoad"; //$NON-NLS-1$
-
-	/**
-	 * 
-	 */
-	public static final String PROPERTY_USE_CACHED_RESOLVED_URI = "useCachedResovledURI"; //$NON-NLS-1$
-
-	/**
-	 * Set the enabled state of a property.
-	 */
-	public void setPropertyEnabled(String propertyName, boolean enabled);
-
-	/**
-	 * Get the enabled state of the property.
-	 */
-	public boolean getPropertyEnabled(String propertyName);
-
-	/**
-	 * Adds a listener. Listeners should expect to receive call backs on a
-	 * secondary thread when asynchronously loading is used.
-	 */
-	public void addListener(CMDocumentManagerListener listener);
-
-	/**
-	 * Removes a listener.
-	 */
-	public void removeListener(CMDocumentManagerListener listener);
-
-	/**
-	 * Lookup or create a CMDocument (depending on PROPERTY_AUTO_LOAD).
-	 * 
-	 * @param publicId
-	 * @param systemId
-	 * @param type -
-	 *            'dtd', 'xsd', 'tld', etc. if null is given as the type, then
-	 *            the type is calculated as last segment (e.g. file extension)
-	 *            of the resolved URI
-	 * @return
-	 */
-	public CMDocument getCMDocument(String publicId, String systemId, String type);
-
-	/**
-	 * Lookup a CMDocument.
-	 */
-	public CMDocument getCMDocument(String publicId);
-
-	/**
-	 * Get the status of a CMDocument.
-	 */
-	public int getCMDocumentStatus(String publicId);
-
-	/**
-	 * Creates a CMDocument and adds the associated CMDocument reference
-	 * information to the table. Calling this method always triggers a
-	 * CMDocument load.
-	 */
-	public void addCMDocumentReference(String publicId, String systemId, String type);
-
-	/**
-	 * Add an existingCMDocument and the reference information to the table.
-	 */
-	public void addCMDocument(String publicId, String systemId, String resolvedURI, String type, CMDocument cmDocument);
-
-	/**
-	 * Remove all entries from the table.
-	 */
-	public void removeAllReferences();
-
-	/**
-	 * Get the CMDocumentCache that is used to store loaded CMDocuments and
-	 * associated status.
-	 */
-	public CMDocumentCache getCMDocumentCache();
-
-	/**
-	 * Builds a CMDocument given a resoulvedURI. Note that no entries are
-	 * added to the table.
-	 */
-	public CMDocument buildCMDocument(String publicId, String resolvedURI, String type);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentManagerListener.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentManagerListener.java
deleted file mode 100644
index b236092..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentManagerListener.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelquery;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCacheListener;
-
-/**
- *
- */
-public interface CMDocumentManagerListener extends CMDocumentCacheListener
-{                    
-  public void propertyChanged(CMDocumentManager cmDocumentManager, String propertyName);
-}       
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentReference.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentReference.java
deleted file mode 100644
index 7a23418..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentReference.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelquery;
-
-
-public interface CMDocumentReference
-{
-  public String getPublicId();
-  public String getSystemId();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentReferenceProvider.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentReferenceProvider.java
deleted file mode 100644
index c8d93d1..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentReferenceProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelquery;
-
-import java.util.List;
-
-import org.w3c.dom.Node;
- 
-/**
- * The interface is used to abstract the task of computing the document references associated with a DOM
- * or a particular node within the DOM.  
- */
-public interface CMDocumentReferenceProvider
-{
-  List getCMDocumentReferences(Node node, boolean deep);
-  String resolveGrammarURI(String publicId, String systemId);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/ModelQuery.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/ModelQuery.java
deleted file mode 100644
index 3b0c0d3..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/ModelQuery.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelquery;
-
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.extension.ModelQueryExtensionManager;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * This class provides an interface for performing higher level queries based on
- * a xml model (DOM) and one or more associated content models (CMDocument).
- *
- * The queries provided can be organized into three groups:
- *
- * 1) DOM Node to CMNode mapping
- *      Given a grammatically valid DOM Node the corresponding CMNode can be determined.
- *      (i.e. Element -> CMElementDeclaration, Attr -> CMAttributeDeclaration, CharacterData -> CMDataType)
- *
- * 2) DOM editing tests ("Can I do this?")
- *      Questions such as canInsert, canRemove, canReplace can assist in the editing of a DOM.
- *
- *      The validityChecking argument determines the strictness of the validity testing that occurs.
- *
- *      - VALIDITY_NONE    : The current content of the Element is ignored.
- *                           Only the content model is considered.
- *                           This is most useful for codeassist related queries.
- *
- *      - VALIDITY_STRICT  : The current content of the Element is considered.
- *                           Returns true only if the operation preserves content validity.
- *                           This is useful when DOM editing needs to be constrained to maintain validity.
- *
- *      - VALIDITY_PARTIAL : Some optimized compromise between the two options above.
- *
- * 3) DOM editing actions ("What can I do here?")
- *      These methods return ModelQueryActions that are relevant at some specified DOM Node.
- *      The actions indicate what kinds of DOM Node can be inserted where (at what index).
- */
-public interface ModelQuery
-{
-  public static final int VALIDITY_NONE = 0;
-  public static final int VALIDITY_PARTIAL = 1;
-  public static final int VALIDITY_STRICT = 2;
-
-  public static final int INCLUDE_ALL = 0xFF;
-  public static final int INCLUDE_ATTRIBUTES = 0x01;
-  public static final int INCLUDE_CHILD_NODES = 0x02;
-  public static final int INCLUDE_SEQUENCE_GROUPS = 0x04;
-  public static final int INCLUDE_TEXT_NODES = 0x08;
-  public static final int INCLUDE_ENCLOSING_REPLACE_ACTIONS = 0x10;
-
-  public static final int EDIT_MODE_UNCONSTRAINED = 0;
-  public static final int EDIT_MODE_CONSTRAINED_LENIENT= 1;
-  public static final int EDIT_MODE_CONSTRAINED_STRICT = 2;
-
-
-  void setEditMode(int editMode);
-
-  int  getEditMode();
-
-  /**
-   * Returns the CMDocument that corresponds to the DOM Node.
-   * or null if no CMDocument is appropriate for the DOM Node.
-   */
-  CMDocument getCorrespondingCMDocument(Node node);
-
-  /**
-   * Returns the corresponding CMNode for the DOM Node
-   * or null if no CMNode is appropriate for the DOM Node.
-   */
-  CMNode getCMNode(Node node);
-
-  /**
-   * Returns the corresponding CMAttribute for the DOM Node
-   * or null if no CMNode is appropriate for the DOM Node.
-   */
-  CMAttributeDeclaration getCMAttributeDeclaration(Attr attr);
-
-  /**
-   * Returns the corresponding CMAttribute for the DOM Node
-   * or null if no CMNode is appropriate for the DOM Node.
-   */
-  CMElementDeclaration getCMElementDeclaration(Element element);
-
-  /**
-   * Returns true if the content of the element is valid
-   */
-  boolean isContentValid(Element element);
-
-  /**
-   * Returns the CMNode of the parent element's content model
-   * that corresponds to the node
-   */
-  CMNode getOrigin(Node node);
-
-  /**
-   * Returns an array of CMNodes of the parent element's content model
-   * that corresponds to the node
-   */
-  CMNode[] getOriginArray(Element element);
-
-  /**
-   * Returns a list of all CMNode 'meta data' that may be potentially added to the element.
-   */
-  List getAvailableContent(Element element, CMElementDeclaration ed, int includeOptions);
-
-  /**
-   * Can a DOM Node corresponding to the CMNode 'meta data' be added to the parent
-   */
-  boolean canInsert(Element parent, CMNode cmNode, int index, int validityChecking);
-
-  /**
-   * Can multiple DOM Nodes corresponding to the list of CMNode 'meta data' be added to the parent
-   */
-  boolean canInsert(Element parent, List cmNodeList, int index, int validityChecking);
-
-  /**
-   * Can the DOM Node be removed
-   */
-  boolean canRemove(Node node, int validityChecking);
-
-  /**
-   * Can the list of DOM Nodes be removed
-   */
-  boolean canRemove(List nodeList, int validityChecking);
-
-  /**
-   * Can the children within the indicated indices be replaced with a DOM Node corresponding to the CMNode 'meta data'
-   */
-  boolean canReplace(Element parent, int startIndex, int endIndex, CMNode cmNode, int validityChecking);
-
-  /**
-   * Can the children within the indicated indices be replaced with multiple DOM Nodes corresponding to the list of CMNode 'meta data'
-   */
-  boolean canReplace(Element parent, int startIndex, int endIndex, List cmNodeList, int validityChecking);
-
-  /**
-   *
-   */
-  void getInsertActions(Element parent, CMElementDeclaration ed, int index, int includeOptions, int validityChecking, List actionList);
-
-  /**
-   *
-   */
-  void getInsertActions(Document parent, CMDocument cmDocument, int index, int includeOptions, int validityChecking, List actionList);
-
-  /**
-   * Return a list of replace actions that can be performed on the parent's content
-   */
-  void getReplaceActions(Element parent, CMElementDeclaration ed, int includeOptions, int validityChecking, List actionList);
-
-  /**
-   * Return a list of replace actions that can be performed on the selected children of that parent 
-   */
-  void getReplaceActions(Element parent, CMElementDeclaration ed, List selectedChildren, int includeOptions, int validityChecking, List actionList);
-
-                        
-  /** 
-   *  @deprecated - use getPossibleDataTypeValues()
-   */
-  List getDataTypeValues(Element element, CMNode cmNode);
-
-  /**
-   * This methods return an array of possible values corresponding to the datatype of the CMNode (either an CMAttributeDeclaration or a CMElementDeclaration)
-   */
-  String[] getPossibleDataTypeValues(Element element, CMNode cmNode);
-
-  /**
-   * This method may return null if a CMDocumentManager is not used by the ModelQuery
-   */
-  CMDocumentManager getCMDocumentManager();                                       
-
-  /**
-   * This method may return null the ModelQuery doesn't support the use of extensions
-   */
-  ModelQueryExtensionManager getExtensionManager();   
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/ModelQueryAction.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/ModelQueryAction.java
deleted file mode 100644
index 098f4f3..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/ModelQueryAction.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelquery;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.w3c.dom.Node;
-
-
-public interface ModelQueryAction
-{
-  public static final int INSERT  = 1;
-  public static final int REMOVE  = 2;
-  public static final int REPLACE = 4;
-
-  public int getKind();
-  /**
-   * if start index == -1 then no insert is possible
-   * if start index != -1 and endIndex == -1 then an insert at any position is possible
-   */
-  public int getStartIndex();
-  public int getEndIndex();
-  public Node getParent();
-  public CMNode getCMNode();
-  public Object getUserData();
-  public void setUserData(Object object);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/ModelQueryAssociationProvider.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/ModelQueryAssociationProvider.java
deleted file mode 100644
index 9fa1000..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/ModelQueryAssociationProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelquery;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-
-/**
- * 
- *
- */
-public interface ModelQueryAssociationProvider extends ModelQueryCMProvider
-{
-  public CMNode getCMNode(Node node);
-  public CMDataType getCMDataType(Text text); 
-  public CMAttributeDeclaration getCMAttributeDeclaration(Attr attr);
-  public CMElementDeclaration getCMElementDeclaration(Element element);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/ModelQueryCMProvider.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/ModelQueryCMProvider.java
deleted file mode 100644
index e9cc02e..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/ModelQueryCMProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelquery;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.w3c.dom.Node;
-
-
-
-/**
- *
- */
-public interface ModelQueryCMProvider
-{
-  /**
-   * Returns the CMDocument that corresponds to the DOM Node.
-   * or null if no CMDocument is appropriate for the DOM Node.
-   */
-  CMDocument getCorrespondingCMDocument(Node node);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/extension/ModelQueryExtension.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/extension/ModelQueryExtension.java
deleted file mode 100644
index e92e668..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/extension/ModelQueryExtension.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.wst.xml.core.internal.contentmodel.modelquery.extension;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public abstract class ModelQueryExtension
-{  
-  protected static final String[] EMPTY_STRING_ARRAY = {};
-  
-  public String[] getAttributeValues(Element ownerElement, String namespace, String name)
-  {
-    return EMPTY_STRING_ARRAY;
-  }
-  
-  public String[] getElementValues(Node parentNode, String namespace, String name)
-  {
-    return EMPTY_STRING_ARRAY;
-  }
-  
-  public boolean isApplicableChildElement(Node parentNode, String namespace, String name)
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/extension/ModelQueryExtensionManager.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/extension/ModelQueryExtensionManager.java
deleted file mode 100644
index 2cdf950..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/extension/ModelQueryExtensionManager.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelquery.extension;
-
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.w3c.dom.Element;
-
-
-
-public interface ModelQueryExtensionManager
-{
-  List getDataTypeValues(Element element, CMNode cmNode);                             
-
-  void filterAvailableElementContent(List availableContent, Element element, CMElementDeclaration ed);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/BaseAssociationProvider.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/BaseAssociationProvider.java
deleted file mode 100644
index 6618e12..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/BaseAssociationProvider.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryAssociationProvider;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-
-/**
- *
- */
-public abstract class BaseAssociationProvider implements ModelQueryAssociationProvider
-{                    
-  public BaseAssociationProvider()
-  {
-  }
-
-  public CMNode getCMNode(Node node)
-  {
-    CMNode result = null;
-    switch (node.getNodeType())
-    {
-      case Node.ATTRIBUTE_NODE :
-      {
-        result = getCMAttributeDeclaration((Attr)node);
-        break;
-      }
-      case Node.ELEMENT_NODE :
-      {
-        result = getCMElementDeclaration((Element)node);
-        break;
-      }
-      case Node.CDATA_SECTION_NODE :
-      case Node.TEXT_NODE :
-      {
-        result = getCMDataType((Text)node);
-        break;
-      }
-    }
-    return result;
-  }
-
-
-  public CMDataType getCMDataType(Text text)
-  {
-    CMDataType result = null;
-    Node parentNode = text.getParentNode();
-    if (parentNode != null && parentNode.getNodeType() == Node.ELEMENT_NODE)
-    {
-      CMElementDeclaration ed = getCMElementDeclaration((Element)parentNode);
-      result = ed.getDataType();
-    }
-    return result;
-  }
-
-
-  public CMAttributeDeclaration getCMAttributeDeclaration(Attr attr)
-  {
-    CMAttributeDeclaration result = null;
-    Element element = attr.getOwnerElement();
-    if (element != null)
-    {
-      CMElementDeclaration ed = getCMElementDeclaration(element);
-      if (ed != null)
-      {
-        result = (CMAttributeDeclaration)ed.getAttributes().getNamedItem(attr.getName());
-      }
-    }
-    return result;
-  }          
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/CMDocumentLoader.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/CMDocumentLoader.java
deleted file mode 100644
index 5b0ddb4..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/CMDocumentLoader.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl;
-                          
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceTable;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- *
- */
-public class CMDocumentLoader
-{                                           
-  protected Document document;
-  protected ModelQuery modelQuery;
-  protected CMDocumentManager cmDocumentManager;
-  protected boolean isInferredGrammarEnabled = true;  
-  protected CMDocumentLoadingNamespaceTable namespaceTable;
-  protected int count = 0;
-    
-  public CMDocumentLoader(Document document, ModelQuery modelQuery)
-  {                             
-    this(document, modelQuery.getCMDocumentManager());
-  }
-  
-  public CMDocumentLoader(Document document, CMDocumentManager cmDocumentManager)
-  {   
-    this.document = document;                     
-    this.cmDocumentManager = cmDocumentManager;  	
-  }
-  
-  public void loadCMDocuments()
-  {          
-    //System.out.println("----------loadCMDocuments ------------");          
-    //long time = System.currentTimeMillis();
-       
-    boolean walkDocument = false;
-            
-    cmDocumentManager.removeAllReferences();
-      
-    String[] doctypeInfo = XMLAssociationProvider.getDoctypeInfo(document);
-    if (doctypeInfo != null)
-    {
-      // load the doctype if required
-      walkDocument = handleGrammar(doctypeInfo[0], doctypeInfo[1], "DTD"); //$NON-NLS-1$
-    }                                   
-    else
-    {                           
-      Element element = getRootElement(document);
-      if (element != null)
-      {
-        namespaceTable = new CMDocumentLoadingNamespaceTable(document);   
-        namespaceTable.addElement(element);
-        if (namespaceTable.isNamespaceEncountered())
-        {   
-          walkDocument = true;
-          //System.out.println("isNamespaceAware");
-        }
-        else
-        {
-          namespaceTable = null;
-          walkDocument = isInferredGrammarEnabled;
-          //System.out.println("is NOT namespaceAware");
-        }        
-      }  
-    } 
-
-    if (walkDocument)
-    {
-      visitNode(document);   
-    } 
-
-    //System.out.println("--- elapsed time (" + count + ") = " + (System.currentTimeMillis() - time));
-  }
-
-
-  public boolean handleGrammar(String publicId, String systemId, String type)
-  {           
-    boolean result = false;
-    
-    int status = cmDocumentManager.getCMDocumentStatus(publicId);
-    if (status == CMDocumentCache.STATUS_NOT_LOADED)
-    {
-      cmDocumentManager.addCMDocumentReference(publicId, systemId, type);
-    }                 
-    else if (status == CMDocumentCache.STATUS_ERROR)
-    {
-      result = true;
-    }
-    return result;
-  } 
-    
-
-  public void handleElement(Element element)
-  {  
-    visitChildNodes(element);
-  }
-
-                             
-  public void handleElementNS(Element element)
-  {
-    namespaceTable.addElement(element);
-    visitChildNodes(element);
-  }
-                                                    
-
-  public void visitNode(Node node)
-  {                    
-    int nodeType = node.getNodeType();
-    if (nodeType == Node.ELEMENT_NODE)
-    {
-      count++;       
-
-      Element element = (Element)node;    
-      if (namespaceTable == null)
-      {
-        handleElement(element); 
-      }
-      else
-      {
-        handleElementNS(element);
-      }            
-    }
-    else if (nodeType == Node.DOCUMENT_NODE)
-    {
-      visitChildNodes(node);
-    }
-  }
-
-
-  protected void visitChildNodes(Node node)
-  {   
-	  for (Node child = node.getFirstChild(); child != null; child = child.getNextSibling()) 
-    {
-	    visitNode(child);
-    }
-	}             
-
-
-  protected class CMDocumentLoadingNamespaceTable extends NamespaceTable
-  {                                        
-    protected List newNamespaceList;
-
-    public CMDocumentLoadingNamespaceTable(Document document)
-    {                                                          
-      super(document);     
-    }  
-                                           
-
-    public void addElement(Element element)
-    {                               
-      newNamespaceList = null;
-      super.addElement(element);  
-      if (newNamespaceList != null)
-      {
-        for (Iterator i = newNamespaceList.iterator(); i.hasNext(); )
-        {
-          NamespaceInfo info = (NamespaceInfo)i.next();
-          handleGrammar(info.uri, info.locationHint, "XSD"); //$NON-NLS-1$
-        }
-      }
-    }                 
-     
-                               
-    protected void internalAddNamespaceInfo(String key, NamespaceInfo info)
-    {
-      super.internalAddNamespaceInfo(key, info);           
-      if (newNamespaceList == null)
-      {
-        newNamespaceList = new ArrayList();
-      }
-      newNamespaceList.add(info);    
-    }                     
-  }
-
-  
-  protected Element getRootElement(Document document)
-  {
-    Element result = null;
-    NodeList nodeList = document.getChildNodes();
-    int nodeListLength = nodeList.getLength();
-    for (int i = 0 ; i < nodeListLength; i++)
-    {
-      Node node = nodeList.item(i);
-      if (node.getNodeType() == Node.ELEMENT_NODE)
-      {
-        result = (Element)node;
-        break;
-      }
-    }
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/CMDocumentManagerImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/CMDocumentManagerImpl.java
deleted file mode 100644
index 77ac6eb..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/CMDocumentManagerImpl.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl;
-                          
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.xml.core.internal.XMLCoreMessages;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.annotation.AnnotationUtility;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManagerListener;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentReferenceProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-
-
-/**
- *
- */
-public class CMDocumentManagerImpl implements CMDocumentManager
-{                                
-  protected CMDocumentCache cmDocumentCache;
-  protected CMDocumentReferenceProvider cmDocumentReferenceProvider;
-  protected List listenerList = new Vector(); 
-  protected Hashtable propertyTable = new Hashtable();
-  protected Hashtable publicIdTable = new Hashtable();
-
-       
-  public CMDocumentManagerImpl(CMDocumentCache cmDocumentCache, CMDocumentReferenceProvider cmDocumentReferenceProvider)
-  {                                                       
-    this.cmDocumentCache = cmDocumentCache;                                                                            
-    this.cmDocumentReferenceProvider = cmDocumentReferenceProvider;
-    setPropertyEnabled(PROPERTY_AUTO_LOAD, true);
-    setPropertyEnabled(PROPERTY_USE_CACHED_RESOLVED_URI, false);
-  }         
-
-       
-  public CMDocumentCache getCMDocumentCache()
-  {
-    return cmDocumentCache;
-  }
-
- 
-  public void setPropertyEnabled(String propertyName, boolean value)
-  {
-    propertyTable.put(propertyName, value ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-    for (Iterator i = listenerList.iterator(); i.hasNext(); )
-    {
-      CMDocumentManagerListener listener = (CMDocumentManagerListener)i.next();
-      listener.propertyChanged(this, propertyName);
-    }
-  }                                        
-
-        
-  public boolean getPropertyEnabled(String propertyName)
-  {
-    Object object = propertyTable.get(propertyName);
-    return object != null && object.equals("true"); //$NON-NLS-1$
-  }
-
-
-  public void addListener(CMDocumentManagerListener listener)
-  {
-    listenerList.add(listener);
-    cmDocumentCache.addListener(listener);
-  }
-
-
-  public void removeListener(CMDocumentManagerListener listener)
-  {
-    listenerList.remove(listener);
-    cmDocumentCache.removeListener(listener);
-  }                       
-   
-                   
-  protected String lookupResolvedURI(String publicId)
-  {
-    String key = publicId != null ? publicId : ""; //$NON-NLS-1$
-    return (String)publicIdTable.get(key);
-  }
-    
-
-  protected String lookupOrCreateResolvedURI(String publicId, String systemId)
-  {                    
-    String resolvedURI = null;                  
-
-    String key = publicId != null ? publicId : ""; //$NON-NLS-1$
-
-    if (getPropertyEnabled(PROPERTY_USE_CACHED_RESOLVED_URI))
-    {
-      resolvedURI = (String)publicIdTable.get(key);
-    }   
-
-    if (resolvedURI == null)
-    {
-      resolvedURI = cmDocumentReferenceProvider.resolveGrammarURI(publicId, systemId);
-      if (resolvedURI == null)
-      {
-        resolvedURI = ""; //$NON-NLS-1$
-      }
-      publicIdTable.put(key, resolvedURI);     
-    }                       
-  
-    return resolvedURI;
-  }
-
-
-  public int getCMDocumentStatus(String publicId)
-  {                                           
-    int status = CMDocumentCache.STATUS_NOT_LOADED; 
-    String resolvedURI = lookupResolvedURI(publicId);
-    if (resolvedURI != null)
-    {                      
-      status = cmDocumentCache.getStatus(resolvedURI);
-    }
-    return status;
-  }    
-              
-
-  public CMDocument getCMDocument(String publicId)
-  {                                           
-    CMDocument result = null;
-    String resolvedURI = lookupResolvedURI(publicId);
-    if (resolvedURI != null)
-    {                      
-      result = cmDocumentCache.getCMDocument(resolvedURI);
-    }
-    return result;
-  }    
-  
-
-  /* (non-Javadoc)
- * @see org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager#getCMDocument(java.lang.String, java.lang.String, java.lang.String)
- */
-public CMDocument getCMDocument(String publicId, String systemId, String type)
-  {                
-    CMDocument cmDocument = null;                           
-    String resolvedURI = null;
-
-    if (getPropertyEnabled(PROPERTY_AUTO_LOAD))
-    {
-      resolvedURI = lookupOrCreateResolvedURI(publicId, systemId);
-    }    
-    else
-    {
-      resolvedURI = lookupResolvedURI(publicId);
-    } 
-
-    if (resolvedURI != null)
-    {                   
-      int status = cmDocumentCache.getStatus(resolvedURI);
-      if (status == CMDocumentCache.STATUS_LOADED)
-      {                      
-        cmDocument = cmDocumentCache.getCMDocument(resolvedURI);
-      }   
-      else if (status == CMDocumentCache.STATUS_NOT_LOADED)
-      {     
-        if (getPropertyEnabled(PROPERTY_AUTO_LOAD))
-        {
-          cmDocument = loadCMDocument(publicId, resolvedURI, type, getPropertyEnabled(PROPERTY_ASYNC_LOAD));
-        }
-      }
-    }
-    return cmDocument;   
-  } 
-  
-  public void addCMDocumentReference(String publicId, String systemId, String type)
-  {
-    String resolvedURI = lookupOrCreateResolvedURI(publicId, systemId);
-    if (resolvedURI != null && resolvedURI.length() > 0)
-    {                                                                      
-      int status = cmDocumentCache.getStatus(resolvedURI);
-      if (status == CMDocumentCache.STATUS_NOT_LOADED)
-      {                      
-        loadCMDocument(publicId, resolvedURI, type, getPropertyEnabled(PROPERTY_ASYNC_LOAD));
-      }         
-    } 
-  }
-     
-
-  public void addCMDocument(String publicId, String systemId, String resolvedURI, String type, CMDocument cmDocument)
-  {
-    String key = publicId != null ? publicId : ""; //$NON-NLS-1$
-    publicIdTable.put(key, resolvedURI);
-    cmDocumentCache.putCMDocument(resolvedURI, cmDocument);
-  }
-
-
-  protected CMDocument loadCMDocument(final String publicId, final String resolvedURI, final String type, boolean async)
-  {                                                      
-    CMDocument result = null;
-                         
-    //System.out.println("about to build CMDocument(" + publicId + ", " + unresolvedURI + " = " + resolvedURI + ")");
-    if (async)
-    {     
-      cmDocumentCache.setStatus(resolvedURI, CMDocumentCache.STATUS_LOADING);
-      //Thread thread = new Thread(new AsyncBuildOperation(publicId, resolvedURI, type));
-      //thread.start();
-      Job job = new Job(XMLCoreMessages.loading + resolvedURI)
-      {
-        public boolean belongsTo(Object family)
-        {
-          boolean result = (family == CMDocumentManager.class);
-          return result;
-        }
-        
-        protected IStatus run(IProgressMonitor monitor)
-        {
-          try
-          {
-            new AsyncBuildOperation(publicId, resolvedURI, type).run();
-          }
-          catch (Exception e)
-          {
-          }
-          return Status.OK_STATUS;
-        }
-      };
-      job.schedule();
-    }
-    else
-    {                
-      result = buildCMDocument(publicId, resolvedURI, type);
-    }          
-    return result;
-  } 
-
-    
-
-  protected class AsyncBuildOperation implements Runnable
-  {
-    protected String publicId;
-    protected String resolvedURI;    
-    protected String type;
-
-    public AsyncBuildOperation(String publicId, String resolvedURI, String type)
-    {
-      this.publicId = publicId;
-      this.resolvedURI = resolvedURI;                                          
-      this.type = type;
-    }      
-
-    public void run()
-    {
-      buildCMDocument(publicId, resolvedURI, type);
-    }
-  }
-    
-  
-  public synchronized CMDocument buildCMDocument(String publicId, String resolvedURI, String type)
-  {                                     
-    cmDocumentCache.setStatus(resolvedURI, CMDocumentCache.STATUS_LOADING);
-  
-    CMDocument result = null;         
-    int x = 1;
-    x++;
-    if (resolvedURI != null && resolvedURI.length() > 0)
-    {
-      // TODO... pass the TYPE thru to the CMDocumentBuilder
-      result = ContentModelManager.getInstance().createCMDocument(resolvedURI, type);
-    }
-    if (result != null)
-    { 
-      // load the annotation files for the document 
-      if (publicId != null)
-      {    
-        AnnotationUtility.loadAnnotationsForGrammar(publicId, result);
-      }
-      cmDocumentCache.putCMDocument(resolvedURI, result);
-    }
-    else
-    {
-      cmDocumentCache.setStatus(resolvedURI, CMDocumentCache.STATUS_ERROR);
-    }
-    return result;
-  } 
-
-  public void removeAllReferences()
-  {
-    // TODO... initiate a timed release of the entries in the CMDocumentCache
-    publicIdTable = new Hashtable();
-  }
-}                                            
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/CMDocumentReferenceImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/CMDocumentReferenceImpl.java
deleted file mode 100644
index 10b9de2..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/CMDocumentReferenceImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentReference;
-
-public class CMDocumentReferenceImpl implements CMDocumentReference
-{              
-  protected String systemId;
-  protected String publicId;
-
-  public CMDocumentReferenceImpl(String publicId, String systemId)
-  {
-    this.publicId = publicId;                                    
-    this.systemId = systemId;
-  }
-
-  public String getPublicId()
-  {                          
-    return publicId;
-  }
-
-  public String getSystemId()
-  {                          
-    return systemId;
-  }      
-  
-  public String toString()
-  {
-    return "[" + publicId + ", " + systemId + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/InferredGrammarBuildingCMDocumentLoader.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/InferredGrammarBuildingCMDocumentLoader.java
deleted file mode 100644
index 29d93f3..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/InferredGrammarBuildingCMDocumentLoader.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl;
-                          
-import java.util.Hashtable;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.modelqueryimpl.InferredGrammarFactory;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- *
- */
-public class InferredGrammarBuildingCMDocumentLoader extends CMDocumentLoader
-{     
-  protected CMElementDeclaration inferredCMElementDeclaration;
-  protected CMDocument inferredCMDocument;
-  protected InferredGrammarFactory inferredGrammarFactory;
-  protected Hashtable createdCMDocumentTable;
-
-  public InferredGrammarBuildingCMDocumentLoader(Document document, ModelQuery modelQuery)
-  {                             
-    this(document, modelQuery.getCMDocumentManager());
-  }
-  
-  public InferredGrammarBuildingCMDocumentLoader(Document document, CMDocumentManager cmDocumentManager)
-  {                             
-    super(document, cmDocumentManager);
-    createdCMDocumentTable = new Hashtable();             
-    inferredGrammarFactory = new InferredGrammarFactory();
-  }     
-
-     
-  public void loadCMDocuments()
-  {   
-    //System.out.println("----------loadCMDocuments ------------");          
-    if (inferredGrammarFactory != null)
-    {
-      //long time = System.currentTimeMillis();
-      super.loadCMDocuments();
-      //System.out.println("--- elapsed time (" + count + ") = " + (System.currentTimeMillis() - time));
-      //inferredGrammarFactory.debugPrint(createdCMDocumentTable.values());
-    }
-    
-  }
-
-  public void handleElement(Element element)
-  { 
-    CMElementDeclaration parentInferredCMElementDeclaration = inferredCMElementDeclaration;
-                
-    if (inferredCMDocument == null)
-    {     
-      String cacheKey = "inferred-document";                    //$NON-NLS-1$
-      inferredCMDocument = inferredGrammarFactory.createCMDocument("");   //$NON-NLS-1$
-      cmDocumentManager.addCMDocument("", "", cacheKey, "DTD", inferredCMDocument); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-      createdCMDocumentTable.put(cacheKey, inferredCMDocument);
-    } 
-
-    inferredCMElementDeclaration = inferredGrammarFactory.createCMElementDeclaration(inferredCMDocument, element, false);                             
-     
-    if (parentInferredCMElementDeclaration != null)
-    {
-      inferredGrammarFactory.createCMContent(inferredCMDocument, parentInferredCMElementDeclaration, inferredCMDocument, inferredCMElementDeclaration, false, null);
-    }     
-       
-
-    visitChildNodes(element);   
-           
-    // reset the 'current' state to inital values
-    inferredCMElementDeclaration = parentInferredCMElementDeclaration;
-  }
-  
-
-  public void handleElementNS(Element element)
-  {                             
-    CMDocument parentInferredCMDocument = inferredCMDocument;
-    CMElementDeclaration parentInferredCMElementDeclaration = inferredCMElementDeclaration;
-        
-    inferredCMDocument = null;                                                            
-    inferredCMElementDeclaration = null;
-
-    // by adding the element to the namespaceTable, handleGrammar() will get called for any schema references
-    if (element.getParentNode() != document)
-    {
-      namespaceTable.addElement(element);
-    }
-
-    String prefix = element.getPrefix();
-    String uri = namespaceTable.getURIForPrefix(prefix);
-
-    if (uri == null && element.getParentNode() == document)
-    {
-      // when this is the root element
-      // we need to add an implied "no namespace schema location"
-      uri = "ommitted-namespace"; //$NON-NLS-1$
-      namespaceTable.addNamespaceInfo(prefix, uri, ""); //$NON-NLS-1$
-    }  
-
-    // here's where we update the inferred grammar if required
-    // 
-    boolean createCMElementDeclaration = true;
-          
-    boolean isLocal = (uri == null && prefix == null);         
-    if (isLocal)
-    {          
-      if (parentInferredCMDocument == null)
-      {
-        // this is a local element... and the parent is not inferred (e.g) it has a known grammar
-        // so we don't need to create an element declaration for this element
-        createCMElementDeclaration = false; 
-      }                             
-      else
-      {
-        if (uri == null)
-        {
-          uri = "ommitted-namespace"; //$NON-NLS-1$
-        }
-      }
-    }
-
-    if (createCMElementDeclaration)
-    {            
-      if (isLocal)
-      {
-        inferredCMDocument = parentInferredCMDocument;
-        inferredCMElementDeclaration = inferredGrammarFactory.createCMElementDeclaration(inferredCMDocument, element, true);       
-      }          
-      else
-      {
-        boolean createCMDocument = false;
-
-        String cacheKey = "inferred-document" + uri;  //$NON-NLS-1$
-        inferredCMDocument = (CMDocument)createdCMDocumentTable.get(cacheKey);
-
-        if (inferredCMDocument == null)
-        {
-          // we don't have an inferred document for this uri yet... let's see of we need one
-          int status = cmDocumentManager.getCMDocumentStatus(uri);                                                                                           
-          if (status == CMDocumentCache.STATUS_NOT_LOADED || status == CMDocumentCache.STATUS_ERROR)
-          {                  
-            // the cache does not contain a 'proper' CMDocument for this uri
-            // so we need to create an inferred one
-            createCMDocument = true;
-          } 
-        } 
-                
-        if (createCMDocument)
-        {           
-          //System.out.println("encountered element {" + element.getNodeName() + "} ... creating inferred CMDocument for " + uri);
-          inferredCMDocument = inferredGrammarFactory.createCMDocument(uri);
-          cmDocumentManager.addCMDocument(uri, "", cacheKey, "XSD", inferredCMDocument); //$NON-NLS-1$ //$NON-NLS-2$
-          createdCMDocumentTable.put(cacheKey, inferredCMDocument);
-        }
-
-        if (inferredCMDocument != null)
-        {
-          inferredCMElementDeclaration = inferredGrammarFactory.createCMElementDeclaration(inferredCMDocument, element, false);
-        }                                                                                                                                                   
-      }
-
-      if (parentInferredCMElementDeclaration != null)
-      {
-        inferredGrammarFactory.createCMContent(parentInferredCMDocument, parentInferredCMElementDeclaration, inferredCMDocument, inferredCMElementDeclaration, isLocal, uri);
-      } 
-    }               
-          
-    visitChildNodes(element);
-      
-    // reset the 'current' state to inital values
-    inferredCMElementDeclaration = parentInferredCMElementDeclaration;
-    inferredCMDocument = parentInferredCMDocument;
-  }                                                                                                       
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/ModelQueryActionHelper.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/ModelQueryActionHelper.java
deleted file mode 100644
index c813dac..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/ModelQueryActionHelper.java
+++ /dev/null
@@ -1,574 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryAction;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- *
- */
-public class ModelQueryActionHelper
-{
-  protected ModelQueryImpl modelQuery;
-
-  protected static class Action implements ModelQueryAction
-  {
-    public int kind;
-    public int startIndex;
-    public int endIndex;
-    public Node parent;
-    public CMNode cmNode;
-    public Object userData;
-
-    public Action(int kind, Node parent, CMNode cmNode)
-    {
-      this.kind = kind;
-      this.parent = parent;
-      this.cmNode = cmNode;
-    }
-
-    public Action(int kind, Node parent, CMNode cmNode, int startIndex, int endIndex)
-    {
-      this.kind = kind;
-      this.parent = parent;
-      this.cmNode = cmNode;
-      this.startIndex = startIndex;
-      this.endIndex = endIndex;
-    }
-
-    public int getKind()
-    {
-      return kind;
-    }
-
-    public int getStartIndex()
-    {
-      return startIndex;
-    }
-
-    public int getEndIndex()
-    {
-      return endIndex;
-    }
-
-    public Node getParent()
-    {
-      return parent;
-    }
-
-    public CMNode getCMNode()
-    {
-      return cmNode;
-    }
-
-    public Object getUserData()
-    {
-      return userData;
-    }
-
-    public void setUserData(Object object)
-    {
-      userData = object;
-    }
-
-    public void performAction()
-    {
-    }
-  }
-
-
-  public ModelQueryActionHelper(ModelQueryImpl modelQuery)
-  {
-    this.modelQuery = modelQuery;
-  }
-
-
-  public void getAllActions(Element parent, CMElementDeclaration ed, int validityChecking, List actionList)
-  {
-  }
-
-
-  // insert actions
-  //
-  public void getInsertActions(Element parent, CMElementDeclaration ed, int index, int includeOptions, int validityChecking, List actionList)
-  {
-    if ((includeOptions & ModelQuery.INCLUDE_ATTRIBUTES) != 0)
-    {
-      getInsertAttributeActions(parent, ed, validityChecking, actionList);
-    }
-    includeOptions &= ~ModelQuery.INCLUDE_ATTRIBUTES;
-    if ((includeOptions & ModelQuery.INCLUDE_CHILD_NODES) != 0)
-    {
-      if (index != -1)
-      {
-        getInsertChildNodeActionsAtIndex(parent, ed, index, includeOptions, validityChecking, actionList);
-      }
-      else
-      {
-        getInsertChildNodeActions(parent, ed, includeOptions, validityChecking, actionList);
-      }
-    }
-  }
-
-
-
-  protected void getInsertAttributeActions(Element parent, CMElementDeclaration ed, int validityChecking, List actionList)
-  {
-    // get actions for each insertable attribute
-    //
-    List availableAttributeList = modelQuery.getAvailableContent(parent, ed, ModelQuery.INCLUDE_ATTRIBUTES);
-
-    for (Iterator i = availableAttributeList.iterator(); i.hasNext(); )
-    {
-      CMAttributeDeclaration ad = (CMAttributeDeclaration)i.next();
-      if (modelQuery.canInsert(parent, ed, ad, 0, validityChecking))
-      {
-        Action action = new Action(ModelQueryAction.INSERT, parent, ad);
-        actionList.add(action);
-      }
-    }
-  }
-
-
-  protected void getInsertChildNodeActionsAtIndex(Element parent, CMElementDeclaration ed, int index, int includeOptions, int validityChecking, List actionList)
-  {                       
-    // get actions for each insertable attribute
-    //
-    int size = parent.getChildNodes().getLength();
-    if (index <= size)
-    {                                                                                          
-      List contentSpecificationList = modelQuery.getValidator().createContentSpecificationList(parent, ed); 
-      List availableChildNodeList = modelQuery.getAvailableContent(parent, ed, includeOptions);
-
-      boolean isSimpleChoice = isSimpleChoiceGroupContentModel(ed);
-     
-      for (Iterator i = availableChildNodeList.iterator(); i.hasNext(); )
-      {
-        CMNode cmNode = (CMNode)i.next();      
-        if (isSimpleChoice || modelQuery.canInsert(parent, ed, cmNode, index, validityChecking, contentSpecificationList))
-        {
-          Action action = new Action(ModelQueryAction.INSERT, parent, cmNode, index, index);
-          actionList.add(action);
-        }
-      }
-    }
-  }
-                  
- 
-  protected boolean isSimpleChoiceGroupContentModel(CMElementDeclaration ed)
-  {       
-    boolean result = false;
-    CMNode cmNode = ed.getContent();
-    if (cmNode != null && cmNode.getNodeType() == CMNode.GROUP)
-    {
-      CMGroup cmGroup = (CMGroup)cmNode;
-      if (cmGroup.getOperator() == CMGroup.CHOICE && cmGroup.getMaxOccur() == -1)
-      {                   
-        result = true;
-        CMNodeList list = cmGroup.getChildNodes();
-        for (int i = list.getLength() - 1; i >= 0; i--)
-        {
-          if (list.item(i).getNodeType() != CMNode.ELEMENT_DECLARATION)
-          {
-            result = false;
-            break;
-          }
-        }
-      }
-    }
-    return result;
-  }
-
-
-  protected void getInsertChildNodeActions(Element parent, CMElementDeclaration ed, int includeOptions, int validityChecking, List actionList)
-  {
-    int size = parent.getChildNodes().getLength();
-    List contentSpecificationList = modelQuery.getValidator().createContentSpecificationList(parent, ed);
-    List availableChildNodeList = modelQuery.getAvailableContent(parent, ed, includeOptions);
-
-    boolean isSimpleChoice = isSimpleChoiceGroupContentModel(ed);
-
-    for (Iterator iterator = availableChildNodeList.iterator(); iterator.hasNext(); )
-    {
-      CMNode cmNode = (CMNode)iterator.next();
-      for (int i = size; i >= 0; i--)
-      {
-        if (isSimpleChoice || modelQuery.canInsert(parent, ed, cmNode, i, validityChecking, contentSpecificationList))
-        {
-          Action action = new Action(ModelQueryAction.INSERT, parent, cmNode, i, i);
-          actionList.add(action);
-          break;
-        }
-      }
-    }
-  }
-
-  public void getInsertActions(Document parent, CMDocument cmDocument, int index, int includeOptions, int validityChecking, List actionList)
-  {
-    // get the root element and doctype index (if any)
-    //
-    int doctypeIndex = -1;
-    DocumentType doctype = null;
-    Element rootElement = null;
-    NodeList nodeList = parent.getChildNodes();
-    int nodeListLength = nodeList.getLength();
-    for (int i = 0; i < nodeListLength; i++)
-    {
-      Node childNode = nodeList.item(i);
-      if (childNode.getNodeType() == Node.ELEMENT_NODE)
-      {
-        rootElement = (Element)childNode;
-        break;
-      }
-      else if (childNode.getNodeType() == Node.DOCUMENT_TYPE_NODE)
-      {
-        doctype = (DocumentType)childNode;
-        doctypeIndex = i;
-      }
-    }
-
-    // make sure that root elements are only added after the doctype (if any)
-    if (rootElement == null && index > doctypeIndex)
-    {
-      CMNamedNodeMap map = cmDocument.getElements();
-      int mapLength = map.getLength();
-      for (int i = 0; i < mapLength; i++)
-      {
-        CMNode cmNode = map.item(i);
-
-        boolean canAdd = true;
-        if (validityChecking == ModelQuery.VALIDITY_STRICT)
-        {
-          canAdd = doctype == null || doctype.getName().equals(cmNode.getNodeName());
-        }
-
-        if (canAdd)
-        {
-          Action action = new Action(ModelQueryAction.INSERT, parent, cmNode, index, index);
-          actionList.add(action);
-        }
-      }
-    }
-  }
-
-
-
-  public void getInsertChildNodeActionTable(Element parent, CMElementDeclaration ed, int validityChecking, Hashtable actionTable)
-  {
-  }
-
-
-  public void getReplaceActions(Element parent, CMElementDeclaration ed, int includeOptions, int validityChecking, List actionList)
-  {
-    CMValidator.MatchModelNode matchModelNode = modelQuery.getValidator().getMatchModel(ed, parent);
-    if (matchModelNode != null)
-    {
-      MatchModelVisitor visitor = new MatchModelVisitor(parent, actionList);
-      visitor.visitMatchModelNode(matchModelNode);
-    }     
-  }
-
-  public void getReplaceActions(Element parent, CMElementDeclaration ed, List selectedChildren, int includeOptions, int validityChecking, List actionList)
-  {
-    int[] range = getRange(parent, selectedChildren);
-    if (range != null)
-    {                
-      if (isContiguous(parent, range, selectedChildren))
-      {
-        List tempList = new Vector();
-        getReplaceActions(parent, ed, includeOptions, validityChecking, tempList);
-        if ((includeOptions & ModelQuery.INCLUDE_ENCLOSING_REPLACE_ACTIONS) != 0)
-        {
-          removeActionsNotContainingRange(tempList, range[0], range[1]);            
-        }
-        else
-        {
-          removeActionsNotMatchingRange(tempList, range[0], range[1]);    
-        }
-        actionList.addAll(tempList);
-      }
-    }   
-    
-    if (selectedChildren.size() == 1)
-    {
-      Node node = (Node)selectedChildren.get(0);
-      if (node.getNodeType() == Node.ELEMENT_NODE)
-      {        
-        Element childElement = (Element)node;       
-        CMNode childEd = modelQuery.getCMElementDeclaration(childElement);
-        if (childEd != null)
-        {         
-
-          CMNode childOrigin= modelQuery.getOrigin(childElement);
-
-          CMNodeList cmNodeList = childOrigin != null ? 
-                                    (CMNodeList)childOrigin.getProperty("SubstitutionGroup") : //$NON-NLS-1$
-                                    (CMNodeList)childEd.getProperty("SubstitutionGroup"); //$NON-NLS-1$
-
-          if (cmNodeList != null && cmNodeList.getLength() > 1)
-          {                                                 
-            int replaceIndex = getIndex(parent, childElement);
-            String childEdName = childEd.getNodeName();
-            for (int i = 0; i < cmNodeList.getLength(); i++)
-            {         
-              CMNode substitution = cmNodeList.item(i);
-              if (!substitution.getNodeName().equals(childEdName) && !Boolean.TRUE.equals(substitution.getProperty("Abstract"))) //$NON-NLS-1$
-              {
-                Action action = new Action(ModelQueryAction.REPLACE, parent, cmNodeList.item(i), replaceIndex, replaceIndex);
-                actionList.add(action);
-              }
-            }
-          }
-        }
-      }   
-    }
-  }     
-           
-  
-  // returns true if the selected nodes are contiguous
-  //  
-  protected boolean isContiguous(Element parent, int[] range, List selectedNodeList)
-  {         
-    boolean result = true;
-    NodeList nodeList = parent.getChildNodes();
-	// issue: nodeListLength was never read, but in theory, 
-	// nodelList.getLength() might cause some clearing of cached 
-	// data, or something, so leaving in a potential meaningless call, for now.
-    //int nodeListLength = nodeList.getLength();
-	nodeList.getLength();
-    for (int i = range[0]; i < range[1]; i++)
-    {       
-      Node node = nodeList.item(i);    
-      if (!isWhitespaceNode(node) && !selectedNodeList.contains(node))
-      {             
-        result = false;
-        break;
-      }                       
-    }         
-    return result;
-  }
- 
- 
-  protected int[] getRange(Element parent, List list)
-  {
-    int[] result = null;
-    int first = -1;
-    int last = -1;                     
-
-    NodeList nodeList = parent.getChildNodes();
-    int nodeListLength = nodeList.getLength();
-    for (int i = 0; i < nodeListLength; i++)
-    {       
-      Node node = nodeList.item(i);    
-      if (list.contains(node))
-      {             
-        first = (first == -1) ? i : Math.min(first, i);        
-        last = Math.max(last, i);
-      }    
-    }
-   
-    if (first != -1 && last!= -1)
-    {             
-      result = new int[2];
-      result[0] = first;
-      result[1] = last;
-    }   
-    return result;
-  } 
-
-
-  protected boolean isWhitespaceNode(Node node)
-  {
-    return node.getNodeType() == Node.TEXT_NODE &&
-           node.getNodeValue().trim().length() == 0;
-  } 
-
-
-  protected int getIndex(Node parentNode, Node child)
-  {
-    NodeList nodeList = parentNode.getChildNodes();
-    int index = -1;
-    int size = nodeList.getLength();
-    for (int i = 0; i < size; i++)
-    {
-      if (nodeList.item(i) == child)
-      {
-        index = i;
-        break;
-      }
-    }
-    return index;
-  }                    
-
-
-  protected boolean isActionContainingRange(ModelQueryAction action, int startIndex, int endIndex)
-  {
-    int actionStartIndex = action.getStartIndex();
-    int actionEndIndex = action.getEndIndex();
-
-    return (actionStartIndex <= startIndex &&
-            actionEndIndex >= endIndex);
-  } 
-           
-
-  protected boolean isActionMatchingRange(ModelQueryAction action, int startIndex, int endIndex)
-  {
-    int actionStartIndex = action.getStartIndex();
-    int actionEndIndex = action.getEndIndex();
-    return (actionStartIndex == startIndex &&        
-            actionEndIndex == endIndex);
-  } 
-           
-
-  protected void removeActionsNotContainingRange(List actionList, int startIndex, int endIndex)
-  {
-    for (int i = actionList.size() - 1; i >= 0; i--)
-    {
-      ModelQueryAction action = (ModelQueryAction)actionList.get(i);
-      if (!isActionContainingRange(action, startIndex, endIndex))
-      {
-        actionList.remove(i);
-      }
-    }
-  }
-
-
-  protected void removeActionsNotMatchingRange(List actionList, int startIndex, int endIndex)
-  {
-    for (int i = actionList.size() - 1; i >= 0; i--)
-    {
-      ModelQueryAction action = (ModelQueryAction)actionList.get(i);
-      if (!isActionMatchingRange(action, startIndex, endIndex))
-      {
-        actionList.remove(i);
-      }
-    }
-  }
-
-
-  public static class MatchModelVisitor
-  {
-    int indent;
-    int elementIndex;
-    Node parent;
-    List actionList;
-
-    public MatchModelVisitor(Node parent, List actionList)
-    {
-      this.parent = parent;
-      this.actionList = actionList;
-    }
-
-    public int indexOfNextElement(int start)
-    {
-      NodeList nodeList = parent.getChildNodes();
-      int length = nodeList.getLength();
-      int result = length;
-      for (int i = start; i < length; i++)
-      {
-        Node node = nodeList.item(i);
-        if (node.getNodeType() == Node.ELEMENT_NODE)
-        {
-          result = i;
-          break;
-        }
-      }
-      return result;
-    }
-
-    public void visitMatchModelNode(CMValidator.MatchModelNode matchModelNode)
-    {
-      int startIndex = indexOfNextElement(elementIndex);
-
-      //String cmNodeName = matchModelNode.cmNode != null ? matchModelNode.cmNode.getNodeName() : "null";
-      //printIndented(indent, "+MatchModelNode : " + cmNodeName +  " " + startIndex);
-
-      indent += 2;
-      for (Iterator iterator = matchModelNode.children.iterator(); iterator.hasNext(); )
-      {
-        CMValidator.MatchModelNode child = (CMValidator.MatchModelNode)iterator.next();
-        visitMatchModelNode(child);
-      }
-      indent -= 2;
-
-      if (matchModelNode.cmNode != null)
-      {
-        int nodeType = matchModelNode.cmNode.getNodeType();
-        if (nodeType == CMNode.GROUP)
-        {
-          CMGroup group = (CMGroup)matchModelNode.cmNode;
-          if (group.getOperator() == CMGroup.CHOICE)
-          {
-            addReplaceActions(matchModelNode, group, startIndex, elementIndex - 1);
-          }
-        }
-        else if (nodeType == CMNode.ELEMENT_DECLARATION)
-        {
-          elementIndex = startIndex + 1;
-        }
-        //printIndented(indent, "-MatchModelNode : " + cmNodeName +  " " + (elementIndex - 1));
-      }
-    }
-
-    public void addReplaceActions(CMValidator.MatchModelNode matchModelNode, CMGroup group, int startIndex, int endIndex)
-    {
-      CMNode excludeCMNode = null;
-      if (matchModelNode.children.size() > 0)
-      {
-        CMValidator.MatchModelNode child = (CMValidator.MatchModelNode)matchModelNode.children.get(0);
-        excludeCMNode = child.cmNode;
-      }
-
-      CMNodeList nodeList = group.getChildNodes();
-      int size = nodeList.getLength();
-      for (int i = 0; i < size; i++)
-      {
-        CMNode alternative = nodeList.item(i);
-        if (alternative != excludeCMNode)
-        {
-          Action action = new Action(ModelQueryAction.REPLACE, parent, alternative, startIndex, endIndex);
-          actionList.add(action);
-        }
-      }
-    }
-  }
-
-  //public static void printIndented(int indent, String string)
-  //{
-  //  for (int i = 0; i < indent; i++)
-  //  {
-  //    System.out.print(" ");
-  //  }
-  //  System.out.println(string);
-  //}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/ModelQueryImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/ModelQueryImpl.java
deleted file mode 100644
index 1ff4182..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/ModelQueryImpl.java
+++ /dev/null
@@ -1,856 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.modelqueryimpl.ModelQueryExtensionManagerImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMDataTypeValueHelper;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.DOMValidator;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryAssociationProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.extension.ModelQueryExtensionManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceTable;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-
-/**
- * This class implements a large portion of the ModelQuery interfaces.
- * Some work is delegated to the DOMHelper, CMDocumentManager, and DOMValidator.
- */
-public class ModelQueryImpl implements ModelQuery
-{
-  protected ModelQueryAssociationProvider modelQueryAssociationProvider;
-  protected ModelQueryActionHelper modelQueryActionHelper;
-  protected DOMValidator validator;   
-  protected ModelQueryExtensionManagerImpl extensionManager;   
-  protected CMDataTypeValueHelper valueHelper;
-  protected int editMode = EDIT_MODE_CONSTRAINED_STRICT;
-
-  public ModelQueryImpl(ModelQueryAssociationProvider modelQueryAssociationProvider)
-  {
-    this.modelQueryAssociationProvider = modelQueryAssociationProvider;
-    modelQueryActionHelper = createModelQueryActionHelper();
-    validator = new DOMValidator();                         
-    extensionManager = new ModelQueryExtensionManagerImpl();
-    valueHelper = new CMDataTypeValueHelper();
-  }
-                         
-  public int getEditMode()
-  {
-    return editMode;
-  }
-                    
-  public void setEditMode(int editMode)
-  {
-    this.editMode =editMode;
-  }
-
-
-  // factory methods
-  public ModelQueryActionHelper createModelQueryActionHelper()
-  {
-    return new ModelQueryActionHelper(this);
-  } 
-
-  public DOMValidator getValidator()
-  {
-    return validator;
-  }
-
-  public CMDocument getCorrespondingCMDocument(Node node)
-  {
-    return modelQueryAssociationProvider.getCorrespondingCMDocument(node);
-  }
-
-  public CMNode getCMNode(Node node)
-  {
-    return modelQueryAssociationProvider.getCMNode(node);
-  }
-
-  public CMDataType getCMDataType(Text text)
-  {
-    return modelQueryAssociationProvider.getCMDataType(text);
-  }
-
-  public CMAttributeDeclaration getCMAttributeDeclaration(Attr attr)
-  {
-    return modelQueryAssociationProvider.getCMAttributeDeclaration(attr);
-  }
-
-  public CMElementDeclaration getCMElementDeclaration(Element element)
-  {
-    return modelQueryAssociationProvider.getCMElementDeclaration(element);
-  }
-   
-  public CMDocumentManager getCMDocumentManager()
-  {
-    CMDocumentManager result = null;
-    if (modelQueryAssociationProvider instanceof XMLAssociationProvider)
-    {             
-      XMLAssociationProvider xmlAssociationProvider = (XMLAssociationProvider)modelQueryAssociationProvider;
-      result = xmlAssociationProvider.getCMDocumentManager();
-    }    
-    return result;
-  }
-       
-
-  /**
-   * @deprected - use 3 arg version below
-   */
-  public List getCMDocumentList(Element element, String uri)
-  {        
-    return Collections.EMPTY_LIST;
-  }
-
-  public List getCMDocumentList(Element element, CMElementDeclaration ed, String uri)
-  {                
-    List result = new Vector();
-    if (modelQueryAssociationProvider instanceof XMLAssociationProvider)
-    {              
-      XMLAssociationProvider xmlAssociationProvider = (XMLAssociationProvider)modelQueryAssociationProvider;
-     
-      // todo... revist... handle each ##thing explicitly
-      //          
-      if (uri == null)
-      {
-        uri = "##any"; //$NON-NLS-1$
-      }               
-
-      if (uri.equals("##targetNamespace")) //$NON-NLS-1$
-      {                                                      
-        CMDocument cmDocument = (CMDocument)ed.getProperty("CMDocument"); //$NON-NLS-1$
-        if (cmDocument != null)
-        {  
-          result.add(cmDocument);
-        }
-      }
-      else if (uri.equals("##any") || uri.equals("##other")) //$NON-NLS-1$ //$NON-NLS-2$
-      {                                        
-        String excludedURI = null;
-        if (uri.equals("##other")) //$NON-NLS-1$
-        {
-          CMDocument cmDocument = (CMDocument)ed.getProperty("CMDocument");        //$NON-NLS-1$
-          if (cmDocument != null)
-          {
-            excludedURI = (String)cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI"); //$NON-NLS-1$
-          }
-        }
-                               
-        // in this case we should consider all of the schema related to this document
-        //
-        NamespaceTable namespaceTable = new NamespaceTable(element.getOwnerDocument());
-        namespaceTable.addElementLineage(element);
-        List list = namespaceTable.getNamespaceInfoList();
-        for (Iterator i = list.iterator(); i.hasNext();)
-        {
-          NamespaceInfo info = (NamespaceInfo)i.next();
-          if (info.uri != null && !info.uri.equals(excludedURI))
-          {
-            CMDocument document = xmlAssociationProvider.getCMDocument(info.uri, info.locationHint, "XSD"); //$NON-NLS-1$
-            if (document != null)
-            {
-              result.add(document);
-            }
-          }
-        }
-      }   
-      else
-      {        
-        CMDocument document = xmlAssociationProvider.getCMDocument(element, uri);
-        if (document != null)
-        {
-          result.add(document);
-        }
-      }      
-    }
-    return result;
-  }
-
-
-  public CMDocument getCMDocument(Element element, String uri)
-  {                
-
-    CMDocument result = null;
-    if (modelQueryAssociationProvider instanceof XMLAssociationProvider)
-    {             
-      XMLAssociationProvider xmlAssociationProvider = (XMLAssociationProvider)modelQueryAssociationProvider;
-      result = xmlAssociationProvider.getCMDocument(element, uri);
-    }
-    //ContentModelManager.println("ModelQueryImpl.getCMDocument(" + element.getNodeName() + ", " + uri + ") = " + result);
-    return result;
-  }
-
-  public boolean isContentValid(Element element)
-  {               
-    CMElementDeclaration ed = getCMElementDeclaration(element);
-    return isContentValid(ed, element);
-  }
-
-  public boolean isContentValid(CMElementDeclaration ed, Element element)
-  {                                               
-    boolean result = true;    
-    if (ed != null)
-    { 
-      // first check to see if all the required attributes are present
-      //                                                      
-      CMNamedNodeMap map = ed.getAttributes();
-      int mapLength = map.getLength();
-      for (int i = 0; i < mapLength; i++)
-      {                                                           
-        CMAttributeDeclaration ad = (CMAttributeDeclaration)map.item(i);
-        String attributeName = DOMNamespaceHelper.computeName(ad, element, null);
-        if (ad.getUsage() == CMAttributeDeclaration.REQUIRED)
-        {               
-           Attr attr = element.getAttributeNode(attributeName);
-           if (attr == null)
-           {
-             result = false;
-             break;
-           }
-        }
-      }
-
-      // now check to see of the children validate properly
-      //
-      if (result) 
-      {
-        CMNode[] originArray = getOriginArray(element);
-        result = originArray != null && originArray.length == element.getChildNodes().getLength();
-      }
-    }
-    return result;
-  }
-
-
-  public CMNode getOrigin(Node node)
-  {
-    CMNode result = null;
-    // todo... make sure parent is right
-    //
-    Node parentNode = getParentOrOwnerNode(node);
-    if (parentNode != null && parentNode.getNodeType() == Node.ELEMENT_NODE)
-    {
-      Element parentElement = (Element)parentNode;
-      CMNode[] array = getOriginArray(parentElement);
-      if (array != null)
-      {
-        int index = getIndexOfNode(parentElement.getChildNodes(), node);
-        if (index < array.length)
-        {
-          result = array[index];
-        }
-      }
-    }
-    return result;
-  }
-
-  public CMNode[] getOriginArray(Element element)
-  {
-    CMElementDeclaration ed = getCMElementDeclaration(element);
-    return (ed != null) ? getValidator().getOriginArray(ed, element) : null;
-  }
-
-  public int getIndexOfNode(NodeList nodeList, Node node)
-  {
-    int result = -1;
-    int size = nodeList.getLength();
-    for (int i = 0; i < size; i++)
-    {
-       if (nodeList.item(i) == node)
-       {
-         result = i;
-         break;
-       }
-    }
-    return result;
-  }
-
-
-  /**
-   * Returns a list of all CMNode 'meta data' that may be potentially added to the element.
-   */
-  public List getAvailableContent(Element element, CMElementDeclaration ed, int includeOptions)
-  {
-    AvailableContentCMVisitor visitor = new AvailableContentCMVisitor(element, ed);
-    List list = visitor.computeAvailableContent(includeOptions);
-    if (extensionManager != null)
-    {                    
-      extensionManager.filterAvailableElementContent(list, element, ed);
-    }  
-    return list;
-  }  
-
-
-  public boolean canInsert(Element parent, CMNode cmNode, int index, int validityChecking)
-  {
-    boolean result = true;
-    CMElementDeclaration ed = getCMElementDeclaration(parent);
-    if (ed != null)
-    {
-      result = canInsert(parent, ed, cmNode, index, validityChecking);
-    }
-    return result;
-  }
-
-
-  public boolean canInsert(Element parent, CMElementDeclaration ed, CMNode cmNode, int index, int validityChecking)
-  {
-    return canInsert(parent, ed, cmNode, index, validityChecking, null);
-  }         
-
-  protected boolean canInsert(Element parent, CMElementDeclaration ed, CMNode cmNode, int index, int validityChecking, Object reuseableData)
-  {
-    boolean result = true;
-    switch (cmNode.getNodeType())
-    {
-      case CMNode.ATTRIBUTE_DECLARATION :
-      {
-        String attributeName = DOMNamespaceHelper.computeName(cmNode, parent, null);
-        result = parent.getAttributeNode(attributeName) == null;
-        break;
-      }
-      case CMNode.ELEMENT_DECLARATION :
-      case CMNode.GROUP :
-      {
-        if (validityChecking == VALIDITY_STRICT)
-        {                                  
-          // create list                       
-          List contentSpecificationList = null;
-          if (reuseableData != null)
-          {                            
-            contentSpecificationList = (List)reuseableData;
-          }    
-          else
-          {                                                                                  
-            contentSpecificationList = getValidator().createContentSpecificationList(parent, ed);
-          }
-          result = getValidator().canInsert(ed, contentSpecificationList, index, cmNode);
-        }
-        break;
-      }
-      case CMNode.DATA_TYPE :
-      {
-        int contentType = ed.getContentType();
-        result = (contentType == CMElementDeclaration.MIXED ||
-                  contentType == CMElementDeclaration.PCDATA ||
-                  contentType == CMElementDeclaration.ANY);
-        break;
-      }
-      default :
-      {
-        result = false;
-        break;
-      }
-    }
-    return result;
-  }
-
-  public boolean canInsert(Element parent, List cmNodeList, int index, int validityChecking)
-  {
-    // todo
-    return true;
-  }
-
-
-  public boolean canRemove(Node node, int validityChecking)
-  {
-    boolean result = true;      
-    if (validityChecking == VALIDITY_STRICT)
-    {
-      int nodeType = node.getNodeType();
-      switch (nodeType)
-      {
-        case Node.ATTRIBUTE_NODE:
-        {
-          CMAttributeDeclaration ad = getCMAttributeDeclaration((Attr)node);
-          if (ad != null)
-          {
-            result = (ad.getUsage() == CMAttributeDeclaration.OPTIONAL);
-          }
-          break;
-        }
-        case Node.ELEMENT_NODE:
-        {
-          Node parentNode = node.getParentNode();
-          if (parentNode.getNodeType() == Node.ELEMENT_NODE)
-          {
-            Element parentElement = (Element)parentNode;
-            CMElementDeclaration ed = getCMElementDeclaration(parentElement);
-            if (ed != null)
-            {
-              List contentSpecificationList = getValidator().createContentSpecificationList(parentElement, ed);
-              int index = getIndexOfNode(parentElement.getChildNodes(), node);
-              result = getValidator().canRemove(ed, contentSpecificationList, index);
-            }
-          }
-          break;
-        }
-      }
-    }
-    return result;
-  }
-
-
-  public boolean canRemove(List nodeList, int validityChecking)
-  {
-    boolean result = true;
-
-    if (validityChecking == VALIDITY_STRICT)
-    {
-      Element parentElement = null;
-      List childList = null;
-
-      for (Iterator i = nodeList.iterator(); i.hasNext(); )
-      {
-        Node node = (Node)i.next();
-
-        if (parentElement == null)
-        {
-          parentElement = getParentOrOwnerElement(node);
-        }
-        else if (parentElement != getParentOrOwnerElement(node))
-        {
-          // make sure the parent are the same
-          result = false;
-          break;
-        }
-
-        if (parentElement == null)
-        {
-          result = true;
-          break;
-        }
-
-        int nodeType = node.getNodeType();
-        if (nodeType == Node.ATTRIBUTE_NODE)
-        {
-          if (!canRemove(node, validityChecking))
-          {
-            result = false;
-            break;
-          }
-        }
-        else
-        {
-          if (childList == null)
-          {
-            childList = nodeListToList(parentElement.getChildNodes());
-          }
-          childList.remove(node);
-        }
-      }
-
-      if (result && childList != null)
-      {
-        CMElementDeclaration ed = getCMElementDeclaration(parentElement);
-        if (ed != null)
-        {                                
-          List contentSpecificationList = getValidator().createContentSpecificationList(childList, ed);
-          result = getValidator().isValid(ed, contentSpecificationList);
-        }
-      }
-    }
-
-    return result;
-  }
-
-  public boolean canReplace(Element parent, int startIndex, int endIndex, CMNode cmNode, int validityChecking)
-  {
-    return true;
-  }
-
-  public boolean canReplace(Element parent, int startIndex, int endIndex, List cmNodeList, int validityChecking)
-  {
-    return true;
-  }     
-   
-  /**
-   * This method is experimental... use at your own risk
-   */
-  public boolean canWrap(Element childElement, CMElementDeclaration wrapElement, int validityChecking)
-  {                        
-    boolean result = true;  
-    Node parentNode = childElement.getParentNode();                      
-    if (parentNode.getNodeType() == Node.ELEMENT_NODE)
-    {           
-      Element parentElement = (Element)parentNode;      
-      CMElementDeclaration parentEd = getCMElementDeclaration(parentElement);
-      if (parentEd != null)
-      {                                                                                         
-        if (validityChecking == VALIDITY_STRICT)
-        {
-          int index = getIndexOfNode(parentElement.getChildNodes(), childElement);
-
-          List contentSpecificationList = getValidator().createContentSpecificationList(parentElement, parentEd);
-          List subList = contentSpecificationList.subList(index, index + 1);
-          result = getValidator().canReplace(parentEd, contentSpecificationList, index, index, wrapElement);
-          if (result)
-          {
-            result = getValidator().isValid(wrapElement, subList);
-          }
-        }
-      }
-    }
-    else
-    {
-      result = false;
-    }                
-    return result;
-  }
-
-  public void getInsertActions(Element parent, CMElementDeclaration ed, int index, int includeOptions, int validityChecking, List actionList)
-  {
-    modelQueryActionHelper.getInsertActions(parent, ed, index, includeOptions, validityChecking, actionList);
-  }
-
-  public void getInsertActions(Document parent, CMDocument cmDocument, int index, int includeOptions, int validityChecking, List actionList)
-  {
-    modelQueryActionHelper.getInsertActions(parent, cmDocument, index, includeOptions, validityChecking, actionList);
-  }
-
-  public void getReplaceActions(Element parent, CMElementDeclaration ed, int includeOptions, int validityChecking, List actionList)
-  {
-    modelQueryActionHelper.getReplaceActions(parent, ed, includeOptions, validityChecking, actionList);
-  }                     
-
-  public void getReplaceActions(Element parent, CMElementDeclaration ed, List selectedChildren, int includeOptions, int validityChecking, List actionList)
-  {
-    modelQueryActionHelper.getReplaceActions(parent, ed, selectedChildren, includeOptions, validityChecking, actionList);
-  }
-
-  public void getInsertChildNodeActionTable(Element parent, CMElementDeclaration ed, int validityChecking, Hashtable actionTable)
-  {
-    modelQueryActionHelper.getInsertChildNodeActionTable(parent, ed, validityChecking, actionTable);
-  }
-
-  public void getActionTable(Element parent, CMElementDeclaration ed, int index, int validityChecking, Hashtable actionTable)
-  {
-    //modelQueryActionHelper.getAllActions(parent, ed, validityChecking, actionList);
-  }
-
-
-  // some helper methods
-  //
-  protected Node getParentOrOwnerNode(Node node)
-  {
-    return (node.getNodeType() == Node.ATTRIBUTE_NODE) ?
-           ((Attr)node).getOwnerElement() :
-           node.getParentNode();
-  }
-
-  protected Element getParentOrOwnerElement(Node node)
-  {
-    Node parent = getParentOrOwnerNode(node);
-    return (parent.getNodeType() == Node.ELEMENT_NODE) ? (Element)parent : null;
-  }
-               
-
-  protected List nodeListToList(NodeList nodeList)
-  {
-    int size = nodeList.getLength();
-    Vector v = new Vector(size);
-    for (int i = 0; i < size; i++)
-    {
-      v.add(nodeList.item(i));
-    }
-    return v;
-  }   
-   
-  /**
-  protected List getCMNodeList(NodeList nodeList)
-  {
-    int size = nodeList.getLength();
-    Vector v = new Vector(size);
-    for (int i = 0; i < size; i++)
-    {
-      v.add(getCMNode(nodeList.item(i));
-    }
-    return v;
-  }
-  */  
-
-  public class AvailableContentCMVisitor extends CMVisitor
-  {
-    public Hashtable childNodeTable = new Hashtable();
-    public Hashtable attributeTable = new Hashtable();
-    public Element rootElement;
-    public CMElementDeclaration rootElementDeclaration; 
-    public boolean isRootVisited;
-    protected boolean includeSequenceGroups;
-
-    public AvailableContentCMVisitor(Element rootElement, CMElementDeclaration rootElementDeclaration)
-    {                                     
-      this.rootElement = rootElement;
-      this.rootElementDeclaration = rootElementDeclaration;
-    }
-
-    protected String getKey(CMNode cmNode)
-    {
-      String key = cmNode.getNodeName();
-      CMDocument cmDocument = (CMDocument)cmNode.getProperty("CMDocument"); //$NON-NLS-1$
-      if (cmDocument != null)
-      {                         
-        String namespaceURI = (String)cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI");    //$NON-NLS-1$
-        if (namespaceURI != null)
-        {   
-          key = "[" + namespaceURI + "]" + key; //$NON-NLS-1$ //$NON-NLS-2$
-        }
-      }
-      return key;
-    }
-    
-    protected void addToTable(Hashtable table, CMNode cmNode)
-    {
-      String nodeName = cmNode.getNodeName();
-      if (nodeName != null && nodeName.length() > 0)
-      {  
-        table.put(getKey(cmNode), cmNode);
-      }  
-    }
-
-    public List computeAvailableContent(int includeOptions)
-    {                   
-      Vector v = new Vector();  
-
-      int contentType = rootElementDeclaration.getContentType();
-      includeSequenceGroups = ((includeOptions & INCLUDE_SEQUENCE_GROUPS) != 0);
-      visitCMNode(rootElementDeclaration);
-      
-      if ((includeOptions & INCLUDE_ATTRIBUTES) != 0)
-      {
-        v.addAll(attributeTable.values());
-        CMAttributeDeclaration nillableAttribute = (CMAttributeDeclaration)rootElementDeclaration.getProperty("http://org.eclipse.wst/cm/properties/nillable"); //$NON-NLS-1$
-        if (nillableAttribute != null)
-        {
-          v.add(nillableAttribute);
-        }
-      }  
-
-      if ((includeOptions & INCLUDE_CHILD_NODES) != 0)
-      {      
-        if (contentType == CMElementDeclaration.MIXED ||
-            contentType == CMElementDeclaration.ELEMENT)
-        {
-          v.addAll(childNodeTable.values());
-        }
-        else if (contentType == CMElementDeclaration.ANY)
-        {      
-          CMDocument cmDocument =  (CMDocument)rootElementDeclaration.getProperty("CMDocument"); //$NON-NLS-1$
-          if (cmDocument != null)
-          {
-            CMNamedNodeMap elements = cmDocument.getElements();            
-            for (Iterator i = elements.iterator(); i.hasNext(); )
-            {
-              v.add(i.next());
-            } 
-          }
-        }
-              
-        if (contentType == CMElementDeclaration.MIXED ||
-            contentType == CMElementDeclaration.PCDATA || 
-            contentType == CMElementDeclaration.ANY)
-        {
-          CMDataType dataType = rootElementDeclaration.getDataType();
-          if (dataType != null)
-          {
-            v.add(dataType);
-          }                                       
-        }
-      }
-      return v;
-    }   
-
-    public void visitCMAnyElement(CMAnyElement anyElement)
-    {            
-      String uri = anyElement.getNamespaceURI();                          
-      List list = getCMDocumentList(rootElement, rootElementDeclaration, uri);
-      for (Iterator iterator = list.iterator(); iterator.hasNext(); )
-      {
-        CMDocument cmdocument = (CMDocument)iterator.next();
-        if (cmdocument != null)
-        {                          
-          CMNamedNodeMap map = cmdocument.getElements();
-          int size = map.getLength();
-          for (int i = 0; i < size; i++)
-          {                       
-            CMNode ed = map.item(i);                  
-            addToTable(childNodeTable,ed);
-          }        
-        }                
-      }
-    }
-
-    public void visitCMAttributeDeclaration(CMAttributeDeclaration ad)
-    {
-      super.visitCMAttributeDeclaration(ad);
-      attributeTable.put(ad.getNodeName(), ad);
-    }
-
-    public void visitCMElementDeclaration(CMElementDeclaration ed)
-    {
-      if (ed == rootElementDeclaration && !isRootVisited)
-      {
-        isRootVisited = true;
-        super.visitCMElementDeclaration(ed);
-      }
-      else
-      {                                                                                  
-        if (!Boolean.TRUE.equals(ed.getProperty("Abstract"))) //$NON-NLS-1$
-        {
-          addToTable(childNodeTable,ed);
-        }
-
-        CMNodeList substitutionGroup = (CMNodeList)ed.getProperty("SubstitutionGroup"); //$NON-NLS-1$
-        if (substitutionGroup != null)
-        {
-          handleSubstitutionGroup(substitutionGroup);
-        }
-      }
-    }                                              
-
-    protected void handleSubstitutionGroup(CMNodeList substitutionGroup)
-    {
-      int substitutionGroupLength = substitutionGroup.getLength();
-      if (substitutionGroupLength > 1)
-      {
-        for (int i = 0; i < substitutionGroupLength; i++)
-        {
-          CMNode ed = substitutionGroup.item(i);
-          if (!Boolean.TRUE.equals(ed.getProperty("Abstract"))) //$NON-NLS-1$
-          {
-            addToTable(childNodeTable,ed);
-          }
-        }
-      }
-    }
-
-    public void visitCMGroup(CMGroup group)
-    {
-      if (includeSequenceGroups)
-      {
-        if (group.getOperator() == CMGroup.SEQUENCE &&
-            group.getChildNodes().getLength() > 1 &&
-            includesRequiredContent(group))
-        {                                        
-          childNodeTable.put(group, group);
-        }
-      }  
-      super.visitCMGroup(group);
-    }   
-
-    public boolean includesRequiredContent(CMGroup group)
-    {
-      List list = getValidator().createContentSpecificationList(group);
-      return list.size() > 1;
-    }
-  }    
-
- 
-  /**
-   * @deprected - use getPossibleDataTypeValues()
-   */
-  public List getDataTypeValues(Element element, CMNode cmNode)
-  {                                                                             
-    return Arrays.asList(getPossibleDataTypeValues(element, cmNode));
-  }
-  
-  /**
-   * This methods return an array of possible values corresponding to the datatype of the CMNode (either an CMAttributeDeclaration or a CMElementDeclaration)
-   */
-  public String[] getPossibleDataTypeValues(Element element, CMNode cmNode)
-  {
-    List list = new Vector();                            
-                               
-    if (cmNode != null)
-    {       
-      CMDataType dataType = null;
-      if (cmNode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION)
-      {
-        dataType = ((CMAttributeDeclaration)cmNode).getAttrType();
-      }
-      else if (cmNode.getNodeType() == CMNode.ELEMENT_DECLARATION)
-      {
-        dataType = ((CMElementDeclaration)cmNode).getDataType();
-      }         
-     
-      String[] enumeratedValues = dataType != null ? dataType.getEnumeratedValues() : null;      
-      if (enumeratedValues != null)
-      {
-        for (int i = 0; i < enumeratedValues.length; i++)
-        {
-          list.add(enumeratedValues[i]);
-        } 
-      }                              
-    }
-                         
-    addValuesForXSIType(element, cmNode, list);
-    
-    if (extensionManager != null)
-    {                    
-      list.addAll(extensionManager.getDataTypeValues(element, cmNode));
-    }          
-                        
-    int listSize = list.size();
-    String[] result = new String[listSize];
-    for (int i = 0; i < listSize; i++)
-    {
-      result[i] = (String)list.get(i);
-    }     
-    return result;
-  }    
-
-           
-  protected void addValuesForXSIType(Element element, CMNode cmNode, List list)
-  {               
-    if (cmNode != null && cmNode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) 
-    {                         
-      CMAttributeDeclaration ad = (CMAttributeDeclaration)cmNode;                              
-      if (valueHelper.isXSIType(ad))
-      {             
-        NamespaceTable table = new NamespaceTable(element.getOwnerDocument());
-        table.addElementLineage(element);
-        list.addAll(valueHelper.getQualifiedXSITypes(ad, table));     
-      }
-    }
-  }
-    
-
-  public ModelQueryExtensionManager getExtensionManager()
-  {
-    return extensionManager;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/SimpleAssociationProvider.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/SimpleAssociationProvider.java
deleted file mode 100644
index 0331531..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/SimpleAssociationProvider.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryCMProvider;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- *
- */
-public class SimpleAssociationProvider extends BaseAssociationProvider
-{
-  protected ModelQueryCMProvider modelQueryCMProvider;
-          
-  public SimpleAssociationProvider(ModelQueryCMProvider modelQueryCMProvider)
-  {                                              
-    this.modelQueryCMProvider = modelQueryCMProvider;
-  }
-
-  public CMDocument getCorrespondingCMDocument(Node node)
-  {
-    return modelQueryCMProvider.getCorrespondingCMDocument(node);
-  }
-  
-  public CMElementDeclaration getCMElementDeclaration(Element element)
-  {
-    CMElementDeclaration result = null;
-    CMDocument cmDocument = getCorrespondingCMDocument(element);
-    if (cmDocument != null)
-    {        
-      result = (CMElementDeclaration)cmDocument.getElements().getNamedItem(element.getNodeName());    
-    }
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/XMLAssociationProvider.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/XMLAssociationProvider.java
deleted file mode 100644
index 646629a..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/XMLAssociationProvider.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentReferenceProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceTable;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- *
- */
-public abstract class XMLAssociationProvider extends BaseAssociationProvider implements CMDocumentReferenceProvider
-{              
-  protected CMDocumentCache cmDocumentCache; 
-  protected CMDocumentManagerImpl documentManager;
-
-  public XMLAssociationProvider(CMDocumentCache cmDocumentCache)
-  {
-    this.cmDocumentCache = cmDocumentCache; 
-    documentManager = new CMDocumentManagerImpl(cmDocumentCache, this);
-  }                              
-
-  public CMDocumentManager getCMDocumentManager()
-  {
-    return documentManager;
-  }
- 
-      
-  public static String[] getDoctypeInfo(Document document)
-  {   
-    String[] result = null;
-    DocumentType doctype = document.getDoctype();
-
-    // defect 206833 ... here we test for DTDs that are declared inline
-    // since we currently have no way of making use of inline DTDs we ingore them
-    // so that the implict DTD (if any) can be used
-    if (doctype != null && (doctype.getPublicId() != null || doctype.getSystemId() != null))
-    {
-      result = new String[2];
-      result[0] = doctype.getPublicId();
-      result[1] = doctype.getSystemId();
-    }   
-    else if (getImplictDoctype(document) != null)
-    {
-      result = getImplictDoctype(document);
-    }                  
-    return result;
-  }   
-
-
-  protected static String[] getImplictDoctype(Document document)
-  { 
-    String[] result = null;
-    /*
-    DOMExtension domExtension = DOMExtensionProviderRegistry.getInstance().getDOMExtension(document);
-    if (domExtension != null)
-    {
-      result = domExtension.getImplicitDoctype();
-    }*/
-    return result;
-  }
-
-  public CMDocument getCorrespondingCMDocument(Node node)
-  {        
-    return getCorrespondingCMDocument(node, true);
-  }
-
-  protected CMDocument getCorrespondingCMDocument(Node node, boolean getDocumentFromCMNode)
-  {            
-    CMDocument result = null;
-    try
-    {
-      Document document = node.getNodeType() == Node.DOCUMENT_NODE ? (Document)node : node.getOwnerDocument();
-   
-      String[] doctypeInfo = getDoctypeInfo(document);
-
-      if (doctypeInfo != null)
-      {
-        result = getCMDocument(doctypeInfo[0], doctypeInfo[1], "DTD"); //$NON-NLS-1$
-      }                                             
-      // defect 211236 ... in some cases calling this method can result in a cycle
-      // we use the getDocumentFromCMNode as a flag to avoid this 
-      // TODO... see if there is a way to re-organize to avoid the need for this flag
-      else if (getDocumentFromCMNode)
-      {
-        CMNode cmNode = getCMNode(node);
-        if (cmNode != null)       
-        {                
-          // todo... add a getCMDocument() methods to CMNode
-          // for now use the getProperty interface
-          result = (CMDocument)cmNode.getProperty("CMDocument"); //$NON-NLS-1$
-        }
-      }
-    }
-    catch (Exception e)
-    {
-      Logger.logException("exception locating CMDocument for " + node, e); //$NON-NLS-1$
-    }
-    return result;
-  }    
-
-      
-  public CMDocument getCMDocument(Element element, String uri)
-  {
-    CMDocument result = null;
-    NamespaceTable namespaceTable = new NamespaceTable(element.getOwnerDocument());
-    namespaceTable.addElementLineage(element);
-    NamespaceInfo namespaceInfo = namespaceTable.getNamespaceInfoForURI(uri);
-    if (namespaceInfo != null)
-    {
-      result = getCMDocument(namespaceInfo.uri, namespaceInfo.locationHint, "XSD"); //$NON-NLS-1$
-    }
-    return result;
-  }         
-  
-                          
-  public CMDocument getCMDocument(String publicId, String systemId, String type)
-  {                   
-    //String resolvedGrammarURI = resolveGrammarURI(document, publicId, systemId);
-    return documentManager.getCMDocument(publicId, systemId, type);  
-  }
-
-  //public CMDocument getCMDocument(Document document, String publicId, String systemId)
-  //{                   
-  //  //String resolvedGrammarURI = resolveGrammarURI(document, publicId, systemId);
-  //  return documentManager.getCMDocument(publicId, systemId);  
-  //}
-   
-  public String resolveGrammarURI(String publicId, String systemId)
-  {
-    return resolveGrammarURI(null, publicId, systemId);
-  }
-
-
-  /**
-   * This method should be specialized in order to implement specialized uri resolution
-   */
-  protected String resolveGrammarURI(Document document, String publicId, String systemId)
-  {
-    return systemId;
-  }
-  
-
-  public CMElementDeclaration getCMElementDeclaration(Element element)
-  { 
-    CMElementDeclaration result = null; 
-    Document document = element.getOwnerDocument();
-    String[] doctypeInfo = getDoctypeInfo(document);
-    if (doctypeInfo != null)
-    {   
-      // we have detected doctype information so we assume that we can locate the CMElementDeclaration 
-      // in the CMDocument's table of global elements 
-      CMDocument cmDocument = getCorrespondingCMDocument(element, false);
-
-      // TODO... consider replacing above with 
-      // CMDocument cmDocument = getCMDocument(document, doctypeInfo[0], doctypeInfo[1]);
-
-      if (cmDocument != null)
-      {        
-        result = (CMElementDeclaration)cmDocument.getElements().getNamedItem(element.getNodeName());    
-                 
-        // this is a hack to get our xsl code assist working... we might want to handle similar
-        // grammar behaviour via some established model query setting 
-        if (result == null && getImplictDoctype(document) != null)
-        {         
-          Node parent = element.getParentNode();
-          if (parent != null && parent.getNodeType() == Node.ELEMENT_NODE)
-          {
-            result = getCMElementDeclaration((Element)parent);
-          }
-        }
-      }
-    }    
-    else
-    {  
-      // here we use a namespaceTable to consider if the root element has any namespace information
-      //
-      NamespaceTable namespaceTable = new NamespaceTable(element.getOwnerDocument());
-      List list = NamespaceTable.getElementLineage(element);
-      Element rootElement = (Element)list.get(0);
-      namespaceTable.addElement(rootElement);
-         
-      if (namespaceTable.isNamespaceEncountered())
-      {                                         
-        // we assume that this is an XMLSchema style namespace aware document
-        result = getCMElementDeclaration(element, list, namespaceTable);
-      }
-      else
-      { 
-        // we assume that this is an inferred CMDocument for a DTD style 'namespaceless' document
-        CMDocument cmDocument = getCMDocument("", "", "DTD"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        if (cmDocument != null)
-        {
-          result = (CMElementDeclaration)cmDocument.getElements().getNamedItem(element.getNodeName()); 
-        }
-      }
-    }             
-    return result;
-  } 
-     
-
-  protected CMElementDeclaration getCMElementDeclaration(Element targetElement, List list, NamespaceTable namespaceTable)
-  {         
-    CMElementDeclaration currentED = null;
-    try
-    {    
-      int listSize = list.size();
-      for (int i = 0; i < listSize; i++)
-      {
-        Element element = (Element)list.get(i);                                     
-                    
-        if (i != 0)
-        {
-          namespaceTable.addElement(element);                        
-        }
-
-        String nodeName = element.getNodeName();
-        String unprefixedName = DOMNamespaceHelper.getUnprefixedName(nodeName);
-        String prefix = DOMNamespaceHelper.getPrefix(nodeName);
- 
-        CMElementDeclaration ed = null;
- 
-        // see if the element is a local of the currentED
-        //             
-        if (currentED != null)
-        {  
-          ed = (CMElementDeclaration)currentED.getLocalElements().getNamedItem(unprefixedName);
-        } 
-                                                                   
-        if (ed == null) 
-        {               
-          NamespaceInfo namespaceInfo = namespaceTable.getNamespaceInfoForPrefix(prefix);                   
-          if (namespaceInfo != null) 
-          {
-            CMDocument cmDocument = getCMDocument(namespaceInfo.uri, namespaceInfo.locationHint, "XSD"); //$NON-NLS-1$
-            if (cmDocument != null)
-            { 
-              ed = (CMElementDeclaration)cmDocument.getElements().getNamedItem(unprefixedName);   
-            }                                        
-          }
-        }                                                   
-        currentED = ed;     
-
-        // handle XSIType     
-        if (currentED != null)
-        {
-          CMElementDeclaration derivedED = getDerivedCMElementDeclaration(element, currentED, namespaceTable);
-          if (derivedED != null)
-          {                           
-            currentED = derivedED;
-          }    
-        }
-      }                                       
-    }
-    catch (Exception e)
-    { 
-      Logger.logException("exception locating element declaration for " + targetElement, e); //$NON-NLS-1$
-    } 
-  
-    return currentED;
-  }  
-      
-
-  protected CMElementDeclaration getDerivedCMElementDeclaration(Element element, CMElementDeclaration ed, NamespaceTable namespaceTable)
-  {                      
-    CMElementDeclaration result = null;
-    String xsiPrefix = namespaceTable.getPrefixForURI("http://www.w3.org/2001/XMLSchema-instance"); //$NON-NLS-1$
-    if (xsiPrefix != null)
-    {
-      String xsiTypeValue = element.getAttribute(xsiPrefix + ":type"); //$NON-NLS-1$
-      if (xsiTypeValue != null)
-      {  
-        String typePrefix = DOMNamespaceHelper.getPrefix(xsiTypeValue);
-        String typeName = DOMNamespaceHelper.getUnprefixedName(xsiTypeValue);
-        String typeURI = namespaceTable.getURIForPrefix(typePrefix);
-        String uriQualifiedTypeName = typeName;
-        if (typeURI != null && typeURI.length() > 0) 
-        {
-          uriQualifiedTypeName = "[" +  typeURI + "]" + typeName; //$NON-NLS-1$ //$NON-NLS-2$
-        }
-        result = (CMElementDeclaration)ed.getProperty("DerivedElementDeclaration=" + uriQualifiedTypeName);   //$NON-NLS-1$
-      }
-    }                                                                                                    
-    return result;
-  }   
-
-
-  public CMAttributeDeclaration getCMAttributeDeclaration(Attr attr)
-  {
-    CMAttributeDeclaration result = null;
-    Element element = attr.getOwnerElement();
-    if (element != null)
-    {
-      CMElementDeclaration ed = getCMElementDeclaration(element);
-      if (ed != null)
-      {                                                
-        result = (CMAttributeDeclaration)ed.getAttributes().getNamedItem(attr.getName());
-        if (result == null)
-        {                                              
-          // try to get the unprefixed name             
-          String name = DOMNamespaceHelper.getUnprefixedName(attr.getName());
-          result = (CMAttributeDeclaration)ed.getAttributes().getNamedItem(name);
-        }                                                                        
-        if (result == null)
-        {
-          // todo... perhaps this is a globally defined attribute... 
-        }
-      }
-    }
-    return result;
-  }               
-
-  /**
-   * This method returns a list of CMDocumentReferences associated with a particular node or subtree
-   */                                                                                                          
-  public List getCMDocumentReferences(Node node, boolean deep)
-  { 
-    List result = new ArrayList();  
-    Document document = (node.getNodeType() == Node.DOCUMENT_NODE) ? (Document)node : node.getOwnerDocument();
-    DocumentType doctype = document.getDoctype();
-    // defect 206833 ... here we test for DTDs that are declared inline
-    // since we currently have no way of making use of inline DTDs we ingore them
-    // so that the implict DTD (if any) can be used
-    if (doctype != null && (doctype.getPublicId() != null || doctype.getSystemId() != null))
-    {                                                                               
-      String uri = resolveGrammarURI(document, doctype.getPublicId(), doctype.getSystemId());
-      result.add(new CMDocumentReferenceImpl(doctype.getPublicId(), uri));
-    }   
-    else if (getImplictDoctype(document) != null)
-    {                  
-      String[] implicitDoctype = getImplictDoctype(document);
-      String uri = resolveGrammarURI(document, implicitDoctype[0], implicitDoctype[1]);
-      result.add(new CMDocumentReferenceImpl(implicitDoctype[0], uri));
-    }                              
-    else
-    {   
-      NamespaceTable namespaceTable = new NamespaceTable(document);
-      if (node.getNodeType() == Node.ELEMENT_NODE)
-      {
-		    namespaceTable.addElement((Element)node);
-      }                                     
-      if (deep)
-      {
-        addChildElementsToNamespaceTable(node, namespaceTable);
-      }
-	    List list = namespaceTable.getNamespaceInfoList();
-		  for (Iterator i = list.iterator(); i.hasNext();) 
-      {
-			  NamespaceInfo info = (NamespaceInfo) i.next();    
-        String uri = resolveGrammarURI(document, info.uri, info.locationHint);
-        result.add(new CMDocumentReferenceImpl(info.uri, uri));
-		  }	
-    } 
-    return result;
-  }
-
-  protected void addChildElementsToNamespaceTable(Node node, NamespaceTable namespaceTable)
-  {
-    NodeList nodeList = node.getChildNodes();
-	  if (nodeList != null) 
-    {
-		  int nodeListLength = nodeList.getLength();
-		  for (int i = 0; i < nodeListLength; i++) 
-      {
-			  Node childNode = nodeList.item(i);
-        if (childNode.getNodeType() == Node.ELEMENT_NODE)
-        {   
-          namespaceTable.addElement((Element)childNode);
-          addChildElementsToNamespaceTable(childNode, namespaceTable);
-        }
-		  }
-	  }
-  }  
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/CMDescriptionBuilder.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/CMDescriptionBuilder.java
deleted file mode 100644
index b55003a..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/CMDescriptionBuilder.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.util;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-
-public class CMDescriptionBuilder extends CMVisitor
-{
-  protected StringBuffer sb;
-  protected CMNode root;
-  protected boolean isRootVisited;
-
-  public String buildDescription(CMNode node)
-  {
-    sb = new StringBuffer();
-    root = node;
-    isRootVisited = false;
-    visitCMNode(node);
-    return sb.toString();
-  }       
-
-  public void visitCMAnyElement(CMAnyElement anyElement)
-  {
-    sb.append("namespace:uri=\"" + anyElement.getNamespaceURI() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-  }
-
-  public void visitCMDataType(CMDataType dataType)
-  {
-    sb.append("#PCDATA"); //$NON-NLS-1$
-  }
-
-  public void visitCMDocument(CMDocument document)
-  {
-    CMNamedNodeMap map = document.getElements();
-    int size = map.getLength();
-    for (int i = 0; i < size; i++)
-    {
-      visitCMNode(map.item(i));
-    }
-  }
-
-  public void visitCMGroup(CMGroup group)
-  {
-    int op = group.getOperator();
-    if (op == CMGroup.ALL)
-    {
-      sb.append("all"); //$NON-NLS-1$
-    }
-
-    sb.append("("); //$NON-NLS-1$
-
-    String separator = ", "; //$NON-NLS-1$
-
-    if (op == CMGroup.CHOICE)
-    {
-      separator = " | "; //$NON-NLS-1$
-    }
-
-    CMNodeList nodeList = group.getChildNodes();
-    int size = nodeList.getLength();
-    for (int i = 0; i < size; i++)
-    {
-      visitCMNode(nodeList.item(i));
-      if (i < size - 1)
-      {
-        sb.append(separator);
-      }
-    }
-    sb.append(")"); //$NON-NLS-1$
-    addOccurenceSymbol(group);
-  }
-
-  public void visitCMElementDeclaration(CMElementDeclaration ed)
-  {
-    if (ed == root && !isRootVisited)
-    {
-      isRootVisited = true;
-      CMContent content = ed.getContent();
-      if (content != null)
-      {
-        if (content.getNodeType() != CMNode.GROUP)
-        {
-          sb.append("("); //$NON-NLS-1$
-          visitCMNode(content);
-          sb.append(")"); //$NON-NLS-1$
-        }
-        else
-        {
-          visitCMNode(content);
-        }
-      }
-    }
-    else
-    {
-      sb.append(ed.getElementName());
-      addOccurenceSymbol(ed);
-    }
-  }
-
-  public void addOccurenceSymbol(CMContent content)
-  {
-    int min = content.getMinOccur();
-    int max = content.getMaxOccur();
-    if (min == 0)
-    {
-      if (max > 1 || max == -1)
-      {
-        sb.append("*"); //$NON-NLS-1$
-      }
-      else
-      {
-        sb.append("?"); //$NON-NLS-1$
-      }
-    }
-    else if (max > 1 || max == -1)
-    {
-      sb.append("+"); //$NON-NLS-1$
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/CMDocumentCache.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/CMDocumentCache.java
deleted file mode 100644
index 961878a..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/CMDocumentCache.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.util;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-
-
-
-/**
- *
- */
-public class CMDocumentCache
-{                                     
-  public static final int STATUS_NOT_LOADED = 0;
-  public static final int STATUS_LOADING    = 2;
-  public static final int STATUS_LOADED     = 3;
-  public static final int STATUS_ERROR      = 4;
-
-  protected class Entry
-  {
-    public String uri;
-    public int status = STATUS_NOT_LOADED;
-    public float progress;
-    public CMDocument cmDocument;
-
-    public Entry(String uri)
-    {                      
-      this.uri = uri;         
-    }
-
-    public Entry(String uri, int status, CMDocument cmDocument)
-    {                                     
-      this.uri = uri;
-      this.status = status;      
-      this.cmDocument = cmDocument;
-    }
-  }
-
-  protected Hashtable hashtable;
-  protected List listenerList = new Vector();
-
-
-  /**
-   * temporarily public until caching problem is solved
-   */
-  public CMDocumentCache()
-  {
-    hashtable = new Hashtable();
-  }
-
-  public void addListener(CMDocumentCacheListener listener)
-  {
-    listenerList.add(listener);
-  }
-
-  public void removeListener(CMDocumentCacheListener listener)
-  {
-    listenerList.remove(listener);
-  }   
-
-  /**
-   *
-   */
-  public CMDocument getCMDocument(String grammarURI)
-  {
-    CMDocument result = null;
-    if (grammarURI != null)
-    {  
-      Entry entry = (Entry)hashtable.get(grammarURI);
-      if (entry != null)
-      {
-        result = entry.cmDocument;
-      }   
-    }
-    return result;
-  }    
-
-  /**
-   *
-   */
-  public int getStatus(String grammarURI)
-  {
-    int result = STATUS_NOT_LOADED;
-    if (grammarURI != null)
-    {  
-      Entry entry = (Entry)hashtable.get(grammarURI);
-      if (entry != null)
-      {
-        result = entry.status;
-      }      
-      
-    }
-    return result;
-  }            
-            
-  /**
-   *
-   */
-  protected Entry lookupOrCreate(String grammarURI)
-  {
-    Entry entry = (Entry)hashtable.get(grammarURI);
-    if (entry == null)
-    {
-      entry = new Entry(grammarURI);                       
-      hashtable.put(grammarURI, entry);
-    }
-    return entry;
-  }
-
-    
-  /**
-   *
-   */
-  public void putCMDocument(String grammarURI, CMDocument cmDocument)
-  {                                    
-    if (grammarURI != null && cmDocument != null)
-    {                           
-      Entry entry = lookupOrCreate(grammarURI);
-      int oldStatus = entry.status;
-      entry.status = STATUS_LOADED;
-      entry.cmDocument = cmDocument;  
-      notifyCacheUpdated(grammarURI, oldStatus, entry.status, entry.cmDocument);  
-    }
-  }
-     
-  /**
-   *
-   */
-  public void setStatus(String grammarURI, int status)
-  {
-    if (grammarURI != null)
-    {
-      Entry entry = lookupOrCreate(grammarURI);
-      int oldStatus = entry.status;
-      entry.status = status;
-      notifyCacheUpdated(grammarURI, oldStatus, entry.status, entry.cmDocument);   
-    }
-  }
-     
-  /**
-   *
-   */
-  public void clear()
-  {
-    hashtable.clear();
-    notifyCacheCleared();
-  }  
-
-  /**
-   *
-   */
-  protected void notifyCacheUpdated(String uri, int oldStatus, int newStatus, CMDocument cmDocument)
-  {      
-    List list = new Vector();
-    list.addAll(listenerList);
-    for (Iterator i = list.iterator(); i.hasNext(); )
-    {
-      CMDocumentCacheListener listener = (CMDocumentCacheListener)i.next();
-      listener.cacheUpdated(this, uri, oldStatus, newStatus, cmDocument);
-    }
-  }
-
-  /**
-   *
-   */
-  protected void notifyCacheCleared()
-  {     
-    List list = new Vector();
-    list.addAll(listenerList);
-    for (Iterator i = list.iterator(); i.hasNext(); )
-    {
-      CMDocumentCacheListener listener = (CMDocumentCacheListener)i.next();
-      listener.cacheCleared(this);
-    }
-  }
-  
-  public List getCMDocuments()
-  {
-  	List list = new ArrayList();  	
-  	for (Iterator i = hashtable.values().iterator(); i.hasNext(); )
-  	{
-  		Entry entry = (Entry)i.next();
-  		list.add(entry.cmDocument);
-  	}
-  	return list;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/CMDocumentCacheListener.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/CMDocumentCacheListener.java
deleted file mode 100644
index 4843d1e..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/CMDocumentCacheListener.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.util;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-
-
-/**
- * todo... add more interface methods
- */
-public interface CMDocumentCacheListener
-{
-  /** Tells the client that the cache has been cleared.
-   *  This gives clients an opportunity to flush any state that depends on the CMDocument
-   *  since this CMDocument will be recomputed on a subsequent 'lookup' request
-   */
-  public void cacheCleared(CMDocumentCache cache); 
-
-  /** 
-   *  Tells the client that the cache has been updated.  
-   */
-  public void cacheUpdated(CMDocumentCache cache, String uri, int oldStatus, int newStatus, CMDocument cmDocument);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/CMVisitor.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/CMVisitor.java
deleted file mode 100644
index 68f78a7..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/CMVisitor.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.util;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-
-public class CMVisitor
-{
-  protected int indent = 0;
-
-  public void visitCMNode(CMNode node)
-  {
-    if (node != null)
-    {
-      //ContentModelManager.printlnIndented("visitCMNode : " + node.getNodeName() + " " + node);
-      indent += 2;
-      int nodeType = node.getNodeType();
-      switch (nodeType)
-      {
-        case CMNode.ANY_ELEMENT :
-        {
-          visitCMAnyElement((CMAnyElement)node);
-          break;
-        }
-        case CMNode.ATTRIBUTE_DECLARATION :
-        {
-          visitCMAttributeDeclaration((CMAttributeDeclaration)node);
-          break;
-        }
-        case CMNode.DATA_TYPE :
-        {
-          visitCMDataType((CMDataType)node);
-          break;
-        }
-        case CMNode.DOCUMENT :
-        {
-          visitCMDocument((CMDocument)node);
-          break;
-        }
-        case CMNode.ELEMENT_DECLARATION :
-        {
-          visitCMElementDeclaration((CMElementDeclaration)node);
-          break;
-        }
-        case CMNode.GROUP :
-        {
-          visitCMGroup((CMGroup)node);
-          break;
-        }
-      }
-      indent -= 2;
-    }
-  }
-      
-  public void visitCMAnyElement(CMAnyElement anyElement)
-  {
-  }
-
-  public void visitCMAttributeDeclaration(CMAttributeDeclaration ad)
-  {
-  }
-
-  public void visitCMDataType(CMDataType dataType)
-  {
-  }
-
-  public void visitCMDocument(CMDocument document)
-  {
-    CMNamedNodeMap map = document.getElements();
-    int size = map.getLength();
-    for (int i = 0; i < size; i++)
-    {
-      visitCMNode(map.item(i));
-    }
-  }
-
-  public void visitCMGroup(CMGroup group)
-  {
-    CMNodeList nodeList = group.getChildNodes();
-    int size = nodeList.getLength();
-    for (int i = 0; i < size; i++)
-    {
-      visitCMNode(nodeList.item(i));
-    }
-  }
-
-  public void visitCMElementDeclaration(CMElementDeclaration ed)
-  {
-    CMNamedNodeMap nodeMap = ed.getAttributes();
-    int size = nodeMap.getLength();
-    for (int i = 0; i < size; i++)
-    {
-      visitCMNode(nodeMap.item(i));
-    }
-
-    visitCMNode(ed.getContent());
-
-    visitCMDataType(ed.getDataType());
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/ContentBuilder.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/ContentBuilder.java
deleted file mode 100644
index 841de74..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/ContentBuilder.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.util;
-
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-
-                   
-/**
- * This class lets you traverse a 'CM' model providing callbacks to build content.
- */
-public class ContentBuilder extends CMVisitor
-{
-  public static final int BUILD_ALL_CONTENT = 1;
-  public static final int BUILD_ONLY_REQUIRED_CONTENT = 2;
-  protected int buildPolicy = BUILD_ALL_CONTENT;
-
-  protected boolean alwaysVisit;
-  protected Vector visitedCMElementDeclarationList = new Vector();
-
-  public ContentBuilder()
-  {
-  }
-                
-  public void setBuildPolicy(int buildPolicy)
-  {
-    this.buildPolicy = buildPolicy;
-  }
-
-  public int getBuildPolicy()
-  {
-    return buildPolicy;
-  }                
-           
-  protected void createAnyElementNode(CMAnyElement anyElement)
-  {
-  }
-
-  protected void createElementNodeStart(CMElementDeclaration ed)
-  {      
-  }
-
-  protected void createElementNodeEnd(CMElementDeclaration ed)
-  {
-  }
-
-  protected void createTextNode(CMDataType dataType)
-  {
-  } 
-
-  protected void createAttributeNode(CMAttributeDeclaration attribute)
-  {
-  } 
- 
-  public void visitCMElementDeclaration(CMElementDeclaration ed)
-  {
-    int forcedMin = (buildPolicy == BUILD_ALL_CONTENT || alwaysVisit) ? 1 : 0;
-    int min = Math.max(ed.getMinOccur(), forcedMin);                          
-    alwaysVisit = false;
-
-    if (min > 0 && !visitedCMElementDeclarationList.contains(ed))
-    {
-      visitedCMElementDeclarationList.add(ed);
-      for (int i = 1; i <= min; i++)
-      {       
-        createElementNodeStart(ed);       
-        
-        // instead of calling super.visitCMElementDeclaration()
-        // we duplicate the code with some minor modifications
-        CMNamedNodeMap nodeMap = ed.getAttributes();
-        int size = nodeMap.getLength();
-        for (int j = 0; j < size; j++)
-        {
-          visitCMNode(nodeMap.item(j));
-        }
-
-        CMContent content = ed.getContent();
-        if (content != null)
-        {
-          visitCMNode(content);
-        }
-
-        if (ed.getContentType() == CMElementDeclaration.PCDATA)
-        {
-          CMDataType dataType = ed.getDataType();
-          if (dataType != null)
-          {
-            visitCMDataType(dataType);
-          }
-        }
-        // end duplication
-        createElementNodeEnd(ed);  
-      }
-      int size = visitedCMElementDeclarationList.size();
-      visitedCMElementDeclarationList.remove(size - 1);
-    }
-  }
-    
-
-  public void visitCMDataType(CMDataType dataType)
-  {
-    createTextNode(dataType);   
-  }
-
-
-  public void visitCMGroup(CMGroup e)
-  { 
-    int forcedMin = (buildPolicy == BUILD_ALL_CONTENT || alwaysVisit) ? 1 : 0;
-    int min = Math.max(e.getMinOccur(), forcedMin);                          
-    alwaysVisit = false;
-
-    for (int i = 1; i <= min; i++)
-    {   
-      if (e.getOperator() == CMGroup.CHOICE)
-      {
-        // add only 1 element from the group
-        // todo... perhaps add something other than the first one        
-        CMNodeList nodeList = e.getChildNodes();
-        if (nodeList.getLength() > 0)
-        {
-          visitCMNode(nodeList.item(0));
-        }
-      }
-      else // SEQUENCE, ALL
-      {
-        // visit all of the content
-        super.visitCMGroup(e);
-      }
-    }
-  } 
-
-  public void visitCMAttributeDeclaration(CMAttributeDeclaration ad)
-  {
-    if (alwaysVisit ||
-        buildPolicy == BUILD_ALL_CONTENT ||
-        ad.getUsage() == CMAttributeDeclaration.REQUIRED)
-    {
-      createAttributeNode(ad);      
-    }
-  }                     
-  
-
-  public void visitCMAnyElement(CMAnyElement anyElement)
-  {  
-    int forcedMin = (buildPolicy == BUILD_ALL_CONTENT || alwaysVisit) ? 1 : 0;
-    alwaysVisit = false; 
-    int min = Math.max(anyElement.getMinOccur(), forcedMin);                          
-    for (int i = 1; i <= min; i++)
-    {                                
-      createAnyElementNode(anyElement);
-    }
-  }     
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMContentBuilder.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMContentBuilder.java
deleted file mode 100644
index 8b6dda7..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMContentBuilder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.util;
-
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.w3c.dom.Node;
-
-
-public interface DOMContentBuilder
-{
-  public static final int BUILD_OPTIONAL_ATTRIBUTES = 1;
-  public static final int BUILD_OPTIONAL_ELEMENTS = 1<<1;
-  public static final int BUILD_FIRST_CHOICE = 1<<2;
-  public static final int BUILD_TEXT_NODES = 1<<3;
-  public static final int BUILD_FIRST_SUBSTITUTION = 1<<4;
-  
-  public static final int 
-    BUILD_ONLY_REQUIRED_CONTENT =
-      BUILD_FIRST_CHOICE
-      | BUILD_TEXT_NODES;
-  public static final int 
-    BUILD_ALL_CONTENT = 
-      BUILD_OPTIONAL_ATTRIBUTES 
-      | BUILD_OPTIONAL_ELEMENTS 
-      | BUILD_FIRST_CHOICE
-      | BUILD_TEXT_NODES;
-      
-  public static final String PROPERTY_BUILD_BLANK_TEXT_NODES = "buildBlankTextNodes"; //$NON-NLS-1$
-  
-  public void setBuildPolicy(int buildPolicy);
-  public int  getBuildPolicy();
-  public void setProperty(String propertyName, Object value);
-  public Object getProperty(String propertyName);
-  public List getResult();
-  public void build(Node parent, CMNode child);
-  public void createDefaultRootContent(CMDocument cmDocument, CMElementDeclaration rootCMElementDeclaration) throws Exception;
-  public void createDefaultRootContent(CMDocument cmDocument, CMElementDeclaration rootCMElementDeclaration, List namespaceInfoList) throws Exception;
-  public void createDefaultContent(Node parent, CMElementDeclaration ed) throws Exception;
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMContentBuilderImpl.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMContentBuilderImpl.java
deleted file mode 100644
index 599439b..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMContentBuilderImpl.java
+++ /dev/null
@@ -1,692 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.util;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Stack;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMDataTypeValueHelper;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-                   
-/**
- * todo... common up this code with 'ContentBuilder'
- */
-public class DOMContentBuilderImpl extends CMVisitor implements DOMContentBuilder
-{
-  protected int buildPolicy = BUILD_ALL_CONTENT;
-  protected Hashtable propertyTable = new Hashtable();
-
-  protected boolean alwaysVisit = false;
-  protected List resultList;
-  protected Document document;
-  protected Node currentParent;  
-  protected Node topParent;
-  protected Vector visitedCMElementDeclarationList = new Vector();
-  protected boolean attachNodesToParent = true;
-  protected NamespaceTable namespaceTable;
-          
-  protected List namespaceInfoList;
-  protected Element rootElement; // this is used only teporarily via createDefaultRootContent
-  protected ExternalCMDocumentSupport externalCMDocumentSupport;
-
-  public boolean supressCreationOfDoctypeAndXMLDeclaration;
-
-  protected CMDataTypeValueHelper valueHelper = new CMDataTypeValueHelper();
-  
-  protected int numOfRepeatableElements = 1;
-  protected Stack cmGroupStack = new Stack();
-
-  public interface ExternalCMDocumentSupport
-  {
-    public CMDocument getCMDocument(Element element, String uri);
-  }
-
-  public void setExternalCMDocumentSupport(ExternalCMDocumentSupport externalCMDocumentSupport)
-  {
-    this.externalCMDocumentSupport = externalCMDocumentSupport;
-  }
-
-  public DOMContentBuilderImpl(Document document)
-  {
-    this.document = document;
-    namespaceTable = new NamespaceTable(document);
-  }
-         
-  public void setBuildPolicy(int buildPolicy)
-  {
-    this.buildPolicy = buildPolicy;
-  }
-
-  public int getBuildPolicy()
-  {
-    return buildPolicy;
-  }
-
-  protected boolean buildAllContent(int policy)
-  {
-    return (policy & BUILD_ALL_CONTENT) == BUILD_ALL_CONTENT;
-  }
-    
-  protected boolean buildOptionalElements(int policy)
-  {
-    return (policy & BUILD_OPTIONAL_ELEMENTS) == BUILD_OPTIONAL_ELEMENTS;
-  }
-  
-  protected boolean buildOptionalAttributes(int policy)
-  {
-    return (policy & BUILD_OPTIONAL_ATTRIBUTES) == BUILD_OPTIONAL_ATTRIBUTES;
-  }
-
-  protected boolean buildFirstChoice(int policy)
-  {
-    return (policy & BUILD_FIRST_CHOICE) == BUILD_FIRST_CHOICE;
-  }
-  
-  protected boolean buildTextNodes(int policy)
-  {
-    return (policy & BUILD_TEXT_NODES) == BUILD_TEXT_NODES;
-  }
-  
-  protected boolean buildFirstSubstitution(int policy)
-  {
-    return (policy & BUILD_FIRST_SUBSTITUTION) == BUILD_FIRST_SUBSTITUTION;
-  }
-      
-  public List getResult()
-  {
-    return resultList;
-  }
-
-  public void setProperty(String propertyName, Object value)
-  {                         
-    propertyTable.put(propertyName, value);
-  }
-
-  public Object getProperty(String propertyName)
-  {
-    return propertyTable.get(propertyName);
-  }
-
-  public void build(Node parent, CMNode child)
-  {      
-    resultList = new Vector();
-    topParent = parent;
-    currentParent = parent;          
-    if (parent instanceof Element)
-    {
-      namespaceTable.addElementLineage((Element)parent);
-    }
-    attachNodesToParent = false;
-    alwaysVisit = true;
-    visitCMNode(child);
-  }
-
-  public void createDefaultRootContent(CMDocument cmDocument, CMElementDeclaration rootCMElementDeclaration, List namespaceInfoList) throws Exception
-  {                    
-    this.namespaceInfoList = namespaceInfoList;
-    createDefaultRootContent(cmDocument, rootCMElementDeclaration);
-  }
-
-  public void createDefaultRootContent(CMDocument cmDocument, CMElementDeclaration rootCMElementDeclaration) throws Exception
-  {
-    String grammarFileName = cmDocument.getNodeName();
-    if (!supressCreationOfDoctypeAndXMLDeclaration)
-    {                                 
-      // TODO cs... investigate to see if this code path is ever used, doesn't seem to be
-      // for now I'm setting the encoding to UTF-8 just incase this code path is used somewhere
-      //
-      String piValue = "version=\"1.0\""; //$NON-NLS-1$
-      String encoding = "UTF-8";           
-      piValue += " encoding=\"" + encoding + "\""; //$NON-NLS-1$ //$NON-NLS-2$      
-      ProcessingInstruction pi = document.createProcessingInstruction("xml", piValue); //$NON-NLS-1$
-      document.appendChild(pi);
-
-      // if we have a 'dtd' then add a DOCTYPE tag
-      //
-      if (grammarFileName != null && grammarFileName.endsWith("dtd")) //$NON-NLS-1$
-      {
-        DOMImplementation domImpl = document.getImplementation();
-        DocumentType documentType = domImpl.createDocumentType(rootCMElementDeclaration.getElementName(), grammarFileName, grammarFileName);
-        document.appendChild(documentType);
-      }
-    }                       
-    
-    // if we have a schema add an xsi:schemaLocation attribute
-    //
-    if (grammarFileName != null && grammarFileName.endsWith("xsd") && namespaceInfoList != null) //$NON-NLS-1$
-    {              
-      DOMNamespaceInfoManager manager = new DOMNamespaceInfoManager();    
-      String name = rootCMElementDeclaration.getNodeName();
-      if (namespaceInfoList.size() > 0)
-      {
-        NamespaceInfo info = (NamespaceInfo)namespaceInfoList.get(0);
-        if (info.prefix != null && info.prefix.length() > 0)
-        {
-          name = info.prefix + ":" + name; //$NON-NLS-1$
-        }
-      }
-      rootElement = createElement(rootCMElementDeclaration, name, document);
-      manager.addNamespaceInfo(rootElement, namespaceInfoList, true);   
-    }
-    createDefaultContent(document, rootCMElementDeclaration);    
-  }
-
-  public void createDefaultContent(Node parent, CMElementDeclaration ed)
-  {
-    currentParent = parent;
-    alwaysVisit = true;           
-    visitCMElementDeclaration(ed);
-  }   
-
-  public String computeName(CMNode cmNode, Node parent)
-  {                   
-    String prefix = null;           
-    return DOMNamespaceHelper.computeName(cmNode, parent, prefix, namespaceTable);
-  }     
-
-  // overide the following 'create' methods to control how nodes are created
-  //
-  protected Element createElement(CMElementDeclaration ed, String name, Node parent)
-  {
-    return  document.createElement(name);
-  }
-
-  protected Attr createAttribute(CMAttributeDeclaration ad, String name, Node parent)
-  {
-    return  document.createAttribute(name);
-  }
-
-  protected Text createTextNode(CMDataType dataType, String value, Node parent)
-  {
-    return document.createTextNode(value);
-  }        
-                 
-  protected void handlePushParent(Element parent, CMElementDeclaration ed)
-  {
-  }   
-
-  protected void handlePopParent(Element element, CMElementDeclaration ed)
-  {
-  }
-  
-  // The range must be between 1 and 99.
-  public void setNumOfRepeatableElements(int i)
-  {
-  	numOfRepeatableElements = i;
-  }
-     
-  protected int getNumOfRepeatableElements()
-  {
-  	return numOfRepeatableElements;
-  }
-        
-  public void visitCMElementDeclaration(CMElementDeclaration ed)
-  {
-    int forcedMin = (buildOptionalElements(buildPolicy) || alwaysVisit) ? 1 : 0;
-    int min = Math.max(ed.getMinOccur(), forcedMin);
-    
-    // Correct the min value if the element is contained in
-    // a group.
-    if (!cmGroupStack.isEmpty())
-    {
-      CMGroup group = (CMGroup)cmGroupStack.peek();
-      int gmin = group.getMinOccur();
-      if (gmin == 0)
-        if (buildOptionalElements(buildPolicy))
-          ; // min = min
-        else
-          min = min * gmin; // min = 0
-      else
-          min = min * gmin;
-    }
-    
-    int max = Math.min(ed.getMaxOccur(), getNumOfRepeatableElements());
-    if (max < min)
-      max = min;
-    	                          
-    alwaysVisit = false;
-
-    // Note - ed may not be abstract but has substitutionGroups
-    // involved.
-    if (buildFirstSubstitution(buildPolicy) 
-        || isAbstract(ed)) // leave this for backward compatibility for now
-    {
-      // Note - To change so that if ed is optional, we do not 
-      // generate anything here.  
-      ed = getSubstitution(ed);
-      
-      // Note - the returned ed may be an abstract element in
-      // which case the xml will be invalid.
-    }
-
-    if (min > 0 && !visitedCMElementDeclarationList.contains(ed))
-    {
-      visitedCMElementDeclarationList.add(ed);
-      for (int i = 1; i <= max; i++)
-      {
-        // create an Element for each
-        Element element = null;
-        if (rootElement != null)                                                 
-        {
-          element = rootElement;
-          rootElement = null;
-        }                       
-        else
-        {
-          element = createElement(ed, computeName(ed, currentParent), currentParent);
-        }
-
-        // visit the children of the GrammarElement
-        Node oldParent = currentParent;
-        currentParent = element;
-        handlePushParent(element, ed);
-
-        namespaceTable.addElement(element);
-    
-        boolean oldAttachNodesToParent = attachNodesToParent;
-        attachNodesToParent = true;
-
-        // instead of calling super.visitCMElementDeclaration()
-        // we duplicate the code with some minor modifications
-        CMNamedNodeMap nodeMap = ed.getAttributes();
-        int size = nodeMap.getLength();
-        for (int j = 0; j < size; j++)
-        {
-          visitCMNode(nodeMap.item(j));
-        }
-
-        CMContent content = ed.getContent();
-        if (content != null)
-        {
-          visitCMNode(content);
-        }
-
-        if (ed.getContentType() == CMElementDeclaration.PCDATA)
-        {
-          CMDataType dataType = ed.getDataType();
-          if (dataType != null)
-          {
-            visitCMDataType(dataType);
-          }
-        }
-        // end duplication
-        attachNodesToParent = oldAttachNodesToParent;
-        handlePopParent(element, ed);
-        currentParent = oldParent;    
-        linkNode(element);
-      }
-      int size = visitedCMElementDeclarationList.size();
-      visitedCMElementDeclarationList.remove(size - 1);
-    }
-  }
-
-
-  public void visitCMDataType(CMDataType dataType)
-  {
-    Text text = null;
-    String value = null;
-
-    // For backward compatibility:
-    //   Previous code uses a property value but new one uses
-    //   buildPolicy.   
-    if (getProperty(PROPERTY_BUILD_BLANK_TEXT_NODES) != null
-        && getProperty(PROPERTY_BUILD_BLANK_TEXT_NODES).equals("true")) //$NON-NLS-1$
-      buildPolicy = buildPolicy ^ BUILD_TEXT_NODES;
-          
-    if (buildTextNodes(buildPolicy))
-    {
-      value = valueHelper.getValue(dataType);
-      if (value == null)
-      {
-        if (currentParent != null && currentParent.getNodeType() == Node.ELEMENT_NODE)
-        {
-          value = currentParent.getNodeName();
-        }
-        else
-        {
-          value = "pcdata"; //$NON-NLS-1$
-        }
-      }
-    }  
-    else
-    {
-      value = ""; //$NON-NLS-1$
-    }
-    text = createTextNode(dataType, value, currentParent);
-    linkNode(text);
-  }
-
-
-  public void visitCMGroup(CMGroup e)
-  {
-  	cmGroupStack.push(e);
-  	 
-    int forcedMin = (buildOptionalElements(buildPolicy) || alwaysVisit) ? 1 : 0;
-    int min = Math.max(e.getMinOccur(), forcedMin);
-
-    int max = 0;
-    if (e.getMaxOccur() == -1) // unbounded
-      max = getNumOfRepeatableElements();
-    else 
-      max = Math.min(e.getMaxOccur(), getNumOfRepeatableElements());
-    
-    if (max < min)
-      max = min;
-                                
-    alwaysVisit = false;
-
-    for (int i = 1; i <= max; i++)
-    {   
-      if (e.getOperator() == CMGroup.CHOICE
-          && buildFirstChoice(buildPolicy))
-      {
-        CMNode hintNode = null; 
-
-        // todo... the CMGroup should specify the hint... but it seems as though
-        // the Yamato guys are making the CMElement specify the hint.
-        // I do it that way for now until... we should fix this post GA
-        //    
-        int listSize = visitedCMElementDeclarationList.size();                                                              
-        if (listSize > 0)
-        {                                                                                                                                          
-          CMElementDeclaration ed = (CMElementDeclaration)visitedCMElementDeclarationList.get(listSize - 1);
-          Object contentHint = ed.getProperty("contentHint"); //$NON-NLS-1$
-          if (contentHint instanceof CMNode)
-          {        
-            hintNode = (CMNode)contentHint;
-          }
-        }
-   
-        // see if this hint corresponds to a valid choice
-        //
-        CMNode cmNode = null;
-
-        if (hintNode != null)
-        {
-          CMNodeList nodeList = e.getChildNodes();
-          int nodeListLength = nodeList.getLength();
-          for (int j = 0; j < nodeListLength; j++)
-          {
-            if (hintNode == nodeList.item(j))
-            { 
-              cmNode = hintNode;
-            }
-          }
-        }
-        
-        // if no cmNode has been determined from the hint, just use the first choice
-        //
-        if (cmNode == null)
-        {
-          CMNodeList nodeList = e.getChildNodes();
-          if (nodeList.getLength() > 0)
-          {
-            cmNode = nodeList.item(0);
-          }
-        }
-
-        if (cmNode != null)
-        {
-          visitCMNode(cmNode);
-        }
-      }
-      else if (e.getOperator() == CMGroup.ALL          // ALL
-                || e.getOperator() == CMGroup.SEQUENCE) // SEQUENCE 
-      {
-        // visit all of the content
-        super.visitCMGroup(e);
-      }
-    }
-    
-    cmGroupStack.pop();
-  }
-
-  static int count = 0;
-
-  public void visitCMAttributeDeclaration(CMAttributeDeclaration ad)
-  {                                            
-    if (alwaysVisit ||
-        buildOptionalAttributes(buildPolicy) ||
-        ad.getUsage() == CMAttributeDeclaration.REQUIRED)
-    {                                                              
-      alwaysVisit = false;                    
-      String name = computeName(ad, currentParent);         
-      String value = valueHelper.getValue(ad, namespaceTable);
-      Attr attr = createAttribute(ad, name, currentParent);      
-      attr.setValue(value != null ? value : ""); //$NON-NLS-1$
-      linkNode(attr);
-    }
-  }                     
-                
-  protected boolean isAbstract(CMNode ed)
-  {
-    boolean result = false;
-    if (ed != null)
-    {
-      Object value = ed.getProperty("Abstract"); //$NON-NLS-1$
-      result = (value ==  Boolean.TRUE);
-    }
-    return result;
-  }
-
-  protected CMElementDeclaration getSubstitution(CMElementDeclaration ed)
-  {
-    CMElementDeclaration result = ed;
-    CMNodeList l = (CMNodeList)ed.getProperty("SubstitutionGroup"); //$NON-NLS-1$
-    if (l != null)
-    {
-      for (int i=0; i < l.getLength(); i++)
-      {
-        CMNode candidate = l.item(i);
-        if (!isAbstract(candidate) && (candidate instanceof CMElementDeclaration))
-        {
-          result = (CMElementDeclaration)candidate;
-          break;
-        }
-      }
-    }
-    return result;
-  }
-
-  protected CMElementDeclaration getParentCMElementDeclaration()
-  {   
-    CMElementDeclaration ed = null;
-    int listSize = visitedCMElementDeclarationList.size();                                                              
-    if (listSize > 0)
-    {                                                                                                                                          
-      ed = (CMElementDeclaration)visitedCMElementDeclarationList.get(listSize - 1);    
-    } 
-    return ed;
-  }
-
-  public void visitCMAnyElement(CMAnyElement anyElement)
-  {                            
-    // ingnore buildPolicy for ANY elements... only create elements if absolutely needed
-    //
-    int forcedMin = alwaysVisit ? 1 : 0;
-    int min = Math.max(anyElement.getMinOccur(), forcedMin);                          
-    alwaysVisit = false;
-      
-    String uri = anyElement.getNamespaceURI();  
-    String targetNSProperty = "http://org.eclipse.wst/cm/properties/targetNamespaceURI"; //$NON-NLS-1$
-    CMDocument parentCMDocument = (CMDocument)anyElement.getProperty("CMDocument"); //$NON-NLS-1$
-    CMElementDeclaration ed = null;                          
-
-    //System.out.println("parentCMDocument = " + parentCMDocument); //$NON-NLS-1$
-    if (parentCMDocument != null)
-    {          
-      if (uri == null || uri.startsWith("##") || uri.equals(parentCMDocument.getProperty(targetNSProperty))) //$NON-NLS-1$
-      {                               
-        ed = getSuitableElement(getParentCMElementDeclaration(), parentCMDocument);
-      }
-    }          
-
-
-    if (ed == null && externalCMDocumentSupport != null && uri != null && !uri.startsWith("##") && currentParent instanceof Element) //$NON-NLS-1$
-    {
-      CMDocument externalCMDocument = externalCMDocumentSupport.getCMDocument((Element)currentParent, uri);
-      if (externalCMDocument != null)
-      { 
-        ed = getSuitableElement(null, externalCMDocument);
-      }
-    }
-
-    for (int i = 1; i <= min; i++)
-    {         
-      if (ed != null)
-      {                        
-        visitCMElementDeclaration(ed); 
-      }  
-      else
-      {                       
-        Element element = document.createElement("ANY-ELEMENT");                    //$NON-NLS-1$
-        linkNode(element);
-      }              
-    }               
-  }    
-
-  protected CMElementDeclaration getSuitableElement(CMNamedNodeMap nameNodeMap)
-  {       
-    CMElementDeclaration result = null;
-    int size = nameNodeMap.getLength();             
-    for (int i = 0; i < size; i++)
-    {           
-      CMElementDeclaration candidate = (CMElementDeclaration)nameNodeMap.item(i);
-      if (!visitedCMElementDeclarationList.contains(candidate))
-      {
-        result = candidate;
-        break;
-      }
-    }
-    return result;
-  }
-
-  protected CMElementDeclaration getSuitableElement(CMElementDeclaration ed, CMDocument cmDocument)
-  {       
-    CMElementDeclaration result = null;
-
-    if (ed != null)
-    {
-      result = getSuitableElement(ed.getLocalElements());
-    }
-
-    if (result == null && cmDocument != null)
-    {
-      result = getSuitableElement(cmDocument.getElements());
-    } 
-
-    return result;
-  }
-
-
-  public void linkNode(Node node)
-  {
-    if (attachNodesToParent && currentParent != null)
-    {
-      if (node.getNodeType() == Node.ATTRIBUTE_NODE)
-      {
-        ((Element)currentParent).setAttributeNode((Attr)node);
-      }
-      else
-      {
-        currentParent.appendChild(node);
-      }
-    }
-    else if (resultList != null)
-    {
-      resultList.add(node);
-    }
-  }
-
-  public static void testPopulateDocumentFromGrammarFile(Document document, String grammarFileName, String rootElementName, boolean hack)
-  {
-    try
-    {
-      CMDocument cmDocument = ContentModelManager.getInstance().createCMDocument(grammarFileName, null);
-      CMNamedNodeMap elementMap = cmDocument.getElements();
-      CMElementDeclaration element = (CMElementDeclaration)elementMap.getNamedItem(rootElementName);
-
-      DOMContentBuilderImpl contentBuilder = new DOMContentBuilderImpl(document);
-      contentBuilder.supressCreationOfDoctypeAndXMLDeclaration = hack;
-      contentBuilder.createDefaultRootContent(cmDocument, element);
-
-      System.out.println();
-      System.out.println("-----------------------------"); //$NON-NLS-1$
-      DOMWriter writer = new DOMWriter();
-      if (hack)
-      {
-        writer.print(document, grammarFileName);
-      }
-      else
-      {
-        writer.print(document);
-      }
-      System.out.println("-----------------------------"); //$NON-NLS-1$
-    }
-    catch (Exception e)
-    {
-      System.out.println("Error: " + e); //$NON-NLS-1$
-      e.printStackTrace();
-    }
-  }
-
-  // test
-  //
-  /*
-  public static void main(String arg[])
-  {
-    if (arg.length >= 2)
-    {
-      try
-      {
-        CMDocumentFactoryRegistry.getInstance().registerCMDocumentBuilderWithClassName("org.eclipse.wst.xml.core.internal.contentmodel.mofimpl.CMDocumentBuilderImpl");
-
-        String grammarFileName = arg[0];
-        String rootElementName = arg[1];
-
-        Document document = (Document)Class.forName("org.apache.xerces.dom.DocumentImpl").newInstance();
-        testPopulateDocumentFromGrammarFile(document, grammarFileName, rootElementName, true);
-      }
-      catch (Exception e)
-      {
-        System.out.println("DOMContentBuilderImpl error");
-        e.printStackTrace();
-      }
-    }
-    else
-    {
-      System.out.println("Usage : java org.eclipse.wst.xml.util.DOMContentBuildingCMVisitor grammarFileName rootElementName");
-    }
-  }*/
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMNamespaceHelper.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMNamespaceHelper.java
deleted file mode 100644
index 2bc784f..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMNamespaceHelper.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.util;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class DOMNamespaceHelper
-{                
-  protected static String getURIForPrefix(Element element, String prefix)
-  {              
-    String result = null;
-	  String nsAttrName = null;
-	  if (prefix != null && prefix.length() > 0) 
-    {
-		  nsAttrName = "xmlns:" + prefix; //$NON-NLS-1$
-	  }
-	  else 
-    {
-		  nsAttrName = "xmlns"; //$NON-NLS-1$
-	  }
-            
-    // assume the node is qualified... look up the URI base on the prefix
-    //
-	  for (Node node = element; node != null; node = node.getParentNode()) 
-    {
-	   	if (node.getNodeType() == Node.ELEMENT_NODE)
-      {
-        Element theElement = (Element)node;
-		    Attr attr = theElement.getAttributeNode(nsAttrName);
-		    if (attr != null) 
-        {
-          result = attr.getValue();
-        }
-      }
-      else
-      {
-        break;
-      }
-    }
-         
-    // see if we can find some info from an 'implicit' namespace
-    //
-    if (result == null)
-    {                                
-      NamespaceTable table = new NamespaceTable(element.getOwnerDocument());
-      result = table.getURIForPrefix(prefix);
-    }
-    return result;
-	}
-
-  public static String getNamespaceURI(Node node)
-  {            
-    String result = null;
-    if (node.getNodeType() == Node.ELEMENT_NODE)
-    {               
-      Element element = (Element)node;
-      String prefix = element.getPrefix();
-      result = getURIForPrefix(element, prefix);
-    }
-    else if (node.getNodeType() == Node.ATTRIBUTE_NODE)
-    {      
-      Attr attr = (Attr)node;
-      String prefix = attr.getPrefix();
-      result = getURIForPrefix(attr.getOwnerElement(), prefix);
-    }
-    return result;
-  }                 
-
-  // todo... this is an ugly hack... needs to be fixed
-  //
-  public static String computePrefix(CMNode cmNode, Node parentNode)
-  {
-    String result = null;
-    for (Node node = parentNode; node != null; node = node.getParentNode())
-    {
-      if (node.getNodeType() == Node.ELEMENT_NODE)
-      {
-        result = getPrefix(node.getNodeName());
-        if (result != null)
-        {
-          break;
-        }
-      }
-    }
-    return result;
-  }        
-
-
-  public static String getPrefix(String name)
-  {
-    String prefix = null;
-    int index = name.indexOf(":"); //$NON-NLS-1$
-    if (index != -1)
-    {
-      prefix = name.substring(0, index);
-    }
-    return prefix;
-  }
-
-
-  public static String getUnprefixedName(String name)
-  {
-    int index = name.indexOf(":"); //$NON-NLS-1$
-    if (index != -1)
-    {
-      name = name.substring(index + 1);
-    }
-    return name;
-  }
-
-
-  public static String computeName(CMNode cmNode, Node parent, String prefix)
-  {     
-    return computeName(cmNode, parent, prefix, null);
-  }   
-
-
-  public static String computeName(CMNode cmNode, Node parent, String prefix, NamespaceTable namespaceTable)
-  {
-    String result = cmNode.getNodeName();
-
-    // if the cmNode has a hard coded prefix then we don't need to do anything
-    //
-    if (getPrefix(result) == null)
-    {              
-      String qualification = (String)cmNode.getProperty("http://org.eclipse.wst/cm/properties/nsPrefixQualification"); //$NON-NLS-1$
-      // see if we need a namespace prefix
-      //
-      if (qualification != null && qualification.equals("qualified")) //$NON-NLS-1$
-      {            
-        if (prefix == null)                 
-        {
-          // todo... add getCMDocument() method to CMNode
-          // for now use this getProperty() hack
-          CMDocument cmDocument = (CMDocument)cmNode.getProperty("CMDocument"); //$NON-NLS-1$
-          if (cmDocument != null)          
-          {     
-            String namespaceURI = (String)cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI");    //$NON-NLS-1$
-            if (namespaceURI != null)
-            {   
-              // use the NamespaceTable to figure out the correct prefix for this namespace uri
-              //      
-              if (namespaceTable == null)
-              {                                            
-                Document document = parent.getNodeType() == Node.DOCUMENT_NODE ? (Document)parent : parent.getOwnerDocument();
-                namespaceTable = new NamespaceTable(document);
-                if (parent instanceof Element)
-                {
-                  namespaceTable.addElementLineage((Element)parent);
-                }
-              }
-              prefix = namespaceTable.getPrefixForURI(namespaceURI);
-            }
-          }
-        }
-        if (prefix != null && prefix.length() > 0)
-        {
-          result = prefix + ":" + result; //$NON-NLS-1$
-        }
-      }    
-    }
-    return result;
-  }  
-  
-
-  public static String[] getURIQualifiedNameComponents(String uriQualifiedName)
-  {
-    String[] result = new String[2];
-    int firstIndex = uriQualifiedName.indexOf("["); //$NON-NLS-1$
-    int lastIndex = uriQualifiedName.indexOf("]"); //$NON-NLS-1$
-    if (firstIndex != -1 && lastIndex > firstIndex)
-    {
-      result[0] = uriQualifiedName.substring(firstIndex + 1, lastIndex);
-      result[1] = uriQualifiedName.substring(lastIndex + 1);
-    }  
-    else
-    {
-      result[1] = uriQualifiedName;
-    }                              
-    return result;
-  }   
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMNamespaceInfoManager.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMNamespaceInfoManager.java
deleted file mode 100644
index e16579c..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMNamespaceInfoManager.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.util;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * DOMNamespaceInfoManager          
- *
- *
- */
-public class DOMNamespaceInfoManager
-{                               
-  public static final String XSI_URI = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$
-
-  public DOMNamespaceInfoManager()
-  {
-  }                 
-
-  public List getNamespaceInfoList(Element element)
-  {
-    NamespaceInfoReader reader = new NamespaceInfoReader();
-    return reader.getNamespaceInfoList(element);
-  }            
-   
-  public void removeNamespaceInfo(Element element)
-  {     
-    NamespaceInfoRemover remover = new NamespaceInfoRemover();
-    remover.removeNamespaceInfo(element);
-  }
-
-  public void addNamespaceInfo(Element element, List namespaceInfoList, boolean needsXSI)
-  {  
-    // first we create an xmlns attribute for each namespace
-    //                   
-    Document document = element.getOwnerDocument();
-                                
-    String schemaLocationValue = "";      //$NON-NLS-1$
-
-    for (Iterator iterator = namespaceInfoList.iterator(); iterator.hasNext(); )
-    {
-      NamespaceInfo nsInfo = (NamespaceInfo)iterator.next();
-      nsInfo.normalize();
-               
-      if (nsInfo.uri != null) 
-      {            
-        String attrName = nsInfo.prefix != null ? "xmlns:" + nsInfo.prefix : "xmlns"; //$NON-NLS-1$ //$NON-NLS-2$
-        Attr namespaceAttr = document.createAttribute(attrName);  
-        namespaceAttr.setValue(nsInfo.uri);
-        element.setAttributeNode(namespaceAttr);   
-
-        // in this case we use the attribute "xsi:schemaLocation"
-        // here we build up its value
-        //
-        if (nsInfo.locationHint != null)
-        {
-          schemaLocationValue += nsInfo.uri;
-          schemaLocationValue += " "; //$NON-NLS-1$
-          schemaLocationValue += nsInfo.locationHint;
-          schemaLocationValue += " ";    //$NON-NLS-1$
-        }   
-
-        if (nsInfo.uri.equals(XSI_URI))
-        {
-          needsXSI = false;
-        }
-      }     
-      else if (nsInfo.locationHint != null)
-      {
-        // in this case we use the attribute "xsi:noNamespaceSchemaLocation"
-        //
-        Attr attr = document.createAttribute("xsi:noNamespaceSchemaLocation");   //$NON-NLS-1$
-        attr.setValue(nsInfo.locationHint);
-        element.setAttributeNode(attr);
-      } 
-    } 
-
-    if (needsXSI)
-    {
-      // we add an xmlns:xsi attribute to define 'xsi:schemaLocation' attribute
-      //   
-      Attr attr = document.createAttribute("xmlns:xsi"); //$NON-NLS-1$
-      attr.setValue(XSI_URI);
-      element.setAttributeNode(attr);
-    }
-
-    if (schemaLocationValue.length() > 0)
-    {
-      // create the "xsi:schemaLocation" attribute
-      //
-      Attr attr = document.createAttribute("xsi:schemaLocation"); //$NON-NLS-1$
-      attr.setValue(schemaLocationValue);
-      element.setAttributeNode(attr);
-    }                             
-  } 
-       
-  /**
-   *
-   */
-  protected static class NamespaceInfoReader extends NamespaceAttributeVisitor
-  {  
-    protected List namespaceInfoList = new Vector();
-
-    public List getNamespaceInfoList(Element element)
-    {
-      visitElement(element);
-      return namespaceInfoList;
-    }
-                       
-
-    public void visitXSINoNamespaceSchemaLocationAttribute(Attr attr, String value)
-    {
-      NamespaceInfo info = createNamespaceInfo();
-      info.locationHint = value;      
-    }
-    
-    public void visitXMLNamespaceAttribute(Attr attr, String prefix, String uri)
-    {           
-      NamespaceInfo info = createNamespaceInfo();
-      info.uri = uri;
-      info.prefix = prefix;      
-      super.visitXMLNamespaceAttribute(attr, prefix, uri);
-    }
-
-    public void visitXSISchemaLocationValuePair(String uri, String locationHint)
-    {    
-      NamespaceInfo info = getNamespaceInfoForURI(uri);            
-      if (info != null)
-      {
-        info.locationHint = locationHint;
-      } 
-      else
-      {
-        info = createNamespaceInfo();
-        info.uri = uri;
-        info.locationHint = locationHint;
-      }
-    }                                                                 
-
-    protected NamespaceInfo getNamespaceInfoForURI(String uri)
-    {    
-      NamespaceInfo result = null;
-      for (Iterator i = namespaceInfoList.iterator(); i.hasNext(); )
-      {
-        NamespaceInfo info = (NamespaceInfo)i.next();
-        if (info.uri != null && info.uri.equals(uri))
-        {
-          result = info;
-          break;
-        }
-      }         
-      return result;
-    }     
-
-    protected NamespaceInfo createNamespaceInfo()
-    {
-      NamespaceInfo info = new NamespaceInfo();
-      namespaceInfoList.add(info);
-      return info;
-    }
-  }
-     
-                                                
-  /**
-   *
-   */
-  protected static class NamespaceInfoRemover extends NamespaceAttributeVisitor
-  {                   
-    protected List attributesToRemove = new Vector();
-
-    public void removeNamespaceInfo(Element element)
-    {  
-      visitElement(element);
-      removeAttributes();
-    }   
-
-    public void visitXSINoNamespaceSchemaLocationAttribute(Attr attr, String value)
-    {
-      attributesToRemove.add(attr);
-    }        
-    
-    public void visitXMLNamespaceAttribute(Attr attr, String namespacePrefix, String namespaceURI)
-    {   
-      attributesToRemove.add(attr);
-      super.visitXMLNamespaceAttribute(attr, namespacePrefix, namespaceURI);
-    }
-    
-    public void visitXSISchemaLocationAttribute(Attr attr, String value)
-    {
-      attributesToRemove.add(attr);
-    }   
-
-    public void removeAttributes()
-    {
-      for (Iterator i = attributesToRemove.iterator(); i.hasNext(); )
-      {
-        Attr attr = (Attr)i.next();
-        Element element = attr.getOwnerElement();
-        if (element != null)
-        {
-          element.removeAttributeNode(attr);
-        }
-      }
-    }   
-  }
-
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMVisitor.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMVisitor.java
deleted file mode 100644
index bf0710b..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMVisitor.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.util;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Comment;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-// todo.. move this class to another package (perhaps xmlutility)
-//
-public class DOMVisitor
-{         
-  public void visitNode(Node node)
-  {
-    switch (node.getNodeType())
-    {
-      case Node.ATTRIBUTE_NODE :
-      {
-        visitAttr((Attr)node);
-        break;
-      }
-      case Node.CDATA_SECTION_NODE :
-      {
-        visitCDATASection((CDATASection)node);
-        break;
-      }
-      case Node.COMMENT_NODE :
-      {
-        visitComment((Comment)node);
-        break;
-      }
-      case Node.DOCUMENT_NODE :
-      {
-        visitDocument((Document)node);
-        break;
-      }
-      case Node.DOCUMENT_TYPE_NODE :
-      {
-        visitDocumentType((DocumentType)node);
-        break;
-      }
-      case Node.ELEMENT_NODE :
-      {
-        visitElement((Element)node);
-        break;
-      }
-      case Node.PROCESSING_INSTRUCTION_NODE :
-      {
-        visitProcessingInstruction((ProcessingInstruction)node);
-        break;
-      }
-      case Node.TEXT_NODE :
-      {
-        visitText((Text)node);
-        break;
-      }
-    }  
-  }    
-    
-  protected void visitDocument(Document document)
-  {                   
-    visitChildNodesHelper(document);
-  }
-
-  protected void visitDocumentType(DocumentType doctype)
-  {         
-
-  }  
-
-  protected void visitElement(Element element)
-  {        
-    visitAttributesHelper(element);
-    visitChildNodesHelper(element);
-  } 
- 
-
-  public void visitAttr(Attr attr)
-  {                                  
-  }
-
-  protected void visitText(Text text)
-  {    
-  }
-
-  protected void visitCDATASection(CDATASection cdataSection)
-  {                       
-  }     
-
-  protected void visitComment(Comment comment)
-  {                   
-  }   
-
-  protected void visitProcessingInstruction(ProcessingInstruction pi)
-  {    
-  }
- 
-
-  protected void visitChildNodesHelper(Node node)
-  {
-    NodeList children = node.getChildNodes();
-    for (int i = 0; i < children.getLength(); i++)
-    {
-      visitNode(children.item(i));
-    }
-  }
-
-  protected void visitAttributesHelper(Node node)
-  {
-    NamedNodeMap map = node.getAttributes();
-    for (int i = 0; i < map.getLength(); i++ )
-    {
-      visitNode(map.item(i));
-    }
-  }         
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMWriter.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMWriter.java
deleted file mode 100644
index 03aca74..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/DOMWriter.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.util;
-
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Comment;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-
-/**
- * This is a hacked up dom writer stolen from a Xerces sample.
- * I'd like to use an exisitng 'generic DOM' writer
- * If anyone can find such a thing then please go ahead and junk this.
- *
- * @version
- */
-public class DOMWriter
-{
-  protected boolean formattingEnabled = true;
-   protected boolean outputDoctypeEnabled = true;
-   protected PrintWriter out;
-   protected int indent = 0;  
-
-   public DOMWriter() throws UnsupportedEncodingException
-   {
-     this(System.out);
-   }
-
-   public DOMWriter(OutputStream outputSteam)
-   {
-     out = new PrintWriter(outputSteam);
-   }
-
-   public DOMWriter(Writer writer)
-   {
-     out = new PrintWriter(writer);
-   }
-
-   public void setFormattingEnabled(boolean enabled)
-   {
-     formattingEnabled = enabled;
-   }
-
-   public boolean getFormattingEnabled()
-   {
-     return formattingEnabled;
-   }
-
-   public void setOutputDoctypeEnabled(boolean enabled)
-   {
-     outputDoctypeEnabled = enabled;
-   }
-
-   public class XMLVisitor
-   {
-     protected boolean currentElementHasChildElements = false;
-
-     public void visitNode(Node node)
-     {
-       switch (node.getNodeType())
-       {
-         case Node.ATTRIBUTE_NODE :
-         {
-           visitAttr((Attr)node);
-           break;
-         }
-         case Node.CDATA_SECTION_NODE :
-         {
-           visitCDATASection((CDATASection)node);
-           break;
-         }
-         case Node.COMMENT_NODE :
-         {
-           visitComment((Comment)node);
-           break;
-         }
-         case Node.DOCUMENT_NODE :
-         {
-           visitDocument((Document)node);
-           break;
-         }
-         case Node.DOCUMENT_TYPE_NODE :
-         {
-           visitDocumentType((DocumentType)node);
-           break;
-         }
-         case Node.ELEMENT_NODE :
-         {
-           visitElement((Element)node);
-           break;
-         }
-         case Node.PROCESSING_INSTRUCTION_NODE :
-         {
-           visitProcessingInstruction((ProcessingInstruction)node);
-           break;
-         }
-         case Node.TEXT_NODE :
-         {
-           visitText((Text)node);
-           break;
-         }
-       }
-     }
-
-     public void visitDocument(Document document)
-     {
-       visitChildNodesHelper(document);
-     }
-
-     public void visitDocumentType(DocumentType doctype)
-     {                       
-       if (outputDoctypeEnabled)
-       {
-         String data = getDocumentTypeData(doctype);
-         print("<!DOCTYPE " + data + ">"); //$NON-NLS-1$ //$NON-NLS-2$
-       }
-     }
-
-     public void visitElement(Element element)
-     {                                  
-       if (!doShow(element))
-         return;
-
-       boolean parentElementHasChildNodes = currentElementHasChildElements;
-       currentElementHasChildElements = hasChildElements(element);
-
-       printIndent();
-       print("<"); //$NON-NLS-1$
-       print(element.getNodeName());
-       visitAttributesHelper(element);
-
-       boolean hasChildNodes = element.getChildNodes().getLength() > 0;                
-       boolean isRootElement = element.getParentNode().getNodeType() == Node.DOCUMENT_NODE;
-       if (hasChildNodes || isRootElement)
-       {
-         if (currentElementHasChildElements || isRootElement)
-         {
-           println(">"); //$NON-NLS-1$
-         }
-         else
-         {
-           print(">"); //$NON-NLS-1$
-         }
-         indent += 2;
-         visitChildNodesHelper(element);
-         indent -= 2;
-
-         if (currentElementHasChildElements || isRootElement)
-         {
-           printIndent();
-         }
-         print("</"); //$NON-NLS-1$
-         print(element.getNodeName());
-         println(">"); //$NON-NLS-1$
-       }
-       else
-       {
-         println("/>"); //$NON-NLS-1$
-       }
-
-       currentElementHasChildElements = parentElementHasChildNodes;
-     }
-
-     public void visitAttr(Attr attr)
-     {
-       print(" "); //$NON-NLS-1$
-       print(attr.getNodeName());
-       print("=\""); //$NON-NLS-1$
-       print(createPrintableCharacterData(attr.getValue()));
-       print("\""); //$NON-NLS-1$
-     }
-
-     public void visitText(Text text)
-     {
-       if (currentElementHasChildElements)
-       {
-         printIndent();
-         print(createPrintableCharacterData(text.getNodeValue()));
-         println();
-       }
-       else
-       {
-         print(createPrintableCharacterData(text.getNodeValue()));
-       }
-     }
-
-     public void visitCDATASection(CDATASection cdataSection)
-     {
-     }
-
-     public void visitComment(Comment comment)
-     {
-       printIndent();
-       print("<!--"); //$NON-NLS-1$
-       print(comment.getNodeValue());
-       println("-->"); //$NON-NLS-1$
-     }
-
-     public void visitProcessingInstruction(ProcessingInstruction pi)
-     {
-       printIndent();
-       print("<?"); //$NON-NLS-1$
-       print(pi.getNodeName());
-       print(" "); //$NON-NLS-1$
-       print(pi.getNodeValue());
-       println("?>"); //$NON-NLS-1$
-     }
-             
-
-     public boolean hasChildElements(Node node)
-     {
-       boolean result = false;
-       NodeList children = node.getChildNodes();
-       for (int i = 0; i < children.getLength(); i++)
-       {
-         if (children.item(i).getNodeType() == Node.ELEMENT_NODE)
-         {
-           result = true;
-           break;
-         }
-       }
-       return result;
-     }
-
-     public void visitChildNodesHelper(Node node)
-     {
-       NodeList children = node.getChildNodes();
-       for (int i = 0; i < children.getLength(); i++)
-       {
-         visitNode(children.item(i));
-       }
-     }
-
-     public void visitAttributesHelper(Node node)
-     {
-       NamedNodeMap map = node.getAttributes();
-       for (int i = 0; i < map.getLength(); i++ )
-       {
-         visitNode(map.item(i));
-       }
-     }
-   }
-
-  /** an ugly hack until I restruct this code a little
-   *  
-   */  
-  protected boolean doShow(Element element)    
-  {
-    return true;
-  }
-                                               
-  /** converts DOM text values to 'printable' values 
-   *  - converts '&' to '&amp;'
-   */
-  protected String createPrintableCharacterData(String string)
-  {              
-    String result = ""; //$NON-NLS-1$
-    int index = 0;                             
-    while (true)
-    {                                                 
-      int ampersandIndex = string.indexOf("&", index); //$NON-NLS-1$
-      if (ampersandIndex != -1)
-      {
-        result += string.substring(index, ampersandIndex);
-        result += "&amp;"; //$NON-NLS-1$
-        index = ampersandIndex + 1; 
-      }
-      else
-      {
-        break;
-      }
-    } 
-    result += string.substring(index);
-    return result;
-  }
-
-
-  /** Prints the specified node, recursively. */
-  public void print(Node node)
-  {
-    // is there anything to do?
-    if (node != null)
-    {
-      XMLVisitor visitor = new XMLVisitor();
-      visitor.visitNode(node);
-    }
-    out.flush();
-  }
-
-  /** a temporary hack to workaround our inability to create a DocumentType tag*/
-  public void print(Document document, String grammarURL)
-  {
-    String systemId = null;
-    if (grammarURL.endsWith("dtd")) //$NON-NLS-1$
-    {
-      int lastSlashIndex = Math.max(grammarURL.lastIndexOf("/"), grammarURL.lastIndexOf("\\")); //$NON-NLS-1$ //$NON-NLS-2$
-      if (lastSlashIndex != -1)
-      {
-        systemId = grammarURL.substring(lastSlashIndex + 1);
-      }
-    }
-    print(document, "UTF-8", grammarURL, null, systemId); //$NON-NLS-1$
-
-  }
-
-  /** a temporary hack to workaround our inability to create a DocumentType tag*/
-  public void print(Document document, String encoding, String grammarFileName, String publicId, String systemId)
-  {
-    out.println("<?xml version=\"1.0\"" + " encoding=\"" + encoding + "\"?>");   //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    if (grammarFileName.endsWith(".dtd")) //$NON-NLS-1$
-    {
-      String docTypeLine = "<!DOCTYPE " + document.getDocumentElement().getNodeName() + " "; //$NON-NLS-1$ //$NON-NLS-2$
-      if (publicId != null) 
-      {
-        docTypeLine += "PUBLIC \"" + publicId + "\" "; //$NON-NLS-1$ //$NON-NLS-2$
-        if (systemId != null)
-        {
-          docTypeLine += "\"" + systemId + "\" "; //$NON-NLS-1$ //$NON-NLS-2$
-        }
-        docTypeLine += ">"; //$NON-NLS-1$
-        out.println(docTypeLine);
-      }
-      else if (systemId != null)
-      {
-        docTypeLine += "SYSTEM \"" + systemId + "\" >"; //$NON-NLS-1$ //$NON-NLS-2$
-        out.println(docTypeLine);
-      }
-    }
-    print(document);
-  }  
-
-  public static String getDocumentTypeData(DocumentType doctype)
-  {
-    String data = doctype.getName();
-    if (doctype.getPublicId() != null)
-    {
-      data += " PUBLIC \"" + doctype.getPublicId() + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-      String systemId = doctype.getSystemId();
-      if (systemId == null)
-      {
-        systemId = ""; //$NON-NLS-1$
-      }
-      data += " \"" + systemId + "\"";      //$NON-NLS-1$ //$NON-NLS-2$
-    }
-    else
-    {
-      data += " SYSTEM \"" + doctype.getSystemId() + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-    }
-    return data;
-  }     
-
-  public void println()
-  {
-    if (formattingEnabled)
-    {
-      out.println();
-    }
-  }
-
-  public void println(String string)
-  {
-    if (formattingEnabled)
-    {
-      out.println(string);
-    }
-    else
-    {
-      out.print(string);
-    }
-  }
-
-  public void printIndent()
-  {             
-    if (formattingEnabled)
-    {
-      for (int i = 0; i < indent; i++)
-      {
-        out.print(" "); //$NON-NLS-1$
-      }
-    }
-  }       
-
-  public void print(String string)
-  {
-    out.print(string);
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/InferredGrammarFactory.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/InferredGrammarFactory.java
deleted file mode 100644
index 601b8ba..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/InferredGrammarFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.util;
-
-import java.util.Collection;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.w3c.dom.Element;
-
-
-// this interface is used to build a grammar document given a local file name
-//
-public interface InferredGrammarFactory
-{   
-  public CMDocument createCMDocument(String uri); 
-  public CMElementDeclaration createCMElementDeclaration(CMDocument cmDocument, Element element, boolean isLocal);
-  public void createCMContent(CMDocument parentCMDocument, CMElementDeclaration parentEd, CMDocument childCMDocument, CMElementDeclaration childEd, boolean isLocal, String uri);
-  public void debugPrint(Collection collection); 
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/NamespaceAttributeVisitor.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/NamespaceAttributeVisitor.java
deleted file mode 100644
index f14a5b7..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/NamespaceAttributeVisitor.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.util;
-
-import java.util.StringTokenizer;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-
-public class NamespaceAttributeVisitor
-{                                      
-  public static final String XML_SCHEMA_INSTANCE_URI = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$
-  public String xsiPrefix = "xsi"; //$NON-NLS-1$
-
-  public void visitXMLNamespaceAttribute(Attr attr, String namespacePrefix, String namespaceURI)
-  {   
-    if (namespaceURI.equals(XML_SCHEMA_INSTANCE_URI))
-    {
-      xsiPrefix = namespacePrefix;
-    }
-  } 
-
-  public void visitXSINoNamespaceSchemaLocationAttribute(Attr attr, String value)
-  {
-  }
-
-  public void visitXSISchemaLocationAttribute(Attr attr, String value)
-  {
-    StringTokenizer st = new StringTokenizer(value);          
-    while (true)
-    {
-      String nsURI = st.hasMoreTokens() ? st.nextToken() : null;
-      String locationHint = st.hasMoreTokens() ? st.nextToken() : null;            
-      if (nsURI != null && locationHint != null)
-      {    
-        visitXSISchemaLocationValuePair(nsURI, locationHint);          
-      }
-      else
-      {
-        break;
-      }
-    }
-  }   
-
-  public void visitXSISchemaLocationValuePair(String uri, String locationHint)
-  {
-  }
-
-  public void visitElement(Element element)
-  {
-    NamedNodeMap map = element.getAttributes();
-    int mapLength = map.getLength();
-    for (int i = 0; i < mapLength; i++)
-    {
-      Attr attr = (Attr)map.item(i);
-      String prefix = DOMNamespaceHelper.getPrefix(attr.getName());
-      String unprefixedName = DOMNamespaceHelper.getUnprefixedName(attr.getName());
-      if (prefix != null && unprefixedName != null)
-      {
-        if (prefix.equals("xmlns")) //$NON-NLS-1$
-        {
-          visitXMLNamespaceAttribute(attr, unprefixedName, attr.getValue());
-        } 
-        else if (prefix.equals(xsiPrefix) && unprefixedName.equals("schemaLocation")) //$NON-NLS-1$
-        {
-          visitXSISchemaLocationAttribute(attr, attr.getValue());
-        }
-        else if (prefix.equals(xsiPrefix) && unprefixedName.equals("noNamespaceSchemaLocation")) //$NON-NLS-1$
-        {
-          visitXSINoNamespaceSchemaLocationAttribute(attr, attr.getValue());
-        }
-      }
-      else if (unprefixedName != null)
-      {
-        if (unprefixedName.equals("xmlns")) //$NON-NLS-1$
-        {
-          visitXMLNamespaceAttribute(attr, "", attr.getValue()); //$NON-NLS-1$
-        }
-      }      
-    }
-  }      
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/NamespaceInfo.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/NamespaceInfo.java
deleted file mode 100644
index d1cbde8..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/NamespaceInfo.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.util;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-public class NamespaceInfo
-{                        
-  public String uri;
-  public String prefix;
-  public String locationHint;
-  public boolean isPrefixRequired; 
-  protected Hashtable hashtable;
-
-  public NamespaceInfo()
-  {
-  }
-
-  public NamespaceInfo(String uri, String prefix, String locationHint)
-  {                                                                  
-    this.uri = uri;                             
-    this.prefix = prefix;
-    this.locationHint = locationHint;
-  }   
-
-  public NamespaceInfo(NamespaceInfo that)
-  {                                               
-    this.uri = that.uri;                             
-    this.prefix = that.prefix;
-    this.locationHint = that.locationHint;
-    // todo... see if we need to clone the hastable 
-  }
-
-  public void normalize()
-  {
-    uri = getNormalizedValue(uri);
-    prefix  = getNormalizedValue(prefix);
-    locationHint= getNormalizedValue(locationHint);
-  }
-
-  protected String getNormalizedValue(String string)
-  {
-    return (string != null && string.trim().length() == 0) ? null : string;
-  }
-    
-  public void setProperty(String property, Object value)
-  {
-    if (hashtable == null)
-    {
-      hashtable = new Hashtable();
-    }
-    hashtable.put(property, value);
-  }
-
-  public Object getProperty(String property)
-  {
-    return (hashtable != null) ? hashtable.get(property) : null;
-  }
-
-  public static List cloneNamespaceInfoList(List oldList)
-  {  
-    List newList = new Vector(oldList.size());
-    for (Iterator i = oldList.iterator(); i.hasNext(); )
-    {
-      NamespaceInfo oldInfo = (NamespaceInfo)i.next();
-      newList.add(new NamespaceInfo(oldInfo));
-    }               
-    return newList;
-  }
-}      
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/NamespaceTable.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/NamespaceTable.java
deleted file mode 100644
index 617f11e..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/NamespaceTable.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved.   This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-* 
-* Contributors:
-*   IBM - Initial API and implementation
-*   Jens Lukowski/Innoopract - initial renaming/restructuring
-* 
-*/
-package org.eclipse.wst.xml.core.internal.contentmodel.util;
-                          
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class NamespaceTable extends NamespaceAttributeVisitor
-{                   
-  public Hashtable hashtable = new Hashtable();
-
-  public NamespaceTable(Document document)
-  {                     
-    //DOMExtension domExtension = DOMExtensionProviderRegistry.getInstance().getDOMExtension(document);
-    //if (domExtension != null)
-    //{                          
-    //  addNamespaceInfoList(domExtension.getImplictNamespaceInfoList(), true);
-    // }
-  }   
-
-  private NamespaceTable()
-  {        
-  }  
-
-  public boolean isNamespaceEncountered()
-  {
-    return hashtable.values().size() > 0;
-  }
-
-  public String getPrefixForURI(String uri)
-  {           
-    String result = null;
-    NamespaceInfo entry = getNamespaceInfoForURI(uri, true);
-    if (entry != null) 
-    {
-      result = entry.prefix;
-    }                         
-    return result;
-  }
-      
-
-  public String getURIForPrefix(String prefix)
-  {           
-    String result = null;
-    NamespaceInfo info = getNamespaceInfoForPrefix(prefix);
-    if (info != null) 
-    {
-      result = info.uri;
-    }                         
-    return result;
-  }    
-
-          
-  protected boolean isMatchingString(String a, String b)
-  {
-    return ((a == null && b == null) || (a != null && b != null && a.equals(b)));
-  }
-   
-
-  public NamespaceInfo getNamespaceInfoForURI(String uri)
-  {                                                     
-    return getNamespaceInfoForURI(uri, false);
-  }
-
-
-  public NamespaceInfo getNamespaceInfoForURI(String uri, boolean testImplied)
-  {
-    NamespaceInfo result = null;
-    for (Iterator i = hashtable.values().iterator(); i.hasNext(); )
-    {                    
-      NamespaceInfo nsInfo = (NamespaceInfo)i.next(); 
-      if (isMatchingString(nsInfo.uri, uri))
-      {                 
-        result = nsInfo;
-        if (testImplied && nsInfo.getProperty("isImplied") != null) //$NON-NLS-1$
-        {
-          // continue
-        }            
-        else
-        {
-          break;
-        }
-      }
-    }
-    return result;
-  } 
-
-
-  public void setLocationHintForURI(String uri, String locationHint)
-  {      
-   // List list = new Vector();
-    for (Iterator i = hashtable.values().iterator(); i.hasNext(); )
-    {                    
-      NamespaceInfo nsInfo = (NamespaceInfo)i.next(); 
-      if (isMatchingString(nsInfo.uri, uri))
-      {                                               
-        nsInfo.locationHint = locationHint;
-      }
-    }
-  }
-    
-
-  public NamespaceInfo getNamespaceInfoForPrefix(String prefix)
-  {                                      
-    prefix = prefix != null ? prefix : ""; //$NON-NLS-1$
-    return (NamespaceInfo)hashtable.get(prefix);
-  }   
-
-
-  public void visitXMLNamespaceAttribute(Attr attr, String namespacePrefix, String namespaceURI)
-  {                                 
-    NamespaceInfo nsInfo = new NamespaceInfo();      
-    nsInfo.prefix = namespacePrefix;
-    nsInfo.uri = namespaceURI;      
-   
-    NamespaceInfo matchingNamespaceInfo = getNamespaceInfoForURI(namespaceURI);
-    if (matchingNamespaceInfo != null)
-    {                           
-      nsInfo.locationHint = matchingNamespaceInfo.locationHint;
-    }                                      
-
-    internalAddNamespaceInfo(namespacePrefix, nsInfo);
-
-    super.visitXMLNamespaceAttribute(attr, namespacePrefix, namespaceURI);
-  } 
-                 
-  public void visitXSISchemaLocationValuePair(String uri, String locationHint)
-  {
-    setLocationHintForURI(uri, locationHint);
-  }   
-
-  public void addNamespaceInfo(NamespaceInfo info)
-  {                           
-    String key  = (info.prefix != null) ? info.prefix : ""; //$NON-NLS-1$
-    internalAddNamespaceInfo(key, info);
-  }
-
-  protected void internalAddNamespaceInfo(String key, NamespaceInfo info)
-  {
-    hashtable.put(key, info);
-  }
-
-  protected void addNamespaceInfoList(List list, boolean isImplied)
-  {       
-    if (list != null)
-    {
-      for (Iterator i = list.iterator(); i.hasNext(); )
-      {
-        NamespaceInfo info = (NamespaceInfo)i.next();
-        NamespaceInfo clone = new NamespaceInfo(info);    
-        if (isImplied)
-        {
-          clone.setProperty("isImplied", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-        }
-        addNamespaceInfo(clone);
-      }
-    }
-  }
-
-  public void addNamespaceInfoList(List list)
-  {  
-    addNamespaceInfoList(list, false);  
-  }
-
-  public void visitXSINoNamespaceSchemaLocationAttribute(Attr attr, String locationHint)
-  {
-    addNoNamespaceSchemaLocation(locationHint);
-  } 
-
-  public void addNoNamespaceSchemaLocation(String locationHint)
-  {
-    NamespaceInfo nsInfo = new NamespaceInfo();      
-    nsInfo.prefix = null;
-    nsInfo.uri = "";       //$NON-NLS-1$
-    nsInfo.locationHint = locationHint;  
-    internalAddNamespaceInfo("", nsInfo); //$NON-NLS-1$
-  } 
-
-  public void addNamespaceInfo(String prefix, String uri, String locationHint)
-  {
-    NamespaceInfo nsInfo = new NamespaceInfo();      
-    nsInfo.prefix = prefix;
-    nsInfo.uri = uri;      
-    nsInfo.locationHint = locationHint;  
-    internalAddNamespaceInfo(prefix != null ? prefix : "", nsInfo); //$NON-NLS-1$
-  } 
-
-  public void addElement(Element element)
-  {   
-    visitElement(element);  
-  }      
-         
-  public void addElementLineage(Element targetElement)
-  {
-    List list = NamespaceTable.getElementLineage(targetElement);                 
-    for (Iterator i = list.iterator(); i.hasNext(); )
-    {
-      Element element = (Element)i.next();
-      addElement(element);
-    }            
-  }
-
-  public static List getElementLineage(Element element)
-  {          
-    List result = new ArrayList();             
-    for (Node node = element; node != null; node = node.getParentNode())
-    {                               
-      if (node.getNodeType() == Node.ELEMENT_NODE)
-      {
-        result.add(0, node);                      
-      }
-      else
-      {
-        break;
-      }
-    }  
-    return result;
-  }    
-
-  public Collection getNamespaceInfoCollection()
-  {              
-    return hashtable.values();
-  } 
-
-  public List getNamespaceInfoList()
-  {                               
-    List list = new Vector();
-    list.addAll(hashtable.values());
-    return list;
-  }
-} 
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/ValidatorHelper.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/ValidatorHelper.java
deleted file mode 100644
index 47bd73c..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/ValidatorHelper.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.internal.validation;
-
-import java.io.Reader;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ext.LexicalHandler;
-
-/**
- * A helper class for the XML validator.
- * 
- * @author Craig Salter, IBM
- * @author Lawrence Mandel, IBM
- */
-public class ValidatorHelper
-{                           
-  public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-  public List namespaceURIList = new Vector();
-  public boolean isGrammarEncountered = false;    
-  public boolean isDTDEncountered = false;
-  public boolean isNamespaceEncountered = false;
-  public String schemaLocationString = "";
-  public int numDTDElements = 0;
-
-  public static final boolean IS_LINUX = java.io.File.separator.equals("/");
-
-  /**
-   * Constructor.
-   */
-  public ValidatorHelper()
-  {
-  }
- 
-  /**
-   * Create an XML Reader.
-   * 
-   * @return An XML Reader if one can be created or null.
-   * @throws Exception
-   */
-  protected XMLReader createXMLReader() throws Exception
-  {     
-    XMLReader reader = null;
-    ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
-    try
-    {
-      Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-      reader = new org.apache.xerces.parsers.SAXParser();     
-
-      reader.setFeature("http://apache.org/xml/features/continue-after-fatal-error", false);
-      reader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
-      reader.setFeature("http://xml.org/sax/features/namespaces", false);
-      reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
-      reader.setContentHandler(new MyContentHandler());
-      reader.setErrorHandler(new InternalErrorHandler()); 
-
-      LexicalHandler lexicalHandler = new LexicalHandler()
-      {      
-        public void startDTD (String name, String publicId, String systemId)
-        {
-          isGrammarEncountered = true;   
-          isDTDEncountered = true;
-        }
-
-        public void endDTD() throws SAXException
-        {
-        }
-
-        public void startEntity(String name) throws SAXException
-        {
-        }
-
-        public void endEntity(String name) throws SAXException
-        {
-        }
-
-        public void startCDATA() throws SAXException
-        {
-        }
-	
-        public void endCDATA() throws SAXException
-        {
-        }
- 
-        public void comment (char ch[], int start, int length) throws SAXException
-        {
-        }
-      };
-      reader.setProperty("http://xml.org/sax/properties/lexical-handler", lexicalHandler);
-    }
-    finally
-    {
-      Thread.currentThread().setContextClassLoader(prevClassLoader);
-    }
-    return reader;
-  }  
-
-  /**
-   * An error handler to suppress error and warning information.
-   */
-  private class InternalErrorHandler implements org.xml.sax.ErrorHandler
-  {
-    public void error(SAXParseException exception) throws SAXException
-    {
-    }
-
-    public void fatalError(SAXParseException exception) throws SAXException
-    {
-    }
-
-    public void warning(SAXParseException exception) throws SAXException
-    {
-    }
-  }
-
- 
-  /**
-   * Figures out the information needed for validation.
-   * 
-   * @param uri The uri of the file to validate.
-   * @param uriResolver A helper to resolve locations.
-   */
-  public void computeValidationInformation(String uri, Reader characterStream, URIResolver uriResolver)
-  {
-    try
-    {
-      XMLReader reader = createXMLReader();  
-      InputSource inputSource = new InputSource(uri);
-      inputSource.setCharacterStream(characterStream);
-      reader.parse(inputSource);
-    }
-    catch (Exception e)
-    {     
-      //System.out.println(e);
-    }
-  }
-  
- 
-
-  /**
-   * Handle the content while parsing the file.
-   */
-  class MyContentHandler extends org.xml.sax.helpers.DefaultHandler
-  {      
-    /* (non-Javadoc)
-     * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
-     */
-    boolean isRootElement = true;
-    
-    public void error(SAXParseException e) throws SAXException
-    {
-    }
-    /* (non-Javadoc)
-     * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
-     */
-    public void fatalError(SAXParseException e) throws SAXException
-    {
-    }
-    /* (non-Javadoc)
-     * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
-     */
-    public void warning(SAXParseException e) throws SAXException
-    {
-    }
-    public String getPrefix(String name)
-    {
-      String prefix = null;
-      int index = name.indexOf(":");
-      if (index != -1)
-      {
-        prefix = name.substring(0, index);
-      }
-      return prefix;
-    }    
-        
-    public String getUnprefixedName(String name)
-    {
-      int index = name.indexOf(":");
-      if (index != -1)
-      {
-        name = name.substring(index + 1);
-      }
-      return name;
-    }
-    
-    public String getPrefixedName(String prefix, String localName)
-    {
-      return prefix != null && prefix.length() > 0 ? prefix + ":" + localName : localName;     
-    }
-
-    public void startElement(String namespaceURI, String localName, String rawName, Attributes atts)
-    {      
-      //String explicitLocation = null;
-      if (isRootElement)
-      {  
-        
-        isRootElement = false;  
-        int nAtts = atts.getLength();    
-        String schemaInstancePrefix = null;
-        for (int i =0; i < nAtts; i++)
-        {              
-          String attributeName = atts.getQName(i);       
-          if (attributeName.equals("xmlns") || attributeName.startsWith("xmlns:"))
-          {                                         
-            isNamespaceEncountered = true;    
-            String value = atts.getValue(i);                 
-            if (value.startsWith("http://www.w3.org/") && value.endsWith("/XMLSchema-instance"))
-            {
-              schemaInstancePrefix = attributeName.equals("xmlns") ? "" : getUnprefixedName(attributeName);
-            }                   
-          }                 
-        }
-        
-        String prefix = getPrefix(rawName);
-        String rootElementNamespaceDeclarationName = (prefix != null && prefix.length() > 0) ? "xmlns:" + prefix : "xmlns";
-        String rootElementNamespace = rootElementNamespaceDeclarationName != null ? atts.getValue(rootElementNamespaceDeclarationName) : null;        
-        
-        String location = null;
-        
-        // first we use any 'xsi:schemaLocation' or 'xsi:noNamespaceSchemaLocation' attribute
-        // to determine a location
-        if (schemaInstancePrefix != null)
-        {                     
-          location = atts.getValue(getPrefixedName(schemaInstancePrefix, "noNamespaceSchemaLocation"));
-          if (location == null)
-          {
-            location = atts.getValue(getPrefixedName(schemaInstancePrefix, "schemaLocation"));  
-          }
-        }  
-        if (location == null && rootElementNamespace != null)
-        {
-          location = URIResolverPlugin.createResolver().resolve(null, rootElementNamespace, null);                                          
-        }           
-        
-        if (location != null)
-        {  
-          isGrammarEncountered = true;
-        }        
-      }
-    }     
-    /* (non-Javadoc)
-     * @see org.xml.sax.ext.DeclHandler#elementDecl(java.lang.String, java.lang.String)
-     */
-    public void elementDecl(String name, String model) 
-    {
-      numDTDElements++;
-    }
-  }   
-       
-  
-  /**
-   * Replace all instances in the string of the old pattern with the new pattern.
-   * 
-   * @param string The string to replace the patterns in.
-   * @param oldPattern The old pattern to replace.
-   * @param newPattern The pattern used for replacement.
-   * @return The modified string with all occurrances of oldPattern replaced by new Pattern.
-   */
-  protected static String replace(String string, String oldPattern, String newPattern)
-  {     
-    int index = 0;
-    while (index != -1)
-    {
-      index = string.indexOf(oldPattern, index);
-      if (index != -1)
-      {
-        string = string.substring(0, index) + newPattern + string.substring(index + oldPattern.length());
-        index = index + oldPattern.length();
-      }
-    }
-    return string;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidationInfo.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidationInfo.java
deleted file mode 100644
index 6457db9..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidationInfo.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.internal.validation;
-
-import org.apache.xerces.xni.XMLLocator;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationInfo;
-
-
-/**
- * A validation information object specific to XML validators.
- * 
- * @author Lawrence Mandel, IBM
- */
-public class XMLValidationInfo extends ValidationInfo implements XMLValidationReport
-{
-  protected boolean grammarEncountered = false;
-  protected boolean dtdEncountered = false;
-  protected boolean namespaceEncountered = false;
-  protected int elementDeclCount = 0;
-  protected String currentErrorKey;
-  protected Object messageArguments[] = null;
-  protected XMLLocator locator = null;
-  
-  /**
-   * Constructor.
-   * 
-   * @param uri The URI of the file this report describes.
-   */
-  public XMLValidationInfo(String uri)
-  {
-    super(uri);
-  }
-  
-  public boolean isGrammarEncountered()
-  {
-    return grammarEncountered;
-  }
-  
-  /**
-   * Set whether a grammar has been encountered or not.
-   * 
-   * @param grammarEncountered Set true if a grammar has been encountered, false otherwise.
-   */
-  public void setGrammarEncountered(boolean grammarEncountered)
-  {
-    this.grammarEncountered = grammarEncountered;
-  }
-  
-  public boolean isDTDWithoutElementDeclarationEncountered()
-  {
-    return dtdEncountered && elementDeclCount == 0;
-  }
-  
-  /**
-   * Set whether a DTD without an element declaration was encountered.
-   * 
-   * @param dtdWithoutElementDeclarationEncountered Set true if a DTD without an
-   *         element declaration was encountered, false otherwise.
-   */
-  public void setDTDEncountered(boolean dtdEncountered)
-  {
-    this.dtdEncountered = dtdEncountered;
-  }
-  
-  public boolean isNamespaceEncountered()
-  {
-    return namespaceEncountered;
-  }
-  
-  /**
-   * Set whether a namespace was encountered.
-   * 
-   * @param namespaceEncountered Set true if a namespace was encountered, false otherwise.
-   */
-  public void setNamespaceEncountered(boolean namespaceEncountered)
-  {
-    this.namespaceEncountered = namespaceEncountered;
-  }
-  
-  /**
-   * Increase the element declaration count for DTD elements by one.
-   */
-  public void increaseElementDeclarationCount()
-  {
-    this.elementDeclCount++;
-  }
-  
-  /**
-   * Set the number of DTD elements encountered.
-   * 
-   * @param count The number of DTD elements encountered.
-   */
-  public void setElementDeclarationCount(int count)
-  {
-  	elementDeclCount = count;
-  }
-  
-  /**
-   * Get the XML locator if one has been specified.
-   * 
-   * @return The XML locator if one has been specified or null.
-   */
-  public XMLLocator getXMLLocator()
-  {
-    return locator;
-  }
-  
-  /**
-   * Set the XMLLocator.
-   * 
-   * @param locator The XMLLocator to set.
-   */
-  public void setXMLLocator(XMLLocator locator)
-  {
-    this.locator = locator;
-  }
-  
-  /**
-   * Get the current error key.
-   * 
-   * @return Returns the currentErrorKey.
-   */
-  public String getCurrentErrorKey()
-  {
-    return currentErrorKey;
-  }
-  
-  /**
-   * Set the current error key.
-   * 
-   * @param currentErrorKey The currentErrorKey to set.
-   */
-  public void setCurrentErrorKey(String currentErrorKey)
-  {
-    this.currentErrorKey = currentErrorKey;
-  }
-
-public Object[] getMessageArguments() {
-	return messageArguments;
-}
-
-
-public void setMessageArguments(Object[] messageArguments) {
-	this.messageArguments = messageArguments;
-}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidationReport.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidationReport.java
deleted file mode 100644
index 7294d9c..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidationReport.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.internal.validation;
-
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-
-/**
- * An interface represention a validation report for XML validation.
- * 
- * @author Lawrence Mandel, IBM
- */
-public interface XMLValidationReport extends ValidationReport
-{
-  
-  /**
-   * Returns whether a grammar was encountered during the validation.
-   * 
-   * @return True if a grammar was encountered, false otherwise.
-   */
-  public boolean isGrammarEncountered();
-  
-  /**
-   * Returns whether a namespace was encountered.
-   * 
-   * @return True if a namespace was encountered, false otherwise.
-   */
-  public boolean isNamespaceEncountered();
-  
-  /**
-   * Returns whether a DTD without element declarations was encountered.
-   * 
-   * @return True if a DTD without element declarations was encountered.
-   */
-  public boolean isDTDWithoutElementDeclarationEncountered();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidator.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidator.java
deleted file mode 100644
index 2f255fd..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidator.java
+++ /dev/null
@@ -1,550 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.internal.validation;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.net.ConnectException;
-import java.net.UnknownHostException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.apache.xerces.impl.XMLErrorReporter;
-import org.apache.xerces.parsers.StandardParserConfiguration;
-import org.apache.xerces.xni.NamespaceContext;
-import org.apache.xerces.xni.XMLLocator;
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.xml.core.internal.validation.core.LazyURLInputStream;
-import org.eclipse.wst.xml.core.internal.validation.core.logging.LoggerFactory;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ext.DeclHandler;
-
-/**
- * This class performs validation using a xerces sax parser.  
- * Here's a quick overview of the details : 
- *   - an ErrorHandler is used to collect errors into a list (so they may be displayed by the UI)
- *   - an EntityResolver is used along with the xerces "external-schemaLocation" property to implement XML Catalog support
- */
-public class XMLValidator
-{
-  public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-  protected URIResolver uriResolver = null;
-  //protected MyEntityResolver entityResolver = null;
-  protected Hashtable ingoredErrorKeyTable = new Hashtable();
-  
-  protected ResourceBundle resourceBundle;
-
-  protected static final String IGNORE_ALWAYS = "IGNORE_ALWAYS";
-  protected static final String IGNORE_IF_DTD_WITHOUT_ELEMENT_DECL = "IGNORE_IF_DTD_WITHOUT_ELEMENT_DECL";
-  protected static final String PREMATURE_EOF = "PrematureEOF";
-  protected static final String ROOT_ELEMENT_TYPE_MUST_MATCH_DOCTYPEDECL = "RootElementTypeMustMatchDoctypedecl";
-  protected static final String MSG_ELEMENT_NOT_DECLARED = "MSG_ELEMENT_NOT_DECLARED";
-  
-  private static final String _UI_PROBLEMS_VALIDATING_FILE_NOT_FOUND = "_UI_PROBLEMS_VALIDATING_FILE_NOT_FOUND";
-  private static final String _UI_PROBLEMS_VALIDATING_UNKNOWN_HOST = "_UI_PROBLEMS_VALIDATING_UNKNOWN_HOST";
-  private static final String _UI_PROBLEMS_CONNECTION_REFUSED = "_UI_PROBLEMS_CONNECTION_REFUSED";
-  
-  private static final String FILE_NOT_FOUND_KEY = "FILE_NOT_FOUND";
-
-  /**
-   * Constructor.
-   */
-  public XMLValidator()
-  {                          
-	resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.xml.core.internal.validation.xmlvalidation");
-    // Here we add some error keys that we need to filter out when we're validation 
-    // against a DTD without any element declarations.       
-    ingoredErrorKeyTable.put(PREMATURE_EOF, IGNORE_ALWAYS);
-    ingoredErrorKeyTable.put(ROOT_ELEMENT_TYPE_MUST_MATCH_DOCTYPEDECL, IGNORE_IF_DTD_WITHOUT_ELEMENT_DECL);
-    ingoredErrorKeyTable.put(MSG_ELEMENT_NOT_DECLARED, IGNORE_IF_DTD_WITHOUT_ELEMENT_DECL);
-  }
-
-  /**
-   * Set the URI Resolver to use.
-   * 
-   * @param uriResolver The URI Resolver to use.
-   */
-  public void setURIResolver(URIResolver uriResolver)
-  {
-    this.uriResolver = uriResolver;
-    //entityResolver = new MyEntityResolver(uriResolver);
-  }
-
- 
-  /**
-   * Create an XML Reader.
-   * 
-   * @return The newly created XML reader or null if unsuccessful.
-   * @throws Exception
-   */
-  protected XMLReader createXMLReader(final XMLValidationInfo valinfo, XMLEntityResolver entityResolver) throws Exception
-  {     
-    XMLReader reader = null;
-    // move to Xerces-2... add the contextClassLoader stuff
-    ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
-    try
-    {
-      Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-      StandardParserConfiguration configuration = new MyStandardParserConfiguration(valinfo);
-      reader = new org.apache.xerces.parsers.SAXParser(configuration)
-      {
-        public void startDocument(org.apache.xerces.xni.XMLLocator theLocator, java.lang.String encoding, NamespaceContext nscontext, org.apache.xerces.xni.Augmentations augs) 
-        {
-          valinfo.setXMLLocator(theLocator);
-          super.startDocument(theLocator, encoding, nscontext, augs); 
-        }
-      };
-
-      reader.setFeature("http://apache.org/xml/features/continue-after-fatal-error", false);
-      reader.setFeature("http://xml.org/sax/features/namespace-prefixes", valinfo.isNamespaceEncountered());
-      reader.setFeature("http://xml.org/sax/features/namespaces", valinfo.isNamespaceEncountered());              
-      reader.setFeature("http://xml.org/sax/features/validation", valinfo.isGrammarEncountered()); 
-      reader.setFeature("http://apache.org/xml/features/validation/schema", valinfo.isGrammarEncountered());
-      
-      // MH make sure validation works even when a customer entityResolver is note set (i.e. via setURIResolver())
-      if (entityResolver != null)
-      {  
-        reader.setProperty("http://apache.org/xml/properties/internal/entity-resolver", entityResolver);
-      }  
-      reader.setProperty("http://xml.org/sax/properties/declaration-handler", new MyDeclHandler());     
-    } 
-    catch(Exception e)
-    { 
-      //TODO: log error message;
-      //e.printStackTrace();
-    }
-    finally
-    {
-      Thread.currentThread().setContextClassLoader(prevClassLoader);
-    }
-    return reader;
-  }  
-
-  /**
-   * Validate the file located at the given URI.
-   * 
-   * @param uri The URI of the file to validate.
-   * @return Returns an XML validation report.
-   */
-  public XMLValidationReport validate(String uri)
-  {
-    return validate(uri, null);  
-  }
-
-  final String createStringForInputStream(InputStream inputStream)
-  {
-    // Here we are reading the file and storing to a stringbuffer.
-    StringBuffer fileString = new StringBuffer();
-    try
-    {
-      InputStreamReader inputReader = new InputStreamReader(inputStream);
-      BufferedReader reader = new BufferedReader(inputReader);
-      char[] chars = new char[1024];
-      int numberRead = reader.read(chars);
-      while (numberRead != -1)
-      {
-        fileString.append(chars, 0, numberRead);
-        numberRead = reader.read(chars);
-      }
-    }
-    catch (Exception e)
-    {
-      //TODO: log error message
-      //e.printStackTrace();
-    }
-    return fileString.toString();
-  }
-  /**
-   * Validate the inputStream
-   * 
-   * @param uri The URI of the file to validate.
-   * @param the inputStream of the file to validate
-   * @return Returns an XML validation report.
-   */
-  public XMLValidationReport validate(String uri, InputStream inputStream)
-  {
-    Reader reader1 = null; // Used for the preparse.
-    Reader reader2 = null; // Used for validation parse.
-    
-    if (inputStream != null)
-    {  
-      String string = createStringForInputStream(inputStream);
-      reader1 = new StringReader(string);
-      reader2 = new StringReader(string);
-    } 
-        
-    XMLValidationInfo valinfo = new XMLValidationInfo(uri);
-    MyEntityResolver entityResolver = new MyEntityResolver(uriResolver); 
-    ValidatorHelper helper = new ValidatorHelper(); 
-    try
-    {  
-        helper.computeValidationInformation(uri, reader1, uriResolver);
-        valinfo.setDTDEncountered(helper.isDTDEncountered);
-        valinfo.setElementDeclarationCount(helper.numDTDElements);
-        valinfo.setNamespaceEncountered(helper.isNamespaceEncountered);
-        valinfo.setGrammarEncountered(helper.isGrammarEncountered);
-        XMLReader reader = createXMLReader(valinfo, entityResolver);
-        XMLErrorHandler errorhandler = new XMLErrorHandler(valinfo);
-        reader.setErrorHandler(errorhandler);
-        
-        InputSource inputSource = new InputSource(uri);
-        inputSource.setCharacterStream(reader2);
-        reader.parse(inputSource);      
-    }
-    catch (SAXParseException saxParseException)
-    {
-      // These errors are caught by the error handler.
-      //addValidationMessage(valinfo, saxParseException);
-    }                 
-    catch (IOException ioException)
-    {
-      addValidationMessage(valinfo, ioException);
-    }                 
-    catch (Exception exception)
-    {  
-    	LoggerFactory.getLoggerInstance().logError(exception.getLocalizedMessage(), exception);
-    }
-     
-    
-    return valinfo;
-       
-  }
-
-  /**
-   * Add a validation message to the specified list.
-   * 
-   * @param valinfo The validation info object to add the error to.
-   * @param exception The exception that contains the validation information.
-   */
-  protected void addValidationMessage(XMLValidationInfo valinfo, IOException exception)
-  { 
-    String validationMessageStr = exception.getMessage();
-	Throwable cause = exception.getCause() != null ? exception.getCause() : exception;
-	while(validationMessageStr == null && cause != null){
-		String localizedMessage = cause.getLocalizedMessage();
-	    cause = cause.getCause();
-	    if(cause == null && localizedMessage != null )
-	    {
-	      validationMessageStr = localizedMessage;
-	    }
-	}
-	
-	if (validationMessageStr != null)
-    {
-      if (cause instanceof FileNotFoundException)
-      {
-        validationMessageStr = MessageFormat.format(resourceBundle.getString(_UI_PROBLEMS_VALIDATING_FILE_NOT_FOUND), new Object [] { validationMessageStr });
-      }
-      else if (cause instanceof UnknownHostException)
-      {
-    	validationMessageStr = MessageFormat.format(resourceBundle.getString(_UI_PROBLEMS_VALIDATING_UNKNOWN_HOST), new Object [] { validationMessageStr });
-      }
-      else if(cause instanceof ConnectException)
-      {
-    	validationMessageStr = resourceBundle.getString(_UI_PROBLEMS_CONNECTION_REFUSED);
-      }
-    }
-
-    if (validationMessageStr != null)
-    {
-      XMLLocator locator = valinfo.getXMLLocator();
-      valinfo.addWarning(validationMessageStr, locator != null ? locator.getLineNumber() : 1, locator != null ? locator.getColumnNumber() : 0, valinfo.getFileURI(), FILE_NOT_FOUND_KEY, null);
-    }
-  }
-                                                                    
-  /**
-   * Add a validation message to the specified list.
-   * 
-   * @param valinfo The validation info object to add the error to.
-   * @param exception The exception that contains the validation information.
-   */
-  protected void addValidationMessage(XMLValidationInfo valinfo, SAXParseException exception)
-  { 
-    if (exception.getMessage() != null)
-    { 
-      valinfo.addError(exception.getLocalizedMessage(), exception.getLineNumber(), exception.getColumnNumber(), exception.getSystemId());
-    }
-  }
-
-  
-  /**
-   * A custom entity resolver that uses the URI resolver specified to resolve entities.
-   */
-  protected class MyEntityResolver implements XMLEntityResolver 
-  {
-    private URIResolver uriResolver;
-    
-    /**
-     * The reported exceptions list allows the entity resolver to only
-     * throw an exception the first time a namespace cannot be located.
-     * This prevents Xerces from producing a warning on every line of the
-     * XML document.
-     */
-    private List reportedSchemaReferenceErrors = new ArrayList();
-    
-    /**
-     * Constructor.
-     * 
-     * @param uriResolver The URI resolver to use with this entity resolver.
-     */
-    public MyEntityResolver(URIResolver uriResolver)
-    {
-      this.uriResolver = uriResolver;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-     */
-    public XMLInputSource resolveEntity(XMLResourceIdentifier rid) throws XNIException, IOException
-    {
-      try
-      {
-        return _internalResolveEntity(uriResolver, rid);
-      }
-      catch(IOException e)
-      {
-        //e.printStackTrace();   
-      }      
-      return null;
-    }
-  }
-  
-  // cs : I've refactored the common SAX based resolution code into this method for use by other validators 
-  // (i.e. XML Schema, WSDL etc).   The other approach is maintain a copy for each validator that has
-  // identical code.  In any case we should strive to ensure that the validators perform resolution consistently. 
-  public static XMLInputSource _internalResolveEntity(URIResolver uriResolver, XMLResourceIdentifier rid) throws  IOException
-  {
-    XMLInputSource is = null;
-    
-    if (uriResolver != null)
-    {         
-      String id = rid.getPublicId();
-      if(id == null)
-      {
-        id = rid.getNamespace();
-      }
-      
-      String location = null;
-      if (id != null || rid.getLiteralSystemId() != null)
-      {  
-        location = uriResolver.resolve(rid.getBaseSystemId(), id, rid.getLiteralSystemId());
-      }  
-      
-      if (location != null)
-      {                     
-        String physical = uriResolver.resolvePhysicalLocation(rid.getBaseSystemId(), id, location);
-        is = new XMLInputSource(rid.getPublicId(), location, location);
-        is.setByteStream(new LazyURLInputStream(physical));      
-      }
-    }
-    return is;    
-  }      
-  
-  /**
-   * An error handler to catch errors encountered while parsing the XML document.
-   */
-  protected class XMLErrorHandler implements org.xml.sax.ErrorHandler
-  {
-
-    private final int ERROR = 0;
-    private final int WARNING = 1;
-    private XMLValidationInfo valinfo;
-    
-    /**
-     * Constructor.
-     * 
-     * @param valinfo The XML validation info object that will hold the validation messages.
-     */
-    public XMLErrorHandler(XMLValidationInfo valinfo)
-    {
-      this.valinfo = valinfo;
-    }
-
-    /**
-     * Add a validation message with the given severity.
-     * 
-     * @param exception The exception that contains the message.
-     * @param severity The severity of the message.
-     */
-    
-    protected void addValidationMessage(SAXParseException exception, int severity)
-    {
-      if(exception.getSystemId() != null)
-      {       	
-        if(severity == WARNING)
-        {
-          valinfo.addWarning(exception.getLocalizedMessage(), exception.getLineNumber(), exception.getColumnNumber(), exception.getSystemId());
-        }
-        else
-        {
-          valinfo.addError(exception.getLocalizedMessage(), exception.getLineNumber(), exception.getColumnNumber(), exception.getSystemId(), valinfo.getCurrentErrorKey(), valinfo.getMessageArguments());
-        }
-      }
-    }
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
-     */
-    public void error(SAXParseException exception) throws SAXException
-    {
-      addValidationMessage(exception, ERROR);
-    }
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
-     */
-    public void fatalError(SAXParseException exception) throws SAXException
-    {
-      addValidationMessage(exception, ERROR);
-    }
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
-     */
-    public void warning(SAXParseException exception) throws SAXException
-    {
-      addValidationMessage(exception, WARNING);
-    }
-  }
-                                                                          
-  /** 
-   * This class is used to count the elementDecls that are encountered in a DTD.
-   */
-  protected class MyDeclHandler implements DeclHandler 
-  {
-    
-    /**
-     * Constructor.
-     * 
-     * @param valinfo The XMLValidationInfo object that will count the declarations.
-     */
-    public MyDeclHandler()
-    {
-    }
-    
-    /* (non-Javadoc)
-     * @see org.xml.sax.ext.DeclHandler#attributeDecl(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
-     */
-    public void attributeDecl(String eName, String aName, String type, String valueDefault, String value) 
-    {
-    }                                    
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ext.DeclHandler#elementDecl(java.lang.String, java.lang.String)
-     */
-    public void elementDecl(String name, String model) 
-    {
-      //valinfo.increaseElementDeclarationCount();
-    }
-  
-    /* (non-Javadoc)
-     * @see org.xml.sax.ext.DeclHandler#externalEntityDecl(java.lang.String, java.lang.String, java.lang.String)
-     */
-    public void externalEntityDecl(String name, String publicId, String systemId) 
-    {
-    }      
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ext.DeclHandler#internalEntityDecl(java.lang.String, java.lang.String)
-     */
-    public void internalEntityDecl(String name, String value) 
-    {
-    }
-  }
-
-  /**
-   * A StandardParserConfiguration that creates an error reporter which can ignore
-   * DTD error messages for DTD's with no elements defined.
-   */
-
-  protected class MyStandardParserConfiguration extends StandardParserConfiguration
-  {
-  	XMLValidationInfo valinfo = null;
-    List reportedExceptions = new ArrayList(); 
-  	
-  	/**
-  	 * Constructor.
-  	 * 
-  	 * @param valinfo The XMLValidationInfo object to use.
-  	 */
-  	public MyStandardParserConfiguration(XMLValidationInfo valinfo)
-  	{
-  	  this.valinfo = valinfo;
-  	}
-
-    /* (non-Javadoc)
-     * @see org.apache.xerces.parsers.DTDConfiguration#createErrorReporter()
-     */
-    protected XMLErrorReporter createErrorReporter() 
-    {
-    	return new XMLErrorReporter()
-		{
-    		/* (non-Javadoc)
-    		 * @see org.apache.xerces.impl.XMLErrorReporter#reportError(java.lang.String, java.lang.String, java.lang.Object[], short)
-    		 */
-    		public void reportError(String domain, String key, Object[] arguments, short severity) throws XNIException 
-    	    {                    
-		      boolean reportError = true;
-              valinfo.setCurrentErrorKey(key);  
-			  valinfo.setMessageArguments(arguments);
-		      String ignoreCondition = (String)ingoredErrorKeyTable.get(key);
-		      if (ignoreCondition != null)
-		      {
-		        if (ignoreCondition.equals(XMLValidator.IGNORE_IF_DTD_WITHOUT_ELEMENT_DECL))
-		        {                    
-		          boolean isDTDWithoutElementDeclarationEncountered = valinfo.isDTDWithoutElementDeclarationEncountered(); 
-		          reportError = !isDTDWithoutElementDeclarationEncountered;  
-		        }
-		        else 
-		        {
-		          reportError = false;
-		        }
-		      }
-		      if ("schema_reference.4".equals(key) && arguments.length > 0)
-              {
-                Object location = arguments[0];  
-                if (location != null)
-                {  
-                  if(reportedExceptions.contains(location))
-                  {
-                    reportError = false;
-                  }
-                  else
-                  {
-                    reportedExceptions.add(location);
-                  }
-                }
-              }          
-		      if (reportError)
-		      {
-		        super.reportError(domain, key, arguments, severity);
-		      }
-		    }
-		};
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/Helper.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/Helper.java
deleted file mode 100644
index 29bd919..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/Helper.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.internal.validation.core;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * A helper class for validation in the validation framework.
- * 
- * @author Ernest Mah (ernest@ca.ibm.com)
- * @author Lawrence Mandel, IBM
- */
-public class Helper extends WorkbenchContext
-{
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  public static final String GET_PROJECT_FILES = "getAllFiles";
-  public static final String GET_FILE = "getFile";
-  //dw private static final IContainer[] NO_CONTAINERS = new IContainer[0];
-  public static final String VALIDATION_MARKER = "org.eclipse.wst.validation.problemmarker";
-  public static final String VALIDATION_MARKER_OWNER = "owner";  
-
-  /**
-   * Constructor.
-   */
-  public Helper()
-  {
-    super();
-
-    // the following will register the helper's symbolic methods
-    Class [] args = new Class[1] ;
-    args[0] = String.class ;  // a string argument denoting a specific JSP.
-    
-    registerModel(GET_FILE, "getFile", args);//$NON-NLS-1$
-    registerModel(GET_PROJECT_FILES, "getFiles", args);//$NON-NLS-1$
-  }
-
-  /**
-   * Get the IFile for the given filename.
-   * 
-   * @param filename The name of the file to retrieve.
-   * @return An IFile representing the file specified or null if it can't be resolved.
-   */
-  public IFile getFile(String filename)
-  {
-    //    System.out.println("file name = " + filename);
-    IResource res = getProject().findMember(filename, true); // true means include phantom resources
-    if (res instanceof IFile) 
-    {
-      return (IFile) res;
-    }
-    return null;
-  }
-  
-  /**
-   * Get the collection of files from the project that are relevant for the
-   * validator with the given class name.
-   * 
-   * @param validatorClassName The name of the validator class.
-   * @return The collection of files relevant for the validator class specified.
-   */
-  public Collection getFiles(String validatorClassName)
-  {
-    IProject project = getProject();
-    List files = new ArrayList();
-    getFiles(files, project, validatorClassName);
-    return files;
-  }
-
-  /**
-   * Get the collection of files from the project that are relevant for the
-   * validator with the given class name.
-   * 
-   * @param files The files relevant for the class name.
-   * @param resource The resource to look for files in.
-   * @param validatorClassName The name of the validator class.
-   */
-  protected void getFiles(Collection files, IContainer resource, String validatorClassName)
-  {
-    try
-    {
-      IResource [] resourceArray = resource.members(false);
-      for (int i=0; i<resourceArray.length; i++)
-      {       
-        if (ValidatorManager.getManager().isApplicableTo(validatorClassName, resourceArray[i])) 
-        {
-          if (resourceArray[i] instanceof IFile) 
-          {
-            files.add(resourceArray[i]);
-          }
-        }
-        if (resourceArray[i].getType() == IResource.FOLDER)
-         getFiles(files,(IContainer)resourceArray[i], validatorClassName) ;
-      }
-    }
-    catch (Exception e) {}
-  }
-
-  
-/**
- * Return the name of the resource, without the project-specific information 
- * in front.
- *
- * This method is used by ValidationOperation to calculate the non-environment 
- * specific names of the files. Only the IWorkbenchContext implementation knows how 
- * much information to strip off of the IResource name. For example, if there is
- * an EJB Project named "MyEJBProject", and it uses the default names for the 
- * source and output folders, "source" and "ejbModule", respectively, then the
- * current implementation of EJB Helper knows how much of that structure is 
- * eclipse-specific. 
- *
- * Since the "source" folder contains Java source files, a portable name would
- * be the fully-qualified name of the Java class, without the eclipse-specific
- * project and folder names in front of the file name. The EJBHelper knows that 
- * everything up to the "source" folder, for example, can be removed, because, 
- * according to the definition of the EJB Project, everything contained
- * in the source folder is java source code. So if there is an IResource in an
- * EJB Project named "/MyEJBProject/source/com/ibm/myclasses/MyJavaFile.java",
- * this method would make this name portable by stripping off the
- * "/MyEJBProject/source", and returning "com/ibm/myclasses/MyJavaFile.java".
- *
- * The output of this method is used by the ValidationOperation, when it
- * is calculating the list of added/changed/deleted file names for incremental
- * validation. If getPortableName(IResource) returns null, that means
- * that the IWorkbenchContext's implementation does not support that particular
- * type of resource, and the resource should not be included in the array of
- * IFileDelta objects in the IValidator's "validate" method. 
- * 
- * @param resource The resource to get the name from.
- * @return The portable name of the resource.
- */
-public String getPortableName(IResource resource)
-  {
-    //    System.out.println("get portablename for " + resource);
-    return resource.getProjectRelativePath().toString();
-  }
-
-/**
- * When an IValidator associates a target object with an IMessage,
- * the WorkbenchReporter eventually resolves that target object
- * with an IResource. Sometimes more than one target object resolves
- * to the same IResource (usually the IProject, which is the default
- * IResource when an IFile cannot be found). This method is called,
- * by the WorkbenchReporter, so that the WorkbenchReporter can 
- * distinguish between the IMessages which are on the same IResource, 
- * but refer to different target objects. This is needed for the 
- * removeAllMessages(IValidator, Object) method, so that when one
- * target object removes all of its messages, that it doesn't remove
- * another target object's messages.
- *
- * This method may return null only if object is null. Otherwise, an
- * id which can uniquely identify a particular object must be returned.
- * The id needs to be unique only within one particular IValidator.
- * 
- * @param object The object from which to get the name.
- * @return The name of the object or null if the object is null.
- */
-public String getTargetObjectName(Object object)
-  {
-    if (object == null) 
-    {
-      return null;
-    }
-    
-    //    System.out.println("get targetname for " + object);
-    return object.toString();
-  }
-  
-  /**
-   * Delete the markers of the specified type from the specified resource.
-   * 
-   * @param resource The resource to delete the markers from.
-   * @param markerType The type of markers to delete from the resource.
-   * @param attributeName The name of the attribute which the markers must have to be deleted.
-   * @param attributeValue The value of the attribute corresponding to attributeName which the markers must have to be deleted.
-   * @throws CoreException
-   */
-  public static void deleteMarkers(IResource resource, String markerType, final String attributeName, final Object attributeValue) throws CoreException
-  {          
-    final IMarker[] v400Markers = resource.findMarkers(IMarker.PROBLEM, false, IResource.DEPTH_INFINITE);
-    final IMarker[] markers = resource.findMarkers(markerType, true, IResource.DEPTH_INFINITE);
-    IWorkspaceRunnable op = new IWorkspaceRunnable() 
-     {
-       public void run(IProgressMonitor progressMonitor) throws CoreException 
-       {    
-         // this fixes defect 193406
-         // here we remove markers that may have been added by the v400 code
-         // hopefully the '.markers' metadata files will be removed for the V5 install
-         // and this kludge will not be needed there
-         for (int i = 0; i < v400Markers.length; i++)
-         {
-           IMarker marker = markers[i];           
-           marker.delete();           
-         }
-    
-         for (int i = 0; i < markers.length; i++) 
-         {
-           IMarker marker = markers[i];
-           
-           Object value = marker.getAttribute(attributeName);
-           if (value != null &&
-               value.equals(attributeValue)) 
-           {
-             marker.delete();
-           }
-         }
-       }
-     };
-    
-    try
-    {
-      ResourcesPlugin.getWorkspace().run(op, null);
-    }
-    catch (Exception e) { }
-  }
-  
-  /**
-   * Get the validation framework severity for the given severity.
-   * 
-   * @param severity The severity to convert to validation framework severity.
-   * @return The validation framework severity for the given severity.
-   */
-  static public int getValidationFrameworkSeverity(int severity)
-  {
-    switch (severity)
-    {
-      case IMarker.SEVERITY_ERROR:
-        return IMessage.HIGH_SEVERITY;
-      case IMarker.SEVERITY_WARNING:
-        return IMessage.NORMAL_SEVERITY;
-      case IMarker.SEVERITY_INFO:
-        return IMessage.LOW_SEVERITY;
-    }
-    return IMessage.LOW_SEVERITY;  
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/LazyURLInputStream.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/LazyURLInputStream.java
deleted file mode 100644
index cb5dbf5..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/LazyURLInputStream.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.internal.validation.core;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-
-/**
- * This class allows InputStreams to be created and returned to xerces without
- * actually opening file handles or network connections until it is absolutely
- * neccessary.
- */
-public class LazyURLInputStream extends InputStream
-{  
-  private static int debugTotalOpenStreamCount = 0; 
-  protected InputStream inner;
-  protected String url;
-  protected boolean error;
-  boolean hasMarks;
-  boolean pretendFileIsStillOpen;
-
-  public LazyURLInputStream(String url)
-  {
-    this.url = url;
-	inner = null;
-	pretendFileIsStillOpen = false;
-  }
-
-  private void createInnerStreamIfRequired() throws IOException
-  {
-    if (inner == null && !error)
-    {
-      debugTotalOpenStreamCount++;
-    
-      try
-      {
-        inner = new URL(url).openStream();
-		pretendFileIsStillOpen = false;
-		hasMarks = false;
-      }
-      finally 
-      {
-        if (inner == null)
-        {  
-          error = true;
-        }
-      }
-    }
-  }
-
-	protected void closeStream() throws IOException {
-		if (inner != null && !pretendFileIsStillOpen) {
-			inner.close();
-			pretendFileIsStillOpen = true;
-		}
-  	}
-
-  public int available() throws IOException
-  {
-	if (pretendFileIsStillOpen) return 0;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	return inner.available();
-  }
-
-  public void close() throws IOException
-  {
-	if (pretendFileIsStillOpen) {
-		// Stop behaving as if the stream were still open.
-		pretendFileIsStillOpen = false;
-	} else {
-		if (inner != null) {
-			debugTotalOpenStreamCount--;
-			inner.close();
-		}
-	}
-  }
-
-  public void mark(int readlimit)
-  {
-	if (pretendFileIsStillOpen) return;
-	hasMarks = true;
-	try {
-		createInnerStreamIfRequired();
-		inner.mark(readlimit);
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
-	}
-  }
-
-  public boolean markSupported()
-  {
-	if (pretendFileIsStillOpen) return false;
-	try {
-		createInnerStreamIfRequired();
-		if (inner == null) return false;
-		return inner.markSupported();
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
-	}
-	return false;
-  }
-
-  public int read() throws IOException
-  {
-	if (pretendFileIsStillOpen) return -1;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	int bytesRead = inner.read();
-	if (bytesRead == -1 && !hasMarks) closeStream();
-	return bytesRead;
-  }
-
-
-	public int read(byte[] b) throws IOException {
-		if (pretendFileIsStillOpen) return -1;
-		createInnerStreamIfRequired();
-		if (inner == null) throw new IOException("Stream not available");
-		int bytesRead = inner.read(b);
-		if (bytesRead == -1 && !hasMarks) closeStream();
-		return bytesRead;
-	}
-
-  public int read(byte[] b, int off, int len) throws IOException
-  {    
-	if (pretendFileIsStillOpen) return -1;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	int bytesRead = inner.read(b, off, len);
-	if (bytesRead == -1 && !hasMarks) closeStream();
-	return bytesRead;
-  }
-
-  public void reset() throws IOException
-  {
-	if (pretendFileIsStillOpen) return;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	inner.reset();
-  }
-
-  public long skip(long n) throws IOException
-  {   
-	if (pretendFileIsStillOpen) return 0;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	return inner.skip(n);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationInfo.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationInfo.java
deleted file mode 100644
index 378dbf2..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationInfo.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.core;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ResourceBundle;
-
-/**
- * This class handles messages from a validator. This class can handle
- * 
- * @author Lawrence Mandel, IBM
- */
-public class ValidationInfo implements ValidationReport
-{
-  private boolean WRAPPER_ERROR_SUPPORT_ENABLED = true;
-  public static int SEV_ERROR = 0;
-  public static int SEV_WARNING = 1;
-  
-  private static String _UI_REF_FILE_ERROR_MESSAGE = "_UI_REF_FILE_ERROR_MESSAGE";
-  private String validating_file_uri = null;
-  private URL validating_file_url = null;
-  private boolean valid = true;
-  private List messages = new ArrayList();
-  private HashMap nestedMessages = new HashMap();
-  
-  protected ResourceBundle resourceBundle;
-
-  /**
-   * Constructor.
-   * 
-   * @param uri
-   *            The URI of the file for the validation.
-   */
-  public ValidationInfo(String uri)
-  {
-	resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.xml.core.internal.validation.xmlvalidation");
-    if(uri != null)
-    {
-      this.validating_file_uri = uri;
-      try
-      {
-        this.validating_file_url = new URL(uri);
-      } catch (MalformedURLException e)
-      {
-      }
-    }
-  }
-
-  public String getFileURI()
-  {
-    return validating_file_uri;
-  }
-
-  public boolean isValid()
-  {
-    return valid;
-  }
-
-  /**
-   * Add an error message.
-   * 
-   * @param message The message to add.
-   * @param line The line location of the message.
-   * @param column The column location of the message.
-   * @param uri The URI of the file that contains the message.
-   */
-  public void addError(String message, int line, int column, String uri)
-  {
-    addError(message, line, column, uri, null, null);
-  }  
-  
-  /**
-   * 
-   * Add an error message.
-   * 
-   * @param message The message to add.
-   * @param line The line location of the message.
-   * @param column The column location of the message.
-   * @param uri The URI of the file that contains the message.
-   * @param key The key for the message.
-   * @param messageArguments more information about the error
-   */
-  public void addError(String message, int line, int column, String uri, String key, Object[] messageArguments)
-  {    
-    if(addMessage(message, line, column, uri, SEV_ERROR, key, messageArguments))
-    {
-      valid = false;
-    }
-  }
-
-  /**
-   * Add a warning message.
-   * 
-   * @param message The string message of the warning.
-   * @param line The line location of the warning.
-   * @param column The column location of the warning.
-   * @param uri The URI of the file that contains the warning.
-   */
-  public void addWarning(String message, int line, int column, String uri)
-  {
-    addWarning(message, line, column, uri, null, null);
-  }
-  
-  /**
-   * 
-   * Add an error message.
-   * 
-   * @param message The message to add.
-   * @param line The line location of the message.
-   * @param column The column location of the message.
-   * @param uri The URI of the file that contains the message.
-   * @param key The key for the message.
-   * @param messageArguments more information about the error
-   */
-  public void addWarning(String message, int line, int column, String uri, String key, Object[] messageArguments)
-  {    
-    addMessage(message, line, column, uri, SEV_WARNING, key, messageArguments);
-  }
-  
-  /**
-   * Add a message to the list. Return true if successful, false otherwise.
-   * 
-   * @param message The message to add to the list.
-   * @param line The line location of the message.
-   * @param column The column location of the message.
-   * @param uri The URI of the file that contains the message.
-   * @param severity The severity of the message.
-   * @param key the Xerces error key for this error
-   * @param messageArguments more information on the error
-   * @return True if the message was successfully added, false otherwise.
-   */
-  private boolean addMessage(String message, int line, int column, String uri, int severity, String key, Object[] messageArguments)
-  {
-    boolean successfullyAdded = false;
-    // If the message if null there is nothing to add.
-    if(message == null)
-    {
-      return successfullyAdded;
-    }
-    String errorURI = normalize(uri);
-    URL errorURL = null;
-    if (errorURI != null)
-    {
-      try
-      {
-        errorURL = new URL(errorURI);
-      } catch (MalformedURLException e)
-      {
-      }
-      //errorURI = normalizeURI(errorURI);
-    }
-    //boolean doDialog = true;
-    if (errorURL != null)
-    {
-      successfullyAdded = true;
-      // Add to the appropriate list if nested error support is off or
-      // this message is for the current file.
-      if (!WRAPPER_ERROR_SUPPORT_ENABLED || validating_file_url.sameFile(errorURL))
-      {
-
-        ValidationMessage valmes = new ValidationMessage(message, line,
-            column, validating_file_uri, key, messageArguments);
-        if (severity == SEV_ERROR)
-        {
-          valmes.setSeverity(ValidationMessage.SEV_NORMAL);
-        } else if (severity == SEV_WARNING)
-        {
-          valmes.setSeverity(ValidationMessage.SEV_LOW);
-        }
-        messages.add(valmes);
-      }
-      // If nested error support is enabled create a nested error.
-      else if (WRAPPER_ERROR_SUPPORT_ENABLED)
-      {
-        String nesteduri = errorURL.toExternalForm();
-        ValidationMessage nestedmess = new ValidationMessage(message, line,
-            column, nesteduri, key, messageArguments);
-        if(severity == SEV_WARNING)
-        {
-          nestedmess.setSeverity(ValidationMessage.SEV_LOW);
-        }
-        else
-        {
-          nestedmess.setSeverity(ValidationMessage.SEV_NORMAL);
-        }
-
-        ValidationMessage container = (ValidationMessage) nestedMessages.get(nesteduri);
-        if(container == null)
-        {
-          container = new ValidationMessage(MessageFormat.format(resourceBundle.getString(_UI_REF_FILE_ERROR_MESSAGE), new Object [] { nesteduri }), 1, 0, nesteduri);
-       
-          // Initially set the nested error to a warning. This will automatically be changed
-          // to an error if a nested message has a severity of error.
-          container.setSeverity(ValidationMessage.SEV_LOW);
-          nestedMessages.put(nesteduri, container);
-          messages.add(container);
-        }
-        container.addNestedMessage(nestedmess);
-      }
-    }
-    return successfullyAdded;
-  }
-  
-  
-  /**
-   * Add a nested message to the validation information.
-   * 
-   * @param message The string message of the validation message.
-   * @param line The line location of the validation message.
-   * @param column The column location of the validation message.
-   * @param uri The URI of the validation message.
-   * @param severity The severity of the validation message.
-   */
-//  public void addNestedMessage(String message, int line, int column, String uri, int severity)
-//  {
-//    ValidationMessage nestedmess = new ValidationMessage(message, line, column, uri);
-//    if(severity == SEV_WARNING)
-//    {
-//      nestedmess.setSeverity(ValidationMessage.SEV_LOW);
-//    }
-//    else
-//    {
-//      nestedmess.setSeverity(ValidationMessage.SEV_NORMAL);
-//    }
-//    ValidationMessage container = (ValidationMessage)nestedMessages.get(uri);
-//    if(container == null)
-//    {
-//      container = new ValidationMessage(XMLCoreValidationPlugin.getResourceString(_UI_REF_FILE_ERROR_MESSAGE, uri), 1, 0, validating_file_uri);
-//      // Initially set the nested error to a warning. This will automatically be changed
-//      // to an error if a nested message has a severity of error.
-//      container.setSeverity(ValidationMessage.SEV_LOW);
-//      nestedMessages.put(uri, container);
-//      messages.add(container);
-//    }
-//    container.addNestedMessage(nestedmess);
-//  }
-
-  /**
-   * @see org.eclipse.wsdl.validate.ValidationReport#getValidationMessages()
-   */
-  public ValidationMessage[] getValidationMessages()
-  {
-    return (ValidationMessage[])messages.toArray(new ValidationMessage[messages.size()]);
-  }
-
-  public HashMap getNestedMessages()
-  {
-    return nestedMessages;
-  }
-  
-  /**
-   * Put the URI in a standard format.
-   * 
-   * @param uri The URI to put into a standard format.
-   * @return The standard format of the URI.
-   */
-  private String normalize(String uri)
-  {
-//    if(uri.startsWith("platform:"))
-//    {
-//      try
-//      {
-//        uri = Platform.resolve(new URL(uri)).toString();
-//      }
-//      catch(Exception e)
-//      {
-//      }
-//    }
-    uri = uri.replaceAll("%20"," ");
-    uri = uri.replaceAll("%5E", "^");
-    uri = uri.replace('\\','/');
-    
-    return uri;
-  }
-  
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationMessage.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationMessage.java
deleted file mode 100644
index eb66b20..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationMessage.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.internal.validation.core;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * A class for holding validation message information. Holds the message and the
- * message location.
- */
-public class ValidationMessage
-{
-  public static final QualifiedName ERROR_MESSAGE_MAP_QUALIFIED_NAME = new QualifiedName("org.eclipse.wst.xml.validation", "errorMessageMap");
-  protected String message;
-  protected int lineNumber;
-  protected int columnNumber;
-  protected String uri;
-  protected List nestedErrors;
-  protected String key;
-  protected Object[] messageArguments;
-  protected int startOffset;
-  protected int severity = IMessage.NORMAL_SEVERITY;
-  public static int SEV_HIGH = IMessage.HIGH_SEVERITY;
-  public static int SEV_NORMAL = IMessage.NORMAL_SEVERITY;
-  public static int SEV_LOW = IMessage.LOW_SEVERITY;
-
-  /**
-   * Constructor.
-   * 
-   * @param message The message for the validation message.
-   * @param lineNumber The line location of the message.
-   * @param columnNumber The column location of the message.
-   */
-  public ValidationMessage(String message, int lineNumber, int columnNumber)
-  {
-    this(message, lineNumber, columnNumber, null);
-  }
-
-  /** 
-   * Constructor.
-   * 
-   * @param message The message for the validation message.
-   * @param lineNumber The line location of the message.
-   * @param columnNumber The column location of the message.
-   * @param uri The uri of the file the message is for.
-   */
-   public ValidationMessage(String message, int lineNumber, int columnNumber, String uri)
-  {
-     this(message, lineNumber, columnNumber, uri, null, null);
-  }
-   
-   /** 
-    * Constructor.
-    * 
-    * @param message The message for the validation message.
-    * @param lineNumber The line location of the message.
-    * @param columnNumber The column location of the message.
-    * @param uri The uri of the file the message is for.
-    * @param key a unique string representing the error
-    * @param messageArguments the arguments Xerces uses to create the message
-    */
-    public ValidationMessage(String message, int lineNumber, int columnNumber, String uri, String key, Object[] messageArguments)
-   {
-     this.message = message;
-     this.lineNumber = lineNumber;
-     this.columnNumber = columnNumber;
-     this.uri = uri;
-     this.key = key;
-	 this.messageArguments = messageArguments;
-     this.startOffset = 0;    
-   }
-   
-
-  /**
-   * Get the message for this valiation message.
-   * 
-   * @return The message for this validation message.
-   */
-  public String getMessage()
-  {
-    return message;
-  }
-
-  /**
-   * Get the column location.
-   * 
-   * @return The column number.
-   */
-  public int getColumnNumber()
-  {
-    return columnNumber;
-  }
-
-  /**
-   * Get the line location.
-   * 
-   * @return The line number.
-   */
-  public int getLineNumber()
-  {
-    return lineNumber;
-  }
-
-  /**
-   * Get the uri for the file that contains the message.
-   * 
-   * @return The uri of the file that contains the message.
-   */
-  public String getUri()
-  {
-    return uri;
-  }
-  
-  /**
-   * Add a nested validation message to this validation message.
-   * 
-   * @param validationMessage The validation message to add as a nested message.
-   */
-  public void addNestedMessage(ValidationMessage validationMessage)
-  {
-    if (nestedErrors == null)
-    {
-      nestedErrors = new ArrayList();
-    }
-    nestedErrors.add(validationMessage);
-    int validaitonmessageSeverity = validationMessage.getSeverity();
-    if(validaitonmessageSeverity == SEV_NORMAL || validaitonmessageSeverity == SEV_HIGH)
-    {
-      setSeverity(SEV_NORMAL);
-    }
-  }
-
-  /**
-   * Get the list of nested validation messages.
-   * 
-   * @return The list of nested validation messages.
-   */
-  public List getNestedMessages()
-  {
-    return nestedErrors != null ? nestedErrors : Collections.EMPTY_LIST;
-  }
-  
-  /**
-   * Get the severity of the defect.
-   * 
-   * @return The severity of the defect.
-   */
-  public int getSeverity()
-  {
-  	return severity;
-  }
-  
-  /**
-   * Set the severity of the message.
-   * 
-   * @param sev The severity to set.
-   */
-  public void setSeverity(int sev)
-  {
-  	severity = sev;
-  }
-  
-  public void setStartOffset(int offset)
-  {
-    this.startOffset = offset;
-  }
-  
-  /**
-   * @return Returns the key.
-   */
-  public String getKey()
-  {
-    return key;
-  }
-  
-  public Object[] getMessageArguments()
-  {
-	  return this.messageArguments;
-  }
-                                     
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationReport.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationReport.java
deleted file mode 100644
index c80e023..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationReport.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.core;
-
-import java.util.HashMap;
-
-/**
- * An interface for a validation report.
- * 
- * @author Lawrence Mandel, IBM
- */
-public interface ValidationReport
-{
-  /**
-   * Returns the URI for the file the report refers to.
-   * 
-   * @return The URI for the file the report refers to.
-   */
-  public String getFileURI();
-  
-  /**
-   * Returns whether the file is valid. The file may have warnings associated with it.
-   * 
-   * @return True if the file is valid, false otherwise.
-   */
-  public boolean isValid();
-
-  /**
-   * Returns an array of validation messages.
-   * 
-   * @return An array of validation messages.
-   */
-  public ValidationMessage[] getValidationMessages();
-  
-  public HashMap getNestedMessages();
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/CommandLineLogger.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/CommandLineLogger.java
deleted file mode 100644
index 0b49920..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/CommandLineLogger.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.internal.validation.core.logging;
-
-/**
- * A logger that will print log info to System.out.
- * 
- * @author Lawrence Mandel, IBM
- */
-public class CommandLineLogger implements ILogger
-{
-  public void logError(String error, Throwable exception)
-  {
-    System.out.println(error);
-    System.out.println(exception.toString());
-  }
-
-  public void logWarning(String warning, Throwable exception)
-  {
-    System.out.println(warning);
-    System.out.println(exception.toString());
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/EclipseLogger.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/EclipseLogger.java
deleted file mode 100644
index e346947..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/EclipseLogger.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.internal.validation.core.logging;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-
-
-/**
- * A logger that will log to the log file in the eclipse metadata directory.
- */
-public class EclipseLogger implements ILogger
-{
-  
-  public void logError(String error, Throwable exception)
-  {
-    XMLCorePlugin.getDefault().getLog().log(new Status(IStatus.ERROR, XMLCorePlugin.getDefault().getBundle().getSymbolicName(), IStatus.ERROR, error, exception));
-  }
- 
-  public void logWarning(String warning, Throwable exception)
-  {
-    XMLCorePlugin.getDefault().getLog().log(new Status(IStatus.WARNING, XMLCorePlugin.getDefault().getBundle().getSymbolicName(), IStatus.WARNING, warning, exception));
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/ILogger.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/ILogger.java
deleted file mode 100644
index 22b8335..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/ILogger.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.core.logging;
-
-/**
- * The interface for a standard logger. Allows for logging errors and warnings.
- * 
- * @author Lawrence Mandel, IBM
- */
-public interface ILogger
-{
-  /**
-   * Log an error message.
-   * 
-   * @param error The error message to log.
-   * @param exception The exception to log.
-   */
-  public void logError(String error, Throwable exception);
-
-  /**
-   * Log a warning message.
-   * 
-   * @param warning The warning message to log.
-   * @param exception The exception to log.
-   */
-  public void logWarning(String warning, Throwable exception);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/LoggerFactory.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/LoggerFactory.java
deleted file mode 100644
index 4d11843..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/LoggerFactory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.core.logging;
-
-/**
- * The logger factory allows for simple use of whatever logging mechanism is in
- * place. The tool can specify a custom logging class and can request the
- * logger from this class.
- * 
- * @author Lawrence Mandel, IBM
- */
-public class LoggerFactory
-{
-  private static ILogger      logger            = null;
-  private static ClassLoader  classloader       = null;
-  private static String       loggerClass       = null;
-  private static final String commandlinelogger = "org.eclipse.wst.xml.validation.internal.core.logging.CommandLineLogger";
-  private static final String eclipselogger     = "org.eclipse.wst.xml.validation.internal.core.logging.EclipseLogger";
-  private static String       defaultlogger     = commandlinelogger;
-
-  /**
-   * Get the one and only instance of the logger.
-   * 
-   * @return The one and only instance of the logger.
-   */
-  public static ILogger getLoggerInstance()
-  {
-    if(logger == null)
-    {
-      if(loggerClass != null)
-      {
-        if(classloader != null)
-        {
-          try
-          {
-            Class lc = classloader.loadClass(loggerClass);
-            logger = (ILogger) lc.newInstance();
-          }
-          catch (Exception e)
-          {
-          }
-        }
-        if(logger == null)
-        {
-          try
-          {
-            Class lc = LoggerFactory.class.getClassLoader().loadClass(loggerClass);
-            logger = (ILogger) lc.newInstance();
-          }
-          catch (Exception e)
-          {
-          }
-        }
-      }
-      if(logger == null)
-      {
-        try
-        {
-          Class lc = LoggerFactory.class.getClassLoader().loadClass(defaultlogger);
-          logger = (ILogger) lc.newInstance();
-        }
-        catch (Exception e)
-        {
-        }
-      }
-    }
-    return logger;
-  }
-
-  /**
-   * Specify the logger implementation to be used.
-   * 
-   * @param classname
-   *            The name of the logger class.
-   * @param loggerclassloader
-   *            The classloader to use to load the logger. If null, the default
-   *            classloader will be used.
-   */
-  public static void specifyLogger(String classname, ClassLoader loggerclassloader)
-  {
-    loggerClass = classname;
-    classloader = loggerclassloader;
-  }
-
-  /**
-   * Set the default logger to the eclipse logger.
-   */
-  public static void useEclipseLogger()
-  {
-    defaultlogger = eclipselogger;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/xmlvalidation.properties b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/xmlvalidation.properties
deleted file mode 100644
index 35e7142..0000000
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/xmlvalidation.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-!-- Constants for strings  
-
-! Usage:
-!   {0} replaced with the host name
-!
-_UI_PROBLEMS_VALIDATING_UNKNOWN_HOST             = The file cannot be validated as the host "{0}" is currently unreachable.
-
-! Usage:
-!   {0} replaced with the file name
-!
-_UI_PROBLEMS_VALIDATING_FILE_NOT_FOUND           = The file cannot be validated as the XML Schema "{0}" that is specified as describing the syntax of the file cannot be located.
-
-_UI_PROBLEMS_CONNECTION_REFUSED                  = The file cannot be validated as there was a connection problem.
-
-!
-! Referenced File Dialog Related Message
-!
-_UI_REF_FILE_ERROR_MESSAGE          = Referenced file contains errors ({0}).  For more information, right click on the message and select "Show Details..."
diff --git a/bundles/org.eclipse.wst.xml.core/src/.cvsignore b/bundles/org.eclipse.wst.xml.core/src/.cvsignore
deleted file mode 100644
index 101c29e..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-notebook.jpage
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/DebugAdapterFactory.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/DebugAdapterFactory.java
deleted file mode 100644
index b85cb8d..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/DebugAdapterFactory.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal;
-
-import java.util.ArrayList;
-
-import org.eclipse.wst.sse.core.internal.PropagatingAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-
-public class DebugAdapterFactory extends AbstractAdapterFactory implements PropagatingAdapterFactory {
-
-	/**
-	 * Constructor for PageDirectiveWatcherFactory.
-	 */
-	public DebugAdapterFactory() {
-		this(IDebugAdapter.class, true);
-	}
-
-	/**
-	 * Constructor for PageDirectiveWatcherFactory.
-	 * 
-	 * @param adapterKey
-	 * @param registerAdapters
-	 */
-	public DebugAdapterFactory(Object adapterKey, boolean registerAdapters) {
-		super(adapterKey, registerAdapters);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.core.PropagatingAdapterFactory#addContributedFactories(org.eclipse.wst.sse.core.IAdapterFactory)
-	 */
-	public void addContributedFactories(INodeAdapterFactory factory) {
-		//none expected
-	}
-
-	public INodeAdapterFactory copy() {
-		return new DebugAdapterFactory(this.adapterKey, this.shouldRegisterAdapter);
-	}
-
-	protected INodeAdapter createAdapter(INodeNotifier target) {
-		EveryNodeDebugAdapter result = null;
-		result = EveryNodeDebugAdapter.getInstance();
-		return result;
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.core.IAdapterFactory#isFactoryForType(java.lang.Object)
-	 */
-	public boolean isFactoryForType(Object type) {
-
-		return IDebugAdapter.class == type;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.core.PropagatingAdapterFactory#setContributedFactories(java.util.ArrayList)
-	 */
-	public void setContributedFactories(ArrayList list) {
-		// none expected
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/EveryNodeDebugAdapter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/EveryNodeDebugAdapter.java
deleted file mode 100644
index 6454928..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/EveryNodeDebugAdapter.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal;
-
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.IModelStateListener;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.events.AboutToBeChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.IModelAboutToBeChangedListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-
-/**
- * Purely for use in debugging
- */
-public class EveryNodeDebugAdapter implements IDebugAdapter {
-
-	static class InternalDocumentListener implements IDocumentListener {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-		 */
-		public void documentAboutToBeChanged(DocumentEvent event) {
-			Debug.println("IdocumentAboutToBeChanged: " + event); //$NON-NLS-1$
-
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)
-		 */
-		public void documentChanged(DocumentEvent event) {
-			Debug.println("IdocumentChanged: " + event); //$NON-NLS-1$
-
-		}
-
-	}
-
-	static class InternalModelStateListener implements IModelStateListener {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.sse.core.IModelStateListener#modelAboutToBeChanged(org.eclipse.wst.sse.core.IStructuredModel)
-		 */
-		public void modelAboutToBeChanged(IStructuredModel model) {
-			Debug.println("modelAboutToBeChanged: " + model); //$NON-NLS-1$
-
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.sse.core.IModelStateListener#modelChanged(org.eclipse.wst.sse.core.IStructuredModel)
-		 */
-		public void modelChanged(IStructuredModel model) {
-			Debug.println("modelChanged: " + model); //$NON-NLS-1$
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.sse.core.IModelStateListener#modelDirtyStateChanged(org.eclipse.wst.sse.core.IStructuredModel,
-		 *      boolean)
-		 */
-		public void modelDirtyStateChanged(IStructuredModel model, boolean isDirty) {
-			Debug.println("modelDirtyStateChanged: " + model); //$NON-NLS-1$
-
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.sse.core.IModelStateListener#modelResourceDeleted(org.eclipse.wst.sse.core.IStructuredModel)
-		 */
-		public void modelResourceDeleted(IStructuredModel model) {
-			Debug.println("modelResourceDeleted: " + model); //$NON-NLS-1$
-
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.sse.core.IModelStateListener#modelResourceMoved(org.eclipse.wst.sse.core.IStructuredModel,
-		 *      org.eclipse.wst.sse.core.IStructuredModel)
-		 */
-		public void modelResourceMoved(IStructuredModel oldModel, IStructuredModel newModel) {
-			Debug.println("modelResourceMoved: " + "oldModel: " + oldModel + "newModel: " + newModel); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-
-		public void modelAboutToBeReinitialized(IStructuredModel structuredModel) {
-			Debug.println("modelAboutToBeReinitialized: " + "structuredModel: " + structuredModel); //$NON-NLS-1$ //$NON-NLS-2$
-
-		}
-
-		public void modelReinitialized(IStructuredModel structuredModel) {
-			Debug.println("modelReinitialized: " + "structuredModel: " + structuredModel); //$NON-NLS-1$ //$NON-NLS-2$
-
-		}
-
-	}
-
-	static class InternalStructuredDocumentAboutToChange implements IModelAboutToBeChangedListener {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.sse.core.events.IModelAboutToBeChangedListener#modelAboutToBeChanged(org.eclipse.wst.sse.core.events.AboutToBeChangedEvent)
-		 */
-		public void modelAboutToBeChanged(AboutToBeChangedEvent structuredDocumentEvent) {
-			Debug.println("structuredDocumentAboutToBeChanged: " + structuredDocumentEvent); //$NON-NLS-1$
-
-		}
-
-	}
-
-	static class InternalStructuredDocumentListener implements IStructuredDocumentListener {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.sse.core.events.IStructuredDocumentListener#newModel(org.eclipse.wst.sse.core.events.NewDocumentContentEvent)
-		 */
-		public void newModel(NewDocumentEvent structuredDocumentEvent) {
-			Debug.println("structuredDocumentChanged - newModel: " + structuredDocumentEvent); //$NON-NLS-1$
-
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.sse.core.events.IStructuredDocumentListener#noChange(org.eclipse.wst.sse.core.events.NoChangeEvent)
-		 */
-		public void noChange(NoChangeEvent structuredDocumentEvent) {
-			Debug.println("structuredDocumentChanged - noChange: " + structuredDocumentEvent); //$NON-NLS-1$
-
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.sse.core.events.IStructuredDocumentListener#nodesReplaced(org.eclipse.wst.sse.core.events.StructuredDocumentRegionsReplacedEvent)
-		 */
-		public void nodesReplaced(StructuredDocumentRegionsReplacedEvent structuredDocumentEvent) {
-			Debug.println("structuredDocumentChanged - nodesReplaced: " + structuredDocumentEvent); //$NON-NLS-1$
-
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.sse.core.events.IStructuredDocumentListener#regionChanged(org.eclipse.wst.sse.core.events.RegionChangedEvent)
-		 */
-		public void regionChanged(RegionChangedEvent structuredDocumentEvent) {
-			Debug.println("structuredDocumentChanged - regionChanged: " + structuredDocumentEvent); //$NON-NLS-1$
-
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.sse.core.events.IStructuredDocumentListener#regionsReplaced(org.eclipse.wst.sse.core.events.RegionsReplacedEvent)
-		 */
-		public void regionsReplaced(RegionsReplacedEvent structuredDocumentEvent) {
-			Debug.println("structuredDocumentChanged - regionsReplaced: " + structuredDocumentEvent); //$NON-NLS-1$
-
-		}
-
-	}
-
-	private static EveryNodeDebugAdapter singletonInstance;
-
-	public static EveryNodeDebugAdapter getInstance() {
-		if (singletonInstance == null) {
-			singletonInstance = new EveryNodeDebugAdapter();
-		}
-		return singletonInstance;
-	}
-
-	InternalDocumentListener fInternalDocumentListener;
-	InternalModelStateListener fInternalModelStateListener;
-	InternalStructuredDocumentAboutToChange fInternalStructuredDocumentAboutToChange;
-	InternalStructuredDocumentListener fInternalStructuredDocumentListener;
-	IStructuredModel fModel;
-
-	/**
-	 * 
-	 */
-	public EveryNodeDebugAdapter() {
-		super();
-		fInternalDocumentListener = new InternalDocumentListener();
-		fInternalStructuredDocumentAboutToChange = new InternalStructuredDocumentAboutToChange();
-		fInternalStructuredDocumentListener = new InternalStructuredDocumentListener();
-		fInternalModelStateListener = new InternalModelStateListener();
-	}
-
-	/**
-	 * @param target
-	 */
-	public EveryNodeDebugAdapter(INodeNotifier target) {
-		this();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.core.INodeAdapter#isAdapterForType(java.lang.Object)
-	 */
-	public boolean isAdapterForType(Object type) {
-		return (type == IDebugAdapter.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.core.INodeAdapter#notifyChanged(org.eclipse.wst.sse.core.INodeNotifier,
-	 *      int, java.lang.Object, java.lang.Object, java.lang.Object, int)
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		if (notifier instanceof IDOMNode) {
-			setModel(((IDOMNode) notifier).getModel());
-		}
-		Debug.println("notifier: " + notifier + " " + INodeNotifier.EVENT_TYPE_STRINGS[eventType] + " changedFeature: " + changedFeature + " oldValue: " + oldValue + " newValue: " + newValue + " pos: " + pos); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.core.internal.IDebugAdapter#setDocument(org.eclipse.wst.sse.core.text.IStructuredDocument)
-	 */
-	private void setModel(IStructuredModel structuredModel) {
-		if (fModel == structuredModel)
-			return;
-
-		if (fModel != null) {
-			fModel.removeModelStateListener(fInternalModelStateListener);
-			//
-			IStructuredDocument structuredDocument = fModel.getStructuredDocument();
-			if (structuredDocument != null) {
-				structuredDocument.removeDocumentListener(fInternalDocumentListener);
-				structuredDocument.removeDocumentAboutToChangeListener(fInternalStructuredDocumentAboutToChange);
-				structuredDocument.removeDocumentChangedListener(fInternalStructuredDocumentListener);
-			}
-		}
-		fModel = structuredModel;
-		if (fModel != null) {
-
-			fModel.addModelStateListener(fInternalModelStateListener);
-			//
-			IStructuredDocument structuredDocument = fModel.getStructuredDocument();
-			if (structuredDocument != null) {
-				structuredDocument.addDocumentListener(fInternalDocumentListener);
-				structuredDocument.addDocumentAboutToChangeListener(fInternalStructuredDocumentAboutToChange);
-				structuredDocument.addDocumentChangedListener(fInternalStructuredDocumentListener);
-			}
-		}
-
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/IDebugAdapter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/IDebugAdapter.java
deleted file mode 100644
index 172f867..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/IDebugAdapter.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-
-
-public interface IDebugAdapter extends INodeAdapter {
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/Logger.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/Logger.java
deleted file mode 100644
index 47770a0..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/Logger.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.xml.core"; //$NON-NLS-1$
-	
-	public static final int ERROR = IStatus.ERROR; // 4
-	public static final int ERROR_DEBUG = 200 + ERROR;
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int INFO_DEBUG = 200 + INFO;
-
-	public static final int OK = IStatus.OK; // 0
-
-	public static final int OK_DEBUG = 200 + OK;
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int WARNING_DEBUG = 200 + WARNING;
-
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 *            OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) 
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * 
-	 * @param message
-	 *            text to print
-	 * @param category
-	 *            category of the message, to be compared with
-	 *            /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) 
-				Platform.getLog(bundle).log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * 
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCoreMessages.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCoreMessages.java
deleted file mode 100644
index 7d05ad0..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCoreMessages.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 IBM Corporation and others. All rights reserved.   This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.wst.xml.core.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by XML Core
- * 
- * @plannedfor 1.0
- */
-public class XMLCoreMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xml.core.internal.XMLCorePluginResources";//$NON-NLS-1$
-	
-	public static String Invalid_character_lt_fo_ERROR_;
-	public static String Invalid_character_gt_fo_ERROR_;
-	public static String Invalid_character_amp_fo_ERROR_;
-	public static String Invalid_character__f_EXC_;
-	public static String loading;
-	public static String Catalog_entry_key_not_set;
-	public static String Catalog_entry_uri_not_set;
-	public static String Catalog_next_catalog_location_uri_not_set;
-	public static String Catalog_resolution_null_catalog;
-	public static String Catalog_resolution_malformed_url;
-	public static String Catalog_resolution_io_exception;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, XMLCoreMessages.class);
-	}
-	
-	private XMLCoreMessages() {
-		// cannot create new instance
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCorePlugin.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCorePlugin.java
deleted file mode 100644
index 18b5ef8..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCorePlugin.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.xml.core.internal.catalog.Catalog;
-import org.eclipse.wst.xml.core.internal.catalog.CatalogSet;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class XMLCorePlugin extends Plugin {
-	//The shared instance.
-	private static XMLCorePlugin plugin;	
-    public static final String USER_CATALOG_ID = "user_catalog";
-	public static final String DEFAULT_CATALOG_ID = "default_catalog";
-	public static final String SYSTEM_CATALOG_ID = "system_catalog";
-    private CatalogSet catalogSet = new CatalogSet();
-	   
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static XMLCorePlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * @deprecated use ResourcesPlugin.getWorkspace();
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * The constructor.
-	 */
-	public XMLCorePlugin() {
-		super();
-		plugin = this;
-	}
-	
-    private String getPluginStateLocation(String fileName)
-    {
-      String location = getStateLocation().append(fileName).toString();
-      String file_protocol = "file:";
-      if (location != null && !location.startsWith(file_protocol))
-      {
-    	  location = file_protocol + location;
-      }                                                          
-      return location;
-    }
-    
-	public void start(BundleContext context) throws Exception 
-	{
-		super.start(context);
-	    catalogSet.putCatalogPersistenceLocation(DEFAULT_CATALOG_ID, getPluginStateLocation(Catalog.DEFAULT_CATALOG_FILE));
-	    catalogSet.putCatalogPersistenceLocation(SYSTEM_CATALOG_ID, getPluginStateLocation(Catalog.SYSTEM_CATALOG_FILE));
-	    catalogSet.putCatalogPersistenceLocation(USER_CATALOG_ID, getPluginStateLocation(Catalog.USER_CATALOG_FILE));
-	}
-	
-	public ICatalog getDefaultXMLCatalog()
-	{
-	    return catalogSet.lookupOrCreateCatalog(DEFAULT_CATALOG_ID, getPluginStateLocation(Catalog.DEFAULT_CATALOG_FILE));
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCorePluginResources.properties b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCorePluginResources.properties
deleted file mode 100644
index c99da79..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCorePluginResources.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Jens Lukowski/Innoopract - initial renaming/restructuring
-#     
-###############################################################################
-Invalid_character_lt_fo_ERROR_=Invalid character ('<') found
-Invalid_character_gt_fo_ERROR_=Invalid character ('>') found
-Invalid_character_amp_fo_ERROR_=Invalid character ('&') found
-Invalid_character__f_EXC_=Invalid character ('\"') found
-###############################################################################
-# contentmodel strings
-loading=loading 
-# catalog strings
-Catalog_entry_key_not_set=Catalog entry key is not set
-Catalog_entry_uri_not_set=Catalog entry uri is not set
-Catalog_next_catalog_location_uri_not_set=Next catalog location uri is not set
-Catalog_resolution_null_catalog=Catalog resolution attempted with null catalog; ignored
-Catalog_resolution_malformed_url=Malformed URL exception trying to resolve
-Catalog_resolution_io_exception=I/O exception trying to resolve
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/CleanupProcessorXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/CleanupProcessorXML.java
deleted file mode 100644
index 97bf41c..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/CleanupProcessorXML.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.cleanup;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
-import org.eclipse.wst.sse.core.internal.cleanup.StructuredCleanupPreferences;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Node;
-
-
-public class CleanupProcessorXML extends AbstractStructuredCleanupProcessor {
-	protected IStructuredCleanupPreferences fCleanupPreferences = null;
-
-	protected IStructuredCleanupHandler getCleanupHandler(Node node) {
-		short nodeType = node.getNodeType();
-		IStructuredCleanupHandler cleanupHandler = null;
-		switch (nodeType) {
-			case Node.ELEMENT_NODE : {
-				cleanupHandler = new ElementNodeCleanupHandler();
-				break;
-			}
-			case Node.TEXT_NODE : {
-				cleanupHandler = new NodeCleanupHandler();
-				break;
-			}
-			default : {
-				cleanupHandler = new NodeCleanupHandler();
-			}
-		}
-
-		// init CleanupPreferences
-		cleanupHandler.setCleanupPreferences(getCleanupPreferences());
-
-		return cleanupHandler;
-	}
-
-	public IStructuredCleanupPreferences getCleanupPreferences() {
-		if (fCleanupPreferences == null) {
-			fCleanupPreferences = new StructuredCleanupPreferences();
-
-			Preferences preferences = getModelPreferences();
-			if (preferences != null) {
-				fCleanupPreferences.setCompressEmptyElementTags(preferences.getBoolean(XMLCorePreferenceNames.COMPRESS_EMPTY_ELEMENT_TAGS));
-				fCleanupPreferences.setInsertRequiredAttrs(preferences.getBoolean(XMLCorePreferenceNames.INSERT_REQUIRED_ATTRS));
-				fCleanupPreferences.setInsertMissingTags(preferences.getBoolean(XMLCorePreferenceNames.INSERT_MISSING_TAGS));
-				fCleanupPreferences.setQuoteAttrValues(preferences.getBoolean(XMLCorePreferenceNames.QUOTE_ATTR_VALUES));
-				fCleanupPreferences.setFormatSource(preferences.getBoolean(XMLCorePreferenceNames.FORMAT_SOURCE));
-				fCleanupPreferences.setConvertEOLCodes(preferences.getBoolean(XMLCorePreferenceNames.CONVERT_EOL_CODES));
-				fCleanupPreferences.setEOLCode(preferences.getString(XMLCorePreferenceNames.CLEANUP_EOL_CODE));
-			}
-		}
-
-		return fCleanupPreferences;
-	}
-
-	protected String getContentType() {
-		return ContentTypeIdForXML.ContentTypeID_XML;
-	}
-
-	protected IStructuredFormatProcessor getFormatProcessor() {
-		return new FormatProcessorXML();
-	}
-
-	protected Preferences getModelPreferences() {
-		return XMLCorePlugin.getDefault().getPluginPreferences();
-	}
-
-	protected void refreshCleanupPreferences() {
-		fCleanupPreferences = null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/ElementNodeCleanupHandler.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/ElementNodeCleanupHandler.java
deleted file mode 100644
index e1e155f..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/ElementNodeCleanupHandler.java
+++ /dev/null
@@ -1,556 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.cleanup;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.document.ISourceGenerator;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class ElementNodeCleanupHandler extends NodeCleanupHandler {
-	protected static final char DOUBLE_QUOTE = '\"'; //$NON-NLS-1$
-	protected static final String DOUBLE_QUOTES = "\"\""; //$NON-NLS-1$
-	protected static final String EMPTY_TAG_CLOSE = "/>"; //$NON-NLS-1$
-	protected static final String END_TAG_OPEN = "</"; //$NON-NLS-1$
-	protected static final char SINGLE_QUOTE = '\''; //$NON-NLS-1$
-	protected static final String SINGLE_QUOTES = "''"; //$NON-NLS-1$
-
-	/** Non-NLS strings */
-	protected static final String START_TAG_OPEN = "<"; //$NON-NLS-1$
-	protected static final String TAG_CLOSE = ">"; //$NON-NLS-1$
-
-	public Node cleanup(Node node) {
-		Node newNode = cleanupChildren(node);
-		IDOMNode renamedNode = newNode instanceof IDOMNode ? (IDOMNode) newNode : null;
-
-		// call quoteAttrValue() first so it will close any unclosed attr
-		// quoteAttrValue() will return the new start tag if there is a
-		// structure change
-		renamedNode = quoteAttrValue(renamedNode);
-
-		// insert tag close if missing
-		// if node is not comment tag
-		// and not implicit tag
-		if (!isCommentTag(renamedNode) && !isImplicitTag(renamedNode)) {
-			IDOMModel structuredModel = renamedNode.getModel();
-
-			// save start offset before insertTagClose()
-			// or else renamedNode.getStartOffset() will be zero if
-			// renamedNode replaced by insertTagClose()
-			int startTagStartOffset = renamedNode.getStartOffset();
-
-			// for start tag
-			IStructuredDocumentRegion startTagStructuredDocumentRegion = renamedNode.getStartStructuredDocumentRegion();
-			insertTagClose(structuredModel, startTagStructuredDocumentRegion);
-
-			// update renamedNode and startTagStructuredDocumentRegion after
-			// insertTagClose()
-			renamedNode = (IDOMNode) structuredModel.getIndexedRegion(startTagStartOffset);
-			startTagStructuredDocumentRegion = renamedNode.getStartStructuredDocumentRegion();
-
-			// for end tag
-			IStructuredDocumentRegion endTagStructuredDocumentRegion = renamedNode.getEndStructuredDocumentRegion();
-			if (endTagStructuredDocumentRegion != startTagStructuredDocumentRegion)
-				insertTagClose(structuredModel, endTagStructuredDocumentRegion);
-		}
-
-		// call insertMissingTags() next, it will generate implicit tags if
-		// there are any
-		// insertMissingTags() will return the new missing start tag if one is
-		// missing
-		renamedNode = insertMissingTags(renamedNode);
-
-		renamedNode = compressEmptyElementTag(renamedNode);
-
-		renamedNode = insertRequiredAttrs(renamedNode);
-
-		return renamedNode;
-	}
-
-	protected Node cleanupChildren(Node node) {
-		Node parentNode = node;
-
-		if (node != null) {
-			Node childNode = node.getFirstChild();
-			while (childNode != null) {
-				// get cleanup handler
-				IStructuredCleanupHandler cleanupHandler = getCleanupHandler(childNode);
-
-				// cleanup each child
-				childNode = cleanupHandler.cleanup(childNode);
-
-				// get new parent node
-				parentNode = (IDOMNode) childNode.getParentNode();
-
-				// get next child node
-				childNode = (IDOMNode) childNode.getNextSibling();
-			}
-		}
-
-		return parentNode;
-	}
-
-	private IDOMNode compressEmptyElementTag(IDOMNode node) {
-		boolean compressEmptyElementTags = getCleanupPreferences().getCompressEmptyElementTags();
-		IDOMNode newNode = node;
-
-		IStructuredDocumentRegion startTagStructuredDocumentRegion = newNode.getFirstStructuredDocumentRegion();
-		IStructuredDocumentRegion endTagStructuredDocumentRegion = newNode.getLastStructuredDocumentRegion();
-
-		if (compressEmptyElementTags && startTagStructuredDocumentRegion != endTagStructuredDocumentRegion && startTagStructuredDocumentRegion != null) {
-			ITextRegionList regions = startTagStructuredDocumentRegion.getRegions();
-			ITextRegion lastRegion = regions.get(regions.size() - 1);
-			// format children and end tag if not empty element tag
-			if (lastRegion.getType() != DOMRegionContext.XML_EMPTY_TAG_CLOSE) {
-				NodeList childNodes = newNode.getChildNodes();
-				if (childNodes == null || childNodes.getLength() == 0 || (childNodes.getLength() == 1 && (childNodes.item(0)).getNodeType() == Node.TEXT_NODE && ((childNodes.item(0)).getNodeValue().trim().length() == 0))) {
-					IDOMModel structuredModel = newNode.getModel();
-					IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-
-					int startTagStartOffset = newNode.getStartOffset();
-					int offset = endTagStructuredDocumentRegion.getStart();
-					int length = endTagStructuredDocumentRegion.getLength();
-					structuredDocument.replaceText(structuredDocument, offset, length, ""); //$NON-NLS-1$
-					newNode = (IDOMNode) structuredModel.getIndexedRegion(startTagStartOffset); // save
-
-					offset = startTagStructuredDocumentRegion.getStart() + lastRegion.getStart();
-					structuredDocument.replaceText(structuredDocument, offset, 0, "/"); //$NON-NLS-1$
-					newNode = (IDOMNode) structuredModel.getIndexedRegion(startTagStartOffset); // save
-				}
-			}
-		}
-
-		return newNode;
-	}
-
-	protected IStructuredCleanupHandler getCleanupHandler(Node node) {
-		short nodeType = node.getNodeType();
-		IStructuredCleanupHandler cleanupHandler = null;
-		switch (nodeType) {
-			case org.w3c.dom.Node.ELEMENT_NODE : {
-				cleanupHandler = new ElementNodeCleanupHandler();
-				break;
-			}
-			case org.w3c.dom.Node.TEXT_NODE : {
-				cleanupHandler = new NodeCleanupHandler();
-				break;
-			}
-			default : {
-				cleanupHandler = new NodeCleanupHandler();
-			}
-		}
-
-		// init CleanupPreferences
-		cleanupHandler.setCleanupPreferences(getCleanupPreferences());
-
-		return cleanupHandler;
-	}
-
-
-	protected ModelQuery getModelQuery(Node node) {
-		if (node.getNodeType() == Node.DOCUMENT_NODE) {
-			return ModelQueryUtil.getModelQuery((Document) node);
-		} else {
-			return ModelQueryUtil.getModelQuery(node.getOwnerDocument());
-		}
-	}
-
-	protected List getRequiredAttrs(Node node) {
-		List result = new ArrayList();
-
-		ModelQuery modelQuery = getModelQuery(node);
-		if (modelQuery != null) {
-			CMElementDeclaration elementDecl = modelQuery.getCMElementDeclaration((Element) node);
-			if (elementDecl != null) {
-				CMNamedNodeMap attrMap = elementDecl.getAttributes();
-				Iterator it = attrMap.iterator();
-				CMAttributeDeclaration attr = null;
-				while (it.hasNext()) {
-					attr = (CMAttributeDeclaration) it.next();
-					if (attr.getUsage() == CMAttributeDeclaration.REQUIRED) {
-						result.add(attr);
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	private IDOMNode insertEndTag(IDOMNode node) {
-		IDOMNode newNode = node;
-		IDOMElement element = (IDOMElement) node;
-		if (element.isCommentTag())
-			return node; // do nothing
-
-		int startTagStartOffset = node.getStartOffset();
-		IDOMModel structuredModel = node.getModel();
-
-		if (isEmptyElement(element)) {
-			IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-			IStructuredDocumentRegion startStructuredDocumentRegion = node.getStartStructuredDocumentRegion();
-			ITextRegionList regions = startStructuredDocumentRegion.getRegions();
-			ITextRegion lastRegion = regions.get(regions.size() - 1);
-			structuredDocument.replaceText(structuredDocument, startStructuredDocumentRegion.getStartOffset(lastRegion), lastRegion.getLength(), EMPTY_TAG_CLOSE);
-
-			if (regions.size() > 1) {
-				ITextRegion regionBeforeTagClose = regions.get(regions.size() - 1 - 1);
-
-				// insert a space separator before tag close if the previous
-				// region does not have extra spaces
-				if (regionBeforeTagClose.getTextLength() == regionBeforeTagClose.getLength())
-					structuredDocument.replaceText(structuredDocument, startStructuredDocumentRegion.getStartOffset(lastRegion), 0, " "); //$NON-NLS-1$
-			}
-		} else {
-			String tagName = node.getNodeName();
-			String endTag = END_TAG_OPEN.concat(tagName).concat(TAG_CLOSE);
-
-			IDOMNode lastChild = (IDOMNode) node.getLastChild();
-			int endTagStartOffset = 0;
-			if (lastChild != null)
-				// if this node has children, insert the end tag after the
-				// last child
-				endTagStartOffset = lastChild.getEndOffset();
-			else
-				// if this node does not has children, insert the end tag
-				// after the start tag
-				endTagStartOffset = node.getEndOffset();
-
-			IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-			structuredDocument.replaceText(structuredDocument, endTagStartOffset, 0, endTag);
-		}
-
-		newNode = (IDOMNode) structuredModel.getIndexedRegion(startTagStartOffset); // save
-		// new
-		// node
-
-		return newNode;
-	}
-
-	private IDOMNode insertMissingTags(IDOMNode node) {
-		boolean insertMissingTags = getCleanupPreferences().getInsertMissingTags();
-		IDOMNode newNode = node;
-
-		if (insertMissingTags) {
-			IStructuredDocumentRegion startTagStructuredDocumentRegion = node.getStartStructuredDocumentRegion();
-			if (startTagStructuredDocumentRegion == null) {
-				// implicit start tag; generate tag for it
-				newNode = insertStartTag(node);
-				startTagStructuredDocumentRegion = newNode.getStartStructuredDocumentRegion();
-			}
-
-			IStructuredDocumentRegion endTagStructuredDocumentRegion = newNode.getEndStructuredDocumentRegion();
-			ITextRegionList startStructuredDocumentRegionRegions = startTagStructuredDocumentRegion.getRegions();
-			if (startTagStructuredDocumentRegion != null && startStructuredDocumentRegionRegions != null && (startStructuredDocumentRegionRegions.get(startStructuredDocumentRegionRegions.size() - 1)).getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) {
-
-			} else {
-				if (startTagStructuredDocumentRegion == null) {
-					// start tag missing
-					if (isStartTagRequired(newNode))
-						newNode = insertStartTag(newNode);
-				} else if (endTagStructuredDocumentRegion == null) {
-					// end tag missing
-					if (isEndTagRequired(newNode))
-						newNode = insertEndTag(newNode);
-				}
-			}
-		}
-
-		return newNode;
-	}
-
-	private IDOMNode insertRequiredAttrs(IDOMNode node) {
-		boolean insertRequiredAttrs = getCleanupPreferences().getInsertRequiredAttrs();
-		IDOMNode newNode = node;
-
-		if (insertRequiredAttrs) {
-			List requiredAttrs = getRequiredAttrs(newNode);
-			if (requiredAttrs.size() > 0) {
-				NamedNodeMap currentAttrs = node.getAttributes();
-				List insertAttrs = new ArrayList();
-				if (currentAttrs.getLength() == 0)
-					insertAttrs.addAll(requiredAttrs);
-				else {
-					for (int i = 0; i < requiredAttrs.size(); i++) {
-						String requiredAttrName = ((CMAttributeDeclaration) requiredAttrs.get(i)).getAttrName();
-						boolean found = false;
-						for (int j = 0; j < currentAttrs.getLength(); j++) {
-							String currentAttrName = currentAttrs.item(j).getNodeName();
-							if (requiredAttrName.compareToIgnoreCase(currentAttrName) == 0) {
-								found = true;
-								break;
-							}
-						}
-						if (!found)
-							insertAttrs.add(requiredAttrs.get(i));
-					}
-				}
-				if (insertAttrs.size() > 0) {
-					IStructuredDocumentRegion startStructuredDocumentRegion = newNode.getStartStructuredDocumentRegion();
-					int index = startStructuredDocumentRegion.getEndOffset();
-					ITextRegion lastRegion = startStructuredDocumentRegion.getLastRegion();
-					if (lastRegion.getType() == DOMRegionContext.XML_TAG_CLOSE) {
-						index--;
-						lastRegion = startStructuredDocumentRegion.getRegionAtCharacterOffset(index - 1);
-					} else if (lastRegion.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) {
-						index = index - 2;
-						lastRegion = startStructuredDocumentRegion.getRegionAtCharacterOffset(index - 1);
-					}
-					MultiTextEdit multiTextEdit = new MultiTextEdit();
-					try {
-						for (int i = insertAttrs.size() - 1; i >= 0; i--) {
-							CMAttributeDeclaration attrDecl = (CMAttributeDeclaration) insertAttrs.get(i);
-							String requiredAttributeName = attrDecl.getAttrName();
-							String defaultValue = attrDecl.getDefaultValue();
-							if (defaultValue == null)
-								defaultValue = ""; //$NON-NLS-1$
-							String nameAndDefaultValue = " "; //$NON-NLS-1$
-							if (i == 0 && lastRegion.getLength() > lastRegion.getTextLength())
-								nameAndDefaultValue = ""; //$NON-NLS-1$
-							nameAndDefaultValue += requiredAttributeName + "=\"" + defaultValue + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-							multiTextEdit.addChild(new InsertEdit(index, nameAndDefaultValue));
-							// BUG3381: MultiTextEdit applies all child
-							// TextEdit's basing on offsets
-							//          in the document before the first TextEdit, not
-							// after each
-							//          child TextEdit. Therefore, do not need to
-							// advance the index.
-							//index += nameAndDefaultValue.length();
-						}
-						multiTextEdit.apply(newNode.getStructuredDocument());
-					} catch (BadLocationException e) {
-						throw new SourceEditingRuntimeException(e);
-					}
-				}
-			}
-		}
-
-		return newNode;
-	}
-
-	private IDOMNode insertStartTag(IDOMNode node) {
-		IDOMNode newNode = node;
-
-		if (isCommentTag(node))
-			return node; // do nothing
-
-		String tagName = node.getNodeName();
-		String startTag = START_TAG_OPEN.concat(tagName).concat(TAG_CLOSE);
-		int startTagStartOffset = node.getStartOffset();
-
-		IDOMModel structuredModel = node.getModel();
-		IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-		structuredDocument.replaceText(structuredDocument, startTagStartOffset, 0, startTag);
-		newNode = (IDOMNode) structuredModel.getIndexedRegion(startTagStartOffset); // save
-		// new
-		// node
-
-		return newNode;
-	}
-
-	private void insertTagClose(IDOMModel structuredModel, IStructuredDocumentRegion flatNode) {
-		if (flatNode != null) {
-			ITextRegionList flatnodeRegions = flatNode.getRegions();
-			if (flatnodeRegions != null) {
-				ITextRegion lastRegion = flatnodeRegions.get(flatnodeRegions.size() - 1);
-				if (lastRegion != null) {
-					String regionType = lastRegion.getType();
-					if ((regionType != DOMRegionContext.XML_EMPTY_TAG_CLOSE) && (regionType != DOMRegionContext.XML_TAG_CLOSE)) {
-						IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-
-						// insert ">" after lastRegion of flatNode
-						// as in "<a</a>" if flatNode is for start tag, or in
-						// "<a></a" if flatNode is for end tag
-						structuredDocument.replaceText(structuredDocument, flatNode.getTextEndOffset(lastRegion), 0, ">"); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param renamedNode
-	 * @return
-	 */
-	private boolean isCommentTag(Node renamedNode) {
-		boolean result = false;
-		if (renamedNode instanceof IDOMElement) {
-			IDOMElement element = (IDOMElement) renamedNode;
-			result = element.isCommentTag();
-		}
-		return result;
-	}
-
-	private boolean isEmptyElement(IDOMElement element) {
-		Document document = element.getOwnerDocument();
-		if (document == null)
-			// undefined tag, return default
-			return false;
-
-		ModelQuery modelQuery = ModelQueryUtil.getModelQuery(document);
-		if (modelQuery == null)
-			// undefined tag, return default
-			return false;
-
-		CMElementDeclaration decl = modelQuery.getCMElementDeclaration(element);
-		if (decl == null)
-			// undefined tag, return default
-			return false;
-
-		return (decl.getContentType() == CMElementDeclaration.EMPTY);
-	}
-
-	private boolean isEndTagRequired(IDOMNode node) {
-		if (node == null)
-			return false;
-		return node.isContainer();
-	}
-
-	/**
-	 * A tag is implicit if it has not corresponding region in document.
-	 * 
-	 * @param renamedNode
-	 * @return
-	 */
-	private boolean isImplicitTag(IDOMNode renamedNode) {
-		return renamedNode.getStartStructuredDocumentRegion() == null;
-	}
-
-	/**
-	 * The end tags of HTML EMPTY content type, such as IMG, and HTML
-	 * undefined tags are parsed separately from the start tags. So inserting
-	 * the missing start tag is useless and even harmful.
-	 */
-	private boolean isStartTagRequired(IDOMNode node) {
-		if (node == null)
-			return false;
-		return node.isContainer();
-	}
-
-	private boolean isXMLType(IDOMModel structuredModel) {
-		boolean result = false;
-
-		if (structuredModel != null && structuredModel != null) {
-			IDOMDocument document = structuredModel.getDocument();
-
-			if (document != null)
-				result = document.isXMLType();
-		}
-
-		return result;
-	}
-
-	private IDOMNode quoteAttrValue(IDOMNode node) {
-		IDOMNode newNode = node;
-		//XMLElement element = (XMLElement) node;
-		if (isCommentTag(node))
-			return node; // do nothing
-
-		boolean quoteAttrValues = getCleanupPreferences().getQuoteAttrValues();
-
-		if (quoteAttrValues) {
-			NamedNodeMap attributes = newNode.getAttributes();
-			if (attributes != null) {
-				int attributesLength = attributes.getLength();
-				ISourceGenerator generator = node.getModel().getGenerator();
-
-				for (int i = 0; i < attributesLength; i++) {
-					attributes = newNode.getAttributes();
-					attributesLength = attributes.getLength();
-					IDOMAttr eachAttr = (IDOMAttr) attributes.item(i);
-					//ITextRegion oldAttrValueRegion =
-					// eachAttr.getValueRegion();
-					String oldAttrValue = eachAttr.getValueRegionText();
-					if (oldAttrValue == null) {
-						IDOMModel structuredModel = node.getModel();
-						if (isXMLType(structuredModel)) {
-							String newAttrValue = "\"" + eachAttr.getNameRegionText() + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-
-							IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-							if (eachAttr.getEqualRegion() != null)
-								// equal region exists
-								structuredDocument.replaceText(structuredDocument, eachAttr.getEndOffset(), 0, newAttrValue);
-							else
-								// no equal region
-								structuredDocument.replaceText(structuredDocument, eachAttr.getNameRegionTextEndOffset(), 0, "=".concat(newAttrValue)); //$NON-NLS-1$
-							newNode = (IDOMNode) structuredModel.getIndexedRegion(node.getStartOffset()); // save
-							// new
-							// node
-						}
-					} else {
-						//String oldAttrValue = oldAttrValueRegion.getText();
-						char quote = StringUtils.isQuoted(oldAttrValue) ? oldAttrValue.charAt(0) : DOUBLE_QUOTE;
-						String newAttrValue = generator.generateAttrValue(eachAttr, quote);
-
-						// There is a problem in
-						// StructuredDocumentRegionUtil.getAttrValue(ITextRegion)
-						// when the region is instanceof ContextRegion.
-						// Workaround for now...
-						if (oldAttrValue.length() == 1) {
-							char firstChar = oldAttrValue.charAt(0);
-							if (firstChar == SINGLE_QUOTE)
-								newAttrValue = SINGLE_QUOTES;
-							else if (firstChar == DOUBLE_QUOTE)
-								newAttrValue = DOUBLE_QUOTES;
-						}
-
-						if (newAttrValue != null) {
-							if (newAttrValue.compareTo(oldAttrValue) != 0) {
-								int attrValueStartOffset = eachAttr.getValueRegionStartOffset();
-								int attrValueLength = oldAttrValue.length();
-								int startTagStartOffset = node.getStartOffset();
-
-								IDOMModel structuredModel = node.getModel();
-								IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-								structuredDocument.replaceText(structuredDocument, attrValueStartOffset, attrValueLength, newAttrValue);
-								newNode = (IDOMNode) structuredModel.getIndexedRegion(startTagStartOffset); // save
-								// new
-								// node
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return newNode;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/NodeCleanupHandler.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/NodeCleanupHandler.java
deleted file mode 100644
index ebe7fec..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/NodeCleanupHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.cleanup;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
-import org.eclipse.wst.sse.core.internal.cleanup.StructuredCleanupPreferences;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.w3c.dom.Node;
-
-
-public class NodeCleanupHandler implements IStructuredCleanupHandler {
-
-	protected IStructuredCleanupPreferences fCleanupPreferences = null;
-	protected IProgressMonitor fProgressMonitor = null;
-
-
-	public Node cleanup(Node node) {
-
-		return node;
-	}
-
-	public IStructuredCleanupPreferences getCleanupPreferences() {
-		if (fCleanupPreferences == null) {
-			fCleanupPreferences = new StructuredCleanupPreferences();
-
-			Preferences preferences = getModelPreferences();
-			if (preferences != null) {
-				fCleanupPreferences.setCompressEmptyElementTags(preferences.getBoolean(XMLCorePreferenceNames.COMPRESS_EMPTY_ELEMENT_TAGS));
-				fCleanupPreferences.setInsertRequiredAttrs(preferences.getBoolean(XMLCorePreferenceNames.INSERT_REQUIRED_ATTRS));
-				fCleanupPreferences.setInsertMissingTags(preferences.getBoolean(XMLCorePreferenceNames.INSERT_MISSING_TAGS));
-				fCleanupPreferences.setQuoteAttrValues(preferences.getBoolean(XMLCorePreferenceNames.QUOTE_ATTR_VALUES));
-				fCleanupPreferences.setFormatSource(preferences.getBoolean(XMLCorePreferenceNames.FORMAT_SOURCE));
-				fCleanupPreferences.setConvertEOLCodes(preferences.getBoolean(XMLCorePreferenceNames.CONVERT_EOL_CODES));
-				fCleanupPreferences.setEOLCode(preferences.getString(XMLCorePreferenceNames.CLEANUP_EOL_CODE));
-			}
-		}
-
-		return fCleanupPreferences;
-	}
-
-	protected Preferences getModelPreferences() {
-		return XMLCorePlugin.getDefault().getPluginPreferences();
-	}
-
-	public void setCleanupPreferences(IStructuredCleanupPreferences cleanupPreferences) {
-
-		fCleanupPreferences = cleanupPreferences;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/XMLCleanupPreferencesImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/XMLCleanupPreferencesImpl.java
deleted file mode 100644
index 4095a5c..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/XMLCleanupPreferencesImpl.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.cleanup;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.sse.core.internal.SSECorePlugin;
-import org.eclipse.wst.xml.core.internal.provisional.IXMLPreferenceNames;
-
-/**
- * @deprecated renamed to StructuredCleanupPreferences
- * 
- * TODO will delete in C5
- */
-public class XMLCleanupPreferencesImpl {
-
-	private static XMLCleanupPreferencesImpl fInstance;
-
-	public synchronized static XMLCleanupPreferencesImpl getInstance() {
-
-		// added for one method in CleanupDialog ... may be better way
-		if (fInstance == null) {
-			fInstance = new XMLCleanupPreferencesImpl();
-		}
-		return fInstance;
-	}
-
-	private int fAttrNameCase;
-	private boolean fConvertEOLCodes;
-	private String fEOLCode;
-	private boolean fFormatSource;
-	private boolean fInsertMissingTags;
-	// private IPreferenceStore fPreferenceStore = null;
-	private Preferences fPreferences = null;
-	private boolean fQuoteAttrValues;
-	private int fTagNameCase;
-
-	public int getAttrNameCase() {
-
-		return fAttrNameCase;
-	}
-
-	public boolean getConvertEOLCodes() {
-
-		return fConvertEOLCodes;
-	}
-
-	public String getEOLCode() {
-
-		return fEOLCode;
-	}
-
-	public boolean getFormatSource() {
-
-		return fFormatSource;
-	}
-
-	public boolean getInsertMissingTags() {
-
-		return fInsertMissingTags;
-	}
-
-	public Preferences getPreferences() {
-
-		if (fPreferences == null) {
-			fPreferences = SSECorePlugin.getDefault().getPluginPreferences();
-		}
-		return fPreferences;
-	}
-
-	public boolean getQuoteAttrValues() {
-
-		return fQuoteAttrValues;
-	}
-
-	public int getTagNameCase() {
-
-		return fTagNameCase;
-	}
-
-	public void setAttrNameCase(int attrNameCase) {
-
-		fAttrNameCase = attrNameCase;
-	}
-
-	public void setConvertEOLCodes(boolean convertEOLCodes) {
-
-		fConvertEOLCodes = convertEOLCodes;
-	}
-
-	public void setEOLCode(String EOLCode) {
-
-		fEOLCode = EOLCode;
-	}
-
-	public void setFormatSource(boolean formatSource) {
-
-		fFormatSource = formatSource;
-	}
-
-	public void setInsertMissingTags(boolean insertMissingTags) {
-
-		fInsertMissingTags = insertMissingTags;
-	}
-
-	public void setPreferences(Preferences prefs) {
-
-		fPreferences = prefs;
-		updateOptions();
-	}
-
-	public void setQuoteAttrValues(boolean quoteAttrValues) {
-
-		fQuoteAttrValues = quoteAttrValues;
-	}
-
-	public void setTagNameCase(int tagNameCase) {
-
-		fTagNameCase = tagNameCase;
-	}
-
-	protected void updateOptions() {
-
-		Preferences p = getPreferences();
-		fTagNameCase = p.getInt(IXMLPreferenceNames.CLEANUP_TAG_NAME_CASE);
-		fAttrNameCase = p.getInt(IXMLPreferenceNames.CLEANUP_ATTR_NAME_CASE);
-		fInsertMissingTags = p.getBoolean(IXMLPreferenceNames.INSERT_MISSING_TAGS);
-		fQuoteAttrValues = p.getBoolean(IXMLPreferenceNames.QUOTE_ATTR_VALUES);
-		fFormatSource = p.getBoolean(IXMLPreferenceNames.FORMAT_SOURCE);
-		fConvertEOLCodes = p.getBoolean(IXMLPreferenceNames.CONVERT_EOL_CODES);
-		fEOLCode = p.getString(IXMLPreferenceNames.CLEANUP_EOL_CODE);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/CommentElementAdapter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/CommentElementAdapter.java
deleted file mode 100644
index 3d8d4bf..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/CommentElementAdapter.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.commentelement;
-
-
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.commentelement.impl.CommentElementConfiguration;
-import org.eclipse.wst.xml.core.internal.document.TagAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-
-/**
- */
-public class CommentElementAdapter implements TagAdapter {
-	private CommentElementConfiguration fConfiguration;
-
-	private boolean fEndTag;
-	private CommentElementHandler fHandler;
-
-	public CommentElementAdapter(boolean isEndTag, CommentElementHandler handler) {
-		fEndTag = isEndTag;
-		fHandler = handler;
-	}
-
-	private String generateCommentClose(IDOMElement element) {
-		return (element.isJSPTag()) ? "--%>" : "-->"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	private String generateCommentOpen(IDOMElement element) {
-		return (element.isJSPTag()) ? "<%--" : "<!--"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	private CommentElementConfiguration getConfiguration() {
-		return fConfiguration;
-	}
-
-	public String getEndTag(IDOMElement element) {
-		String content = fHandler.generateEndTagContent(element);
-		if (content == null) {
-			return null;
-		}
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append(generateCommentOpen(element));
-		buffer.append(content);
-		buffer.append(generateCommentClose(element));
-
-		return buffer.toString();
-	}
-
-	public String getHandlerID() {
-		return getConfiguration().getHandlerID();
-	}
-
-	/**
-	 * @deprecated this should not be needed by anyone
-	 */
-	public IPluginDescriptor getHandlerPluginDescriptor() {
-		return fConfiguration.getHandlerPluginDescriptor();
-	}
-
-	public String getProperty(String name) {
-		return getConfiguration().getProperty(name);
-	}
-
-	public String getStartTag(IDOMElement element) {
-		String content = fHandler.generateStartTagContent(element);
-		if (content == null) {
-			return null;
-		}
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append(generateCommentOpen(element));
-		buffer.append(content);
-		buffer.append(generateCommentClose(element));
-
-		return buffer.toString();
-	}
-
-	public boolean isAdapterForType(Object type) {
-		return (type == CommentElementAdapter.class || type == TagAdapter.class);
-	}
-
-	public boolean isContainer() {
-		return (!fHandler.isEmpty());
-	}
-
-	public boolean isEndTag() {
-		return fEndTag;
-	}
-
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-	}
-
-	public void setConfiguration(CommentElementConfiguration configuration) {
-		fConfiguration = configuration;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/CommentElementHandler.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/CommentElementHandler.java
deleted file mode 100644
index 03d7f3a..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/CommentElementHandler.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.commentelement;
-
-
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- */
-public interface CommentElementHandler {
-	/**
-	 * This method is called when the prefix of the comment content matches
-	 * the string specified in &lt;startswith prefix=""/&gt; in plugin
-	 * extension. Comment content is parsed and new DOM element is created in
-	 * this method. Implementor has to do following:
-	 * <li>For start tag :
-	 * <ul>
-	 * <li>parse comment content and create new element instance.</li>
-	 * </ul>
-	 * </li>
-	 * <li>For end tag :
-	 * <ul>
-	 * <li>parse comment content and create new element instance.</li>
-	 * <li>make isEndTag flag true.</li>
-	 * <li>Parser framework searches mached start tag element instance after
-	 * this createElement call, and new instance is just thrown away.</li>
-	 * </ul>
-	 * </li>
-	 * <li>For empty tag :
-	 * <ul>
-	 * <li>parse comment content and create new element instance.</li>
-	 * <li>make isEndTag flag true.</li>
-	 * </ul>
-	 * </li>
-	 * 
-	 * @param document
-	 *            parent DOM document
-	 * @param data
-	 *            comment content. comment prefix (&lt;!-- or &lt;%--), suffix
-	 *            (--&gt; or --%&gt;), and surrounding spaces are trimmed.
-	 * @param isJSPTag
-	 *            true if the comment is JSP style comment. This information
-	 *            may be required by handler when the handler accepts both XML
-	 *            style and JSP style comment (namely,
-	 *            commenttype=&quot;both&quot; in plugin.xml).
-	 * @return comment element instance if the comment content is rightly
-	 *         parsed. if parse failed, returns null.
-	 */
-	Element createElement(Document document, String data, boolean isJSPTag);
-
-	/**
-	 * This method generates the source text of the end tag for the passed
-	 * element. Do not generate comment prefix (&lt;!-- or &lt;%--) and suffix
-	 * (--&gt; or --%&gt;). XMLGenerator uses this method to generate XML/HTML
-	 * source for a comment element.
-	 * 
-	 * @param element
-	 *            the comment element
-	 * @return generated tag string
-	 */
-	String generateEndTagContent(IDOMElement element);
-
-	/**
-	 * This method generates the source text of the start tag for the passed
-	 * element. Do not generate comment prefix (&lt;!-- or &lt;%--) and suffix
-	 * (--&gt; or --%&gt;). XMLGenerator uses this method to generate XML/HTML
-	 * source for a comment element.
-	 * 
-	 * @param element
-	 *            the comment element
-	 * @return generated tag string
-	 */
-	String generateStartTagContent(IDOMElement element);
-
-	/**
-	 * 
-	 * @param element
-	 *            the element
-	 * @return boolean whether the element is comment element or not
-	 */
-	boolean isCommentElement(IDOMElement element);
-
-	/**
-	 * 
-	 * @return boolean whether this element can have children or not
-	 */
-	boolean isEmpty();
-
-	/**
-	 * @return String
-	 */
-	//	String getElementPrefix();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/impl/BasicCommentElementHandler.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/impl/BasicCommentElementHandler.java
deleted file mode 100644
index d4b8391..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/impl/BasicCommentElementHandler.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.commentelement.impl;
-
-
-
-import org.eclipse.wst.xml.core.internal.commentelement.CommentElementHandler;
-import org.eclipse.wst.xml.core.internal.commentelement.util.CommentElementFactory;
-import org.eclipse.wst.xml.core.internal.commentelement.util.TagScanner;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.ISourceGenerator;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-
-/**
- */
-class BasicCommentElementHandler implements CommentElementHandler {
-
-	private String elementName;
-	private boolean isEmpty;
-
-	public BasicCommentElementHandler(String elementName, boolean isEmpty) {
-		super();
-		this.elementName = elementName;
-		this.isEmpty = isEmpty;
-	}
-
-
-	public Element createElement(Document document, String data, boolean isJSPTag) {
-		Element element = null;
-		String str = data.trim();
-		CommentElementFactory factory = new CommentElementFactory(document, isJSPTag, this);
-		if (str.charAt(0) == '/') { // end tag
-			TagScanner scanner = new TagScanner(str, 1); // skip '/'
-			String name = scanner.nextName();
-			if (name.equals(elementName)) {
-				element = factory.create(name, CommentElementFactory.IS_END);
-			}
-		} else { // start tag
-			TagScanner scanner = new TagScanner(str, 0);
-			String name = scanner.nextName();
-			if (name.equals(elementName)) {
-				element = factory.create(name, (isEmpty) ? CommentElementFactory.IS_EMPTY : CommentElementFactory.IS_START);
-				// set attributes
-				String attrName = scanner.nextName();
-				while (attrName != null) {
-					String attrValue = scanner.nextValue();
-					Attr attr = document.createAttribute(attrName);
-					if (attr != null) {
-						if (attrValue != null)
-							((IDOMAttr) attr).setValueSource(attrValue);
-						element.setAttributeNode(attr);
-					}
-					attrName = scanner.nextName();
-				}
-			}
-		}
-		return element;
-	}
-
-
-	public String generateEndTagContent(IDOMElement element) {
-		if (isEmpty) {
-			return null;
-		}
-		ISourceGenerator generator = element.getModel().getGenerator();
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append(" /"); //$NON-NLS-1$
-		String tagName = generator.generateTagName(element);
-		if (tagName != null) {
-			buffer.append(tagName);
-		}
-		buffer.append(' ');
-
-		return buffer.toString();
-	}
-
-	public String generateStartTagContent(IDOMElement element) {
-		ISourceGenerator generator = element.getModel().getGenerator();
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append(' ');
-		String tagName = generator.generateTagName(element);
-		if (tagName != null) {
-			buffer.append(tagName);
-		}
-
-		NamedNodeMap attributes = element.getAttributes();
-		int length = attributes.getLength();
-		for (int i = 0; i < length; i++) {
-			Attr attr = (Attr) attributes.item(i);
-			if (attr == null) {
-				continue;
-			}
-			buffer.append(' ');
-			String attrName = generator.generateAttrName(attr);
-			if (attrName != null) {
-				buffer.append(attrName);
-			}
-			String attrValue = generator.generateAttrValue(attr);
-			if (attrValue != null) {
-				// attr name only for HTML boolean and JSP
-				buffer.append('=');
-				buffer.append(attrValue);
-			}
-		}
-
-		buffer.append(' ');
-
-		return buffer.toString();
-	}
-
-	public boolean isCommentElement(IDOMElement element) {
-		return (element != null && element.getTagName().equals(elementName)) ? true : false;
-	}
-
-	public boolean isEmpty() {
-		return isEmpty;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/impl/CommentElementConfiguration.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/impl/CommentElementConfiguration.java
deleted file mode 100644
index 1fe62da..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/impl/CommentElementConfiguration.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.commentelement.impl;
-
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.commentelement.CommentElementAdapter;
-import org.eclipse.wst.xml.core.internal.commentelement.CommentElementHandler;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- */
-public class CommentElementConfiguration {
-	private Map fAttributes = null;
-	private boolean fCustom;
-	private IConfigurationElement fElement = null;
-
-	private boolean fEmpty;
-	private CommentElementHandler fHandler = null;
-	private String fID = null;
-	private boolean fJSPComment;
-	private String[] fPrefix = null;
-	private boolean fXMLComment;
-
-	CommentElementConfiguration() {
-		super();
-	}
-
-	CommentElementConfiguration(IConfigurationElement element) {
-		super();
-		fElement = element;
-		fCustom = (element.getName().equalsIgnoreCase("handler-custom")) ? true : false; //$NON-NLS-1$
-
-		fillAttributes(element);
-
-		fXMLComment = fJSPComment = false;
-		String commentType = getProperty("commenttype"); //$NON-NLS-1$
-		if (commentType.equalsIgnoreCase("xml")) { //$NON-NLS-1$
-			fXMLComment = true;
-		} else if (commentType.equalsIgnoreCase("jsp")) { //$NON-NLS-1$
-			fJSPComment = true;
-		} else if (commentType.equalsIgnoreCase("both")) { //$NON-NLS-1$
-			fXMLComment = fJSPComment = true;
-		}
-		String empty = getProperty("isempty"); //$NON-NLS-1$
-		fEmpty = (empty != null && !empty.equals("false")) ? true : false; //$NON-NLS-1$
-	}
-
-	public boolean acceptJSPComment() {
-		return fJSPComment;
-	}
-
-	public boolean acceptXMLComment() {
-		return fXMLComment;
-	}
-
-	public Element createElement(Document document, String data, boolean isJSPTag) {
-		IDOMElement element = (IDOMElement) getHandler().createElement(document, data, isJSPTag);
-		if (element != null) {
-			CommentElementAdapter adapter = (CommentElementAdapter) element.getAdapterFor(CommentElementAdapter.class);
-			if (adapter != null) {
-				adapter.setConfiguration(this);
-			}
-		}
-		return element;
-	}
-
-	private void fillAttributes(IConfigurationElement element) {
-		if (fAttributes == null) {
-			fAttributes = new HashMap();
-		} else {
-			fAttributes.clear();
-		}
-		String[] names = element.getAttributeNames();
-		if (names == null) {
-			return;
-		}
-		int length = names.length;
-		for (int i = 0; i < length; i++) {
-			String name = names[i];
-			fAttributes.put(name.toLowerCase(), element.getAttribute(name));
-		}
-	}
-
-	public CommentElementHandler getHandler() {
-		if (fHandler == null) {
-			if (fElement != null) {
-				try {
-					if (isCustom()) {
-						fHandler = (CommentElementHandler) fElement.createExecutableExtension("class"); //$NON-NLS-1$
-					} else {
-						String elementName = getProperty("elementname"); //$NON-NLS-1$
-						fHandler = new BasicCommentElementHandler(elementName, fEmpty);
-					}
-					//					((AbstractCommentElementHandler)fHandler).setElementPrefix(fElement.getAttribute("prefix"));
-				} catch (Exception e) {
-					// catch and log (and ignore) ANY exception created
-					// by executable extension.
-					Logger.logException(e);
-					fHandler = null;
-				}
-			}
-			if (fHandler == null) {
-				fHandler = new CommentElementHandler() {
-					public Element createElement(Document document, String data, boolean isJSPTag) {
-						return null;
-					}
-
-					public String generateEndTagContent(IDOMElement element) {
-						return null;
-					}
-
-					public String generateStartTagContent(IDOMElement element) {
-						return null;
-					}
-
-// removed in RC2, ro removed "unused" error/warning
-//					public String getElementPrefix() {
-//						return null;
-//					}
-
-					public boolean isCommentElement(IDOMElement element) {
-						return false;
-					}
-
-					public boolean isEmpty() {
-						return false;
-					}
-				};
-			}
-		}
-		return fHandler;
-	}
-
-	public String getHandlerID() {
-		if (fID == null) {
-			fID = getProperty("id"); //$NON-NLS-1$
-			if (fID == null) {
-				if (isCustom()) {
-					fID = getProperty("class"); //$NON-NLS-1$				
-				} else {
-					StringBuffer buf = new StringBuffer();
-					buf.append(fElement.getDeclaringExtension().getNamespace());
-					buf.append('.');
-					buf.append(getProperty("elementname")); //$NON-NLS-1$
-					fID = buf.toString();
-				}
-			}
-		}
-		return fID;
-	}
-
-	/**
-	 * @deprecated this should not be needed by anyone
-	 */
-	public IPluginDescriptor getHandlerPluginDescriptor() {
-		return fElement.getDeclaringExtension().getDeclaringPluginDescriptor();
-	}
-
-	public String[] getPrefix() {
-		if (fPrefix == null) {
-			if (fElement != null) {
-				if (isCustom()) { // custom
-					IConfigurationElement[] prefixes = fElement.getChildren("startwith"); //$NON-NLS-1$	
-					if (prefixes != null) {
-						fPrefix = new String[prefixes.length];
-						for (int i = 0; i < prefixes.length; i++) {
-							fPrefix[i] = prefixes[i].getAttribute("prefix"); //$NON-NLS-1$	
-						}
-					}
-				} else { // basic
-					String name = getProperty("elementname"); //$NON-NLS-1$
-					if (name != null) {
-						if (isEmpty()) {
-							fPrefix = new String[1];
-							fPrefix[0] = name;
-						} else {
-							fPrefix = new String[2];
-							fPrefix[0] = name;
-							fPrefix[1] = '/' + name;
-						}
-					}
-				}
-			}
-		}
-		if (fPrefix == null) {
-			fPrefix = new String[1];
-			fPrefix[0] = ""; //$NON-NLS-1$
-		}
-		return fPrefix;
-	}
-
-	public String getProperty(String name) {
-		return (fAttributes != null) ? (String) fAttributes.get(name) : null;
-	}
-
-	private boolean isCustom() {
-		return fCustom;
-	}
-
-	private boolean isEmpty() {
-		return fEmpty;
-	}
-
-	void setupCommentElement(IDOMElement element) {
-		element.setCommentTag(true);
-		CommentElementAdapter adapter = new CommentElementAdapter(false, fHandler);
-		adapter.setConfiguration(this);
-		element.addAdapter(adapter);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/impl/CommentElementRegistry.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/impl/CommentElementRegistry.java
deleted file mode 100644
index 8fc50b5..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/impl/CommentElementRegistry.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.commentelement.impl;
-
-
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.internal.commentelement.CommentElementHandler;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-
-/**
- */
-public class CommentElementRegistry {
-
-	private static CommentElementRegistry fInstance = null;
-
-	public synchronized static CommentElementRegistry getInstance() {
-		if (fInstance == null) {
-			fInstance = new CommentElementRegistry();
-		}
-		return fInstance;
-	}
-
-	private String EXTENSION_POINT_ID = "commentElementHandler"; //$NON-NLS-1$
-	private CommentElementConfiguration[] fConfigurations = null;
-
-	private String PLUGIN_ID = "org.eclipse.wst.sse.core"; //$NON-NLS-1$
-
-	/**
-	 * Constructor for CommentElementRegistry.
-	 */
-	private CommentElementRegistry() {
-		super();
-	}
-
-	public CommentElementConfiguration[] getConfigurations() {
-		if (fConfigurations == null) {
-			IExtensionRegistry registry = Platform.getExtensionRegistry();
-			IExtensionPoint point = registry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
-			if (point != null) {
-				IConfigurationElement[] elements = point.getConfigurationElements();
-				fConfigurations = new CommentElementConfiguration[elements.length];
-				for (int i = 0; i < elements.length; i++) {
-					fConfigurations[i] = new CommentElementConfiguration(elements[i]);
-				}
-			}
-			if (fConfigurations == null) {
-				fConfigurations = new CommentElementConfiguration[0];
-			}
-		}
-		return fConfigurations;
-	}
-
-	public boolean setupCommentElement(IDOMElement element) {
-		CommentElementConfiguration configurations[] = getConfigurations();
-		int length = configurations.length;
-		for (int i = 0; i < length; i++) {
-			CommentElementConfiguration conf = configurations[i];
-			boolean isJSP = element.isJSPTag();
-			if (isJSP && conf.acceptJSPComment() || !isJSP && conf.acceptXMLComment()) {
-				CommentElementHandler handler = conf.getHandler();
-				if (handler.isCommentElement(element)) {
-					conf.setupCommentElement(element);
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/util/CommentElementFactory.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/util/CommentElementFactory.java
deleted file mode 100644
index 1351c42..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/util/CommentElementFactory.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.commentelement.util;
-
-
-
-import org.eclipse.wst.xml.core.internal.commentelement.CommentElementAdapter;
-import org.eclipse.wst.xml.core.internal.commentelement.CommentElementHandler;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- */
-public class CommentElementFactory {
-	public static final int IS_EMPTY = 4866;
-	public static final int IS_END = 1808;
-
-	public static final int IS_START = 28011;
-
-	private Document fDocument;
-	private CommentElementHandler fHandler;
-	private boolean fJSPTag;
-
-	/**
-	 * Constructor for CommentElementFactory.
-	 */
-	private CommentElementFactory() {
-		super();
-	}
-
-	public CommentElementFactory(Document document, boolean isJSPTag, CommentElementHandler handler) {
-		super();
-		fDocument = document;
-		fJSPTag = isJSPTag;
-		fHandler = handler;
-	}
-
-	public Element create(String name, int nodeType) {
-		IDOMElement element = (IDOMElement) fDocument.createElement(name);
-		if (element == null)
-			return null;
-		element.setCommentTag(true);
-		if (nodeType == IS_EMPTY) {
-			element.setEmptyTag(true);
-		}
-		element.setJSPTag(fJSPTag);
-
-		CommentElementAdapter adapter = new CommentElementAdapter((nodeType == IS_END), fHandler);
-		element.addAdapter(adapter);
-
-		return element;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/util/TagScanner.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/util/TagScanner.java
deleted file mode 100644
index 33d9cb1..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/util/TagScanner.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.commentelement.util;
-
-
-
-/**
- */
-public class TagScanner {
-
-	/**
-	 */
-	private static boolean isEqual(char c) {
-		return (c == '=');
-	}
-
-	/**
-	 */
-	private static boolean isQuote(char c) {
-		return (c == '"' || c == '\'');
-	}
-
-	/**
-	 */
-	private static boolean isSpace(char c) {
-		return Character.isWhitespace(c);
-	}
-
-	private int length = 0;
-	private int memOffset = 0;
-	private int offset = 0;
-	private boolean oneLine = false;
-
-	private String tag = null;
-
-	/**
-	 */
-	public TagScanner(String tag, int offset) {
-		super();
-
-		this.tag = tag;
-		this.offset = offset;
-		this.memOffset = -1;
-		if (tag != null)
-			this.length = tag.length();
-	}
-
-	/**
-	 */
-	public TagScanner(String tag, int offset, boolean oneLine) {
-		this(tag, offset);
-
-		this.oneLine = oneLine;
-	}
-
-	/**
-	 */
-	public int getNextOffset() {
-		int i;
-		char c;
-		for (i = offset; i < length; i++) {
-			c = tag.charAt(i);
-			if (isEnd(c))
-				break;
-			if (isQuote(c)) {
-				i++;
-				break;
-			}
-			if (!isSpace(c) && !isEqual(c))
-				break;
-		}
-		return i;
-	}
-
-	/**
-	 */
-	public int getOffset() {
-		return this.memOffset;
-	}
-
-	/**
-	 */
-	private final boolean isEnd(char c) {
-		return (this.oneLine && (c == '\r' || c == '\n'));
-	}
-
-	/**
-	 */
-	public boolean isNewLine() {
-		if (oneLine)
-			return false;
-		char c;
-		for (int i = memOffset - 1; 0 <= i; i--) {
-			c = tag.charAt(i);
-			if (c == '\r' || c == '\n')
-				return true;
-			if (!isSpace(c))
-				return false;
-		}
-		return false;
-	}
-
-	/**
-	 */
-	private char nextChar() {
-		for (; this.offset < this.length; this.offset++) {
-			char c = this.tag.charAt(this.offset);
-			if (isEnd(c))
-				break;
-			if (!isSpace(c))
-				return c;
-		}
-		return 0;
-	}
-
-	/**
-	 */
-	public String nextName() {
-		if (this.tag == null)
-			return null;
-		if (this.offset >= this.length)
-			return null;
-
-		if (nextChar() == 0)
-			return null;
-
-		int nameOffset = this.offset;
-		for (; this.offset < this.length; this.offset++) {
-			char c = this.tag.charAt(this.offset);
-			if (isEnd(c) || isSpace(c))
-				break;
-			if (isEqual(c) && this.offset > nameOffset)
-				break;
-		}
-		if (this.offset == nameOffset)
-			return null;
-
-		this.memOffset = nameOffset;
-		return this.tag.substring(nameOffset, this.offset);
-	}
-
-	/**
-	 */
-	public String nextValue() {
-		if (this.tag == null)
-			return null;
-		if (this.offset >= this.length)
-			return null;
-
-		char seperator = nextChar();
-		if (!isEqual(seperator))
-			return null;
-		this.offset++; // skip '='
-		char quote = nextChar();
-		if (quote == 0)
-			return null;
-		if (isQuote(quote))
-			this.offset++;
-		else
-			quote = 0;
-
-		int valueOffset = this.offset;
-		for (; this.offset < this.length; this.offset++) {
-			char c = this.tag.charAt(this.offset);
-			if (isEnd(c)) {
-				quote = 0;
-				break;
-			}
-			if (quote == 0) {
-				if (isSpace(c))
-					break;
-			} else {
-				if (c == quote)
-					break;
-			}
-		}
-		int valueEnd = this.offset;
-		if (quote != 0 && this.offset < this.length)
-			this.offset++;
-		if (valueEnd == valueOffset)
-			return null;
-
-		this.memOffset = valueOffset;
-		return this.tag.substring(valueOffset, valueEnd);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/AbstractResourceEncodingDetector.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/AbstractResourceEncodingDetector.java
deleted file mode 100644
index 2c00760..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/AbstractResourceEncodingDetector.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.contenttype;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.IllegalCharsetNameException;
-import java.nio.charset.UnsupportedCharsetException;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.wst.sse.core.internal.encoding.CodedIO;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-
-public abstract class AbstractResourceEncodingDetector implements IResourceCharsetDetector {
-
-	protected EncodingMemento fEncodingMemento;
-
-	protected boolean fHeaderParsed;
-
-	protected Reader fReader;
-
-	/**
-	 *  
-	 */
-	public AbstractResourceEncodingDetector() {
-		super();
-	}
-
-	/**
-	 * Note: once this instance is created, trace info still needs to be
-	 * appended by caller, depending on the context its created.
-	 */
-	private void createEncodingMemento(String detectedCharsetName) {
-		fEncodingMemento = new EncodingMemento();
-		fEncodingMemento.setJavaCharsetName(getAppropriateJavaCharset(detectedCharsetName));
-		fEncodingMemento.setDetectedCharsetName(detectedCharsetName);
-		// TODO: if detectedCharset and spec default is
-		// null, need to use "work
-		// bench based" defaults.
-		fEncodingMemento.setAppropriateDefault(getSpecDefaultEncoding());
-	}
-
-	/**
-	 * convience method all subclasses can use (but not override)
-	 * 
-	 * @param detectedCharsetName
-	 * @param reason
-	 */
-	final protected void createEncodingMemento(String detectedCharsetName, String reason) {
-		createEncodingMemento(detectedCharsetName);
-	}
-
-	/**
-	 * convience method all subclasses can use (but not override)
-	 */
-	final protected void ensureInputSet() {
-		if (fReader == null) {
-			throw new IllegalStateException("input must be set before use"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * This method can return null, if invalid charset name (in which case
-	 * "appropriateDefault" should be used, if a name is really need for some
-	 * "save anyway" cases).
-	 * 
-	 * @param detectedCharsetName
-	 * @return
-	 */
-	private String getAppropriateJavaCharset(String detectedCharsetName) {
-		String result = null;
-		// 1. Check explicit mapping overrides from
-		// property file -- its here we pick up "rules" for cases
-		// that are not even in Java
-		result = CodedIO.checkMappingOverrides(detectedCharsetName);
-		// 2. Use the "canonical" name from JRE mappings
-		// Note: see Charset JavaDoc, the name you get one
-		// with can be alias,
-		// the name you get back is "standard" name.
-		Charset javaCharset = null;
-		try {
-			javaCharset = Charset.forName(detectedCharsetName);
-		} catch (UnsupportedCharsetException e) {
-			// only set invalid, if result is same as detected -- they won't
-			// be equal if
-			// overridden
-			if (result != null && result.equals(detectedCharsetName)) {
-				fEncodingMemento.setInvalidEncoding(detectedCharsetName);
-			}
-		} catch (IllegalCharsetNameException e) {
-			// only set invalid, if result is same as detected -- they won't
-			// be equal if
-			// overridden
-			if (result != null && result.equals(detectedCharsetName)) {
-				fEncodingMemento.setInvalidEncoding(detectedCharsetName);
-			}
-		}
-		// give priority to java cononical name, if present
-		if (javaCharset != null) {
-			result = javaCharset.name();
-			// but still allow overrides
-			result = CodedIO.checkMappingOverrides(result);
-		}
-		return result;
-	}
-
-	public String getEncoding() throws IOException {
-		return getEncodingMemento().getDetectedCharsetName();
-	}
-
-	// to ensure consist overall rules used, we'll mark as
-	// final,
-	// and require subclasses to provide certain pieces of
-	// the
-	// implementation
-	public EncodingMemento getEncodingMemento() throws IOException {
-		ensureInputSet();
-		if (!fHeaderParsed) {
-			parseInput();
-			// we keep track of if header's already been
-			// parse, so can make
-			// multiple 'get' calls, without causing
-			// reparsing.
-			fHeaderParsed = true;
-			// Note: there is a "hidden assumption" here
-			// that an empty
-			// string in content should be treated same as
-			// not present.
-		}
-		if (fEncodingMemento == null) {
-			handleSpecDefault();
-		}
-		if (fEncodingMemento == null) {
-			// safty net
-			fEncodingMemento = new NullMemento();
-		}
-		return fEncodingMemento;
-	}
-
-	/**
-	 * This is to return a default encoding -- as specified by an industry
-	 * content type spec -- when not present in the stream, for example, XML
-	 * specifies UTF-8, JSP specifies ISO-8859-1. This method should return
-	 * null if there is no such "spec default".
-	 */
-	abstract public String getSpecDefaultEncoding();
-
-	public EncodingMemento getSpecDefaultEncodingMemento() {
-		resetAll();
-		EncodingMemento result = null;
-		String enc = getSpecDefaultEncoding();
-		if (enc != null) {
-			createEncodingMemento(enc, EncodingMemento.DEFAULTS_ASSUMED_FOR_EMPTY_INPUT);
-			fEncodingMemento.setAppropriateDefault(enc);
-			result = fEncodingMemento;
-		}
-		return result;
-	}
-
-	private void handleSpecDefault() {
-		String encodingName;
-		encodingName = getSpecDefaultEncoding();
-		if (encodingName != null) {
-			//createEncodingMemento(encodingName,
-			// EncodingMemento.USED_CONTENT_TYPE_DEFAULT);
-			fEncodingMemento = new EncodingMemento();
-			fEncodingMemento.setJavaCharsetName(encodingName);
-			fEncodingMemento.setAppropriateDefault(encodingName);
-		}
-	}
-
-	/**
-	 * Every subclass must provide a way to parse the input. This method has
-	 * several critical responsibilities:
-	 * <li>set the fEncodingMemento field appropriately, according to the
-	 * results of the parse of fReader.</li>
-	 * <li>set fHarderParsed to true, to avoid wasted re-parsing.</li>
-	 */
-	abstract protected void parseInput() throws IOException;
-
-	/**
-	 *  
-	 */
-	protected void resetAll() {
-		fReader = null;
-		fHeaderParsed = false;
-		fEncodingMemento = null;
-	}
-
-	/**
-	 *  
-	 */
-	public void set(InputStream inputStream) {
-		resetAll();
-		fReader = new ByteReader(inputStream);
-		try {
-			fReader.mark(CodedIO.MAX_MARK_SIZE);
-		} catch (IOException e) {
-			// impossible, since we know ByteReader
-			// supports marking
-			throw new Error(e);
-		}
-	}
-
-	/**
-	 *  
-	 */
-	public void set(IStorage iStorage) throws CoreException {
-		resetAll();
-		InputStream inputStream = iStorage.getContents();
-		InputStream resettableStream = new BufferedInputStream(inputStream, CodedIO.MAX_BUF_SIZE);
-		resettableStream.mark(CodedIO.MAX_MARK_SIZE);
-		set(resettableStream);
-		// TODO we'll need to "remember" IFile, or
-		// get its (or its project's) settings, in case
-		// those are needed to handle cases when the
-		// encoding is not in the file stream.
-	}
-
-	/**
-	 * Note: this is not part of interface to help avoid confusion ... it
-	 * expected this Reader is a well formed character reader ... that is, its
-	 * all ready been determined to not be a unicode marked input stream. And,
-	 * its assumed to be in the correct position, at position zero, ready to
-	 * read first character.
-	 */
-	public void set(Reader reader) {
-		resetAll();
-		fReader = reader;
-		if (!fReader.markSupported()) {
-			fReader = new BufferedReader(fReader);
-		}
-		try {
-			fReader.mark(CodedIO.MAX_MARK_SIZE);
-		} catch (IOException e) {
-			// impossble, since we just checked if markable
-			throw new Error(e);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/ByteReader.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/ByteReader.java
deleted file mode 100644
index d9ae470..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/ByteReader.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.contenttype;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.eclipse.wst.sse.core.internal.encoding.CodedIO;
-
-/**
- * This is an "adapter" class, simply to get in input stream to act like a
- * reader. We could not use InputStreamReader directly because its internal
- * buffers are not controllable, and it sometimes pulls too much out of input
- * stream (even when it wasn't needed for our purposes).
- * 
- * The use of this class is highly specialized and by not means meant to be
- * general purpose. Its use is restricted to those cases where the input
- * stream can be regarded as ascii just long enough to determine what the real
- * encoding should be.
- */
-
-public class ByteReader extends Reader {
-
-	public static final int DEFAULT_BUFFER_SIZE = CodedIO.MAX_BUF_SIZE;
-
-	protected byte[] fBuffer;
-
-	protected InputStream fInputStream;
-
-	protected ByteReader() {
-		super();
-	}
-
-	public ByteReader(InputStream inputStream) {
-		this(inputStream, DEFAULT_BUFFER_SIZE);
-		if (!inputStream.markSupported()) {
-			throw new IllegalArgumentException("ByteReader is required to have a resettable stream"); //$NON-NLS-1$
-		}
-	}
-
-	public ByteReader(InputStream inputStream, int size) {
-		fInputStream = inputStream;
-		if (!inputStream.markSupported()) {
-			throw new IllegalArgumentException("ByteReader is required to have a resettable stream"); //$NON-NLS-1$
-		}
-		fBuffer = new byte[size];
-
-	}
-
-	public void close() throws IOException {
-		fInputStream.close();
-	}
-
-	public void mark(int readAheadLimit) throws IOException {
-		fInputStream.mark(readAheadLimit);
-	}
-
-	public boolean markSupported() {
-		return true;
-	}
-
-	public int read() throws IOException {
-		int b0 = fInputStream.read();
-		return (b0 & 0x00FF);
-	}
-
-	public int read(char ch[], int offset, int length) throws IOException {
-		if (length > fBuffer.length) {
-			length = fBuffer.length;
-		}
-
-		int count = fInputStream.read(fBuffer, 0, length);
-
-		for (int i = 0; i < count; i++) {
-			int b0 = fBuffer[i];
-			// the 0x00FF is to "lose" the negative bits filled in the byte to
-			// int conversion
-			// (and which would be there if cast directly from byte to char).
-			char c0 = (char) (b0 & 0x00FF);
-			ch[offset + i] = c0;
-		}
-		return count;
-	}
-
-	public boolean ready() throws IOException {
-		return fInputStream.available() > 0;
-	}
-
-	public void reset() throws IOException {
-		fInputStream.reset();
-	}
-
-	public long skip(long n) throws IOException {
-		return fInputStream.skip(n);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/ContentDescriberForXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/ContentDescriberForXML.java
deleted file mode 100644
index cb9617f..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/ContentDescriberForXML.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.contenttype;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.content.IContentDescriber;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.ITextContentDescriber;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IContentDescriptionExtended;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-
-public final class ContentDescriberForXML implements ITextContentDescriber {
-	private final static QualifiedName[] SUPPORTED_OPTIONS = {IContentDescription.CHARSET, IContentDescription.BYTE_ORDER_MARK, IContentDescriptionExtended.DETECTED_CHARSET, IContentDescriptionExtended.UNSUPPORTED_CHARSET, IContentDescriptionExtended.APPROPRIATE_DEFAULT};
-	/**
-	 * <code>restrictedMode</code> is used just for testing/experiments.
-	 * 
-	 * If in restrictedMode, our "custom" contentType is seen as valid only in
-	 * cases that the platform's standard one does not cover.
-	 */
-	private boolean restrictedMode = true;
-	private XMLResourceEncodingDetector fResourceEncodingDetector;
-
-	private IResourceCharsetDetector getDetector() {
-		if (fResourceEncodingDetector == null) {
-			fResourceEncodingDetector = new XMLResourceEncodingDetector();
-		}
-		return fResourceEncodingDetector;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.content.IContentDescriber#describe(java.io.InputStream,
-	 *      org.eclipse.core.runtime.content.IContentDescription)
-	 */
-	public int describe(InputStream contents, IContentDescription description) throws IOException {
-		// for this special case, always assume invalid, unless
-		// our special circumstances are met.
-		int result = IContentDescriber.INVALID;
-
-		if (description == null) {
-			// purely request for validty
-			result = determineValidity(result, contents);
-		}
-		else {
-			result = calculateSupportedOptions(result, contents, description);
-		}
-		return result;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.content.ITextContentDescriber#describe(java.io.Reader,
-	 *      org.eclipse.core.runtime.content.IContentDescription)
-	 */
-	public int describe(Reader contents, IContentDescription description) throws IOException {
-		// for this special case, always assume invalid, unless
-		// our special circumstances are met.
-		int result = IContentDescriber.INVALID;
-
-		if (description == null) {
-			// purely request for validty
-			result = determineValidity(result, contents);
-		}
-		else {
-			result = calculateSupportedOptions(result, contents, description);
-		}
-		return result;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.content.IContentDescriber#getSupportedOptions()
-	 */
-	public QualifiedName[] getSupportedOptions() {
-
-		return SUPPORTED_OPTIONS;
-	}
-
-	private int calculateSupportedOptions(int result, InputStream contents, IContentDescription description) throws IOException {
-		int returnResult = result;
-		if (isRelevent(description)) {
-			IResourceCharsetDetector detector = getDetector();
-			contents.reset();
-			detector.set(contents);
-			returnResult = handleCalculations(result, description, detector);
-		}
-		return returnResult;
-	}
-
-	private int determineValidity(int result, InputStream contents) throws IOException {
-		int returnResult = result;
-		IResourceCharsetDetector detector = getDetector();
-		contents.reset();
-		detector.set(contents);
-		returnResult = determineValidity(detector, returnResult);
-		return returnResult;
-	}
-	private int determineValidity(int result, Reader contents) throws IOException {
-		int returnResult = result;
-		IResourceCharsetDetector detector = getDetector();
-		contents.reset();
-		detector.set(contents);
-		returnResult = determineValidity(detector, returnResult);
-		return returnResult;
-	}
-	/**
-	 * @param contents
-	 * @param description
-	 * @throws IOException
-	 */
-	private int calculateSupportedOptions(int result, Reader contents, IContentDescription description) throws IOException {
-		int returnResult = result;
-		if (isRelevent(description)) {
-			IResourceCharsetDetector detector = getDetector();
-			detector.set(contents);
-			returnResult = handleCalculations(result, description, detector);
-		}
-		return returnResult;
-	}
-
-	private void handleDetectedSpecialCase(IContentDescription description, Object detectedCharset, Object javaCharset) {
-		// since equal, we don't need to add, but if our detected version is
-		// different than
-		// javaCharset, then we should add it. This will happen, for example,
-		// if there's
-		// differences in case, or differences due to override properties
-		if (detectedCharset != null) {
-			// if (!detectedCharset.equals(javaCharset)) {
-			// description.setProperty(IContentDescriptionExtended.DETECTED_CHARSET,
-			// detectedCharset);
-			// }
-
-			// Once we detected a charset, we should set the property even
-			// though it's the same as javaCharset
-			// because there are clients that rely on this property to
-			// determine if the charset is actually detected in file or not.
-			description.setProperty(IContentDescriptionExtended.DETECTED_CHARSET, detectedCharset);
-		}
-	}
-
-	/**
-	 * @param description
-	 * @return
-	 */
-	private boolean isRelevent(IContentDescription description) {
-		boolean result = false;
-		if (description == null)
-			result = false;
-		else if (description.isRequested(IContentDescription.BYTE_ORDER_MARK))
-			result = true;
-		else if (description.isRequested(IContentDescription.CHARSET))
-			result = true;
-		else if (description.isRequested(IContentDescriptionExtended.APPROPRIATE_DEFAULT))
-			result = true;
-		else if (description.isRequested(IContentDescriptionExtended.DETECTED_CHARSET))
-			result = true;
-		else if (description.isRequested(IContentDescriptionExtended.UNSUPPORTED_CHARSET))
-			result = true;
-		return result;
-	}
-
-	/**
-	 * @param description
-	 * @param detector
-	 * @throws IOException
-	 */
-	private int handleCalculations(int result, IContentDescription description, IResourceCharsetDetector detector) throws IOException {
-		int returnResult = result;
-		EncodingMemento encodingMemento = ((XMLResourceEncodingDetector) detector).getEncodingMemento();
-		if (description != null) {
-			// TODO: I need to verify to see if this BOM work is always done
-			// by text type.
-			Object detectedByteOrderMark = encodingMemento.getUnicodeBOM();
-			if (detectedByteOrderMark != null) {
-				Object existingByteOrderMark = description.getProperty(IContentDescription.BYTE_ORDER_MARK);
-				// not sure why would ever be different, so if is different,
-				// may
-				// need to "push" up into base.
-				if (!detectedByteOrderMark.equals(existingByteOrderMark))
-					description.setProperty(IContentDescription.BYTE_ORDER_MARK, detectedByteOrderMark);
-			}
-
-
-			if (!encodingMemento.isValid()) {
-				// note: after setting here, its the mere presence of
-				// IContentDescriptionExtended.UNSUPPORTED_CHARSET
-				// in the resource's description that can be used to determine
-				// if invalid in those cases, the "detected" property contains
-				// an "appropriate default" to use.
-				description.setProperty(IContentDescriptionExtended.UNSUPPORTED_CHARSET, encodingMemento.getInvalidEncoding());
-				description.setProperty(IContentDescriptionExtended.APPROPRIATE_DEFAULT, encodingMemento.getAppropriateDefault());
-			}
-
-			Object detectedCharset = encodingMemento.getDetectedCharsetName();
-			Object javaCharset = encodingMemento.getJavaCharsetName();
-
-			// we always include detected, if its different than java
-			handleDetectedSpecialCase(description, detectedCharset, javaCharset);
-
-			if (javaCharset != null) {
-				Object existingCharset = description.getProperty(IContentDescription.CHARSET);
-				if (javaCharset.equals(existingCharset)) {
-					handleDetectedSpecialCase(description, detectedCharset, javaCharset);
-				}
-				else {
-					// we may need to add what we found, but only need to add
-					// if different from the default
-					Object defaultCharset = getDetector().getSpecDefaultEncoding();
-					if (defaultCharset != null) {
-						if (!defaultCharset.equals(javaCharset)) {
-							description.setProperty(IContentDescription.CHARSET, javaCharset);
-						}
-					}
-					else {
-						// assuming if there is no spec default, we always
-						// need to add.
-						// TODO: this is probably a dead branch in current
-						// code, should re-examine for removal.
-						description.setProperty(IContentDescription.CHARSET, javaCharset);
-					}
-				}
-			}
-		}
-
-		returnResult = determineValidity(detector, returnResult);
-		return returnResult;
-	}
-
-	private int determineValidity(IResourceCharsetDetector detector, int returnResult) {
-		// we always expect XMLResourceEncodingDetector, but just to make safe
-		// cast.
-		if (detector instanceof XMLResourceEncodingDetector) {
-			XMLResourceEncodingDetector xmlResourceDetector = (XMLResourceEncodingDetector) detector;
-			if (xmlResourceDetector.isDeclDetected()) {
-				if (restrictedMode) {
-					// if there is no initial whitespace, then platform's
-					// default one will do.
-					if (xmlResourceDetector.hasInitialWhiteSpace()) {
-						returnResult = IContentDescriber.VALID;
-					}
-				}
-				else {
-					returnResult = IContentDescriber.VALID;
-				}
-			}
-		}
-		return returnResult;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/EncodingParserConstants.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/EncodingParserConstants.java
deleted file mode 100644
index 9a002b7..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/EncodingParserConstants.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.contenttype;
-
-
-public interface EncodingParserConstants {
-
-	final String EOF = "EOF"; //$NON-NLS-1$
-	final String InvalidTerminatedStringValue = "InvalidTerminatedStringValue"; //$NON-NLS-1$
-	final String InvalidTermintatedUnDelimitedStringValue = "InvalidTermintatedUnDelimitedStringValue"; //$NON-NLS-1$
-	final String MAX_CHARS_REACHED = "MAX_CHARS_REACHED"; //$NON-NLS-1$
-	final String StringValue = "strval"; //$NON-NLS-1$
-	final String UnDelimitedStringValue = "UnDelimitedStringValue"; //$NON-NLS-1$
-	public final String UTF16BE = "UTF16BE"; //$NON-NLS-1$
-	public final String UTF16LE = "UTF16LE"; //$NON-NLS-1$
-
-
-	public final String UTF83ByteBOM = "UTF83ByteBOM"; //$NON-NLS-1$
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/HeadParserToken.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/HeadParserToken.java
deleted file mode 100644
index 0f14b8b..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/HeadParserToken.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.contenttype;
-
-public class HeadParserToken {
-	private int fStart;
-
-	private String fText;
-	private String fType;
-
-	protected HeadParserToken() {
-		super();
-	}
-
-	public HeadParserToken(String type, int start, String text) {
-		this();
-		fType = type;
-		fStart = start;
-		fText = text;
-
-	}
-
-	public String getText() {
-		return fText;
-	}
-
-	public String getType() {
-		return fType;
-	}
-
-	public String toString() {
-		return ("text: " + fText + " offset: " + fStart + " type: " + fType); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/IntStack.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/IntStack.java
deleted file mode 100644
index 1d1052d..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/IntStack.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.contenttype;
-
-/*
- * 
- * A non-resizable class implementing the behavior of java.util.Stack, but
- * directly for the <code> integer </code> primitive.
- */
-import java.util.EmptyStackException;
-
-public class IntStack {
-	private int[] list = null;
-
-	private int size = 0;
-
-	public IntStack() {
-		this(100);
-	}
-
-	public IntStack(int maxdepth) {
-		super();
-		list = new int[maxdepth];
-		initialize();
-	}
-
-	public void clear() {
-		initialize();
-	}
-
-	public boolean empty() {
-		return size == 0;
-	}
-
-	public int get(int slot) {
-		return list[slot];
-	}
-
-	private void initialize() {
-		for (int i = 0; i < list.length; i++)
-			list[i] = -1;
-	}
-
-	/**
-	 * Returns the int at the top of the stack without removing it
-	 * 
-	 * @return int at the top of this stack.
-	 * @exception EmptyStackException
-	 *                when empty.
-	 */
-	public int peek() {
-		if (size == 0)
-			throw new EmptyStackException();
-		return list[size - 1];
-	}
-
-	/**
-	 * Removes and returns the int at the top of the stack
-	 * 
-	 * @return int at the top of this stack.
-	 * @exception EmptyStackException
-	 *                when empty.
-	 */
-	public int pop() {
-		int value = peek();
-		list[size - 1] = -1;
-		size--;
-		return value;
-	}
-
-	/**
-	 * Pushes an item onto the top of this stack.
-	 * 
-	 * @param newValue -
-	 *            the int to be pushed onto this stack.
-	 * @return the <code>newValue</code> argument.
-	 */
-	public int push(int newValue) {
-		if (size == list.length) {
-			throw new StackOverflowError();
-		}
-		list[size++] = newValue;
-		return newValue;
-	}
-
-	public int size() {
-		return list.length;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/NullMemento.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/NullMemento.java
deleted file mode 100644
index bc47024..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/NullMemento.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.contenttype;
-
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.NonContentBasedEncodingRules;
-
-
-
-/**
- * This class can be used in place of an EncodingMemento (its super class),
- * when there is not in fact ANY encoding information. For example, when a
- * structuredDocument is created directly from a String
- */
-public class NullMemento extends EncodingMemento {
-	/**
-	 *  
-	 */
-	public NullMemento() {
-		super();
-		String defaultCharset = NonContentBasedEncodingRules.useDefaultNameRules(null);
-		setJavaCharsetName(defaultCharset);
-		setAppropriateDefault(defaultCharset);
-		setDetectedCharsetName(null);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/XMLDeclDetector.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/XMLDeclDetector.java
deleted file mode 100644
index 20ab286..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/XMLDeclDetector.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.contenttype;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-
-public class XMLDeclDetector {
-	private static final int MAX_BUF_SIZE = 1024 * 8;
-	private static final int MAX_MARK_SIZE = 1024 * 8;
-	protected boolean fHeaderParsed;
-	private boolean fIsXML;
-	protected Reader fReader;
-	//private boolean DEBUG = false;
-	private XMLHeadTokenizer fTokenizer;
-
-	private boolean canHandleAsUnicodeStream(String tokenType) {
-		boolean canHandleAsUnicodeStream = false;
-		if (tokenType == EncodingParserConstants.UTF83ByteBOM) {
-			canHandleAsUnicodeStream = true;
-			//fUnicode = "UTF-8"; //$NON-NLS-1$
-		} else if (tokenType == EncodingParserConstants.UTF16BE) {
-			canHandleAsUnicodeStream = true;
-			//fUnicode = "UTF-16BE"; //$NON-NLS-1$
-		} else if (tokenType == EncodingParserConstants.UTF16LE) {
-			canHandleAsUnicodeStream = true;
-			//fUnicode = "UTF-16"; //$NON-NLS-1$
-		}
-		return canHandleAsUnicodeStream;
-	}
-
-	final private void ensureInputSet() {
-		if (fReader == null) {
-			throw new IllegalStateException("input must be set before use"); //$NON-NLS-1$
-		}
-	}
-
-	//private String fUnicode;
-
-	/**
-	 * @return Returns the tokenizer.
-	 */
-	private XMLHeadTokenizer getTokenizer() {
-		if (fTokenizer == null) {
-			fTokenizer = new XMLHeadTokenizer();
-		}
-		return fTokenizer;
-	}
-
-	/**
-	 * @return Returns the isXML.
-	 */
-	public boolean isXML() throws IOException {
-		ensureInputSet();
-		if (!fHeaderParsed) {
-			parseInput();
-		}
-		return fIsXML;
-	}
-
-	private void parseInput() throws IOException {
-		XMLHeadTokenizer tokenizer = getTokenizer();
-		tokenizer.reset(fReader);
-		HeadParserToken token = null;
-		String tokenType = null;
-		do {
-			token = tokenizer.getNextToken();
-			tokenType = token.getType();
-			if (canHandleAsUnicodeStream(tokenType)) {
-				fReader.reset();
-				// this is (obviously) not always true.
-				// TODO: need to fix so we "remember" original iFile or
-				// inputstream, and
-				// create appropriate InputStreamReader.
-				// I'm not sure what to do for the set(reader) case ... if its
-				// even relevent.
-				// plus, ensure against infinite loops!
-				fIsXML = true;
-				//fReader = new InputStreamReader(fReader, fUnicode);
-				// parseInput();
-			} else {
-				if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) {
-					fIsXML = true;
-				}
-			}
-		} while (tokenizer.hasMoreTokens());
-
-	}
-
-	private void resetAll() {
-		fReader = null;
-		fHeaderParsed = false;
-		fIsXML = false;
-		//fUnicode = null;
-
-	}
-
-	public void set(IFile iFile) throws CoreException {
-		resetAll();
-		InputStream inputStream = iFile.getContents(true);
-		InputStream resettableStream = new BufferedInputStream(inputStream, MAX_BUF_SIZE);
-		resettableStream.mark(MAX_MARK_SIZE);
-		set(resettableStream);
-	}
-
-	public void set(InputStream inputStream) {
-		resetAll();
-		fReader = new ByteReader(inputStream);
-		try {
-			fReader.mark(MAX_MARK_SIZE);
-		} catch (IOException e) {
-			// impossible, since we know ByteReader supports marking
-			throw new Error(e);
-		}
-	}
-
-	/**
-	 * Note: this is not part of interface to help avoid confusion ... it
-	 * expected this Reader is a well formed character reader ... that is, its
-	 * all ready been determined to not be a unicode marked input stream. And,
-	 * its assumed to be in the correct position, at position zero, ready to
-	 * read first character.
-	 */
-	public void set(Reader reader) {
-		resetAll();
-		fReader = reader;
-		if (!fReader.markSupported()) {
-			fReader = new BufferedReader(fReader);
-		}
-
-		try {
-			fReader.mark(MAX_MARK_SIZE);
-		} catch (IOException e) {
-			// impossble, since we just checked if markable
-			throw new Error(e);
-		}
-
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/XMLHeadTokenizer.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/XMLHeadTokenizer.java
deleted file mode 100644
index 3eab68b..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/XMLHeadTokenizer.java
+++ /dev/null
@@ -1,1033 +0,0 @@
-/* The following code was generated by JFlex 1.4 on 7/5/05 1:19 AM */
-
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*nlsXXX*/
-package org.eclipse.wst.xml.core.internal.contenttype;
-import java.io.IOException;
-import java.io.Reader;
-
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
-
-
-
-/**
- * This class is a scanner generated by 
- * <a href="http://www.jflex.de/">JFlex</a> 1.4
- * on 7/5/05 1:19 AM from the specification file
- * <tt>D:/builds/Workspaces/PureHeadWTP_M7/org.eclipse.wst.xml.core/DevTimeSupport/HeadParsers/XMLHeadTokenizer.jFlex</tt>
- */
-public class XMLHeadTokenizer {
-
-  /** This character denotes the end of file */
-  public static final int YYEOF = -1;
-
-  /** initial size of the lookahead buffer */
-  private static final int ZZ_BUFFERSIZE = 8192;
-
-  /** lexical states */
-  public static final int YYINITIAL = 0;
-  public static final int UnDelimitedString = 10;
-  public static final int DQ_STRING = 6;
-  public static final int SQ_STRING = 8;
-  public static final int ST_XMLDecl = 2;
-  public static final int QuotedAttributeValue = 4;
-
-  /**
-   * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-   * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-   *                  at the beginning of a line
-   * l is of the form l = 2*k, k a non negative integer
-   */
-  private static final int ZZ_LEXSTATE[] = { 
-     0,  1,  2,  2,  3,  3,  4,  4,  5,  5,  6, 6
-  };
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final String ZZ_CMAP_PACKED = 
-    "\11\0\1\6\1\11\2\0\1\10\22\0\1\6\1\0\1\32\2\0"+
-    "\1\34\1\0\1\33\24\0\1\12\1\7\1\31\1\13\3\0\1\26"+
-    "\1\27\1\20\1\0\1\30\1\0\1\23\2\0\1\16\1\15\1\25"+
-    "\1\24\2\0\1\21\1\22\2\0\1\17\1\0\1\14\12\0\1\26"+
-    "\1\27\1\20\1\0\1\30\1\0\1\23\2\0\1\16\1\15\1\25"+
-    "\1\24\2\0\1\21\1\22\2\0\1\17\1\0\1\14\102\0\1\4"+
-    "\3\0\1\5\17\0\1\3\16\0\1\1\20\0\1\3\16\0\1\1"+
-    "\1\2\170\0\1\2\ufe87\0";
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
-
-  /** 
-   * Translates DFA states to action switch labels.
-   */
-  private static final int [] ZZ_ACTION = zzUnpackAction();
-
-  private static final String ZZ_ACTION_PACKED_0 =
-    "\7\0\11\1\2\2\1\1\1\3\1\4\1\5\1\6"+
-    "\1\5\1\7\1\5\1\7\1\5\1\10\2\11\1\12"+
-    "\1\13\4\0\1\14\3\0\1\15\1\0\1\16\1\17"+
-    "\11\0\1\20\4\0\1\21\1\0\1\22";
-
-  private static int [] zzUnpackAction() {
-    int [] result = new int[62];
-    int offset = 0;
-    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAction(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-
-  /* error codes */
-  private static final int ZZ_UNKNOWN_ERROR = 0;
-  private static final int ZZ_NO_MATCH = 1;
-  private static final int ZZ_PUSHBACK_2BIG = 2;
-
-  /* error messages for the codes above */
-  private static final String ZZ_ERROR_MSG[] = {
-    "Unkown internal scanner error",
-    "Error: could not match input",
-    "Error: pushback value was too large"
-  };
-
-  /** the input device */
-  private java.io.Reader zzReader;
-
-  /** the current state of the DFA */
-  private int zzState;
-
-  /** the current lexical state */
-  private int zzLexicalState = YYINITIAL;
-
-  /** this buffer contains the current text to be matched and is
-      the source of the yytext() string */
-  private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
-
-  /** the textposition at the last accepting state */
-  private int zzMarkedPos;
-
-  /** the textposition at the last state to be included in yytext */
-  private int zzPushbackPos;
-
-  /** the current text position in the buffer */
-  private int zzCurrentPos;
-
-  /** startRead marks the beginning of the yytext() string in the buffer */
-  private int zzStartRead;
-
-  /** endRead marks the last character in the buffer, that has been read
-      from input */
-  private int zzEndRead;
-
-  /** number of newlines encountered up to the start of the matched text */
-//  private int yyline;
-
-  /** the number of characters up to the start of the matched text */
-  private int yychar;
-
-  /**
-   * the number of characters from the last newline up to the start of the 
-   * matched text
-   */
-//  private int yycolumn;
-
-  /** 
-   * zzAtBOL == true <=> the scanner is currently at the beginning of a line
-   */
-  private boolean zzAtBOL = true;
-
-  /** zzAtEOF == true <=> the scanner is at the EOF */
-  private boolean zzAtEOF;
-
-  /** denotes if the user-EOF-code has already been executed */
-  private boolean zzEOFDone;
-
-  /* user code: */
-
-
-	private boolean hasMore = true;
-	private final static int MAX_TO_SCAN = 8000;
-	StringBuffer string = new StringBuffer();
-	// state stack for easier state handling
-	private IntStack fStateStack = new IntStack();
-	private String valueText = null;
-
-
-	public XMLHeadTokenizer() {
-		super();
-	}
-
-	  public void reset (Reader in) {
-                /* the input device */
-                zzReader = in;
-
-                /* the current state of the DFA */
-                zzState = 0;
-
-                /* the current lexical state */
-                zzLexicalState = YYINITIAL;
-
-                /* this buffer contains the current text to be matched and is
-                 the source of the yytext() string */
-                java.util.Arrays.fill(zzBuffer, (char)0);
-
-                /* the textposition at the last accepting state */
-                zzMarkedPos = 0;
-
-                /* the textposition at the last state to be included in yytext */
-                zzPushbackPos = 0;
-
-                /* the current text position in the buffer */
-                zzCurrentPos = 0;
-
-                /* startRead marks the beginning of the yytext() string in the buffer */
-                zzStartRead = 0;
-
-                /**
-                 * endRead marks the last character in the buffer, that has been read
-                 * from input
-                 */
-                zzEndRead = 0;
-
-                /* number of newlines encountered up to the start of the matched text */
-//                yyline = 0;
-
-                /* the number of characters up to the start of the matched text */
-                yychar = 0;
-
-                /**
-                 * the number of characters from the last newline up to the start
-                 * of the matched text
-                 */
-//                yycolumn = 0;
-
-                /**
-                 * yy_atBOL == true <=> the scanner is currently at the beginning
-                 * of a line
-                 */
-                zzAtBOL = true;
-
-                /* yy_atEOF == true <=> the scanner has returned a value for EOF */
-                zzAtEOF = false;
-
-                /* denotes if the user-EOF-code has already been executed */
-                zzEOFDone = false;
-
-
-                fStateStack.clear();
-
-                hasMore = true;
-  		
-  	}
-
-
-	public final HeadParserToken getNextToken() throws IOException {
-		String context = null;
-		context = primGetNextToken();
-		HeadParserToken result = null;
-		if (valueText != null) {
-			result = createToken(context, yychar, valueText);
-			valueText = null;
-		} else {
-			result = createToken(context, yychar, yytext());
-		}
-		return result;
-	}
-
-	public final boolean hasMoreTokens() {
-		return hasMore && yychar < MAX_TO_SCAN;
-	}
-	private void pushCurrentState() {
-		fStateStack.push(yystate());
-
-	}
-
-	private void popState() {
-		yybegin(fStateStack.pop());
-	}
-	
-	private HeadParserToken createToken(String context, int start, String text) {
-		return new HeadParserToken(context, start, text);
-	}	
-
-
-
-  /**
-   * Creates a new scanner
-   * There is also a java.io.InputStream version of this constructor.
-   *
-   * @param   in  the java.io.Reader to read input from.
-   */
-  public XMLHeadTokenizer(java.io.Reader in) {
-    this.zzReader = in;
-  }
-
-  /**
-   * Creates a new scanner.
-   * There is also java.io.Reader version of this constructor.
-   *
-   * @param   in  the java.io.Inputstream to read input from.
-   */
-  public XMLHeadTokenizer(java.io.InputStream in) {
-    this(new java.io.InputStreamReader(in));
-  }
-
-  /** 
-   * Unpacks the compressed character translation table.
-   *
-   * @param packed   the packed character translation table
-   * @return         the unpacked character translation table
-   */
-  private static char [] zzUnpackCMap(String packed) {
-    char [] map = new char[0x10000];
-    int i = 0;  /* index in packed string  */
-    int j = 0;  /* index in unpacked array */
-    while (i < 148) {
-      int  count = packed.charAt(i++);
-      char value = packed.charAt(i++);
-      do map[j++] = value; while (--count > 0);
-    }
-    return map;
-  }
-
-
-  /**
-   * Refills the input buffer.
-   *
-   * @return      <code>false</code>, iff there was new input.
-   * 
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  private boolean zzRefill() throws java.io.IOException {
-
-    /* first: make room (if you can) */
-    if (zzStartRead > 0) {
-      System.arraycopy(zzBuffer, zzStartRead,
-                       zzBuffer, 0,
-                       zzEndRead-zzStartRead);
-
-      /* translate stored positions */
-      zzEndRead-= zzStartRead;
-      zzCurrentPos-= zzStartRead;
-      zzMarkedPos-= zzStartRead;
-      zzPushbackPos-= zzStartRead;
-      zzStartRead = 0;
-    }
-
-    /* is the buffer big enough? */
-    if (zzCurrentPos >= zzBuffer.length) {
-      /* if not: blow it up */
-      char newBuffer[] = new char[zzCurrentPos*2];
-      System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length);
-      zzBuffer = newBuffer;
-    }
-
-    /* finally: fill the buffer with new input */
-    int numRead = zzReader.read(zzBuffer, zzEndRead,
-                                            zzBuffer.length-zzEndRead);
-
-    if (numRead < 0) {
-      return true;
-    }
-    else {
-      zzEndRead+= numRead;
-      return false;
-    }
-  }
-
-    
-  /**
-   * Closes the input stream.
-   */
-  public final void yyclose() throws java.io.IOException {
-    zzAtEOF = true;            /* indicate end of file */
-    zzEndRead = zzStartRead;  /* invalidate buffer    */
-
-    if (zzReader != null)
-      zzReader.close();
-  }
-
-
-  /**
-   * Resets the scanner to read from a new input stream.
-   * Does not close the old reader.
-   *
-   * All internal variables are reset, the old input stream 
-   * <b>cannot</b> be reused (internal buffer is discarded and lost).
-   * Lexical state is set to <tt>ZZ_INITIAL</tt>.
-   *
-   * @param reader   the new input stream 
-   */
-  public final void yyreset(java.io.Reader reader) {
-    zzReader = reader;
-    zzAtBOL  = true;
-    zzAtEOF  = false;
-    zzEndRead = zzStartRead = 0;
-    zzCurrentPos = zzMarkedPos = zzPushbackPos = 0;
-    yychar = 0;
-    zzLexicalState = YYINITIAL;
-  }
-
-
-  /**
-   * Returns the current lexical state.
-   */
-  public final int yystate() {
-    return zzLexicalState;
-  }
-
-
-  /**
-   * Enters a new lexical state
-   *
-   * @param newState the new lexical state
-   */
-  public final void yybegin(int newState) {
-    zzLexicalState = newState;
-  }
-
-
-  /**
-   * Returns the text matched by the current regular expression.
-   */
-  public final String yytext() {
-    return new String( zzBuffer, zzStartRead, zzMarkedPos-zzStartRead );
-  }
-
-
-  /**
-   * Returns the character at position <tt>pos</tt> from the 
-   * matched text. 
-   * 
-   * It is equivalent to yytext().charAt(pos), but faster
-   *
-   * @param pos the position of the character to fetch. 
-   *            A value from 0 to yylength()-1.
-   *
-   * @return the character at position pos
-   */
-  public final char yycharat(int pos) {
-    return zzBuffer[zzStartRead+pos];
-  }
-
-
-  /**
-   * Returns the length of the matched text region.
-   */
-  public final int yylength() {
-    return zzMarkedPos-zzStartRead;
-  }
-
-
-  /**
-   * Reports an error that occured while scanning.
-   *
-   * In a wellformed scanner (no or only correct usage of 
-   * yypushback(int) and a match-all fallback rule) this method 
-   * will only be called with things that "Can't Possibly Happen".
-   * If this method is called, something is seriously wrong
-   * (e.g. a JFlex bug producing a faulty scanner etc.).
-   *
-   * Usual syntax/scanner level error handling should be done
-   * in error fallback rules.
-   *
-   * @param   errorCode  the code of the errormessage to display
-   */
-  private void zzScanError(int errorCode) {
-    String message;
-    try {
-      message = ZZ_ERROR_MSG[errorCode];
-    }
-    catch (ArrayIndexOutOfBoundsException e) {
-      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
-    }
-
-    throw new Error(message);
-  } 
-
-
-  /**
-   * Pushes the specified amount of characters back into the input stream.
-   *
-   * They will be read again by then next call of the scanning method
-   *
-   * @param number  the number of characters to be read again.
-   *                This number must not be greater than yylength()!
-   */
-  public void yypushback(int number)  {
-    if ( number > yylength() )
-      zzScanError(ZZ_PUSHBACK_2BIG);
-
-    zzMarkedPos -= number;
-  }
-
-
-  /**
-   * Contains user EOF-code, which will be executed exactly once,
-   * when the end of file is reached
-   */
-  private void zzDoEOF() {
-    if (!zzEOFDone) {
-      zzEOFDone = true;
-    	hasMore=false;
-
-    }
-  }
-
-
-  /**
-   * Resumes scanning until the next regular expression is matched,
-   * the end of input is encountered or an I/O-Error occurs.
-   *
-   * @return      the next token
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  public String primGetNextToken() throws java.io.IOException {
-    int zzInput;
-    int zzAction;
-
-    // cached fields:
-    int zzCurrentPosL;
-    int zzMarkedPosL;
-    int zzEndReadL = zzEndRead;
-    char [] zzBufferL = zzBuffer;
-    char [] zzCMapL = ZZ_CMAP;
-
-
-    while (true) {
-      zzMarkedPosL = zzMarkedPos;
-
-      yychar+= zzMarkedPosL-zzStartRead;
-
-      if (zzMarkedPosL > zzStartRead) {
-        switch (zzBufferL[zzMarkedPosL-1]) {
-        case '\n':
-        case '\u000B':
-        case '\u000C':
-        case '\u0085':
-        case '\u2028':
-        case '\u2029':
-          zzAtBOL = true;
-          break;
-        case '\r': 
-          if (zzMarkedPosL < zzEndReadL)
-            zzAtBOL = zzBufferL[zzMarkedPosL] != '\n';
-          else if (zzAtEOF)
-            zzAtBOL = false;
-          else {
-            boolean eof = zzRefill();
-            zzMarkedPosL = zzMarkedPos;
-            zzBufferL = zzBuffer;
-            if (eof) 
-              zzAtBOL = false;
-            else 
-              zzAtBOL = zzBufferL[zzMarkedPosL] != '\n';
-          }
-          break;
-        default:
-          zzAtBOL = false;
-        }
-      }
-      zzAction = -1;
-
-      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
-  
-      if (zzAtBOL)
-        zzState = ZZ_LEXSTATE[zzLexicalState+1];
-      else
-        zzState = ZZ_LEXSTATE[zzLexicalState];
-
-
-      zzForAction: {
-        while (true) {
-    
-          if (zzCurrentPosL < zzEndReadL)
-            zzInput = zzBufferL[zzCurrentPosL++];
-          else if (zzAtEOF) {
-            zzInput = YYEOF;
-            break zzForAction;
-          }
-          else {
-            // store back cached positions
-            zzCurrentPos  = zzCurrentPosL;
-            zzMarkedPos   = zzMarkedPosL;
-            boolean eof = zzRefill();
-            // get translated positions and possibly new buffer
-            zzCurrentPosL  = zzCurrentPos;
-            zzMarkedPosL   = zzMarkedPos;
-            zzBufferL      = zzBuffer;
-            zzEndReadL     = zzEndRead;
-            if (eof) {
-              zzInput = YYEOF;
-              break zzForAction;
-            }
-            else {
-              zzInput = zzBufferL[zzCurrentPosL++];
-            }
-          }
-          zzInput = zzCMapL[zzInput];
-
-          boolean zzIsFinal = false;
-          boolean zzNoLookAhead = false;
-
-          zzForNext: { switch (zzState) {
-            case 0:
-              switch (zzInput) {
-                default: zzIsFinal = true; zzNoLookAhead = true; zzState = 7; break zzForNext;
-              }
-
-            case 1:
-              switch (zzInput) {
-                case 1: zzIsFinal = true; zzState = 8; break zzForNext;
-                case 2: zzIsFinal = true; zzState = 9; break zzForNext;
-                case 3: zzIsFinal = true; zzState = 10; break zzForNext;
-                case 6: 
-                case 8: 
-                case 9: zzIsFinal = true; zzState = 11; break zzForNext;
-                case 10: zzIsFinal = true; zzState = 12; break zzForNext;
-                default: zzIsFinal = true; zzNoLookAhead = true; zzState = 7; break zzForNext;
-              }
-
-            case 2:
-              switch (zzInput) {
-                case 11: zzIsFinal = true; zzState = 13; break zzForNext;
-                case 15: zzIsFinal = true; zzState = 14; break zzForNext;
-                case 16: zzIsFinal = true; zzState = 15; break zzForNext;
-                default: zzIsFinal = true; zzNoLookAhead = true; zzState = 7; break zzForNext;
-              }
-
-            case 3:
-              switch (zzInput) {
-                case 6: 
-                case 8: zzIsFinal = true; zzState = 17; break zzForNext;
-                case 9: zzIsFinal = true; zzState = 18; break zzForNext;
-                case 26: zzIsFinal = true; zzNoLookAhead = true; zzState = 19; break zzForNext;
-                case 27: zzIsFinal = true; zzNoLookAhead = true; zzState = 20; break zzForNext;
-                default: zzIsFinal = true; zzNoLookAhead = true; zzState = 16; break zzForNext;
-              }
-
-            case 4:
-              switch (zzInput) {
-                case 8: 
-                case 9: zzIsFinal = true; zzNoLookAhead = true; zzState = 22; break zzForNext;
-                case 11: zzIsFinal = true; zzState = 23; break zzForNext;
-                case 26: zzIsFinal = true; zzNoLookAhead = true; zzState = 24; break zzForNext;
-                case 27: zzIsFinal = true; zzState = 25; break zzForNext;
-                default: zzIsFinal = true; zzNoLookAhead = true; zzState = 21; break zzForNext;
-              }
-
-            case 5:
-              switch (zzInput) {
-                case 8: 
-                case 9: zzIsFinal = true; zzNoLookAhead = true; zzState = 22; break zzForNext;
-                case 27: zzIsFinal = true; zzState = 26; break zzForNext;
-                case 28: zzIsFinal = true; zzState = 27; break zzForNext;
-                default: zzIsFinal = true; zzNoLookAhead = true; zzState = 21; break zzForNext;
-              }
-
-            case 6:
-              switch (zzInput) {
-                case 11: zzIsFinal = true; zzState = 27; break zzForNext;
-                case 6: 
-                case 8: 
-                case 9: zzIsFinal = true; zzNoLookAhead = true; zzState = 28; break zzForNext;
-                case 26: zzIsFinal = true; zzNoLookAhead = true; zzState = 29; break zzForNext;
-                case 27: zzIsFinal = true; zzState = 30; break zzForNext;
-                default: zzIsFinal = true; zzNoLookAhead = true; zzState = 21; break zzForNext;
-              }
-
-            case 8:
-              switch (zzInput) {
-                case 2: zzIsFinal = true; zzNoLookAhead = true; zzState = 31; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 9:
-              switch (zzInput) {
-                case 1: zzIsFinal = true; zzNoLookAhead = true; zzState = 32; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 10:
-              switch (zzInput) {
-                case 4: zzState = 33; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 11:
-              switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: zzState = 34; break zzForNext;
-                case 10: zzState = 35; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 12:
-              switch (zzInput) {
-                case 11: zzState = 36; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 13:
-              switch (zzInput) {
-                case 25: zzIsFinal = true; zzNoLookAhead = true; zzState = 37; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 14:
-              switch (zzInput) {
-                case 16: zzState = 38; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 15:
-              switch (zzInput) {
-                case 21: zzState = 39; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 17:
-              switch (zzInput) {
-                case 6: 
-                case 8: zzIsFinal = true; zzState = 17; break zzForNext;
-                case 9: zzState = 40; break zzForNext;
-                default: zzIsFinal = true; zzNoLookAhead = true; zzState = 16; break zzForNext;
-              }
-
-            case 18:
-              switch (zzInput) {
-                case 6: 
-                case 8: zzIsFinal = true; zzState = 17; break zzForNext;
-                case 9: zzState = 40; break zzForNext;
-                default: zzIsFinal = true; zzNoLookAhead = true; zzState = 16; break zzForNext;
-              }
-
-            case 23:
-              switch (zzInput) {
-                case 25: zzIsFinal = true; zzNoLookAhead = true; zzState = 41; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 25:
-              switch (zzInput) {
-                case 10: zzState = 42; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 26:
-              switch (zzInput) {
-                case 10: zzState = 42; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 27:
-              switch (zzInput) {
-                case 25: zzIsFinal = true; zzNoLookAhead = true; zzState = 43; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 30:
-              switch (zzInput) {
-                case 10: zzState = 42; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 33:
-              switch (zzInput) {
-                case 5: zzIsFinal = true; zzNoLookAhead = true; zzState = 44; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 34:
-              switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: zzState = 34; break zzForNext;
-                case 10: zzState = 35; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 35:
-              switch (zzInput) {
-                case 11: zzState = 36; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 36:
-              switch (zzInput) {
-                case 12: zzState = 45; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 38:
-              switch (zzInput) {
-                case 17: zzState = 46; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 39:
-              switch (zzInput) {
-                case 22: zzState = 47; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 40:
-              switch (zzInput) {
-                case 6: 
-                case 8: zzIsFinal = true; zzState = 17; break zzForNext;
-                case 9: zzState = 40; break zzForNext;
-                default: zzIsFinal = true; zzNoLookAhead = true; zzState = 16; break zzForNext;
-              }
-
-            case 42:
-              switch (zzInput) {
-                case 27: zzIsFinal = true; zzNoLookAhead = true; zzState = 22; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 45:
-              switch (zzInput) {
-                case 13: zzState = 48; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 46:
-              switch (zzInput) {
-                case 18: zzState = 49; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 47:
-              switch (zzInput) {
-                case 20: zzState = 50; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 48:
-              switch (zzInput) {
-                case 14: zzState = 51; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 49:
-              switch (zzInput) {
-                case 19: zzState = 52; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 50:
-              switch (zzInput) {
-                case 23: zzState = 53; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 51:
-              switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: zzIsFinal = true; zzState = 54; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 52:
-              switch (zzInput) {
-                case 20: zzState = 55; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 53:
-              switch (zzInput) {
-                case 19: zzState = 56; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 54:
-              switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: zzIsFinal = true; zzState = 54; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 55:
-              switch (zzInput) {
-                case 21: zzState = 57; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 56:
-              switch (zzInput) {
-                case 21: zzState = 58; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 57:
-              switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: zzState = 57; break zzForNext;
-                case 7: zzIsFinal = true; zzState = 59; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 58:
-              switch (zzInput) {
-                case 24: zzState = 60; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 59:
-              switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: zzIsFinal = true; zzState = 59; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 60:
-              switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: zzState = 60; break zzForNext;
-                case 7: zzIsFinal = true; zzState = 61; break zzForNext;
-                default: break zzForAction;
-              }
-
-            case 61:
-              switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: zzIsFinal = true; zzState = 61; break zzForNext;
-                default: break zzForAction;
-              }
-
-            default:
-              // if this is ever reached, there is a serious bug in JFlex
-              zzScanError(ZZ_UNKNOWN_ERROR);
-              break;
-          } }
-
-          if ( zzIsFinal ) {
-            zzAction = zzState;
-            zzMarkedPosL = zzCurrentPosL;
-            if ( zzNoLookAhead ) break zzForAction;
-          }
-
-        }
-      }
-
-      // store back cached position
-      zzMarkedPos = zzMarkedPosL;
-
-      switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
-        case 10: 
-          { if (yychar == 0 ) {hasMore = false; return EncodingParserConstants.UTF16BE;}
-          }
-        case 19: break;
-        case 15: 
-          { if (yychar == 0 ) {hasMore = false; return EncodingParserConstants.UTF83ByteBOM;}
-          }
-        case 20: break;
-        case 4: 
-          { yybegin(SQ_STRING); string.setLength(0);
-          }
-        case 21: break;
-        case 5: 
-          { string.append( yytext() );
-          }
-        case 22: break;
-        case 1: 
-          { if (yychar > MAX_TO_SCAN) {hasMore=false; return EncodingParserConstants.MAX_CHARS_REACHED;}
-          }
-        case 23: break;
-        case 11: 
-          { if (yychar == 0 ) {hasMore = false; return EncodingParserConstants.UTF16LE;}
-          }
-        case 24: break;
-        case 6: 
-          { yypushback(1);popState(); valueText = string.toString(); return EncodingParserConstants.InvalidTerminatedStringValue;
-          }
-        case 25: break;
-        case 8: 
-          { yypushback(1);popState(); valueText = string.toString(); return EncodingParserConstants.UnDelimitedStringValue;
-          }
-        case 26: break;
-        case 9: 
-          { yypushback(1);popState(); valueText = string.toString(); return EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue;
-          }
-        case 27: break;
-        case 7: 
-          { popState(); valueText = string.toString(); return EncodingParserConstants.StringValue;
-          }
-        case 28: break;
-        case 13: 
-          { yypushback(2); popState(); valueText = string.toString(); return EncodingParserConstants.InvalidTerminatedStringValue;
-          }
-        case 29: break;
-        case 16: 
-          { if (yychar == 0 ) {yybegin(ST_XMLDecl); return XMLHeadTokenizerConstants.XMLDeclStart;}
-          }
-        case 30: break;
-        case 2: 
-          { yypushback(1); yybegin(UnDelimitedString); string.setLength(0);
-          }
-        case 31: break;
-        case 18: 
-          { pushCurrentState(); yybegin(QuotedAttributeValue); return XMLHeadTokenizerConstants.XMLDelEncoding;
-          }
-        case 32: break;
-        case 17: 
-          { pushCurrentState(); yybegin(QuotedAttributeValue); return XMLHeadTokenizerConstants.XMLDeclVersion;
-          }
-        case 33: break;
-        case 14: 
-          { yypushback(2);popState(); valueText = string.toString(); return EncodingParserConstants.InvalidTerminatedStringValue;
-          }
-        case 34: break;
-        case 3: 
-          { yybegin(DQ_STRING); string.setLength(0);
-          }
-        case 35: break;
-        case 12: 
-          { yybegin(YYINITIAL); hasMore = false; return XMLHeadTokenizerConstants.XMLDeclEnd;
-          }
-        case 36: break;
-        default: 
-          if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
-            zzAtEOF = true;
-            zzDoEOF();
-              { hasMore = false; return EncodingParserConstants.EOF; }
-          } 
-          else {
-            zzScanError(ZZ_NO_MATCH);
-          }
-      }
-    }
-  }
-
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/XMLHeadTokenizerConstants.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/XMLHeadTokenizerConstants.java
deleted file mode 100644
index 3ebd28b..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/XMLHeadTokenizerConstants.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.contenttype;
-
-public interface XMLHeadTokenizerConstants extends EncodingParserConstants {
-
-	final String XMLDeclEnd = "XMLDeclEnd"; //$NON-NLS-1$
-	final String XMLDeclStart = "XMLDeclStart"; //$NON-NLS-1$
-	final String XMLDelEncoding = "XMLDelEncoding"; //$NON-NLS-1$
-	final String XMLDeclVersion = "XMLDeclVersion"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/XMLResourceEncodingDetector.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/XMLResourceEncodingDetector.java
deleted file mode 100644
index 3a49524..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/contenttype/XMLResourceEncodingDetector.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.contenttype;
-
-import java.io.IOException;
-
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-
-public class XMLResourceEncodingDetector extends AbstractResourceEncodingDetector implements IResourceCharsetDetector {
-	private XMLHeadTokenizer fTokenizer;
-	private boolean fDeclDetected = false;
-	private boolean fInitialWhiteSpace = false;
-
-	private boolean canHandleAsUnicodeStream(String tokenType) {
-		boolean canHandleAsUnicodeStream = false;
-		if (tokenType == EncodingParserConstants.UTF83ByteBOM) {
-			canHandleAsUnicodeStream = true;
-			String enc = "UTF-8"; //$NON-NLS-1$
-			createEncodingMemento(enc, EncodingMemento.DETECTED_STANDARD_UNICODE_BYTES);
-			fEncodingMemento.setUTF83ByteBOMUsed(true);
-		}
-
-		else if (tokenType == EncodingParserConstants.UTF16BE) {
-			canHandleAsUnicodeStream = true;
-			String enc = "UTF-16BE"; //$NON-NLS-1$
-			createEncodingMemento(enc, EncodingMemento.DETECTED_STANDARD_UNICODE_BYTES);
-		}
-		else if (tokenType == EncodingParserConstants.UTF16LE) {
-			canHandleAsUnicodeStream = true;
-			String enc = "UTF-16"; //$NON-NLS-1$
-			createEncodingMemento(enc, EncodingMemento.DETECTED_STANDARD_UNICODE_BYTES);
-		}
-		return canHandleAsUnicodeStream;
-	}
-
-	public String getSpecDefaultEncoding() {
-		// by default, UTF-8 as per XML spec
-		final String enc = "UTF-8"; //$NON-NLS-1$
-		return enc;
-	}
-
-	/**
-	 * @return Returns the tokenizer.
-	 */
-	private XMLHeadTokenizer getTokenizer() {
-		// TODO: need to work on 'reset' in tokenizer, so new instance isn't
-		// always needed
-		// if (fTokenizer == null) {
-		fTokenizer = new XMLHeadTokenizer();
-		// }
-		return fTokenizer;
-	}
-
-	private boolean isLegalString(String valueTokenType) {
-		if (valueTokenType == null)
-			return false;
-		else
-			return valueTokenType.equals(EncodingParserConstants.StringValue) || valueTokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || valueTokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || valueTokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
-	}
-
-	protected void parseInput() throws IOException {
-		XMLHeadTokenizer tokenizer = getTokenizer();
-		tokenizer.reset(fReader);
-		HeadParserToken token = null;
-		String tokenType = null;
-		do {
-			token = tokenizer.getNextToken();
-			tokenType = token.getType();
-
-			// handle xml content type detection
-			if (tokenType == XMLHeadTokenizerConstants.XMLDeclStart) {
-				fDeclDetected = true;
-				String declText = token.getText();
-				if (declText.startsWith("<?")) { //$NON-NLS-1$
-					fInitialWhiteSpace = false;
-				}
-				else {
-					fInitialWhiteSpace = true;
-				}
-			}
-
-			// handle encoding detection
-			if (canHandleAsUnicodeStream(tokenType)) {
-				// side effect of canHandle is to create appropriate memento
-			}
-			else {
-				if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) {
-					if (tokenizer.hasMoreTokens()) {
-						token = tokenizer.getNextToken();
-						tokenType = token.getType();
-						if (isLegalString(tokenType)) {
-							String enc = token.getText();
-							if (enc != null && enc.length() > 0) {
-								createEncodingMemento(enc, EncodingMemento.FOUND_ENCODING_IN_CONTENT);
-							}
-						}
-					}
-				}
-			}
-		}
-		while (tokenizer.hasMoreTokens());
-
-	}
-
-	public boolean isDeclDetected() {
-		if (!fHeaderParsed) {
-			try {
-				parseInput();
-			}
-			catch (IOException e) {
-				fDeclDetected = false;
-			}
-			// we keep track of if header's already been
-			// parse, so can make
-			// multiple 'get' calls, without causing
-			// reparsing.
-			fHeaderParsed = true;
-		}
-		// fDeclDetected is set as part of parsing.
-		return fDeclDetected;
-	}
-
-	public boolean hasInitialWhiteSpace() {
-		return fInitialWhiteSpace;
-	}
-
-	protected void resetAll() {
-	    super.resetAll();
-		fDeclDetected = false;
-		fInitialWhiteSpace = false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/AttrImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/AttrImpl.java
deleted file mode 100644
index ab29bca..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/AttrImpl.java
+++ /dev/null
@@ -1,746 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-
-import java.util.Iterator;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.provisional.IXMLCharEntity;
-import org.eclipse.wst.xml.core.internal.provisional.IXMLNamespace;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * AttrImpl class
- */
-public class AttrImpl extends NodeImpl implements IDOMAttr {
-	private ITextRegion equalRegion = null;
-
-	private String name = null;
-	private ITextRegion nameRegion = null;
-	private String namespaceURI = null;
-	private ElementImpl ownerElement = null;
-	private ITextRegion valueRegion = null;
-	private String valueSource = null;
-
-	/**
-	 * AttrImpl constructor
-	 */
-	protected AttrImpl() {
-		super();
-	}
-
-	/**
-	 * AttrImpl constructor
-	 * 
-	 * @param that
-	 *            AttrImpl
-	 */
-	protected AttrImpl(AttrImpl that) {
-		super(that);
-
-		if (that != null) {
-			this.name = that.name;
-			this.valueSource = that.getValueSource();
-		}
-	}
-
-	/**
-	 * cloneNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 */
-	public Node cloneNode(boolean deep) {
-		AttrImpl cloned = new AttrImpl(this);
-		return cloned;
-	}
-
-	/**
-	 */
-	protected CMAttributeDeclaration getDeclaration() {
-		ElementImpl element = (ElementImpl) getOwnerElement();
-		if (element == null)
-			return null;
-		CMElementDeclaration elementDecl = element.getDeclaration();
-		if (elementDecl == null)
-			return null;
-		CMNamedNodeMap attributes = elementDecl.getAttributes();
-		if (attributes == null)
-			return null;
-		return (CMAttributeDeclaration) attributes.getNamedItem(getName());
-	}
-
-	/**
-	 * getEndOffset method
-	 * 
-	 * @return int
-	 */
-	public int getEndOffset() {
-		if (this.ownerElement == null)
-			return 0;
-		int offset = this.ownerElement.getStartOffset();
-		if (this.valueRegion != null) {
-			return (offset + this.valueRegion.getEnd());
-		}
-		if (this.equalRegion != null) {
-			return (offset + this.equalRegion.getEnd());
-		}
-		if (this.nameRegion != null) {
-			return (offset + this.nameRegion.getEnd());
-		}
-		return 0;
-	}
-
-	
-	public ITextRegion getEqualRegion() {
-		return this.equalRegion;
-	}
-
-	/**
-	 */
-	public String getLocalName() {
-		if (this.name == null)
-			return null;
-		int index = this.name.indexOf(':');
-		if (index < 0)
-			return this.name;
-		return this.name.substring(index + 1);
-	}
-
-	/**
-	 * getName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getName() {
-		if (this.name == null)
-			return new String();
-		return this.name;
-	}
-
-
-	public ITextRegion getNameRegion() {
-		return this.nameRegion;
-	}
-
-	public int getNameRegionEndOffset() {
-		if (this.ownerElement == null)
-			return 0;
-		// assuming the firstStructuredDocumentRegion is the one that contains
-		// attributes
-		IStructuredDocumentRegion flatNode = this.ownerElement.getFirstStructuredDocumentRegion();
-		if (flatNode == null)
-			return 0;
-		return flatNode.getEndOffset(this.nameRegion);
-	}
-
-	public int getNameRegionStartOffset() {
-		if (this.ownerElement == null)
-			return 0;
-		// assuming the firstStructuredDocumentRegion is the one that contains
-		// attributes
-		IStructuredDocumentRegion flatNode = this.ownerElement.getFirstStructuredDocumentRegion();
-		if (flatNode == null)
-			return 0;
-		return flatNode.getStartOffset(this.nameRegion);
-	}
-
-	public String getNameRegionText() {
-		if (this.ownerElement == null)
-			return null;
-		// assuming the firstStructuredDocumentRegion is the one that contains
-		// attributes
-		IStructuredDocumentRegion flatNode = this.ownerElement.getFirstStructuredDocumentRegion();
-		if (flatNode == null)
-			return null;
-		return flatNode.getText(this.nameRegion);
-	}
-
-	public int getNameRegionTextEndOffset() {
-		if (this.ownerElement == null)
-			return 0;
-		// assuming the firstStructuredDocumentRegion is the one that contains
-		// attributes
-		IStructuredDocumentRegion flatNode = this.ownerElement.getFirstStructuredDocumentRegion();
-		if (flatNode == null)
-			return 0;
-		return flatNode.getTextEndOffset(this.nameRegion);
-	}
-
-	/**
-	 */
-	public String getNamespaceURI() {
-		String nsAttrName = null;
-		String prefix = getPrefix();
-		if (prefix != null && prefix.length() > 0) {
-			if (prefix.equals(IXMLNamespace.XMLNS)) {
-				// fixed URI
-				return IXMLNamespace.XMLNS_URI;
-			}
-			nsAttrName = IXMLNamespace.XMLNS_PREFIX + prefix;
-		}
-		else {
-			String name = getName();
-			if (name != null && name.equals(IXMLNamespace.XMLNS)) {
-				// fixed URI
-				return IXMLNamespace.XMLNS_URI;
-			}
-			// does not inherit namespace from owner element
-			// if (this.ownerElement != null) return
-			// this.ownerElement.getNamespaceURI();
-			return this.namespaceURI;
-		}
-
-		for (Node node = this.ownerElement; node != null; node = node.getParentNode()) {
-			if (node.getNodeType() != ELEMENT_NODE)
-				break;
-			Element element = (Element) node;
-			Attr attr = element.getAttributeNode(nsAttrName);
-			if (attr != null)
-				return attr.getValue();
-		}
-
-		return this.namespaceURI;
-	}
-
-	/**
-	 * getNodeName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeName() {
-		return getName();
-	}
-
-	/**
-	 * getNodeType method
-	 * 
-	 * @return short
-	 */
-	public short getNodeType() {
-		return ATTRIBUTE_NODE;
-	}
-
-	/**
-	 * getNodeValue method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeValue() {
-		return getValue();
-	}
-
-	/**
-	 * getOwnerElement method
-	 * 
-	 * @return org.w3c.dom.Element
-	 */
-	public Element getOwnerElement() {
-		return this.ownerElement;
-	}
-
-	/**
-	 */
-	public String getPrefix() {
-		if (this.name == null)
-			return null;
-		int index = this.name.indexOf(':');
-		if (index <= 0)
-			return null;
-		// exclude JSP tag in name
-		if (this.name.charAt(0) == '<')
-			return null;
-		return this.name.substring(0, index);
-	}
-
-	/**
-	 * getSpecified method
-	 * 
-	 * @return boolean
-	 */
-	public boolean getSpecified() {
-		return true;
-	}
-
-	/**
-	 * getStartOffset method
-	 * 
-	 * @return int
-	 */
-	public int getStartOffset() {
-		if (this.ownerElement == null)
-			return 0;
-		int offset = this.ownerElement.getStartOffset();
-		if (this.nameRegion != null) {
-			return (offset + this.nameRegion.getStart());
-		}
-		if (this.equalRegion != null) {
-			return (offset + this.equalRegion.getStart());
-		}
-		if (this.valueRegion != null) {
-			return (offset + this.valueRegion.getStart());
-		}
-		return 0;
-	}
-
-	/**
-	 * getValue method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getValue() {
-		return getValue(getValueSource());
-	}
-
-	/**
-	 * Returns value for the source
-	 */
-	private String getValue(String source) {
-		if (source == null)
-			return new String();
-		if (source.length() == 0)
-			return source;
-		StringBuffer buffer = null;
-		int offset = 0;
-		int length = source.length();
-		int ref = source.indexOf('&');
-		while (ref >= 0) {
-			int end = source.indexOf(';', ref + 1);
-			if (end > ref + 1) {
-				String name = source.substring(ref + 1, end);
-				String value = getCharValue(name);
-				if (value != null) {
-					if (buffer == null)
-						buffer = new StringBuffer(length);
-					if (ref > offset)
-						buffer.append(source.substring(offset, ref));
-					buffer.append(value);
-					offset = end + 1;
-					ref = end;
-				}
-			}
-			ref = source.indexOf('&', ref + 1);
-		}
-		if (buffer == null)
-			return source;
-		if (length > offset)
-			buffer.append(source.substring(offset));
-		return buffer.toString();
-	}
-
-	public ITextRegion getValueRegion() {
-		return this.valueRegion;
-	}
-
-	/**
-	 * ISSUE: what should behavior be if this.value == null?
-	 * It's an "error" to be in that state, but seems to 
-	 * occur relatively easily ... probably due to threading 
-	 * bugs ... but this just shows its needs to be spec'd. 
-	 * 
-	 */
-	public int getValueRegionStartOffset() {
-		if (this.ownerElement == null)
-			return 0;
-		// assuming the firstStructuredDocumentRegion is the one that contains
-		// the valueRegion -- should make smarter? 
-		IStructuredDocumentRegion structuredDocumentRegion = this.ownerElement.getFirstStructuredDocumentRegion();
-		if (structuredDocumentRegion == null)
-			return 0;
-		// ensure we never pass null to getStartOffset.
-		if (this.valueRegion == null) {
-			return 0;
-		}
-		return structuredDocumentRegion.getStartOffset(this.valueRegion);
-	}
-
-	public String getValueRegionText() {
-		if (this.ownerElement == null)
-			return null;
-		// assuming the firstStructuredDocumentRegion is the one that contains
-		// attributes
-		IStructuredDocumentRegion flatNode = this.ownerElement.getFirstStructuredDocumentRegion();
-		if (flatNode == null)
-			return null;
-		if (this.valueRegion == null)
-			return null;
-		return flatNode.getText(this.valueRegion);
-	}
-
-	/**
-	 */
-	public String getValueSource() {
-		if (this.valueSource != null)
-			return this.valueSource;
-		// DW: 4/16/2003 due to change in structuredDocument ... we need a
-		// flatnode to
-		// get at region values. For now I'll assume this is always the first
-		// flatnode .. may need to make smarter later (e.g. to search for
-		// the flatnode that this.valueRegion belongs to.
-		// DW: 4/30/2003 For some reason, this method is getting called a lot
-		// Not sure if its a threading problem, or a fundamental error
-		// elsewhere.
-		// It needs more investigation, but in the use cases I've seen,
-		// doesn't
-		// seem to hurt to simply return null in those cases. I saw this null
-		// case,
-		// when tryint go format an XML file.
-		if (this.ownerElement == null)
-			return null;
-		IStructuredDocumentRegion ownerRegion = this.ownerElement.getFirstStructuredDocumentRegion();
-		if (ownerRegion == null)
-			return null;
-		if (this.valueRegion != null)
-			return StructuredDocumentRegionUtil.getAttrValue(ownerRegion, this.valueRegion);
-		return new String();
-	}
-
-	private String getValueSource(ElementImpl ownerElement) {
-		if (this.valueSource != null)
-			return this.valueSource;
-		// DW: 4/16/2003 due to change in structuredDocument ... we need a
-		// flatnode to
-		// get at region values. For now I'll assume this is always the first
-		// flatnode .. may need to make smarter later (e.g. to search for
-		// the flatnode that this.valueRegion belongs to.
-		if (this.valueRegion != null)
-			return StructuredDocumentRegionUtil.getAttrValue(ownerElement.getStructuredDocumentRegion(), this.valueRegion);
-		return new String();
-	}
-
-	/**
-	 */
-	private String getValueSource(String value) {
-		if (value == null)
-			return null;
-		if (value.length() == 0)
-			return value;
-		StringBuffer buffer = null;
-		int offset = 0;
-		int length = value.length();
-		int amp = value.indexOf('&');
-		while (amp >= 0) {
-			if (buffer == null)
-				buffer = new StringBuffer(length + 4);
-			if (amp > offset)
-				buffer.append(value.substring(offset, amp));
-			buffer.append(IXMLCharEntity.AMP_REF);
-			offset = amp + 1;
-			amp = value.indexOf('&', offset);
-		}
-		if (buffer == null)
-			return value;
-		if (length > offset)
-			buffer.append(value.substring(offset));
-		return buffer.toString();
-	}
-
-	/**
-	 * Check if Attr has JSP in value
-	 */
-public boolean hasNestedValue() {
-		if (this.valueRegion == null)
-			return false;
-		if (!(this.valueRegion instanceof ITextRegionContainer))
-			return false;
-		ITextRegionList regions = ((ITextRegionContainer) this.valueRegion).getRegions();
-		if (regions == null)
-			return false;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			if (region == null)
-				continue;
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_TAG_OPEN || isNestedLanguageOpening(regionType))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Check if Attr has only name but not equal sign nor value
-	 */
-	public boolean hasNameOnly() {
-		return (this.nameRegion != null && this.equalRegion == null && this.valueRegion == null);
-	}
-
-	/**
-	 */
-	protected final boolean hasPrefix() {
-		if (this.name == null)
-			return false;
-		if (this.name.indexOf(':') <= 0)
-			return false;
-		// exclude JSP tag in name
-		if (this.name.charAt(0) == '<')
-			return false;
-		return true;
-	}
-
-	/**
-	 */
-	protected final boolean ignoreCase() {
-		if (this.ownerElement != null) {
-			if (this.ownerElement.ignoreCase()) {
-				return !hasPrefix();
-			}
-		}
-		else {
-			DocumentImpl document = (DocumentImpl) getOwnerDocument();
-			if (document != null && document.ignoreCase()) {
-				// even in case insensitive document, if having prefix, it's
-				// case sensitive
-				return !hasPrefix();
-			}
-		}
-		return false;
-	}
-
-	/**
-	 */
-	public boolean isGlobalAttr() {
-		if (hasPrefix())
-			return false;
-		if (this.ownerElement == null)
-			return false;
-		return this.ownerElement.isGlobalTag();
-	}
-
-	/**
-	 */
-	public final boolean isXMLAttr() {
-		if (this.ownerElement != null) {
-			if (!this.ownerElement.isXMLTag()) {
-				return hasPrefix();
-			}
-		}
-		else {
-			DocumentImpl document = (DocumentImpl) getOwnerDocument();
-			if (document != null && !document.isXMLType()) {
-				// even in non-XML document, if having prefix, it's XML tag
-				return hasPrefix();
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * matchName method
-	 * 
-	 * @return boolean
-	 * @param name
-	 *            java.lang.String
-	 */
-	protected boolean matchName(String name) {
-		if (name == null)
-			return (this.name == null);
-		if (this.name == null)
-			return false;
-		if (!ignoreCase())
-			return this.name.equals(name);
-		return this.name.equalsIgnoreCase(name);
-	}
-
-	/**
-	 * notifyValueChanged method
-	 */
-	protected void notifyNameChanged() {
-		if (this.ownerElement == null)
-			return;
-		DocumentImpl document = (DocumentImpl) this.ownerElement.getContainerDocument();
-		if (document == null)
-			return;
-		DOMModelImpl model = (DOMModelImpl) document.getModel();
-		if (model == null)
-			return;
-		model.nameChanged(this);
-	}
-
-	/**
-	 * notifyValueChanged method
-	 */
-	protected void notifyValueChanged() {
-		if (this.ownerElement == null)
-			return;
-		DocumentImpl document = (DocumentImpl) this.ownerElement.getContainerDocument();
-		if (document == null)
-			return;
-		DOMModelImpl model = (DOMModelImpl) document.getModel();
-		if (model == null)
-			return;
-		model.valueChanged(this);
-	}
-
-	/**
-	 * removeRegions method
-	 */
-	void removeRegions() {
-		this.nameRegion = null;
-		this.valueRegion = null;
-		this.equalRegion = null;
-	}
-
-	/**
-	 */
-	void resetRegions() {
-		this.valueSource = getValueSource();
-		removeRegions();
-	}
-
-	/**
-	 */
-	void resetRegions(ElementImpl ownerElement) {
-		this.valueSource = getValueSource(ownerElement);
-		removeRegions();
-	}
-
-	void setEqualRegion(ITextRegion equalRegion) {
-		this.equalRegion = equalRegion;
-	}
-
-	/**
-	 * setName method
-	 * 
-	 * @param name
-	 *            java.lang.String
-	 */
-	protected void setName(String name) {
-		String value = null;
-		int startOffset = 0;
-		if (this.ownerElement != null) {
-			value = getValue();
-			startOffset = this.ownerElement.getStartOffset();
-			this.ownerElement.notify(CHANGE, this, value, null, startOffset);
-		}
-		this.name = name;
-		if (this.ownerElement != null) {
-			this.ownerElement.notify(CHANGE, this, null, value, startOffset);
-		}
-	}
-
-	void setNameRegion(ITextRegion nameRegion) {
-		this.nameRegion = nameRegion;
-	}
-
-	protected void setNamespaceURI(String namespaceURI) {
-		this.namespaceURI = namespaceURI;
-	}
-
-	/**
-	 * setNodeValue method
-	 * 
-	 * @param nodeValue
-	 *            java.lang.String
-	 */
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setValue(nodeValue);
-	}
-
-	/**
-	 * setOwnerElement method
-	 * 
-	 * @param ownerElement
-	 *            org.w3c.dom.Element
-	 */
-	protected void setOwnerElement(Element ownerElement) {
-		this.ownerElement = (ElementImpl) ownerElement;
-	}
-
-	/**
-	 */
-	public void setPrefix(String prefix) throws DOMException {
-		if (this.ownerElement != null && !this.ownerElement.isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-		int prefixLength = (prefix != null ? prefix.length() : 0);
-		String localName = getLocalName();
-		if (prefixLength == 0) {
-			setName(localName);
-			return;
-		}
-		if (localName == null)
-			localName = new String();
-		int localLength = localName.length();
-		StringBuffer buffer = new StringBuffer(prefixLength + 1 + localLength);
-		buffer.append(prefix);
-		buffer.append(':');
-		buffer.append(localName);
-		setName(buffer.toString());
-
-		notifyNameChanged();
-	}
-
-	/**
-	 * setValue method
-	 * 
-	 * @param value
-	 *            java.lang.String
-	 */
-	public void setValue(String value) {
-		// Remember: as we account for "floaters" in
-		// future, remember that some are created
-		// in the natural process of implementing
-		// DOM apis.
-		// this "self notification" of about/changed,
-		// is added for this case, because it known to
-		// be called from properties pages. Should be a
-		// added to all DOM Modifiying APIs eventually.
-		try {
-			getModel().aboutToChangeModel();
-			setValueSource(getValueSource(value));
-		}
-		finally {
-			getModel().changedModel();
-		}
-	}
-
-	void setValueRegion(ITextRegion valueRegion) {
-		this.valueRegion = valueRegion;
-		if (valueRegion != null)
-			this.valueSource = null;
-	}
-
-	public void setValueSource(String source) {
-		if (this.ownerElement != null && !this.ownerElement.isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-		this.valueSource = source;
-
-		notifyValueChanged();
-	}
-
-	/**
-	 * Subclasses must override
-	 * @param regionType
-	 * @return
-	 */
-	protected boolean isNestedLanguageOpening(String regionType) {
-		boolean result = false;
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CDATASectionImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CDATASectionImpl.java
deleted file mode 100644
index 13e3136..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CDATASectionImpl.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import java.util.Iterator;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Node;
-
-
-/**
- * CDATASectionImpl class
- */
-public class CDATASectionImpl extends TextImpl implements CDATASection {
-
-	/**
-	 * CDATASectionImpl constructor
-	 */
-	protected CDATASectionImpl() {
-		super();
-	}
-
-	/**
-	 * CDATASectionImpl constructor
-	 * 
-	 * @param that
-	 *            CDATASectionImpl
-	 */
-	protected CDATASectionImpl(CDATASectionImpl that) {
-		super(that);
-	}
-
-	/**
-	 * cloneNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param deep
-	 *            boolean
-	 */
-	public Node cloneNode(boolean deep) {
-		CDATASectionImpl cloned = new CDATASectionImpl(this);
-		return cloned;
-	}
-
-	/**
-	 * getData method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getData() throws DOMException {
-		// instead of super(TextImpl).getData(), call getCharacterData()
-		String data = getCharacterData();
-		if (data == null) {
-			data = getData(getStructuredDocumentRegion());
-			if (data == null)
-				data = new String();
-		}
-		return data;
-	}
-
-	/**
-	 */
-	private String getData(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return null;
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null)
-			return null;
-
-		ITextRegion contentRegion = null;
-		StringBuffer buffer = null;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_CDATA_OPEN || regionType == DOMRegionContext.XML_CDATA_CLOSE) {
-				continue;
-			}
-			if (contentRegion == null) { // first content
-				contentRegion = region;
-			} else { // multiple contents
-				if (buffer == null) {
-					buffer = new StringBuffer(flatNode.getText(contentRegion));
-				}
-				buffer.append(flatNode.getText(region));
-			}
-		}
-
-		if (buffer != null)
-			return buffer.toString();
-		if (contentRegion != null)
-			return flatNode.getText(contentRegion);
-		return null;
-	}
-
-	/**
-	 * getNodeName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeName() {
-		return "#cdata-section";//$NON-NLS-1$
-	}
-
-	/**
-	 * getNodeType method
-	 * 
-	 * @return short
-	 */
-	public short getNodeType() {
-		return CDATA_SECTION_NODE;
-	}
-
-	/**
-	 */
-	public boolean isClosed() {
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode == null)
-			return true; // will be generated
-		String regionType = StructuredDocumentRegionUtil.getLastRegionType(flatNode);
-		return (regionType == DOMRegionContext.XML_CDATA_CLOSE);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CMNodeUtil.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CMNodeUtil.java
deleted file mode 100644
index b10f6dd..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CMNodeUtil.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-
-
-/**
- */
-public class CMNodeUtil {
-
-	/**
-	 */
-	public static CMAttributeDeclaration getAttributeDeclaration(Attr attr) {
-		if (attr == null)
-			return null;
-		return ((AttrImpl) attr).getDeclaration();
-	}
-
-	/**
-	 */
-	public static CMElementDeclaration getElementDeclaration(Element element) {
-		if (element == null)
-			return null;
-		return ((ElementImpl) element).getDeclaration();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CharacterDataImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CharacterDataImpl.java
deleted file mode 100644
index 0b8e234..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CharacterDataImpl.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Node;
-
-
-/**
- * CharacterDataImpl class
- */
-public abstract class CharacterDataImpl extends NodeImpl implements CharacterData {
-
-	private String data = null;
-
-	/**
-	 * CharacterDataImpl constructor
-	 */
-	protected CharacterDataImpl() {
-		super();
-	}
-
-	/**
-	 * CharacterDataImpl constructor
-	 * 
-	 * @param that
-	 *            CharacterDataImpl
-	 */
-	protected CharacterDataImpl(CharacterDataImpl that) {
-		super(that);
-
-		if (that != null) {
-			this.data = that.getData();
-		}
-	}
-
-	/**
-	 * appendData method
-	 * 
-	 * @param arg
-	 *            java.lang.String
-	 */
-	public void appendData(String arg) throws DOMException {
-		if (arg == null)
-			return;
-
-		String data = getData();
-		if (data == null)
-			data = arg;
-		else
-			data += arg;
-		setData(data);
-	}
-
-	/**
-	 * deleteData method
-	 * 
-	 * @param offset
-	 *            int
-	 * @param count
-	 *            int
-	 */
-	public void deleteData(int offset, int count) throws DOMException {
-		if (count == 0)
-			return;
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		if (count < 0 || offset < 0) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-
-		String data = getData();
-		if (data == null) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-		int length = data.length();
-		if (offset > length) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-		if (offset == 0) {
-			if (count > length) {
-				throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-			}
-			if (count == length)
-				data = new String();
-			else
-				data = data.substring(count);
-		} else {
-			int end = offset + count;
-			if (end > length) {
-				throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-			}
-			if (end == length)
-				data = data.substring(0, offset);
-			else
-				data = data.substring(0, offset) + data.substring(end);
-		}
-		setData(data);
-	}
-
-	/**
-	 */
-	protected final String getCharacterData() {
-		return this.data;
-	}
-
-	/**
-	 * getData method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getData() throws DOMException {
-		return getCharacterData();
-	}
-
-	/**
-	 * getLength method
-	 * 
-	 * @return int
-	 */
-	public int getLength() {
-		String data = getData();
-		if (data == null)
-			return 0;
-		return data.length();
-	}
-
-	/**
-	 * getNodeValue method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeValue() {
-		return getData();
-	}
-
-	/**
-	 * insertData method
-	 * 
-	 * @param offset
-	 *            int
-	 * @param arg
-	 *            java.lang.String
-	 */
-	public void insertData(int offset, String arg) throws DOMException {
-		if (arg == null)
-			return;
-
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		if (offset < 0) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-
-		String data = getData();
-		if (data == null) {
-			if (offset > 0) {
-				throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-			}
-			data = arg;
-		} else if (offset == 0) {
-			data = arg + data;
-		} else {
-			int length = data.length();
-			if (offset > length) {
-				throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-			}
-			if (offset == length)
-				data += arg;
-			else
-				data = data.substring(0, offset) + arg + data.substring(offset);
-		}
-		setData(data);
-	}
-
-	/**
-	 * isJSPContent method
-	 * 
-	 * @return boolean
-	 */
-	public boolean isJSPContent() {
-		Node parent = getParentNode();
-		if (parent == null || parent.getNodeType() != Node.ELEMENT_NODE)
-			return false;
-		ElementImpl element = (ElementImpl) parent;
-		return element.isJSPContainer();
-	}
-
-	/**
-	 * replaceData method
-	 * 
-	 * @param offset
-	 *            int
-	 * @param count
-	 *            int
-	 * @param arg
-	 *            java.lang.String
-	 */
-	public void replaceData(int offset, int count, String arg) throws DOMException {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		if (arg == null) {
-			deleteData(offset, count);
-			return;
-		}
-		if (count == 0) {
-			insertData(offset, arg);
-			return;
-		}
-		if (offset < 0 || count < 0) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-
-		String data = getData();
-		if (data == null) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		} else if (offset == 0) {
-			int length = data.length();
-			if (count > length) {
-				throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-			}
-			if (count == length)
-				data = arg;
-			else
-				data = arg + data.substring(count);
-		} else {
-			int length = data.length();
-			int end = offset + count;
-			if (end > length) {
-				throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-			}
-			if (end == length)
-				data = data.substring(0, offset) + arg;
-			else
-				data = data.substring(0, offset) + arg + data.substring(end);
-		}
-		setData(data);
-	}
-
-	/**
-	 */
-	void resetStructuredDocumentRegions() {
-		this.data = getData();
-		setStructuredDocumentRegion(null);
-	}
-
-	/**
-	 * setData method
-	 * 
-	 * @param data
-	 *            java.lang.String
-	 */
-	public void setData(String data) throws DOMException {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		this.data = data;
-
-		notifyValueChanged();
-	}
-
-	/**
-	 * setNodeValue method
-	 * 
-	 * @param nodeValue
-	 *            java.lang.String
-	 */
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setData(nodeValue);
-	}
-
-	/**
-	 */
-	void setStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		super.setStructuredDocumentRegion(flatNode);
-		if (flatNode != null)
-			this.data = null;
-	}
-
-	/**
-	 * substringData method
-	 * 
-	 * @return java.lang.String
-	 * @param offset
-	 *            int
-	 * @param count
-	 *            int
-	 */
-	public String substringData(int offset, int count) throws DOMException {
-		if (count == 0)
-			return new String();
-		if (offset < 0 || count < 0) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-
-		String data = getData();
-		if (data == null) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-		int length = data.length();
-		if (offset == 0 && count == length)
-			return data;
-		if (offset > length) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-		int end = offset + count;
-		if (end > length) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-		return data.substring(offset, end);
-	}
-
-	/**
-	 * toString method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append(getNodeName());
-		buffer.append('(');
-		buffer.append(getData());
-		buffer.append(')');
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode != null) {
-			buffer.append('@');
-			buffer.append(flatNode.toString());
-		}
-		return buffer.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CommentImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CommentImpl.java
deleted file mode 100644
index 988bb57..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CommentImpl.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import java.util.Iterator;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Comment;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Node;
-
-
-/**
- * CommentImpl class
- */
-public class CommentImpl extends CharacterDataImpl implements Comment {
-
-	private boolean isJSPTag = false;
-
-	/**
-	 * CommentImpl constructor
-	 */
-	protected CommentImpl() {
-		super();
-	}
-
-	/**
-	 * CommentImpl constructor
-	 * 
-	 * @param that
-	 *            CommentImpl
-	 */
-	protected CommentImpl(CommentImpl that) {
-		super(that);
-
-		if (that != null) {
-			this.isJSPTag = that.isJSPTag;
-		}
-	}
-
-	/**
-	 * cloneNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param deep
-	 *            boolean
-	 */
-	public Node cloneNode(boolean deep) {
-		CommentImpl cloned = new CommentImpl(this);
-		return cloned;
-	}
-
-	/**
-	 * getData method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getData() throws DOMException {
-		String data = getCharacterData();
-		if (data == null) {
-			data = getData(getStructuredDocumentRegion());
-			if (data == null)
-				data = new String();
-		}
-		return data;
-	}
-
-	/**
-	 */
-	private String getData(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return null;
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null)
-			return null;
-
-		ITextRegion contentRegion = null;
-		StringBuffer buffer = null;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_COMMENT_OPEN || regionType == DOMRegionContext.XML_COMMENT_CLOSE || isNestedCommentOpenClose(regionType)) {
-				continue;
-			}
-			if (contentRegion == null) { // first content
-				contentRegion = region;
-			}
-			else { // multiple contents
-				if (buffer == null) {
-					buffer = new StringBuffer(flatNode.getText(contentRegion));
-				}
-				buffer.append(flatNode.getText(region));
-			}
-		}
-
-		if (buffer != null)
-			return buffer.toString();
-		if (contentRegion != null)
-			return flatNode.getText(contentRegion);
-		return null;
-	}
-
-	/**
-	 * getNodeName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeName() {
-		return "#comment";//$NON-NLS-1$
-	}
-
-	/**
-	 * getNodeType method
-	 * 
-	 * @return short
-	 */
-	public short getNodeType() {
-		return COMMENT_NODE;
-	}
-
-	/**
-	 */
-	public boolean isClosed() {
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode == null)
-			return true; // will be generated
-		String regionType = StructuredDocumentRegionUtil.getLastRegionType(flatNode);
-		return (regionType == DOMRegionContext.XML_COMMENT_CLOSE || isNestedCommentClose(regionType));
-	}
-
-	/**
-	 * Subclasses must override
-	 * @param regionType
-	 * @return
-	 */
-	protected boolean isNestedCommentClose(String regionType) {
-		boolean result = false;
-		return result; 
-	}
-	/**
-	 * Subclasses must override
-	 * @param regionType
-	 * @return
-	 */
-	protected boolean isNestedCommentOpenClose(String regionType) {
-		boolean result = false;
-		return result; 
-	}
-																											
-	public boolean isJSPTag() {
-		return this.isJSPTag;
-	}
-
-	/**
-	 * setJSPTag method
-	 * 
-	 * @param isJSPTag
-	 *            boolean
-	 */
-	public void setJSPTag(boolean isJSPTag) {
-		if (isJSPTag == this.isJSPTag)
-			return;
-
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		DocumentImpl document = (DocumentImpl) getOwnerDocument();
-		if (isJSPTag) {
-			if (document == null || !document.isJSPType())
-				return;
-		}
-
-		this.isJSPTag = isJSPTag;
-
-		if (getContainerDocument() != null) {
-			// already in the tree, update IStructuredDocument
-			setData(getData()); // calls notifyValueChanged();
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DOMModelImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DOMModelImpl.java
deleted file mode 100644
index 172ef13..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DOMModelImpl.java
+++ /dev/null
@@ -1,909 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-import org.eclipse.wst.sse.core.internal.model.AbstractStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.document.ISourceGenerator;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * XMLModelImpl class
- */
-public class DOMModelImpl extends AbstractStructuredModel implements IStructuredDocumentListener, IDOMModel, DOMImplementation {
-	private static String TRACE_PARSER_MANAGEMENT_EXCEPTION = "parserManagement"; //$NON-NLS-1$
-	private Object active = null;
-	private DocumentImpl document = null;
-	private ISourceGenerator generator = null;
-	private XMLModelNotifier notifier = null;
-	private XMLModelParser parser = null;
-	private boolean refresh = false;
-	private XMLModelUpdater updater = null;
-
-	/**
-	 * XMLModelImpl constructor
-	 */
-	public DOMModelImpl() {
-		super();
-		this.document = (DocumentImpl) internalCreateDocument();
-	}
-
-	/**
-	 * This API allows clients to declare that they are about to make a
-	 * "large" change to the model. This change might be in terms of content
-	 * or it might be in terms of the model id or base location.
-	 * 
-	 * Note that in the case of embedded calls, notification to listners is
-	 * sent only once.
-	 * 
-	 * Note that the client who is making these changes has the responsibility
-	 * to restore the models state once finished with the changes. See
-	 * getMemento and restoreState.
-	 * 
-	 * The method isModelStateChanging can be used by a client to determine if
-	 * the model is already in a change sequence.
-	 */
-	public void aboutToChangeModel() {
-		super.aboutToChangeModel();
-		// technically, no need to call beginChanging so often,
-		// since aboutToChangeModel can be nested.
-		// but will leave as is for this release.
-		// see modelChanged, and be sure stays coordinated there.
-		getModelNotifier().beginChanging();
-	}
-
-	public void aboutToReinitializeModel() {
-		XMLModelNotifier notifier = getModelNotifier();
-		notifier.cancelPending();
-		super.aboutToReinitializeModel();
-	}
-
-	/**
-	 * attrReplaced method
-	 * 
-	 * @param element
-	 *            org.w3c.dom.Element
-	 * @param newAttr
-	 *            org.w3c.dom.Attr
-	 * @param oldAttr
-	 *            org.w3c.dom.Attr
-	 */
-	protected void attrReplaced(Element element, Attr newAttr, Attr oldAttr) {
-		if (element == null)
-			return;
-		if (getActiveParser() == null) {
-			XMLModelUpdater updater = getModelUpdater();
-			setActive(updater);
-			updater.initialize();
-			updater.replaceAttr(element, newAttr, oldAttr);
-			setActive(null);
-		}
-		getModelNotifier().attrReplaced(element, newAttr, oldAttr);
-	}
-
-	/**
-	 * This API allows a client controlled way of notifying all ModelEvent
-	 * listners that the model has been changed. This method is a matched pair
-	 * to aboutToChangeModel, and must be called after aboutToChangeModel ...
-	 * or some listeners could be left waiting indefinitely for the changed
-	 * event. So, its suggested that changedModel always be in a finally
-	 * clause. Likewise, a client should never call changedModel without
-	 * calling aboutToChangeModel first.
-	 * 
-	 * In the case of embedded calls, the notification is just sent once.
-	 * 
-	 */
-	public void changedModel() {
-		// NOTE: the order of 'changedModel' and 'endChanging' is significant.
-		// By calling changedModel first, this basically decrements the
-		// "isChanging" counter
-		// in super class and when zero all listeners to model state events
-		// will be notified
-		// that the model has been changed. 'endChanging' will notify all
-		// deferred adapters.
-		// So, the significance of order is that adapters (and methods they
-		// call)
-		// can count on the state of model "isChanging" to be accurate.
-		// But, remember, that this means the "modelChanged" event can be
-		// received before all
-		// adapters have finished their processing.
-		// NOTE NOTE: The above note is obsolete in fact (though still states
-		// issue correctly).
-		// Due to popular demand, the order of these calls were reversed and
-		// behavior
-		// changed on 07/22/2004.
-		// 
-		// see also
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=4302
-		// for motivation for this 'on verge of' call.
-		// this could be improved in future if notifier also used counting
-		// flag to avoid nested calls. If/when changed be sure to check if
-		// aboutToChangeModel needs any changes too.
-		if (isModelChangeStateOnVergeOfEnding()) {
-			// end lock before noticiation loop, since directly or indirectly
-			// we may be "called from foriegn code" during notification.
-			endLock();
-
-			// the notifier is what controls adaper notification, which
-			// should be sent out before the 'modelChanged' event.
-			getModelNotifier().endChanging();
-		}
-		// changedModel handles 'nesting', so only one event sent out
-		// when mulitple calls to 'aboutToChange/Changed'.
-		super.changedModel();
-		handleRefresh();
-	}
-
-	/**
-	 * childReplaced method
-	 * 
-	 * @param parentNode
-	 *            org.w3c.dom.Node
-	 * @param newChild
-	 *            org.w3c.dom.Node
-	 * @param oldChild
-	 *            org.w3c.dom.Node
-	 */
-	protected void childReplaced(Node parentNode, Node newChild, Node oldChild) {
-		if (parentNode == null)
-			return;
-		if (getActiveParser() == null) {
-			XMLModelUpdater updater = getModelUpdater();
-			setActive(updater);
-			updater.initialize();
-			updater.replaceChild(parentNode, newChild, oldChild);
-			setActive(null);
-		}
-		getModelNotifier().childReplaced(parentNode, newChild, oldChild);
-	}
-
-	/**
-	 * Creates an XML <code>Document</code> object of the specified type
-	 * with its document element. HTML-only DOM implementations do not need to
-	 * implement this method.
-	 * 
-	 * @param namespaceURIThe
-	 *            namespace URI of the document element to create.
-	 * @param qualifiedNameThe
-	 *            qualified name of the document element to be created.
-	 * @param doctypeThe
-	 *            type of document to be created or <code>null</code>. When
-	 *            <code>doctype</code> is not <code>null</code>, its
-	 *            <code>Node.ownerDocument</code> attribute is set to the
-	 *            document being created.
-	 * @return A new <code>Document</code> object.
-	 * @exception DOMException
-	 *                INVALID_CHARACTER_ERR: Raised if the specified qualified
-	 *                name contains an illegal character. <br>
-	 *                NAMESPACE_ERR: Raised if the <code>qualifiedName</code>
-	 *                is malformed, if the <code>qualifiedName</code> has a
-	 *                prefix and the <code>namespaceURI</code> is
-	 *                <code>null</code>, or if the
-	 *                <code>qualifiedName</code> has a prefix that is "xml"
-	 *                and the <code>namespaceURI</code> is different from "
-	 *                http://www.w3.org/XML/1998/namespace" .<br>
-	 *                WRONG_DOCUMENT_ERR: Raised if <code>doctype</code> has
-	 *                already been used with a different document or was
-	 *                created from a different implementation.
-	 * @see DOM Level 2
-	 */
-	public Document createDocument(String namespaceURI, String qualifiedName, DocumentType doctype) throws DOMException {
-		return null;
-	}
-
-	/**
-	 * Creates an empty <code>DocumentType</code> node. Entity declarations
-	 * and notations are not made available. Entity reference expansions and
-	 * default attribute additions do not occur. It is expected that a future
-	 * version of the DOM will provide a way for populating a
-	 * <code>DocumentType</code>.<br>
-	 * HTML-only DOM implementations do not need to implement this method.
-	 * 
-	 * @param qualifiedNameThe
-	 *            qualified name of the document type to be created.
-	 * @param publicIdThe
-	 *            external subset public identifier.
-	 * @param systemIdThe
-	 *            external subset system identifier.
-	 * @return A new <code>DocumentType</code> node with
-	 *         <code>Node.ownerDocument</code> set to <code>null</code>.
-	 * @exception DOMException
-	 *                INVALID_CHARACTER_ERR: Raised if the specified qualified
-	 *                name contains an illegal character. <br>
-	 *                NAMESPACE_ERR: Raised if the <code>qualifiedName</code>
-	 *                is malformed.
-	 * @see DOM Level 2
-	 */
-	public DocumentType createDocumentType(String qualifiedName, String publicId, String systemId) throws DOMException {
-		DocumentTypeImpl documentType = new DocumentTypeImpl();
-		documentType.setName(qualifiedName);
-		documentType.setPublicId(publicId);
-		documentType.setSystemId(systemId);
-		return documentType;
-	}
-
-	/**
-	 */
-	protected void documentTypeChanged() {
-		if (this.refresh)
-			return;
-		// unlike 'resfresh', 'reinitialize' finishes loop
-		// and flushes remaining notification que before
-		// actually reinitializing.
-		// ISSUE: should reinit be used instead of handlerefresh?
-		// this.setReinitializeNeeded(true);
-		if (this.active != null || getModelNotifier().isChanging())
-			return; // defer
-		handleRefresh();
-	}
-
-	protected void editableChanged(Node node) {
-		if (node != null) {
-			getModelNotifier().editableChanged(node);
-		}
-	}
-
-	/**
-	 */
-	protected void endTagChanged(Element element) {
-		if (element == null)
-			return;
-		if (getActiveParser() == null) {
-			XMLModelUpdater updater = getModelUpdater();
-			setActive(updater);
-			updater.initialize();
-			updater.changeEndTag(element);
-			setActive(null);
-		}
-		getModelNotifier().endTagChanged(element);
-	}
-
-	/**
-	 */
-	private XMLModelParser getActiveParser() {
-		if (this.parser == null)
-			return null;
-		if (this.parser != this.active)
-			return null;
-		return this.parser;
-	}
-
-	/**
-	 */
-	private XMLModelUpdater getActiveUpdater() {
-		if (this.updater == null)
-			return null;
-		if (this.updater != this.active)
-			return null;
-		return this.updater;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (Document.class.equals(adapter))
-			return getDocument();
-		return super.getAdapter(adapter);
-	}
-
-	/**
-	 * getDocument method
-	 * 
-	 * @return XMLDocument
-	 */
-	public IDOMDocument getDocument() {
-		return this.document;
-	}
-
-	public ISourceGenerator getGenerator() {
-		if (this.generator == null) {
-			this.generator = XMLGeneratorImpl.getInstance();
-		}
-		return this.generator;
-	}
-
-	/**
-	 * getNode method
-	 * 
-	 * @param offset
-	 *            int
-	 */
-	public IndexedRegion getIndexedRegion(int offset) {
-		if (this.document == null)
-			return null;
-		// search in document children
-		IDOMNode parent = null;
-		int length = this.document.getEndOffset();
-		if (offset * 2 < length) {
-			// search from the first
-			IDOMNode child = (IDOMNode) this.document.getFirstChild();
-			while (child != null) {
-				if (child.getEndOffset() <= offset) {
-					child = (IDOMNode) child.getNextSibling();
-					continue;
-				}
-				if (child.getStartOffset() > offset) {
-					break;
-				}
-				IStructuredDocumentRegion startStructuredDocumentRegion = child.getStartStructuredDocumentRegion();
-				if (startStructuredDocumentRegion != null) {
-					if (startStructuredDocumentRegion.getEnd() > offset)
-						return child;
-				}
-				IStructuredDocumentRegion endStructuredDocumentRegion = child.getEndStructuredDocumentRegion();
-				if (endStructuredDocumentRegion != null) {
-					if (endStructuredDocumentRegion.getStart() <= offset)
-						return child;
-				}
-				// dig more
-				parent = child;
-				child = (IDOMNode) parent.getFirstChild();
-			}
-		}
-		else {
-			// search from the last
-			IDOMNode child = (IDOMNode) this.document.getLastChild();
-			while (child != null) {
-				if (child.getStartOffset() > offset) {
-					child = (IDOMNode) child.getPreviousSibling();
-					continue;
-				}
-				if (child.getEndOffset() <= offset) {
-					break;
-				}
-				IStructuredDocumentRegion startStructuredDocumentRegion = child.getStartStructuredDocumentRegion();
-				if (startStructuredDocumentRegion != null) {
-					if (startStructuredDocumentRegion.getEnd() > offset)
-						return child;
-				}
-				IStructuredDocumentRegion endStructuredDocumentRegion = child.getEndStructuredDocumentRegion();
-				if (endStructuredDocumentRegion != null) {
-					if (endStructuredDocumentRegion.getStart() <= offset)
-						return child;
-				}
-				// dig more
-				parent = child;
-				child = (IDOMNode) parent.getLastChild();
-			}
-		}
-		return parent;
-	}
-
-	/**
-	 */
-	public XMLModelNotifier getModelNotifier() {
-		if (this.notifier == null) {
-			this.notifier = new XMLModelNotifierImpl();
-		}
-		return this.notifier;
-	}
-
-	/**
-	 */
-	private XMLModelParser getModelParser() {
-		if (this.parser == null) {
-			this.parser = createModelParser();
-		}
-		return this.parser;
-	}
-
-	protected XMLModelParser createModelParser() {
-		return new XMLModelParser(this);
-	}
-
-	/**
-	 */
-	private XMLModelUpdater getModelUpdater() {
-		if (this.updater == null) {
-			this.updater = createModelUpdater();
-		}
-		return this.updater;
-	}
-
-	protected XMLModelUpdater createModelUpdater() {
-		return new XMLModelUpdater(this);
-	}
-
-	/**
-	 */
-	private void handleRefresh() {
-		if (!this.refresh)
-			return;
-		XMLModelNotifier notifier = getModelNotifier();
-		boolean isChanging = notifier.isChanging();
-		if (!isChanging)
-			notifier.beginChanging(true);
-		XMLModelParser parser = getModelParser();
-		setActive(parser);
-		this.document.removeChildNodes();
-		try {
-			parser.replaceStructuredDocumentRegions(getStructuredDocument().getRegionList(), null);
-		}
-		catch (Exception ex) {
-			Logger.logException(ex);
-		}
-		finally {
-			setActive(null);
-			if (!isChanging)
-				notifier.endChanging();
-			this.refresh = false;
-		}
-	}
-
-	/**
-	 * Test if the DOM implementation implements a specific feature.
-	 * 
-	 * @param featureThe
-	 *            name of the feature to test (case-insensitive). The values
-	 *            used by DOM features are defined throughout the DOM Level 2
-	 *            specifications and listed in the section. The name must be
-	 *            an XML name. To avoid possible conflicts, as a convention,
-	 *            names referring to features defined outside the DOM
-	 *            specification should be made unique by reversing the name of
-	 *            the Internet domain name of the person (or the organization
-	 *            that the person belongs to) who defines the feature,
-	 *            component by component, and using this as a prefix. For
-	 *            instance, the W3C SVG Working Group defines the feature
-	 *            "org.w3c.dom.svg".
-	 * @param versionThis
-	 *            is the version number of the feature to test. In Level 2,
-	 *            the string can be either "2.0" or "1.0". If the version is
-	 *            not specified, supporting any version of the feature causes
-	 *            the method to return <code>true</code>.
-	 * @return <code>true</code> if the feature is implemented in the
-	 *         specified version, <code>false</code> otherwise.
-	 */
-	public boolean hasFeature(String feature, String version) {
-		if (feature == null)
-			return false;
-		if (version != null) {
-			if (!version.equals("1.0") && !version.equals("2.0")) { //$NON-NLS-2$//$NON-NLS-1$
-				return false;
-			}
-		}
-		if (feature.equalsIgnoreCase("Core")) //$NON-NLS-1$
-			return true; //$NON-NLS-1$
-		if (feature.equalsIgnoreCase("XML")) //$NON-NLS-1$
-			return true; //$NON-NLS-1$
-		return false;
-	}
-
-	/**
-	 * createDocument method
-	 * 
-	 * @return org.w3c.dom.Document
-	 */
-	protected Document internalCreateDocument() {
-		DocumentImpl document = new DocumentImpl();
-		document.setModel(this);
-		return document;
-	}
-
-	boolean isReparsing() {
-		return (active != null);
-	}
-
-	/**
-	 * nameChanged method
-	 * 
-	 * @param node
-	 *            org.w3c.dom.Node
-	 */
-	protected void nameChanged(Node node) {
-		if (node == null)
-			return;
-		if (getActiveParser() == null) {
-			XMLModelUpdater updater = getModelUpdater();
-			setActive(updater);
-			updater.initialize();
-			updater.changeName(node);
-			setActive(null);
-		}
-		// notification is already sent
-	}
-
-	/**
-	 * newModel method
-	 * 
-	 */
-	public void newModel(NewDocumentEvent structuredDocumentEvent) {
-		if (structuredDocumentEvent == null)
-			return;
-		IStructuredDocument structuredDocument = structuredDocumentEvent.getStructuredDocument();
-		if (structuredDocument == null)
-			return;
-		// this should not happen, but for the case
-		if (structuredDocument != getStructuredDocument())
-			setStructuredDocument(structuredDocument);
-		IStructuredDocumentRegionList flatNodes = structuredDocument.getRegionList();
-		if ((flatNodes == null) || (flatNodes.getLength() == 0)) {
-			return;
-		}
-		if (this.document == null)
-			return; // being constructed
-		XMLModelUpdater updater = getActiveUpdater();
-		if (updater != null) { // being updated
-			try {
-				updater.replaceStructuredDocumentRegions(flatNodes, null);
-			}
-			catch (Exception ex) {
-				Logger.logException(ex);
-				this.refresh = true;
-				handleRefresh();
-			}
-			finally {
-				setActive(null);
-			}
-			// // for new model, we might need to
-			// // re-init, e.g. if someone calls setText
-			// // on an existing model
-			// checkForReinit();
-			return;
-		}
-		XMLModelNotifier notifier = getModelNotifier();
-		boolean isChanging = notifier.isChanging();
-		// call even if changing to notify doing new model
-		getModelNotifier().beginChanging(true);
-		XMLModelParser parser = getModelParser();
-		setActive(parser);
-		this.document.removeChildNodes();
-		try {
-			parser.replaceStructuredDocumentRegions(flatNodes, null);
-		}
-		catch (Exception ex) {
-			Logger.logException(ex);
-			// meaningless to refresh, because the result might be the same
-		}
-		finally {
-			setActive(null);
-			if (!isChanging) {
-				getModelNotifier().endChanging();
-			}
-			// ignore refresh
-			this.refresh = false;
-		}
-		// checkForReinit();
-	}
-
-	/**
-	 */
-	public void noChange(NoChangeEvent event) {
-		XMLModelUpdater updater = getActiveUpdater();
-		if (updater != null) { // being updated
-			// cleanup updater staffs
-			try {
-				updater.replaceStructuredDocumentRegions(null, null);
-			}
-			catch (Exception ex) {
-				Logger.logException(ex);
-				this.refresh = true;
-				handleRefresh();
-			}
-			finally {
-				setActive(null);
-			}
-			// I guess no chanage means the model could not need re-init
-			// checkForReinit();
-			return;
-		}
-	}
-
-	/**
-	 * nodesReplaced method
-	 * 
-	 */
-	public void nodesReplaced(StructuredDocumentRegionsReplacedEvent event) {
-		if (event == null)
-			return;
-		IStructuredDocumentRegionList oldStructuredDocumentRegions = event.getOldStructuredDocumentRegions();
-		IStructuredDocumentRegionList newStructuredDocumentRegions = event.getNewStructuredDocumentRegions();
-		XMLModelUpdater updater = getActiveUpdater();
-		if (updater != null) { // being updated
-			try {
-				updater.replaceStructuredDocumentRegions(newStructuredDocumentRegions, oldStructuredDocumentRegions);
-			}
-			catch (Exception ex) {
-				if (ex.getClass().equals(StructuredDocumentRegionManagementException.class)) {
-					Logger.traceException(TRACE_PARSER_MANAGEMENT_EXCEPTION, ex);
-				}
-				else {
-					Logger.logException(ex);
-				}
-				this.refresh = true;
-				handleRefresh();
-			}
-			finally {
-				setActive(null);
-			}
-			// checkForReinit();
-			return;
-		}
-		XMLModelNotifier notifier = getModelNotifier();
-		boolean isChanging = notifier.isChanging();
-		if (!isChanging)
-			notifier.beginChanging();
-		XMLModelParser parser = getModelParser();
-		setActive(parser);
-		try {
-			parser.replaceStructuredDocumentRegions(newStructuredDocumentRegions, oldStructuredDocumentRegions);
-		}
-		catch (Exception ex) {
-			Logger.logException(ex);
-			this.refresh = true;
-			handleRefresh();
-		}
-		finally {
-			setActive(null);
-			if (!isChanging) {
-				notifier.endChanging();
-				handleRefresh();
-			}
-		}
-
-	}
-
-	/**
-	 * regionChanged method
-	 * 
-	 * @param structuredDocumentEvent
-	 */
-	public void regionChanged(RegionChangedEvent event) {
-		if (event == null)
-			return;
-		IStructuredDocumentRegion flatNode = event.getStructuredDocumentRegion();
-		if (flatNode == null)
-			return;
-		ITextRegion region = event.getRegion();
-		if (region == null)
-			return;
-		XMLModelUpdater updater = getActiveUpdater();
-		if (updater != null) { // being updated
-			try {
-				updater.changeRegion(flatNode, region);
-			}
-			catch (Exception ex) {
-				Logger.logException(ex);
-				this.refresh = true;
-				handleRefresh();
-			}
-			finally {
-				setActive(null);
-			}
-			// checkForReinit();
-			return;
-		}
-		XMLModelNotifier notifier = getModelNotifier();
-		boolean isChanging = notifier.isChanging();
-		if (!isChanging)
-			notifier.beginChanging();
-		XMLModelParser parser = getModelParser();
-		setActive(parser);
-		try {
-			parser.changeRegion(flatNode, region);
-		}
-		catch (Exception ex) {
-			Logger.logException(ex);
-			this.refresh = true;
-			handleRefresh();
-		}
-		finally {
-			setActive(null);
-			if (!isChanging) {
-				notifier.endChanging();
-				handleRefresh();
-			}
-		}
-		// checkForReinit();
-	}
-
-	/**
-	 * regionsReplaced method
-	 * 
-	 * @param event
-	 */
-	public void regionsReplaced(RegionsReplacedEvent event) {
-		if (event == null)
-			return;
-		IStructuredDocumentRegion flatNode = event.getStructuredDocumentRegion();
-		if (flatNode == null)
-			return;
-		ITextRegionList oldRegions = event.getOldRegions();
-		ITextRegionList newRegions = event.getNewRegions();
-		if (oldRegions == null && newRegions == null)
-			return;
-		XMLModelUpdater updater = getActiveUpdater();
-		if (updater != null) { // being updated
-			try {
-				updater.replaceRegions(flatNode, newRegions, oldRegions);
-			}
-			catch (Exception ex) {
-				Logger.logException(ex);
-				this.refresh = true;
-				handleRefresh();
-			}
-			finally {
-				setActive(null);
-			}
-			// checkForReinit();
-			return;
-		}
-		XMLModelNotifier notifier = getModelNotifier();
-		boolean isChanging = notifier.isChanging();
-		if (!isChanging)
-			notifier.beginChanging();
-		XMLModelParser parser = getModelParser();
-		setActive(parser);
-		try {
-			parser.replaceRegions(flatNode, newRegions, oldRegions);
-		}
-		catch (Exception ex) {
-			Logger.logException(ex);
-			this.refresh = true;
-			handleRefresh();
-		}
-		finally {
-			setActive(null);
-			if (!isChanging) {
-				notifier.endChanging();
-				handleRefresh();
-			}
-		}
-		// checkForReinit();
-	}
-
-	/**
-	 */
-	public void releaseFromEdit() {
-		if (!isShared()) {
-			// this.document.releaseStyleSheets();
-			// this.document.releaseDocumentType();
-		}
-		super.releaseFromEdit();
-	}
-
-	/**
-	 */
-	public void releaseFromRead() {
-		if (!isShared()) {
-			// this.document.releaseStyleSheets();
-			// this.document.releaseDocumentType();
-		}
-		super.releaseFromRead();
-	}
-
-	/**
-	 */
-	private void setActive(Object active) {
-		this.active = active;
-		// side effect
-		// when ever becomes active, besure tagNameCache is cleared
-		// (and not used)
-		if (active == null) {
-			document.activateTagNameCache(true);
-		}
-		else {
-			document.activateTagNameCache(false);
-		}
-
-	}
-
-	/**
-	 */
-	public void setGenerator(ISourceGenerator generator) {
-		this.generator = generator;
-	}
-
-	/**
-	 */
-	public void setModelNotifier(XMLModelNotifier notifier) {
-		this.notifier = notifier;
-	}
-
-	/**
-	 */
-	public void setModelParser(XMLModelParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 */
-	public void setModelUpdater(XMLModelUpdater updater) {
-		this.updater = updater;
-	}
-
-	/**
-	 * setStructuredDocument method
-	 * 
-	 * @param structuredDocument
-	 */
-	public void setStructuredDocument(IStructuredDocument structuredDocument) {
-		IStructuredDocument oldStructuredDocument = super.getStructuredDocument();
-		if (structuredDocument == oldStructuredDocument)
-			return; // nothing to do
-		if (oldStructuredDocument != null)
-			oldStructuredDocument.removeDocumentChangingListener(this);
-		super.setStructuredDocument(structuredDocument);
-		if (structuredDocument != null) {
-			if (structuredDocument.getLength() > 0) {
-				newModel(new NewDocumentEvent(structuredDocument, this));
-			}
-			structuredDocument.addDocumentChangingListener(this);
-		}
-	}
-
-	/**
-	 */
-	protected void startTagChanged(Element element) {
-		if (element == null)
-			return;
-		if (getActiveParser() == null) {
-			XMLModelUpdater updater = getModelUpdater();
-			setActive(updater);
-			updater.initialize();
-			updater.changeStartTag(element);
-			setActive(null);
-		}
-		getModelNotifier().startTagChanged(element);
-	}
-
-	/**
-	 * valueChanged method
-	 * 
-	 * @param node
-	 *            org.w3c.dom.Node
-	 */
-	protected void valueChanged(Node node) {
-		if (node == null)
-			return;
-		if (getActiveParser() == null) {
-			XMLModelUpdater updater = getModelUpdater();
-			setActive(updater);
-			updater.initialize();
-			updater.changeValue(node);
-			setActive(null);
-		}
-		getModelNotifier().valueChanged(node);
-	}
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation of DOM 3.
-	 */
-	public Object getFeature(String feature, String version) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version."); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentFragmentImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentFragmentImpl.java
deleted file mode 100644
index 06058a5..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentFragmentImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Node;
-
-
-/**
- * DocumentFragmentImpl class
- */
-public class DocumentFragmentImpl extends NodeContainer implements DocumentFragment {
-
-	/**
-	 * DocumentFragmentImpl constructor
-	 */
-	protected DocumentFragmentImpl() {
-		super();
-	}
-
-	/**
-	 * DocumentFragmentImpl constructor
-	 * 
-	 * @param that
-	 *            DocumentFragmentImpl
-	 */
-	protected DocumentFragmentImpl(DocumentFragmentImpl that) {
-		super(that);
-	}
-
-	/**
-	 * cloneNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param deep
-	 *            boolean
-	 */
-	public Node cloneNode(boolean deep) {
-		DocumentFragmentImpl cloned = new DocumentFragmentImpl(this);
-		if (deep)
-			cloneChildNodes(cloned, deep);
-		return cloned;
-	}
-
-	/**
-	 * getNodeName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeName() {
-		return "#document-fragment";//$NON-NLS-1$
-	}
-
-	/**
-	 * getNodeType method
-	 * 
-	 * @return short
-	 */
-	public short getNodeType() {
-		return DOCUMENT_FRAGMENT_NODE;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentImpl.java
deleted file mode 100644
index af96f24..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentImpl.java
+++ /dev/null
@@ -1,1149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-// for org.apache.xerces 3.2.1
-// import org.apache.xerces.utils.XMLCharacterProperties;
-// DMW modified for XML4J 4.0.1
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.xml.core.internal.commentelement.impl.CommentElementRegistry;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMEntityDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.IXMLCharEntity;
-import org.eclipse.wst.xml.core.internal.provisional.NameValidator;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Comment;
-import org.w3c.dom.DOMConfiguration;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Entity;
-import org.w3c.dom.EntityReference;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Notation;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-import org.w3c.dom.ranges.Range;
-import org.w3c.dom.traversal.NodeFilter;
-import org.w3c.dom.traversal.NodeIterator;
-import org.w3c.dom.traversal.TreeWalker;
-
-
-/**
- * DocumentImpl class
- */
-public class DocumentImpl extends NodeContainer implements IDOMDocument {
-
-	/**
-	 * Internal-use only class. This class was added to better able to handle
-	 * repetetive request for getElementsByTagName. The cache is cleared when
-	 * ever the document changes at all, so still not real efficient,
-	 */
-	class TagNameCache {
-
-		private boolean active = true;
-
-		private Map cache;
-
-		public TagNameCache() {
-			super();
-			cache = new HashMap();
-		}
-
-		/**
-		 * @param b
-		 */
-		public void activate(boolean b) {
-			active = b;
-			if (!b)
-				clear();
-		}
-
-		public void addItem(String tagname, NodeListImpl nodelist) {
-			if (tagname == null || nodelist == null)
-				return;
-			cache.put(tagname, nodelist);
-		}
-
-		public void clear() {
-			cache.clear();
-		}
-
-		public NodeListImpl getItem(String tagName) {
-			NodeListImpl result = null;
-			if (active) {
-				result = (NodeListImpl) cache.get(tagName);
-				// if (result != null) {
-				// System.out.println("getElementsByTagname from cache: " +
-				// tagName);
-				// }
-			}
-			return result;
-		}
-
-	}
-
-	// this is a constant just to give compile-time control over
-	// whether or not to use the cache. If, in future, its found that
-	// there are no (or few) "duplicate requests" ... then this cache
-	// is not needed.
-	private static final boolean usetagnamecache = true;
-
-	//private DocumentTypeAdapter documentTypeAdapter = null;
-
-	private DOMModelImpl model = null;
-	private TagNameCache tagNameCache;
-
-	/**
-	 * DocumentImpl constructor
-	 */
-	protected DocumentImpl() {
-		super();
-		if (usetagnamecache) {
-			tagNameCache = new TagNameCache();
-		}
-	}
-
-	/**
-	 * DocumentImpl constructor
-	 * 
-	 * @param that
-	 *            DocumentImpl
-	 */
-	protected DocumentImpl(DocumentImpl that) {
-		super(that);
-		if (usetagnamecache) {
-			tagNameCache = new TagNameCache();
-		}
-	}
-
-	/**
-	 * @param b
-	 */
-	void activateTagNameCache(boolean b) {
-		tagNameCache.activate(b);
-	}
-
-	/**
-	 * <p>
-	 * EXPERIMENTAL! Based on the <a
-	 * href='http://www.w3.org/TR/2001/WD-DOM-Level-3-Core-20010605'>Document
-	 * Object Model (DOM) Level 3 Core Working Draft of 5 June 2001. </a>.
-	 * <p>
-	 * Changes the <code>ownerDocument</code> of a node, its children, as
-	 * well as the attached attribute nodes if there are any. If the node has
-	 * a parent it is first removed from its parent child list. This
-	 * effectively allows moving a subtree from one document to another. The
-	 * following list describes the specifics for each type of node.
-	 * <dl>
-	 * <dt>ATTRIBUTE_NODE</dt>
-	 * <dd>The <code>ownerElement</code> attribute is set to
-	 * <code>null</code> and the <code>specified</code> flag is set to
-	 * <code>true</code> on the adopted <code>Attr</code>. The
-	 * descendants of the source <code>Attr</code> are recursively adopted.
-	 * </dd>
-	 * <dt>DOCUMENT_FRAGMENT_NODE</dt>
-	 * <dd>The descendants of the source node are recursively adopted.</dd>
-	 * <dt>DOCUMENT_NODE</dt>
-	 * <dd><code>Document</code> nodes cannot be adopted.</dd>
-	 * <dt>DOCUMENT_TYPE_NODE</dt>
-	 * <dd><code>DocumentType</code> nodes cannot be adopted.</dd>
-	 * <dt>ELEMENT_NODE</dt>
-	 * <dd>Specified attribute nodes of the source element are adopted, and
-	 * the generated <code>Attr</code> nodes. Default attributes are
-	 * discarded, though if the document being adopted into defines default
-	 * attributes for this element name, those are assigned. The descendants
-	 * of the source element are recursively adopted.</dd>
-	 * <dt>ENTITY_NODE</dt>
-	 * <dd><code>Entity</code> nodes cannot be adopted.</dd>
-	 * <dt>ENTITY_REFERENCE_NODE</dt>
-	 * <dd>Only the <code>EntityReference</code> node itself is adopted,
-	 * the descendants are discarded, since the source and destination
-	 * documents might have defined the entity differently. If the document
-	 * being imported into provides a definition for this entity name, its
-	 * value is assigned.</dd>
-	 * <dt>NOTATION_NODE</dt>
-	 * <dd><code>Notation</code> nodes cannot be adopted.</dd>
-	 * <dt>PROCESSING_INSTRUCTION_NODE, TEXT_NODE, CDATA_SECTION_NODE,
-	 * COMMENT_NODE</dt>
-	 * <dd>These nodes can all be adopted. No specifics.</dd>
-	 * Should this method simply return null when it fails? How "exceptional"
-	 * is failure for this method?Stick with raising exceptions only in
-	 * exceptional circumstances, return null on failure (F2F 19 Jun 2000).Can
-	 * an entity node really be adopted?No, neither can Notation nodes (Telcon
-	 * 13 Dec 2000).Does this affect keys and hashCode's of the adopted
-	 * subtree nodes?If so, what about readonly-ness of key and hashCode?if
-	 * not, would appendChild affect keys/hashCodes or would it generate
-	 * exceptions if key's are duplicate? Update: Hashcodes have been dropped.
-	 * Given that the key is only unique within a document an adopted node
-	 * needs to be given a new key, but what does it mean for the application?
-	 * 
-	 * @param source
-	 *            The node to move into this document.
-	 * @return The adopted node, or <code>null</code> if this operation
-	 *         fails, such as when the source node comes from a different
-	 *         implementation.
-	 * @exception DOMException
-	 *                NOT_SUPPORTED_ERR: Raised if the source node is of type
-	 *                <code>DOCUMENT</code>,<code>DOCUMENT_TYPE</code>.
-	 *                <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised when the source node
-	 *                is readonly.
-	 * @see DOM Level 3
-	 */
-	public org.w3c.dom.Node adoptNode(org.w3c.dom.Node source) throws org.w3c.dom.DOMException {
-		return null;
-	}
-
-	/**
-	 * @param tagName
-	 */
-	protected void checkTagNameValidity(String tagName) {
-		if (!isValidName(tagName)) {
-			throw new DOMException(DOMException.INVALID_CHARACTER_ERR, createDOMExceptionMessage(DOMException.INVALID_CHARACTER_ERR, tagName));
-		}
-	}
-
-	/**
-	 * cloneNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param deep
-	 *            boolean
-	 */
-	public Node cloneNode(boolean deep) {
-		DocumentImpl cloned = new DocumentImpl(this);
-		if (deep)
-			cloned.importChildNodes(this, true);
-		return cloned;
-	}
-
-	/**
-	 * createAttribute method
-	 * 
-	 * @return org.w3c.dom.Attr
-	 * @param name
-	 *            java.lang.String
-	 */
-	public Attr createAttribute(String name) throws DOMException {
-		AttrImpl attr = new AttrImpl();
-		attr.setOwnerDocument(this);
-		attr.setName(name);
-		return attr;
-	}
-
-	/**
-	 */
-	public Attr createAttributeNS(String uri, String name) throws DOMException {
-		AttrImpl attr = new AttrImpl();
-		attr.setOwnerDocument(this);
-		attr.setName(name);
-		attr.setNamespaceURI(uri);
-		return attr;
-	}
-
-	/**
-	 * createCDATASection method
-	 * 
-	 * @return org.w3c.dom.CDATASection
-	 * @param data
-	 *            java.lang.String
-	 */
-	public CDATASection createCDATASection(String data) throws DOMException {
-		// allow CDATA section
-		// if (!isXMLType()) {
-		// throw new DOMException(DOMException.NOT_SUPPORTED_ERR, new
-		// String());
-		// }
-		CDATASectionImpl cdata = new CDATASectionImpl();
-		cdata.setOwnerDocument(this);
-		if (data != null)
-			cdata.setData(data);
-		return cdata;
-	}
-
-	/**
-	 * createComment method
-	 * 
-	 * @return org.w3c.dom.Comment
-	 * @param data
-	 *            java.lang.String
-	 */
-	public Comment createComment(String data) {
-		CommentImpl comment = new CommentImpl();
-		comment.setOwnerDocument(this);
-		if (data != null)
-			comment.setData(data);
-		return comment;
-	}
-
-	public Element createCommentElement(String tagName, boolean isJSPTag) throws DOMException {
-		if (!isJSPType() && isJSPTag) {
-			throw new DOMException(DOMException.INVALID_MODIFICATION_ERR, new String());
-		}
-		ElementImpl element = (ElementImpl) createElement(tagName);
-		element.setJSPTag(isJSPTag);
-		CommentElementRegistry registry = CommentElementRegistry.getInstance();
-		if (registry.setupCommentElement(element)) {
-			return element;
-		}
-		else {
-			throw new DOMException(DOMException.INVALID_CHARACTER_ERR, new String());
-		}
-	}
-
-	/**
-	 * createDoctype method
-	 * 
-	 * @return org.w3c.dom.DocumentType
-	 * @param name
-	 *            java.lang.String
-	 */
-	public DocumentType createDoctype(String name) {
-		DocumentTypeImpl docType = new DocumentTypeImpl();
-		docType.setOwnerDocument(this);
-		docType.setName(name);
-		return docType;
-	}
-
-	/**
-	 * createDocumentFragment method
-	 * 
-	 * @return org.w3c.dom.DocumentFragment
-	 */
-	public DocumentFragment createDocumentFragment() {
-		DocumentFragmentImpl fragment = new DocumentFragmentImpl();
-		fragment.setOwnerDocument(this);
-		return fragment;
-	}
-
-	/**
-	 * createElement method
-	 * 
-	 * @return org.w3c.dom.Element
-	 * @param tagName
-	 *            java.lang.String
-	 */
-	public Element createElement(String tagName) throws DOMException {
-		checkTagNameValidity(tagName);
-
-		ElementImpl element = new ElementImpl();
-		element.setOwnerDocument(this);
-		element.setTagName(tagName);
-		return element;
-	}
-
-	/**
-	 */
-	public Element createElementNS(String uri, String tagName) throws DOMException {
-		if (!isValidName(tagName)) {
-			throw new DOMException(DOMException.INVALID_CHARACTER_ERR, new String());
-		}
-
-		ElementImpl element = (ElementImpl) createElement(tagName);
-		element.setNamespaceURI(uri);
-		return element;
-	}
-
-	/**
-	 * createEntity method
-	 * 
-	 * @return org.w3c.dom.Entity
-	 * @param name
-	 *            java.lang.String
-	 */
-	public Entity createEntity(String name) {
-		EntityImpl entity = new EntityImpl();
-		entity.setOwnerDocument(this);
-		entity.setName(name);
-		return entity;
-	}
-
-	/**
-	 * createEntityReference method
-	 * 
-	 * @return org.w3c.dom.EntityReference
-	 * @param name
-	 *            java.lang.String
-	 */
-	public EntityReference createEntityReference(String name) throws DOMException {
-		if (!isXMLType()) {
-			throw new DOMException(DOMException.NOT_SUPPORTED_ERR, new String());
-		}
-
-		EntityReferenceImpl ref = new EntityReferenceImpl();
-		ref.setOwnerDocument(this);
-		ref.setName(name);
-		return ref;
-	}
-
-	/**
-	 */
-	public NodeIterator createNodeIterator(Node root, int whatToShow, NodeFilter filter, boolean entityReferenceExpansion) {
-		if (root == null)
-			root = this;
-		return new NodeIteratorImpl(root, whatToShow, filter);
-	}
-
-	/**
-	 * createNotation method
-	 * 
-	 * @return org.w3c.dom.Notation
-	 * @param name
-	 *            java.lang.String
-	 */
-	public Notation createNotation(String name) {
-		NotationImpl notation = new NotationImpl();
-		notation.setOwnerDocument(this);
-		notation.setName(name);
-		return notation;
-	}
-
-	/**
-	 * createProcessingInstruction method
-	 * 
-	 * @return org.w3c.dom.ProcessingInstruction
-	 * @param target
-	 *            java.lang.String
-	 * @param data
-	 *            java.lang.String
-	 */
-	public ProcessingInstruction createProcessingInstruction(String target, String data) throws DOMException {
-		ProcessingInstructionImpl pi = new ProcessingInstructionImpl();
-		pi.setOwnerDocument(this);
-		pi.setTarget(target);
-		if (data != null)
-			pi.setData(data);
-		return pi;
-	}
-
-	/**
-	 */
-	public Range createRange() {
-		return new RangeImpl();
-	}
-
-	/**
-	 * createTextNode method
-	 * 
-	 * @return org.w3c.dom.Text
-	 * @param data
-	 *            java.lang.String
-	 */
-	public Text createTextNode(String data) {
-		TextImpl text = new TextImpl();
-		text.setOwnerDocument(this);
-		text.setData(data);
-		return text;
-	}
-
-	/**
-	 */
-	public TreeWalker createTreeWalker(Node root, int whatToShow, NodeFilter filter, boolean entityReferenceExpansion) {
-		// not suppoerted
-		return null;
-	}
-
-	private DocumentType findDoctype(Node node) {
-		for (Node child = node.getFirstChild(); child != null; child = child.getNextSibling()) {
-			if (child.getNodeType() == DOCUMENT_TYPE_NODE && child instanceof DocumentType) {
-				return (DocumentType) child;
-			}
-			else if (child.getNodeType() == ELEMENT_NODE && ((IDOMElement) child).isCommentTag()) {
-				// search DOCTYPE inside of generic comment element
-				DocumentType docType = findDoctype(child);
-				if (docType != null) {
-					return docType;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	private Element findDocumentElement(String docName, Node node, Node[] firstFound) {
-		for (Node child = node.getFirstChild(); child != null; child = child.getNextSibling()) {
-			if (child.getNodeType() != ELEMENT_NODE)
-				continue;
-			ElementImpl element = (ElementImpl) child;
-			if (element.isCommentTag()) {
-				Element docElement = findDocumentElement(docName, element, firstFound);
-				if (docElement != null) {
-					return docElement;
-				}
-				else {
-					// added 'else continue' to better handle cases where
-					// there is "more than one root" element
-					// especially complicated by CommentElements, which are
-					// sometimes treated as elements, but should
-					// be treated as comments in this context.
-					continue;
-				}
-			}
-			// note: the "name" won't match in the event of a jsp tag ... but
-			// incase
-			// the name is null, we do not want the jsp element returned as
-			// documentElement
-			if (element.isJSPTag())
-				continue;
-			if (docName == null)
-				return element;
-			// use local name for namespace
-			String localName = element.getLocalName();
-			if (localName == null)
-				continue;
-			if (isXMLType()) {
-				if (localName.equals(docName))
-					return element;
-			}
-			else {
-				if (localName.equalsIgnoreCase(docName))
-					return element;
-			}
-			if (firstFound[0] == null)
-				firstFound[0] = element;
-		}
-		return null;
-	}
-
-	/**
-	 * getCharValue method
-	 * 
-	 * @return java.lang.String
-	 * @param name
-	 *            java.lang.String
-	 */
-	protected String getCharValue(String name) {
-		if (name == null)
-			return null;
-		int length = name.length();
-		if (length == 0)
-			return null;
-
-		if (name.charAt(0) == '#') { // character reference
-			if (length == 1)
-				return null;
-			int radix = 10;
-			String s = null;
-			// now allow hexadecimal also for non XML document
-			if (name.charAt(1) == 'x') { // hexadecimal
-				radix = 16;
-				s = name.substring(2);
-			}
-			else { // decimal
-				s = name.substring(1);
-			}
-			if (s == null || s.length() == 0)
-				return null;
-			if (s.charAt(0) == '-')
-				return null; // no minus accepted
-			char c = 0;
-			try {
-				c = (char) Integer.parseInt(s, radix);
-			}
-			catch (NumberFormatException ex) {
-			}
-			if (c == 0)
-				return null;
-			return String.valueOf(c);
-		}
-
-		// implicit character entities for XML
-		if (name.equals(IXMLCharEntity.LT_NAME))
-			return IXMLCharEntity.LT_VALUE;
-		if (name.equals(IXMLCharEntity.GT_NAME))
-			return IXMLCharEntity.GT_VALUE;
-		if (name.equals(IXMLCharEntity.AMP_NAME))
-			return IXMLCharEntity.AMP_VALUE;
-		if (name.equals(IXMLCharEntity.QUOT_NAME))
-			return IXMLCharEntity.QUOT_VALUE;
-		if (isXMLType()) {
-			if (name.equals(IXMLCharEntity.APOS_NAME))
-				return IXMLCharEntity.APOS_VALUE;
-		}
-
-		CMDocument cm = getCMDocument();
-		if (cm != null) {
-			CMNamedNodeMap map = cm.getEntities();
-			if (map != null) {
-				CMEntityDeclaration decl = (CMEntityDeclaration) map.getNamedItem(name);
-				if (decl != null) {
-					String value = decl.getValue();
-					if (value == null)
-						return null;
-					int valueLength = value.length();
-					if (valueLength > 1 && value.charAt(0) == '&' && value.charAt(1) == '#' && value.charAt(valueLength - 1) == ';') {
-						// character reference
-						return getCharValue(value.substring(1, valueLength - 1));
-					}
-					return value;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 */
-	protected CMDocument getCMDocument() {
-		ModelQuery modelQuery = ModelQueryUtil.getModelQuery(this);
-		if (modelQuery == null)
-			return null;
-		return modelQuery.getCorrespondingCMDocument(this);
-	}
-
-	/**
-	 * getDoctype method
-	 * 
-	 * @return org.w3c.dom.DocumentType
-	 */
-	public DocumentType getDoctype() {
-		return findDoctype(this);
-	}
-
-	/**
-	 * getDocumentElement
-	 * 
-	 * @return org.w3c.dom.Element From DOM 2 Spec: documentElement of type
-	 *         Element [p.62] , readonly This is a convenience [p.119]
-	 *         attribute that allows direct access to the child node that is
-	 *         the root element of the document. For HTML documents, this is
-	 *         the element with the tagName "HTML". Note: we differ from this
-	 *         definition a little in that we don't necessarily take the first
-	 *         child but also look to match the name. In a well formed
-	 *         document, of course, the result is the same, but not
-	 *         necessarily the same in an ill-formed document.
-	 */
-	public Element getDocumentElement() {
-		String name = null;
-		DocumentType docType = getDocumentType();
-		if (docType != null) {
-			name = docType.getName();
-		}
-
-		Element first[] = new Element[1];
-		Element docElement = findDocumentElement(name, this, first);
-		if (docElement == null) {
-			docElement = first[0];
-		}
-
-		return docElement;
-	}
-
-	/**
-	 */
-	protected DocumentType getDocumentType() {
-		DocumentTypeAdapter adapter = (DocumentTypeAdapter) getAdapterFor(DocumentTypeAdapter.class);;
-		if (adapter == null)
-			return getDoctype();
-		return adapter.getDocumentType();
-	}
-
-	/**
-	 */
-//	protected DocumentTypeAdapter getDocumentTypeAdapter() {
-//		// be sure to release since possibly changing
-//		if (this.documentTypeAdapter != null) {
-//			this.documentTypeAdapter.release();
-//		}
-//		this.documentTypeAdapter = (DocumentTypeAdapter) getAdapterFor(DocumentTypeAdapter.class);
-//		if (this.documentTypeAdapter == null) {
-//			// add default adapter
-//			this.documentTypeAdapter = new DocumentTypeAdapterImpl(this);
-//			addAdapter(this.documentTypeAdapter);
-//		}
-//		return this.documentTypeAdapter;
-//	}
-
-	/**
-	 */
-	public String getDocumentTypeId() {
-		DocumentType docType = getDocumentType();
-		if (docType == null)
-			return null;
-		String id = docType.getPublicId();
-		if (id == null)
-			id = docType.getSystemId();
-		return id;
-	}
-
-	/**
-	 */
-	public Element getElementById(String id) {
-		if (id == null)
-			return null;
-		NodeIterator it = createNodeIterator(this, NodeFilter.SHOW_ALL, null, false);
-		if (it == null)
-			return null;
-
-		for (Node node = it.nextNode(); node != null; node = it.nextNode()) {
-			if (node.getNodeType() != ELEMENT_NODE)
-				continue;
-			ElementImpl element = (ElementImpl) node;
-			String value = element.getAttribute("id");//$NON-NLS-1$
-			if (value != null && value.equals(id))
-				return element;
-		}
-
-		return null;
-	}
-
-	/**
-	 * getElementsByTagName method
-	 * 
-	 * @return org.w3c.dom.NodeList
-	 * @param tagName
-	 *            java.lang.String
-	 */
-	public NodeList getElementsByTagName(String tagName) {
-		if (tagName == null)
-			return new NodeListImpl();
-
-		NodeListImpl elements = null;
-
-		if (usetagnamecache) {
-			elements = tagNameCache.getItem(tagName);
-		}
-
-		if (elements == null) {
-			elements = internalGetElementsByTagName(tagName);
-
-		}
-
-		return elements;
-	}
-
-	/**
-	 */
-	public NodeList getElementsByTagNameNS(String uri, String tagName) {
-		if (tagName == null)
-			return new NodeListImpl();
-
-		NodeIterator it = createNodeIterator(this, NodeFilter.SHOW_ALL, null, false);
-		if (it == null)
-			return new NodeListImpl();
-		NodeListImpl elements = new NodeListImpl();
-
-		if (uri != null && uri.length() == 1 && uri.charAt(0) == '*') {
-			uri = null; // do not care
-		}
-		if (tagName.length() == 1 && tagName.charAt(0) == '*') {
-			tagName = null; // do not care
-		}
-
-		for (Node node = it.nextNode(); node != null; node = it.nextNode()) {
-			if (node.getNodeType() != ELEMENT_NODE)
-				continue;
-			ElementImpl element = (ElementImpl) node;
-			if (tagName != null) {
-				String localName = element.getLocalName();
-				if (localName == null || !localName.equals(tagName))
-					continue;
-			}
-			if (uri != null) {
-				String nsURI = element.getNamespaceURI();
-				if (nsURI == null || !nsURI.equals(uri))
-					continue;
-			}
-			elements.appendNode(element);
-		}
-
-		return elements;
-	}
-
-	/**
-	 * <p>
-	 * EXPERIMENTAL! Based on the <a
-	 * href='http://www.w3.org/TR/2001/WD-DOM-Level-3-Core-20010605'>Document
-	 * Object Model (DOM) Level 3 Core Working Draft of 5 June 2001. </a>.
-	 * <p>
-	 * An attribute specifying, as part of the XML declaration, the encoding
-	 * of this document. This is <code>null</code> when unspecified.
-	 * 
-	 * @see DOM Level 3
-	 */
-	public java.lang.String getEncoding() {
-		return null;
-	}
-
-	/**
-	 */
-	public DOMImplementation getImplementation() {
-		return model;
-	}
-
-	/**
-	 * other nodes will be referring to this one to get the owning model
-	 */
-	public IDOMModel getModel() {
-		return model;
-	}
-
-	/**
-	 * getNodeName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeName() {
-		return "#document";//$NON-NLS-1$
-	}
-
-	/**
-	 * getNodeType method
-	 * 
-	 * @return short
-	 */
-	public short getNodeType() {
-		return DOCUMENT_NODE;
-	}
-
-	/**
-	 * <p>
-	 * EXPERIMENTAL! Based on the <a
-	 * href='http://www.w3.org/TR/2001/WD-DOM-Level-3-Core-20010605'>Document
-	 * Object Model (DOM) Level 3 Core Working Draft of 5 June 2001. </a>.
-	 * <p>
-	 * An attribute specifying, as part of the XML declaration, whether this
-	 * document is standalone.
-	 * 
-	 * @see DOM Level 3
-	 */
-	public boolean getStandalone() {
-		return false;
-	}
-
-	/**
-	 * <p>
-	 * EXPERIMENTAL! Based on the <a
-	 * href='http://www.w3.org/TR/2001/WD-DOM-Level-3-Core-20010605'>Document
-	 * Object Model (DOM) Level 3 Core Working Draft of 5 June 2001. </a>.
-	 * <p>
-	 * An attribute specifying whether errors checking is enforced or not.
-	 * When set to <code>false</code>, the implementation is free to not
-	 * test every possible error case normally defined on DOM operations, and
-	 * not raise any <code>DOMException</code>. In case of error, the
-	 * behavior is undefined. This attribute is <code>true</code> by
-	 * defaults.
-	 * 
-	 * @see DOM Level 3
-	 */
-	public boolean getStrictErrorChecking() {
-		return false;
-	}
-
-	/**
-	 * <p>
-	 * EXPERIMENTAL! Based on the <a
-	 * href='http://www.w3.org/TR/2001/WD-DOM-Level-3-Core-20010605'>Document
-	 * Object Model (DOM) Level 3 Core Working Draft of 5 June 2001. </a>.
-	 * <p>
-	 * An attribute specifying, as part of the XML declaration, the version
-	 * number of this document. This is <code>null</code> when unspecified.
-	 * 
-	 * @see DOM Level 3
-	 */
-	public String getVersion() {
-		return null;
-	}
-
-	/**
-	 */
-	protected boolean ignoreCase() {
-		DocumentTypeAdapter adapter = (DocumentTypeAdapter) getAdapterFor(DocumentTypeAdapter.class);
-		if (adapter == null)
-			return false;
-		return (adapter.getTagNameCase() != DocumentTypeAdapter.STRICT_CASE);
-	}
-
-	/**
-	 */
-	protected void importChildNodes(Node parent, boolean deep) {
-		if (parent == null)
-			return;
-
-		removeChildNodes();
-
-		for (Node child = parent.getFirstChild(); child != null; child = child.getNextSibling()) {
-			Node imported = importNode(child, deep);
-			if (imported == null)
-				continue;
-			appendChild(imported);
-		}
-	}
-
-	/**
-	 */
-	public Node importNode(Node node, boolean deep) throws DOMException {
-		if (node == null)
-			return null;
-		NodeImpl imported = (NodeImpl) node.cloneNode(deep);
-		if (imported == null)
-			return null;
-		imported.setOwnerDocument(this, deep);
-		return imported;
-	}
-
-	private NodeListImpl internalGetElementsByTagName(String tagName) {
-		// System.out.println("getElementsByTagname: " + tagName);
-		NodeIterator it = createNodeIterator(this, NodeFilter.SHOW_ALL, null, false);
-		if (it == null)
-			return new NodeListImpl();
-		NodeListImpl elements = new NodeListImpl();
-
-		if (tagName.length() == 1 && tagName.charAt(0) == '*') {
-			tagName = null; // do not care
-		}
-
-		for (Node node = it.nextNode(); node != null; node = it.nextNode()) {
-			if (node.getNodeType() != ELEMENT_NODE)
-				continue;
-			if (tagName != null) {
-				ElementImpl element = (ElementImpl) node;
-				if (!element.matchTagName(tagName))
-					continue;
-			}
-			elements.appendNode(node);
-		}
-		if (usetagnamecache) {
-			tagNameCache.addItem(tagName, elements);
-		}
-		return elements;
-	}
-
-	/**
-	 */
-	public boolean isJSPDocument() {
-		Element element = getDocumentElement();
-		if (element == null)
-			return false;
-		String tagName = element.getTagName();
-		if (tagName == null)
-			return false;
-		return tagName.equals(JSPTag.JSP_ROOT);
-	}
-
-	/**
-	 */
-	public boolean isJSPType() {
-		if (this.model == null)
-			return false;
-		IModelHandler handler = this.model.getModelHandler();
-		if (handler == null)
-			return false;
-		String id = handler.getAssociatedContentTypeId();
-		if (id == null)
-			return false;
-		// ISSUE: -- avoid this hardcoded string
-		return id.equals("org.eclipse.jst.jsp.core.jspsource"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	protected boolean isValidName(String name) {
-		if (name == null || name.length() == 0)
-			return false;
-		// // DMW: modified for XML4J 4.0.1
-		// if (XMLChar.isValidName(name)) return true;
-		if (NameValidator.isValid(name))
-			return true;
-		// special for invalid declaration
-		if (name.length() == 1 && name.charAt(0) == '!')
-			return true;
-		// special for JSP tag in tag name
-		if (name.startsWith(JSPTag.TAG_OPEN))
-			return true;
-		return false;
-	}
-
-	/**
-	 */
-	public boolean isXMLType() {
-		DocumentTypeAdapter adapter = (DocumentTypeAdapter) getAdapterFor(DocumentTypeAdapter.class);
-		if (adapter == null)
-			return true;
-		return adapter.isXMLType();
-	}
-
-	/**
-	 */
-//	protected void releaseDocumentType() {
-//		if (this.documentTypeAdapter == null)
-//			return;
-//		this.documentTypeAdapter.release();
-//		this.documentTypeAdapter = null;
-//	}
-
-	/**
-	 * <p>
-	 * EXPERIMENTAL! Based on the <a
-	 * href='http://www.w3.org/TR/2001/WD-DOM-Level-3-Core-20010605'>Document
-	 * Object Model (DOM) Level 3 Core Working Draft of 5 June 2001. </a>.
-	 * <p>
-	 * An attribute specifying, as part of the XML declaration, the encoding
-	 * of this document. This is <code>null</code> when unspecified.
-	 * 
-	 * @see DOM Level 3
-	 */
-	public void setEncoding(java.lang.String encoding) {
-	}
-
-	/**
-	 * setModel method
-	 * 
-	 * @param model
-	 *            XMLModel
-	 */
-
-	protected void setModel(IDOMModel model) {
-		this.model = (DOMModelImpl) model;
-	}
-
-	/**
-	 * <p>
-	 * EXPERIMENTAL! Based on the <a
-	 * href='http://www.w3.org/TR/2001/WD-DOM-Level-3-Core-20010605'>Document
-	 * Object Model (DOM) Level 3 Core Working Draft of 5 June 2001. </a>.
-	 * <p>
-	 * An attribute specifying, as part of the XML declaration, whether this
-	 * document is standalone.
-	 * 
-	 * @see DOM Level 3
-	 */
-	public void setStandalone(boolean standalone) {
-	}
-
-	/**
-	 * <p>
-	 * EXPERIMENTAL! Based on the <a
-	 * href='http://www.w3.org/TR/2001/WD-DOM-Level-3-Core-20010605'>Document
-	 * Object Model (DOM) Level 3 Core Working Draft of 5 June 2001. </a>.
-	 * <p>
-	 * An attribute specifying whether errors checking is enforced or not.
-	 * When set to <code>false</code>, the implementation is free to not
-	 * test every possible error case normally defined on DOM operations, and
-	 * not raise any <code>DOMException</code>. In case of error, the
-	 * behavior is undefined. This attribute is <code>true</code> by
-	 * defaults.
-	 * 
-	 * @see DOM Level 3
-	 */
-	public void setStrictErrorChecking(boolean strictErrorChecking) {
-	}
-
-	/**
-	 * <p>
-	 * EXPERIMENTAL! Based on the <a
-	 * href='http://www.w3.org/TR/2001/WD-DOM-Level-3-Core-20010605'>Document
-	 * Object Model (DOM) Level 3 Core Working Draft of 5 June 2001. </a>.
-	 * <p>
-	 * An attribute specifying, as part of the XML declaration, the version
-	 * number of this document. This is <code>null</code> when unspecified.
-	 * 
-	 * @see DOM Level 3
-	 */
-	public void setVersion(java.lang.String version) {
-	}
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public String getInputEncoding() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implmented in this version"); //$NON-NLS-1$
-	}
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public String getXmlEncoding() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implmented in this version"); //$NON-NLS-1$
-	}
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public boolean getXmlStandalone() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implmented in this version"); //$NON-NLS-1$
-	}
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public void setXmlStandalone(boolean xmlStandalone) throws DOMException {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implmented in this version"); //$NON-NLS-1$
-	}
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public String getXmlVersion() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implmented in this version"); //$NON-NLS-1$
-	}
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public void setXmlVersion(String xmlVersion) throws DOMException {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implmented in this version"); //$NON-NLS-1$
-	}
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public String getDocumentURI() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implmented in this version"); //$NON-NLS-1$
-	}
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public void setDocumentURI(String documentURI) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implmented in this version"); //$NON-NLS-1$
-	}
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public DOMConfiguration getDomConfig() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implmented in this version"); //$NON-NLS-1$
-	}
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public void normalizeDocument() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implmented in this version"); //$NON-NLS-1$
-	}
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implmented in this version"); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeAdapter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeAdapter.java
deleted file mode 100644
index 1e5ff4c..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeAdapter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.w3c.dom.DocumentType;
-
-
-/**
- */
-public interface DocumentTypeAdapter extends INodeAdapter {
-	static final int LOWER_CASE = 2;
-	static final int STRICT_CASE = 0;
-	static final int UPPER_CASE = 1;
-
-	/**
-	 */
-	int getAttrNameCase();
-
-	/**
-	 */
-	DocumentType getDocumentType();
-
-	/**
-	 */
-	int getTagNameCase();
-
-	/**
-	 */
-	boolean hasFeature(String feature);
-
-	/**
-	 */
-	boolean isXMLType();
-
-	/**
-	 */
-	void release();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeAdapterImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeAdapterImpl.java
deleted file mode 100644
index 4f6d8b3..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeAdapterImpl.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.DocumentType;
-
-
-/**
- */
-public class DocumentTypeAdapterImpl implements DocumentTypeAdapter {
-
-	private IDOMDocument document = null;
-	private DocumentType documentType = null;
-
-	/**
-	 */
-	protected DocumentTypeAdapterImpl() {
-		super();
-	}
-
-	/**
-	 */
-	protected DocumentTypeAdapterImpl(IDOMDocument document) {
-		this.document = document;
-		if (document != null) {
-			this.documentType = document.getDoctype();
-		}
-	}
-
-	/**
-	 */
-	public int getAttrNameCase() {
-		return STRICT_CASE;
-	}
-
-	/**
-	 */
-	protected IDOMDocument getDocument() {
-		return this.document;
-	}
-
-	/**
-	 */
-	public DocumentType getDocumentType() {
-		return this.documentType;
-	}
-
-	/**
-	 */
-	public int getTagNameCase() {
-		return STRICT_CASE;
-	}
-
-	/**
-	 */
-	public boolean hasFeature(String feature) {
-		return false;
-	}
-
-	/**
-	 */
-	public boolean isAdapterForType(Object type) {
-		return (type == DocumentTypeAdapter.class);
-	}
-
-	/**
-	 */
-	public boolean isXMLType() {
-		return true;
-	}
-
-	/**
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		if (eventType != INodeNotifier.STRUCTURE_CHANGED)
-			return;
-		if (notifier == null || !(notifier instanceof IDOMDocument))
-			return;
-		this.documentType = ((IDOMDocument) notifier).getDoctype();
-	}
-
-	/**
-	 */
-	protected void notifyDocumentTypeChanged() {
-		if (this.document == null)
-			return;
-		IDOMModel model = this.document.getModel();
-		if (model == null)
-			return;
-		((DOMModelImpl) model).documentTypeChanged();
-	}
-
-	/**
-	 */
-	public void release() {
-		// nothing to do
-	}
-
-	/**
-	 */
-	protected void setDocumentType(DocumentType documentType) {
-		this.documentType = documentType;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeImpl.java
deleted file mode 100644
index c92f25f..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeImpl.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocumentType;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-
-/**
- * DocumentType class
- */
-public class DocumentTypeImpl extends NodeImpl implements IDOMDocumentType {
-	private String internalSubset = null;
-
-	private String name = null;
-	private String publicId = null;
-	private String systemId = null;
-
-	/**
-	 * DocumentTypeImpl constructor
-	 */
-	protected DocumentTypeImpl() {
-		super();
-	}
-
-	/**
-	 * DocumentTypeImpl constructor
-	 * 
-	 * @param that
-	 *            DocumentTypeImpl
-	 */
-	protected DocumentTypeImpl(DocumentTypeImpl that) {
-		super(that);
-
-		if (that != null) {
-			this.name = that.name;
-		}
-	}
-
-	/**
-	 * cloneNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param deep
-	 *            boolean
-	 */
-	public Node cloneNode(boolean deep) {
-		DocumentTypeImpl cloned = new DocumentTypeImpl(this);
-		return cloned;
-	}
-
-	/**
-	 * getEntities method
-	 * 
-	 * @return org.w3c.dom.NamedNodeMap
-	 */
-	public NamedNodeMap getEntities() {
-		return null;
-	}
-
-	/**
-	 */
-	public String getInternalSubset() {
-		return this.internalSubset;
-	}
-
-	/**
-	 * getName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getName() {
-		if (this.name == null)
-			return new String();
-		return this.name;
-	}
-
-	/**
-	 * getNodeName
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeName() {
-		return getName();
-	}
-
-	/**
-	 * getNodeType method
-	 * 
-	 * @return short
-	 */
-	public short getNodeType() {
-		return DOCUMENT_TYPE_NODE;
-	}
-
-	/**
-	 * getNotations method
-	 * 
-	 * @return org.w3c.dom.NamedNodeMap
-	 */
-	public NamedNodeMap getNotations() {
-		return null;
-	}
-
-	/**
-	 * getPublicId method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getPublicId() {
-		return this.publicId;
-	}
-
-	/**
-	 * getSystemId method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getSystemId() {
-		return this.systemId;
-	}
-
-	/**
-	 */
-	public boolean isClosed() {
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode == null)
-			return true; // will be generated
-		String regionType = StructuredDocumentRegionUtil.getLastRegionType(flatNode);
-		return (regionType == DOMRegionContext.XML_DOCTYPE_DECLARATION_CLOSE || regionType == DOMRegionContext.XML_DECLARATION_CLOSE);
-	}
-
-	/**
-	 */
-	public void setInternalSubset(String internalSubset) {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		this.internalSubset = internalSubset;
-	}
-
-	/**
-	 * setName method
-	 * 
-	 * @param name
-	 *            java.lang.String
-	 */
-	protected void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * setPublicId method
-	 * 
-	 * @param publicId
-	 *            java.lang.String
-	 */
-	public void setPublicId(String publicId) {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		this.publicId = publicId;
-
-		notifyValueChanged();
-	}
-
-	/**
-	 * setSystemId method
-	 * 
-	 * @param systemId
-	 *            java.lang.String
-	 */
-	public void setSystemId(String systemId) {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		this.systemId = systemId;
-
-		notifyValueChanged();
-	}
-
-	/**
-	 * toString method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append(getName());
-		buffer.append('(');
-		buffer.append(getPublicId());
-		buffer.append(')');
-		buffer.append('(');
-		buffer.append(getSystemId());
-		buffer.append(')');
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode != null) {
-			buffer.append('@');
-			buffer.append(flatNode.toString());
-		}
-		return buffer.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ElementImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ElementImpl.java
deleted file mode 100644
index 27a62c5..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ElementImpl.java
+++ /dev/null
@@ -1,1458 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import java.util.Iterator;
-
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.commentelement.CommentElementAdapter;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
-import org.eclipse.wst.xml.core.internal.provisional.IXMLNamespace;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.traversal.NodeFilter;
-import org.w3c.dom.traversal.NodeIterator;
-
-
-/**
- * ElementImpl class
- */
-public class ElementImpl extends NodeContainer implements IDOMElement {
-
-	private class Attributes implements NamedNodeMap {
-		Attributes() {
-			super();
-		}
-
-		public int getLength() {
-			if (attrNodes == null)
-				return 0;
-			return attrNodes.getLength();
-		}
-
-		public Node getNamedItem(String name) {
-			return getAttributeNode(name);
-		}
-
-		public Node getNamedItemNS(String uri, String name) {
-			return getAttributeNodeNS(uri, name);
-		}
-
-		public Node item(int index) {
-			if (attrNodes == null)
-				return null;
-			return attrNodes.item(index);
-		}
-
-		public Node removeNamedItem(String name) throws DOMException {
-			return removeAttributeNode(name);
-		}
-
-		public Node removeNamedItemNS(String uri, String name) throws DOMException {
-			return removeAttributeNodeNS(uri, name);
-		}
-
-		public Node setNamedItem(Node arg) throws DOMException {
-			return setAttributeNode((AttrImpl) arg);
-		}
-
-		public Node setNamedItemNS(Node arg) throws DOMException {
-			return setAttributeNodeNS((AttrImpl) arg);
-		}
-	}
-
-	NodeListImpl attrNodes = null;
-	private IStructuredDocumentRegion endStructuredDocumentRegion = null;
-	private boolean isCommentTag = false;
-	private boolean isEmptyTag = false;
-	private boolean isJSPTag = false;
-	private String namespaceURI = null;
-
-	private String tagName = null;
-
-	/**
-	 * ElementImpl constructor
-	 */
-	protected ElementImpl() {
-		super();
-	}
-
-	/**
-	 * ElementImpl constructor
-	 * 
-	 * @param that
-	 *            ElementImpl
-	 */
-	protected ElementImpl(ElementImpl that) {
-		super(that);
-
-		if (that != null) {
-			this.tagName = that.tagName;
-			this.isEmptyTag = that.isEmptyTag;
-			this.isJSPTag = that.isJSPTag;
-			this.isCommentTag = that.isCommentTag;
-
-			// clone attributes
-			that.cloneAttributes(this);
-		}
-	}
-
-	/**
-	 * addEndTag method
-	 * 
-	 * @param end
-	 *            org.w3c.dom.Element
-	 */
-	protected void addEndTag(Element endTag) {
-		if (endTag == null)
-			return;
-		if (hasEndTag())
-			return;
-		ElementImpl end = (ElementImpl) endTag;
-
-		// move the end flat node from the end tag
-		IStructuredDocumentRegion flatNode = end.getEndStructuredDocumentRegion();
-		if (flatNode == null)
-			return;
-		end.setEndStructuredDocumentRegion(null);
-		setEndStructuredDocumentRegion(flatNode);
-	}
-
-	/**
-	 * appendAttibuteNode method
-	 * 
-	 * @return org.w3c.dom.Attr
-	 * @param newAttr
-	 *            org.w3c.dom.Attr
-	 */
-	public Attr appendAttributeNode(Attr newAttr) {
-		if (newAttr == null)
-			return null;
-		AttrImpl attr = (AttrImpl) newAttr;
-		if (attr.getOwnerElement() != null)
-			return null;
-
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		if (this.attrNodes == null)
-			this.attrNodes = new NodeListImpl();
-		this.attrNodes.appendNode(attr);
-		attr.setOwnerElement(this);
-
-		notifyAttrReplaced(attr, null);
-		return attr;
-	}
-
-	/**
-	 * cloneAttributes method
-	 * 
-	 * @param newOwner
-	 *            org.w3c.dom.Element
-	 */
-	protected void cloneAttributes(Element newOwner) {
-		if (newOwner == null || newOwner == this)
-			return;
-
-		ElementImpl element = (ElementImpl) newOwner;
-		element.removeAttributes();
-
-		if (this.attrNodes == null)
-			return;
-
-		int length = this.attrNodes.getLength();
-		for (int i = 0; i < length; i++) {
-			Node node = this.attrNodes.item(i);
-			if (node == null)
-				continue;
-			Attr cloned = (Attr) node.cloneNode(false);
-			if (cloned != null)
-				element.appendAttributeNode(cloned);
-		}
-	}
-
-	/**
-	 * cloneNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param deep
-	 *            boolean
-	 */
-	public Node cloneNode(boolean deep) {
-		ElementImpl cloned = new ElementImpl(this);
-		if (deep)
-			cloneChildNodes(cloned, deep);
-		return cloned;
-	}
-
-	/**
-	 * getAttribute method
-	 * 
-	 * @return java.lang.String
-	 * @param name
-	 *            java.lang.String
-	 */
-	public String getAttribute(String name) {
-		Attr attr = getAttributeNode(name);
-		if (attr == null)
-			return null;
-		return attr.getValue();
-	}
-
-	/**
-	 * getAttributeNode method
-	 * 
-	 * @return org.w3c.dom.Attr
-	 * @param name
-	 *            java.lang.String
-	 */
-	public Attr getAttributeNode(String name) {
-		if (name == null)
-			return null; // invalid parameter
-		if (this.attrNodes == null)
-			return null; // no attribute
-
-		int length = this.attrNodes.getLength();
-		for (int i = 0; i < length; i++) {
-			AttrImpl attr = (AttrImpl) this.attrNodes.item(i);
-			if (attr == null)
-				continue;
-			if (attr.matchName(name))
-				return attr; // found
-		}
-
-		return null; // not found
-	}
-
-	/**
-	 */
-	public Attr getAttributeNodeNS(String uri, String name) {
-		if (name == null)
-			return null; // invalid parameter
-		if (this.attrNodes == null)
-			return null; // no attribute
-
-		int length = this.attrNodes.getLength();
-		for (int i = 0; i < length; i++) {
-			AttrImpl attr = (AttrImpl) this.attrNodes.item(i);
-			if (attr == null)
-				continue;
-			String localName = attr.getLocalName();
-			if (localName == null || !localName.equals(name))
-				continue;
-			String nsURI = attr.getNamespaceURI();
-			if (uri == null) {
-				if (nsURI != null)
-					continue;
-			}
-			else {
-				if (nsURI == null || !nsURI.equals(uri))
-					continue;
-			}
-
-			// found
-			return attr;
-		}
-
-		return null; // not found
-	}
-
-	/**
-	 */
-	public String getAttributeNS(String uri, String name) {
-		Attr attr = getAttributeNodeNS(uri, name);
-		if (attr == null)
-			return null;
-		return attr.getValue();
-	}
-
-	/**
-	 * getAttributes method
-	 * 
-	 * @return org.w3c.dom.NamedNodeMap
-	 */
-	public NamedNodeMap getAttributes() {
-		return new Attributes();
-	}
-
-	/**
-	 */
-	protected CMElementDeclaration getDeclaration() {
-		Document document = getOwnerDocument();
-		if (document == null)
-			return null;
-		ModelQuery modelQuery = ModelQueryUtil.getModelQuery(document);
-		if (modelQuery == null)
-			return null;
-		return modelQuery.getCMElementDeclaration(this);
-	}
-
-	/**
-	 * getElementsByTagName method
-	 * 
-	 * @return org.w3c.dom.NodeList
-	 * @param tagName
-	 *            java.lang.String
-	 */
-	public NodeList getElementsByTagName(String tagName) {
-		if (tagName == null)
-			return new NodeListImpl();
-
-		DocumentImpl document = (DocumentImpl) getOwnerDocument();
-		if (document == null)
-			return new NodeListImpl();
-		NodeIterator it = document.createNodeIterator(this, NodeFilter.SHOW_ALL, null, false);
-		if (it == null)
-			return new NodeListImpl();
-		NodeListImpl elements = new NodeListImpl();
-
-		if (tagName.length() == 1 && tagName.charAt(0) == '*') {
-			tagName = null; // do not care
-		}
-
-		for (Node node = it.nextNode(); node != null; node = it.nextNode()) {
-			if (node.getNodeType() != ELEMENT_NODE)
-				continue;
-			if (tagName != null) {
-				ElementImpl element = (ElementImpl) node;
-				if (!element.matchTagName(tagName))
-					continue;
-			}
-			elements.appendNode(node);
-		}
-
-		return elements;
-	}
-
-	/**
-	 */
-	public NodeList getElementsByTagNameNS(String uri, String tagName) {
-		if (tagName == null)
-			return new NodeListImpl();
-
-		DocumentImpl document = (DocumentImpl) getOwnerDocument();
-		if (document == null)
-			return new NodeListImpl();
-		NodeIterator it = document.createNodeIterator(this, NodeFilter.SHOW_ALL, null, false);
-		if (it == null)
-			return new NodeListImpl();
-		NodeListImpl elements = new NodeListImpl();
-
-		if (uri != null && uri.length() == 1 && uri.charAt(0) == '*') {
-			uri = null; // do not care
-		}
-		if (tagName.length() == 1 && tagName.charAt(0) == '*') {
-			tagName = null; // do not care
-		}
-
-		for (Node node = it.nextNode(); node != null; node = it.nextNode()) {
-			if (node.getNodeType() != ELEMENT_NODE)
-				continue;
-			ElementImpl element = (ElementImpl) node;
-			if (tagName != null) {
-				String localName = element.getLocalName();
-				if (localName == null || !localName.equals(tagName))
-					continue;
-			}
-			if (uri != null) {
-				String nsURI = element.getNamespaceURI();
-				if (nsURI == null || !nsURI.equals(uri))
-					continue;
-			}
-			elements.appendNode(element);
-		}
-
-		return elements;
-	}
-
-	/**
-	 * getEndOffset method
-	 * 
-	 * @return int
-	 */
-	public int getEndOffset() {
-		if (this.endStructuredDocumentRegion != null)
-			return this.endStructuredDocumentRegion.getEnd();
-		return super.getEndOffset();
-	}
-
-	/**
-	 * getEndStartOffset method
-	 * 
-	 * @return int
-	 */
-	public int getEndStartOffset() {
-		if (this.endStructuredDocumentRegion != null)
-			return this.endStructuredDocumentRegion.getStart();
-		return super.getEndOffset();
-	}
-
-	/**
-	 * getEndStructuredDocumentRegion method
-	 * 
-	 */
-	public IStructuredDocumentRegion getEndStructuredDocumentRegion() {
-		return this.endStructuredDocumentRegion;
-	}
-
-	public String getEndTagName() {
-		if (this.endStructuredDocumentRegion == null)
-			return null;
-
-		ITextRegionList regions = this.endStructuredDocumentRegion.getRegions();
-		if (regions == null)
-			return null;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedEndTag(regionType)) {
-				return this.endStructuredDocumentRegion.getText(region);
-			}
-		}
-
-		return null;
-	}
-
-	protected boolean isNestedEndTag(String regionType) {
-		boolean result = false;
-		return result;
-	}
-
-	/**
-	 * getFirstStructuredDocumentRegion method
-	 * 
-	 */
-	public IStructuredDocumentRegion getFirstStructuredDocumentRegion() {
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode != null)
-			return StructuredDocumentRegionUtil.getStructuredDocumentRegion(flatNode);
-		return StructuredDocumentRegionUtil.getStructuredDocumentRegion(this.endStructuredDocumentRegion);
-	}
-
-	/**
-	 * getLastStructuredDocumentRegion method
-	 * 
-	 */
-	public IStructuredDocumentRegion getLastStructuredDocumentRegion() {
-		if (this.endStructuredDocumentRegion != null)
-			return StructuredDocumentRegionUtil.getStructuredDocumentRegion(this.endStructuredDocumentRegion);
-		return StructuredDocumentRegionUtil.getStructuredDocumentRegion(getStructuredDocumentRegion());
-	}
-
-	/**
-	 */
-	public String getLocalName() {
-		if (this.tagName == null)
-			return null;
-		int index = this.tagName.indexOf(':');
-		if (index < 0)
-			return this.tagName;
-		return this.tagName.substring(index + 1);
-	}
-
-	/**
-	 */
-	public String getNamespaceURI() {
-		String nsAttrName = null;
-		String prefix = getPrefix();
-		if (prefix != null && prefix.length() > 0) {
-			nsAttrName = IXMLNamespace.XMLNS_PREFIX + prefix;
-		}
-		else {
-			nsAttrName = IXMLNamespace.XMLNS;
-		}
-
-		for (Node node = this; node != null; node = node.getParentNode()) {
-			if (node.getNodeType() != ELEMENT_NODE)
-				break;
-			Element element = (Element) node;
-			Attr attr = element.getAttributeNode(nsAttrName);
-			if (attr != null)
-				return attr.getValue();
-		}
-
-		return this.namespaceURI;
-	}
-
-	/**
-	 * getNodeName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeName() {
-		return getTagName();
-	}
-
-	/**
-	 * getNodeType method
-	 * 
-	 * @return short
-	 */
-	public short getNodeType() {
-		return ELEMENT_NODE;
-	}
-
-	/**
-	 */
-	public String getPrefix() {
-		if (this.tagName == null)
-			return null;
-		int index = this.tagName.indexOf(':');
-		if (index <= 0)
-			return null;
-		// exclude JSP tag in tag name
-		if (this.tagName.charAt(0) == '<')
-			return null;
-		return this.tagName.substring(0, index);
-	}
-
-	/**
-	 * getStartEndOffset method
-	 * 
-	 * @return int
-	 */
-	public int getStartEndOffset() {
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode != null)
-			return flatNode.getEnd();
-		return super.getStartOffset();
-	}
-
-	/**
-	 * getStartOffset method
-	 * 
-	 * @return int
-	 */
-	public int getStartOffset() {
-		if (getStartStructuredDocumentRegion() == null && this.endStructuredDocumentRegion != null && !hasChildNodes()) {
-			return this.endStructuredDocumentRegion.getStart();
-		}
-		return super.getStartOffset();
-	}
-
-	/**
-	 * getStartStructuredDocumentRegion method
-	 * 
-	 */
-	public IStructuredDocumentRegion getStartStructuredDocumentRegion() {
-		return getStructuredDocumentRegion();
-	}
-
-	/**
-	 * getTagName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getTagName() {
-		if (this.tagName == null)
-			return new String();
-		return this.tagName;
-	}
-
-	/**
-	 */
-	public boolean hasAttribute(String name) {
-		return (getAttributeNode(name) != null);
-	}
-
-	/**
-	 */
-	public boolean hasAttributeNS(String uri, String name) {
-		return (getAttributeNodeNS(uri, name) != null);
-	}
-
-	/**
-	 */
-	public boolean hasAttributes() {
-		return (this.attrNodes != null && this.attrNodes.getLength() > 0);
-	}
-
-	/**
-	 * hasEndTag method
-	 * 
-	 * @return boolean
-	 */
-	public boolean hasEndTag() {
-		return (this.endStructuredDocumentRegion != null);
-	}
-
-	/**
-	 */
-	protected final boolean hasPrefix() {
-		if (this.tagName == null)
-			return false;
-		if (this.tagName.indexOf(':') <= 0)
-			return false;
-		// exclude JSP tag in tag name
-		if (this.tagName.charAt(0) == '<')
-			return false;
-		return true;
-	}
-
-	/**
-	 * hasStartTag method
-	 * 
-	 * @return boolean
-	 */
-	public boolean hasStartTag() {
-		return (getStructuredDocumentRegion() != null);
-	}
-
-	/**
-	 */
-	protected final boolean ignoreCase() {
-		DocumentImpl document = (DocumentImpl) getOwnerDocument();
-		if (document != null && document.ignoreCase()) {
-			// even in case insensitive document, if having prefix, it's case
-			// sensitive tag
-			return !hasPrefix();
-		}
-		return false;
-	}
-
-	/**
-	 */
-	protected Attr insertAttributeNode(Attr newAttr, int index) {
-		if (newAttr == null)
-			return null;
-		AttrImpl attr = (AttrImpl) newAttr;
-		if (attr.getOwnerElement() != null)
-			return null;
-
-		if (this.attrNodes == null)
-			this.attrNodes = new NodeListImpl();
-		this.attrNodes.insertNode(attr, index);
-		attr.setOwnerElement(this);
-
-		notifyAttrReplaced(attr, null);
-		return attr;
-	}
-
-	/**
-	 * insertBefore method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param newChild
-	 *            org.w3c.dom.Node
-	 * @param refChild
-	 *            org.w3c.dom.Node
-	 */
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		// should throw DOMException instead of return null?
-		if (newChild == null)
-			return null;
-		if (!isContainer()) { // never be container
-			throw new DOMException(DOMException.HIERARCHY_REQUEST_ERR, new String());
-		}
-		if (newChild.getNodeType() != TEXT_NODE) {
-			if (isJSPContainer() || isCDATAContainer()) { // accepts only
-				// Text
-				// child
-				throw new DOMException(DOMException.HIERARCHY_REQUEST_ERR, new String());
-			}
-		}
-		return super.insertBefore(newChild, refChild);
-	}
-
-	/**
-	 */
-	protected boolean isCDATAContainer() {
-		// use BlockMaker instead of CMElementDeclaration
-		// because <style> and <script> in XHTML is not CDATA content type
-		IDOMModel model = getModel();
-		if (model == null)
-			return false; // error
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (structuredDocument == null)
-			return false; // eror
-		RegionParser parser = structuredDocument.getParser();
-		if (parser == null || !(parser instanceof XMLSourceParser))
-			return false;
-		return (((XMLSourceParser) parser).getBlockMarker(this.tagName) != null);
-		/*
-		 * CMElementDeclaration decl = getDeclaration(); if (decl == null)
-		 * return false; if (decl instanceof CMNodeWrapper) { decl =
-		 * (CMElementDeclaration)((CMNodeWrapper)decl).getOriginNode(); if
-		 * (decl == null) return false; } if (decl instanceof
-		 * TLDElementDeclaration) { String content =
-		 * ((TLDElementDeclaration)decl).getBodycontent(); if (content ==
-		 * null) return false; return
-		 * content.equals(JSP11TLDNames.CONTENT_TAGDEPENDENT); } if
-		 * (!isGlobalTag()) return false; return (decl.getContentType() ==
-		 * CMElementDeclaration.CDATA);
-		 */
-	}
-
-	/**
-	 */
-	public boolean isClosed() {
-		IStructuredDocumentRegion flatNode = null;
-		if (isEmptyTag() || !isContainer()) {
-			flatNode = getStructuredDocumentRegion();
-			if (flatNode == null)
-				return true; // will be generated
-		}
-		else {
-			flatNode = getEndStructuredDocumentRegion();
-			if (flatNode == null)
-				return false; // must be generated
-		}
-		String regionType = StructuredDocumentRegionUtil.getLastRegionType(flatNode);
-		if (isCommentTag()) {
-			return (isNestedClosedComment(regionType) || regionType == DOMRegionContext.XML_COMMENT_CLOSE);
-		}
-		if (isJSPTag()) {
-			return isNestedClosed(regionType);
-		}
-		return (regionType == DOMRegionContext.XML_TAG_CLOSE || regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE || regionType == DOMRegionContext.XML_DECLARATION_CLOSE);
-	}
-
-	protected boolean isNestedClosed(String regionType) {
-		boolean result = false;
-		return result;
-	}
-
-	protected boolean isNestedClosedComment(String regionType) {
-		boolean result = false;
-		return result;
-	}
-
-	/**
-	 */
-	public final boolean isCommentTag() {
-		return this.isCommentTag;
-	}
-
-	/**
-	 * isContainer method
-	 * 
-	 * @return boolean
-	 */
-	public boolean isContainer() {
-		if (isCommentTag()) {
-			CommentElementAdapter adapter = (CommentElementAdapter) getAdapterFor(CommentElementAdapter.class);
-			if (adapter != null) {
-				return (adapter.isContainer());
-			}
-			return (getDeclaration() == null);
-		}
-		if (isJSPTag()) {
-			// exclude JSP directive
-			return (matchTagName(JSPTag.JSP_SCRIPTLET) || matchTagName(JSPTag.JSP_DECLARATION) || matchTagName(JSPTag.JSP_EXPRESSION));
-		}
-		if (!isXMLTag()) { // non-XML tag
-			CMElementDeclaration decl = getDeclaration();
-			if (decl == null)
-				return false; // undefined tag
-			return (decl.getContentType() != CMElementDeclaration.EMPTY);
-		}
-		return true;
-	}
-
-	/**
-	 * isEmptyTag method
-	 * 
-	 * @return boolean
-	 */
-	public boolean isEmptyTag() {
-		if (isJSPTag())
-			return false;
-		if (isCommentTag())
-			return false;
-		if (!isXMLTag())
-			return false;
-		return this.isEmptyTag;
-	}
-
-	/**
-	 */
-	public boolean isEndTag() {
-		return (hasEndTag() && !hasStartTag() && !hasChildNodes());
-	}
-
-	/**
-	 */
-	public boolean isGlobalTag() {
-		return !hasPrefix();
-	}
-
-	/**
-	 */
-	public boolean isImplicitTag() {
-		if (hasStartTag() || hasEndTag())
-			return false;
-		// make sure this is in the document tree
-		// because if not in the document tree, no tags are generated yet
-		return (getContainerDocument() != null);
-	}
-
-	/**
-	 */
-	public boolean isJSPContainer() {
-		return (isJSPTag() && !isCommentTag() && isContainer());
-	}
-
-	/**
-	 * isJSPTag method
-	 * 
-	 * @return boolean
-	 */
-	public final boolean isJSPTag() {
-		return this.isJSPTag;
-	}
-
-	/**
-	 */
-	public boolean isStartTagClosed() {
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode == null)
-			return true; // will be generated
-		String regionType = StructuredDocumentRegionUtil.getLastRegionType(flatNode);
-		if (isCommentTag()) {
-			return (isNestedClosedComment(regionType) || regionType == DOMRegionContext.XML_COMMENT_CLOSE);
-		}
-		if (isJSPTag()) {
-			if (isContainer())
-				return true; // start tag always has a single region
-			return isClosedNestedDirective(regionType);
-		}
-		return (regionType == DOMRegionContext.XML_TAG_CLOSE || regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE || regionType == DOMRegionContext.XML_DECLARATION_CLOSE);
-	}
-
-	protected boolean isClosedNestedDirective(String regionType) {
-		boolean result = false;
-		return result;
-	}
-
-	/**
-	 */
-	public final boolean isXMLTag() {
-		if (isJSPTag())
-			return false;
-		if (isCommentTag())
-			return false;
-		DocumentImpl document = (DocumentImpl) getOwnerDocument();
-		if (document != null && !document.isXMLType()) {
-			// even in non-XML document, if having prefix, it's XML tag
-			return hasPrefix();
-		}
-		return true;
-	}
-
-	/**
-	 */
-	protected boolean matchEndTag(Element element) {
-		if (element == null)
-			return false;
-		ElementImpl impl = (ElementImpl) element;
-		if (isJSPTag() && !isCommentTag()) {
-			return (impl.isJSPTag() && !impl.isCommentTag());
-		}
-		return matchTagName(element.getTagName());
-	}
-
-	/**
-	 * matchTagName method
-	 * 
-	 * @return boolean
-	 * @param tagName
-	 *            java.lang.String
-	 */
-	public boolean matchTagName(String tagName) {
-		if (tagName == null)
-			return (this.tagName == null);
-		if (this.tagName == null)
-			return false;
-		if (!ignoreCase())
-			return this.tagName.equals(tagName);
-		return this.tagName.equalsIgnoreCase(tagName);
-	}
-
-	/**
-	 * notifyAttrReplaced method
-	 * 
-	 * @param newAttr
-	 *            org.w3c.dom.Attr
-	 * @param oldAttr
-	 *            org.w3c.dom.Attr
-	 */
-	protected void notifyAttrReplaced(Attr newAttr, Attr oldAttr) {
-		DocumentImpl document = (DocumentImpl) getContainerDocument();
-		if (document == null)
-			return;
-		DOMModelImpl model = (DOMModelImpl) document.getModel();
-		if (model == null)
-			return;
-		model.attrReplaced(this, newAttr, oldAttr);
-	}
-
-	/**
-	 * notifyValueChanged method
-	 */
-	public void notifyEndTagChanged() {
-		DocumentImpl document = (DocumentImpl) getContainerDocument();
-		if (document == null)
-			return;
-		DOMModelImpl model = (DOMModelImpl) document.getModel();
-		if (model == null)
-			return;
-		model.endTagChanged(this);
-	}
-
-	/**
-	 */
-	public void notifyStartTagChanged() {
-		DocumentImpl document = (DocumentImpl) getContainerDocument();
-		if (document == null)
-			return;
-		DOMModelImpl model = (DOMModelImpl) document.getModel();
-		if (model == null)
-			return;
-		model.startTagChanged(this);
-	}
-
-	/**
-	 */
-	public boolean preferEmptyTag() {
-		if (hasChildNodes())
-			return false;
-		if (isJSPTag())
-			return false;
-		if (isCommentTag())
-			return false;
-		if (!isXMLTag())
-			return false;
-		CMElementDeclaration decl = getDeclaration();
-		if (decl == null)
-			return false;
-		return (decl.getContentType() == CMElementDeclaration.EMPTY);
-	}
-
-	/**
-	 * removeAttribute method
-	 * 
-	 * @param name
-	 *            java.lang.String
-	 */
-	public void removeAttribute(String name) throws DOMException {
-		removeAttributeNode(name);
-	}
-
-	/**
-	 * removeAttributeNode method
-	 * 
-	 * @return org.w3c.dom.Attr
-	 * @param oldAttr
-	 *            org.w3c.dom.Attr
-	 */
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		if (oldAttr == null)
-			return null; // invalid parameter
-
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		if (this.attrNodes == null) { // no attribute
-			throw new DOMException(DOMException.NOT_FOUND_ERR, new String());
-		}
-
-		int length = this.attrNodes.getLength();
-		for (int i = 0; i < length; i++) {
-			AttrImpl attr = (AttrImpl) this.attrNodes.item(i);
-			if (attr != oldAttr)
-				continue;
-
-			// found
-			this.attrNodes.removeNode(i);
-			attr.setOwnerElement(null);
-
-			notifyAttrReplaced(null, attr);
-			return attr;
-		}
-
-		// not found
-		throw new DOMException(DOMException.NOT_FOUND_ERR, new String());
-	}
-
-	/**
-	 * removeAttributeNode method
-	 * 
-	 * @return org.w3c.dom.Attr
-	 * @param name
-	 *            java.lang.String
-	 */
-	public Attr removeAttributeNode(String name) {
-		if (name == null)
-			return null; // invalid parameter
-		if (this.attrNodes == null)
-			return null; // no attribute
-
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		int length = this.attrNodes.getLength();
-		for (int i = 0; i < length; i++) {
-			AttrImpl attr = (AttrImpl) this.attrNodes.item(i);
-			if (attr == null)
-				continue;
-			if (!attr.matchName(name))
-				continue;
-
-			// found
-			this.attrNodes.removeNode(i);
-			attr.setOwnerElement(null);
-
-			notifyAttrReplaced(null, attr);
-			return attr;
-		}
-
-		return null; // not found
-	}
-
-	/**
-	 */
-	public Attr removeAttributeNodeNS(String uri, String name) {
-		if (name == null)
-			return null; // invalid parameter
-		if (this.attrNodes == null)
-			return null; // no attribute
-
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		int length = this.attrNodes.getLength();
-		for (int i = 0; i < length; i++) {
-			AttrImpl attr = (AttrImpl) this.attrNodes.item(i);
-			if (attr == null)
-				continue;
-			String localName = attr.getLocalName();
-			if (localName == null || !localName.equals(name))
-				continue;
-			String nsURI = attr.getNamespaceURI();
-			if (uri == null) {
-				if (nsURI != null)
-					continue;
-			}
-			else {
-				if (nsURI == null || !nsURI.equals(uri))
-					continue;
-			}
-
-			// found
-			this.attrNodes.removeNode(i);
-			attr.setOwnerElement(null);
-
-			notifyAttrReplaced(null, attr);
-			return attr;
-		}
-
-		return null; // not found
-	}
-
-	/**
-	 */
-	public void removeAttributeNS(String uri, String name) throws DOMException {
-		removeAttributeNodeNS(uri, name);
-	}
-
-	/**
-	 * removeAttributes method
-	 */
-	public void removeAttributes() {
-		if (this.attrNodes == null)
-			return;
-
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		int length = this.attrNodes.getLength();
-		for (int i = 0; i < length; i++) {
-			AttrImpl attr = (AttrImpl) this.attrNodes.item(i);
-			if (attr != null) {
-				attr.setOwnerElement(null);
-				notifyAttrReplaced(null, attr);
-			}
-		}
-
-		this.attrNodes = null;
-	}
-
-	/**
-	 * removeEndTag method
-	 * 
-	 * @return org.w3c.dom.Element
-	 */
-	protected Element removeEndTag() {
-		if (!hasEndTag())
-			return null;
-		NodeListImpl attrNodes = this.attrNodes;
-		this.attrNodes = null; // not to copy attributes
-		ElementImpl end = (ElementImpl) cloneNode(false);
-		this.attrNodes = attrNodes;
-		if (end == null)
-			return null;
-
-		// move the end flat node to the end tag
-		IStructuredDocumentRegion flatNode = getEndStructuredDocumentRegion();
-		if (flatNode == null)
-			return null;
-		setEndStructuredDocumentRegion(null);
-		end.setEndStructuredDocumentRegion(flatNode);
-		return end;
-	}
-
-	/**
-	 */
-	protected void removeStartTag() {
-		removeAttributes();
-	}
-
-	/**
-	 * Resets attribute values from IStructuredDocumentRegion.
-	 */
-	void resetStructuredDocumentRegions() {
-		if (this.attrNodes != null) {
-			int length = this.attrNodes.getLength();
-			for (int i = 0; i < length; i++) {
-				AttrImpl attr = (AttrImpl) this.attrNodes.item(i);
-				if (attr == null)
-					continue;
-				attr.resetRegions();
-			}
-		}
-
-		super.resetStructuredDocumentRegions(); // for children
-
-		this.endStructuredDocumentRegion = null;
-	}
-
-	/**
-	 * setAttribute method
-	 * 
-	 * @param name
-	 *            java.lang.String
-	 * @param value
-	 *            java.lang.String
-	 */
-	public void setAttribute(String name, String value) throws DOMException {
-		if (name == null)
-			return;
-
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		Attr attr = getAttributeNode(name);
-		if (attr != null) {
-			attr.setValue(value); // change value
-			return;
-		}
-
-		// new attribute
-		Document doc = getOwnerDocument();
-		if (doc == null)
-			return;
-		attr = doc.createAttribute(name);
-		if (attr == null)
-			return;
-		attr.setValue(value);
-		appendAttributeNode(attr);
-	}
-
-	/**
-	 * setAttributeNode method
-	 * 
-	 * @return org.w3c.dom.Attr
-	 * @param newAttr
-	 *            org.w3c.dom.Attr
-	 */
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		if (newAttr == null)
-			return null; // nothing to do
-
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		AttrImpl attr = (AttrImpl) newAttr;
-		Element owner = attr.getOwnerElement();
-		if (owner != null) {
-			if (owner == this)
-				return null; // nothing to do
-			throw new DOMException(DOMException.INUSE_ATTRIBUTE_ERR, new String());
-		}
-
-		Attr oldAttr = removeAttributeNode(newAttr.getName());
-		appendAttributeNode(attr);
-		return oldAttr;
-	}
-
-	/**
-	 */
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		if (newAttr == null)
-			return null; // nothing to do
-
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		AttrImpl attr = (AttrImpl) newAttr;
-		Element owner = attr.getOwnerElement();
-		if (owner != null) {
-			if (owner == this)
-				return null; // nothing to do
-			throw new DOMException(DOMException.INUSE_ATTRIBUTE_ERR, new String());
-		}
-
-		String name = newAttr.getLocalName();
-		String uri = newAttr.getNamespaceURI();
-		Attr oldAttr = removeAttributeNodeNS(uri, name);
-		appendAttributeNode(attr);
-		return oldAttr;
-	}
-
-	/**
-	 */
-	public void setAttributeNS(String uri, String name, String value) throws DOMException {
-		if (name == null)
-			return;
-
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		Attr attr = getAttributeNodeNS(uri, name);
-		if (attr != null) {
-			attr.setValue(value); // change value
-			return;
-		}
-
-		// new attribute
-		Document doc = getOwnerDocument();
-		if (doc == null)
-			return;
-		attr = doc.createAttributeNS(uri, name);
-		if (attr == null)
-			return;
-		attr.setValue(value);
-		appendAttributeNode(attr);
-	}
-
-	/**
-	 */
-	public void setCommentTag(boolean isCommentTag) {
-		IDOMNode parent = (IDOMNode) getParentNode();
-		if (parent != null && !parent.isChildEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		this.isCommentTag = isCommentTag;
-	}
-
-	/**
-	 * setEmptyTag method
-	 * 
-	 * @param isEmptyTag
-	 *            boolean
-	 */
-	public void setEmptyTag(boolean isEmptyTag) {
-		IDOMNode parent = (IDOMNode) getParentNode();
-		if (parent != null && !parent.isChildEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		this.isEmptyTag = isEmptyTag;
-	}
-
-	/**
-	 * setEndStructuredDocumentRegion method
-	 * 
-	 * @param flatNode
-	 */
-	void setEndStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		this.endStructuredDocumentRegion = flatNode;
-
-		NodeContainer parent = (NodeContainer) getParentNode();
-		if (parent != null) {
-			parent.syncChildEditableState(this);
-		}
-	}
-
-	/**
-	 * setJSPTag method
-	 * 
-	 * @param isJSPTag
-	 *            boolean
-	 */
-	public void setJSPTag(boolean isJSPTag) {
-		IDOMNode parent = (IDOMNode) getParentNode();
-		if (parent != null && !parent.isChildEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		this.isJSPTag = isJSPTag;
-	}
-
-	/**
-	 */
-	protected void setNamespaceURI(String namespaceURI) {
-		this.namespaceURI = namespaceURI;
-	}
-
-	/**
-	 */
-	protected void setOwnerDocument(Document ownerDocument, boolean deep) {
-		super.setOwnerDocument(ownerDocument, deep);
-
-		if (this.attrNodes == null)
-			return;
-
-		int length = this.attrNodes.getLength();
-		for (int i = 0; i < length; i++) {
-			AttrImpl attr = (AttrImpl) this.attrNodes.item(i);
-			if (attr == null)
-				continue;
-			attr.setOwnerDocument(ownerDocument);
-		}
-	}
-
-	/**
-	 */
-	public void setPrefix(String prefix) throws DOMException {
-		IDOMNode parent = (IDOMNode) getParentNode();
-		if (parent != null && !parent.isChildEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		int prefixLength = (prefix != null ? prefix.length() : 0);
-		String localName = getLocalName();
-		if (prefixLength == 0) {
-			if (localName == null || localName.length() == 0) {
-				// invalid local name
-				return;
-			}
-			setTagName(localName);
-		}
-		else {
-			int localLength = (localName != null ? localName.length() : 0);
-			StringBuffer buffer = new StringBuffer(prefixLength + 1 + localLength);
-			buffer.append(prefix);
-			buffer.append(':');
-			if (localName != null)
-				buffer.append(localName);
-			setTagName(buffer.toString());
-		}
-
-		boolean changeEndTag = hasEndTag();
-		notifyStartTagChanged();
-		if (changeEndTag)
-			notifyEndTagChanged();
-	}
-
-	/**
-	 * setStartStructuredDocumentRegion method
-	 * 
-	 * @param flatNode
-	 */
-	void setStartStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		setStructuredDocumentRegion(flatNode);
-	}
-
-	/**
-	 * setTagName method
-	 * 
-	 * @param tagName
-	 *            java.lang.String
-	 */
-	protected void setTagName(String tagName) {
-		this.tagName = tagName;
-	}
-
-	/**
-	 * toString method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		String tagName = getTagName();
-		if (hasStartTag())
-			buffer.append(tagName);
-		if (isEmptyTag())
-			buffer.append('/');
-		if (hasEndTag()) {
-			buffer.append('/');
-			buffer.append(tagName);
-		}
-		if (buffer.length() == 0)
-			buffer.append(tagName);
-
-		IStructuredDocumentRegion startStructuredDocumentRegion = getStartStructuredDocumentRegion();
-		if (startStructuredDocumentRegion != null) {
-			buffer.append('@');
-			buffer.append(startStructuredDocumentRegion.toString());
-		}
-		IStructuredDocumentRegion endStructuredDocumentRegion = getEndStructuredDocumentRegion();
-		if (endStructuredDocumentRegion != null) {
-			buffer.append('@');
-			buffer.append(endStructuredDocumentRegion.toString());
-		}
-		return buffer.toString();
-	}
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not supported in this version"); //$NON-NLS-1$
-	}
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not supported in this version"); //$NON-NLS-1$
-	}
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not supported in this version"); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/EntityImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/EntityImpl.java
deleted file mode 100644
index 47558fb..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/EntityImpl.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Entity;
-import org.w3c.dom.Node;
-
-/**
- * EntityImpl class
- */
-public class EntityImpl extends NodeImpl implements Entity {
-
-	private String name = null;
-	private String notationName = null;
-	private String publicId = null;
-	private String systemId = null;
-
-	/**
-	 * EntityImpl constructor
-	 */
-	protected EntityImpl() {
-		super();
-	}
-
-	/**
-	 * EntityImpl constructor
-	 * 
-	 * @param that
-	 *            EntityImpl
-	 */
-	protected EntityImpl(EntityImpl that) {
-		super(that);
-
-		if (that != null) {
-			this.name = that.name;
-			this.publicId = that.publicId;
-			this.systemId = that.systemId;
-			this.notationName = that.notationName;
-		}
-	}
-
-	/**
-	 * cloneNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param deep
-	 *            boolean
-	 */
-	public Node cloneNode(boolean deep) {
-		EntityImpl cloned = new EntityImpl(this);
-		return cloned;
-	}
-
-	/**
-	 * <p>
-	 * EXPERIMENTAL! Based on the <a
-	 * href='http://www.w3.org/TR/2001/WD-DOM-Level-3-Core-20010605'>Document
-	 * Object Model (DOM) Level 3 Core Working Draft of 5 June 2001. </a>.
-	 * <p>
-	 * An attribute specifying, as part of the text declaration, the encoding
-	 * of this entity, when it is an external parsed entity. This is
-	 * <code>null</code> otherwise.
-	 * 
-	 * @see DOM Level 3
-	 */
-	public java.lang.String getEncoding() {
-		return null;
-	}
-
-	/**
-	 * getNodeName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeName() {
-		if (this.name == null)
-			return new String();
-		return this.name;
-	}
-
-	/**
-	 * getNodeType method
-	 * 
-	 * @return short
-	 */
-	public short getNodeType() {
-		return ENTITY_NODE;
-	}
-
-	/**
-	 * getNotationName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNotationName() {
-		return this.notationName;
-	}
-
-	/**
-	 * getPublicId method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getPublicId() {
-		return this.publicId;
-	}
-
-	/**
-	 * getSystemId method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getSystemId() {
-		return this.systemId;
-	}
-
-	/**
-	 * <p>
-	 * EXPERIMENTAL! Based on the <a
-	 * href='http://www.w3.org/TR/2001/WD-DOM-Level-3-Core-20010605'>Document
-	 * Object Model (DOM) Level 3 Core Working Draft of 5 June 2001. </a>.
-	 * <p>
-	 * An attribute specifying, as part of the text declaration, the version
-	 * number of this entity, when it is an external parsed entity. This is
-	 * <code>null</code> otherwise.
-	 * 
-	 * @see DOM Level 3
-	 */
-	public java.lang.String getVersion() {
-		return null;
-	}
-
-	/**
-	 * <p>
-	 * EXPERIMENTAL! Based on the <a
-	 * href='http://www.w3.org/TR/2001/WD-DOM-Level-3-Core-20010605'>Document
-	 * Object Model (DOM) Level 3 Core Working Draft of 5 June 2001. </a>.
-	 * <p>
-	 * An attribute specifying, as part of the text declaration, the encoding
-	 * of this entity, when it is an external parsed entity. This is
-	 * <code>null</code> otherwise.
-	 * 
-	 * @see DOM Level 3
-	 */
-	public void setEncoding(java.lang.String encoding) {
-	}
-
-	/**
-	 * setName method
-	 * 
-	 * @param name
-	 *            java.lang.String
-	 */
-	protected void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * setNotationName method
-	 * 
-	 * @param notationName
-	 *            java.lang.String
-	 */
-	public void setNotationName(String notationName) {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		this.notationName = notationName;
-	}
-
-	/**
-	 * setPublicId method
-	 * 
-	 * @param publicId
-	 *            java.lang.String
-	 */
-	public void setPublicId(String publicId) {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		this.publicId = publicId;
-	}
-
-	/**
-	 * setSystemId method
-	 * 
-	 * @param systemId
-	 *            java.lang.String
-	 */
-	public void setSystemId(String systemId) {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		this.systemId = systemId;
-	}
-
-	/**
-	 * <p>
-	 * EXPERIMENTAL! Based on the <a
-	 * href='http://www.w3.org/TR/2001/WD-DOM-Level-3-Core-20010605'>Document
-	 * Object Model (DOM) Level 3 Core Working Draft of 5 June 2001. </a>.
-	 * <p>
-	 * An attribute specifying, as part of the text declaration, the version
-	 * number of this entity, when it is an external parsed entity. This is
-	 * <code>null</code> otherwise.
-	 * 
-	 * @see DOM Level 3
-	 */
-	public void setVersion(java.lang.String version) {
-	}
-
-	public String getInputEncoding() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version"); //$NON-NLS-1$
-	}
-
-	public String getXmlEncoding() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version"); //$NON-NLS-1$
-	}
-
-
-	public String getXmlVersion() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version"); //$NON-NLS-1$
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/EntityReferenceImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/EntityReferenceImpl.java
deleted file mode 100644
index 366ecc0..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/EntityReferenceImpl.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.w3c.dom.EntityReference;
-import org.w3c.dom.Node;
-
-/**
- * EntityReference class
- */
-public class EntityReferenceImpl extends NodeImpl implements EntityReference {
-
-	private String name = null;
-
-	/**
-	 * EntityReferenceImpl constructor
-	 */
-	protected EntityReferenceImpl() {
-		super();
-	}
-
-	/**
-	 * EntityReferenceImpl constructor
-	 * 
-	 * @param that
-	 *            EntityReferenceImpl
-	 */
-	protected EntityReferenceImpl(EntityReferenceImpl that) {
-		super(that);
-
-		if (that != null) {
-			this.name = that.name;
-		}
-	}
-
-	/**
-	 * cloneNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param deep
-	 *            boolean
-	 */
-	public Node cloneNode(boolean deep) {
-		EntityReferenceImpl cloned = new EntityReferenceImpl(this);
-		return cloned;
-	}
-
-	/**
-	 * getNodeName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeName() {
-		if (this.name == null)
-			return new String();
-		return this.name;
-	}
-
-	/**
-	 * getNodeType method
-	 * 
-	 * @return short
-	 */
-	public short getNodeType() {
-		return ENTITY_REFERENCE_NODE;
-	}
-
-	/**
-	 * setName method
-	 * 
-	 * @param name
-	 *            java.lang.String
-	 */
-	protected void setName(String name) {
-		this.name = name;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/InvalidCharacterException.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/InvalidCharacterException.java
deleted file mode 100644
index a8166ed..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/InvalidCharacterException.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-/**
- * Thrown an invalid character is specified in : XMLNode#setSource(String)
- */
-public class InvalidCharacterException extends Exception {
-
-	/**
-	 * Default <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 1L;
-	private char invalidChar = 0;
-	private int offset = -1;
-
-	/**
-	 */
-	public InvalidCharacterException() {
-		super();
-	}
-
-	/**
-	 */
-	public InvalidCharacterException(String s) {
-		super(s);
-	}
-
-	/**
-	 */
-	public InvalidCharacterException(String s, char c) {
-		super(s);
-		this.invalidChar = c;
-	}
-
-	/**
-	 */
-	public InvalidCharacterException(String s, char c, int offset) {
-		super(s);
-		this.invalidChar = c;
-		this.offset = offset;
-	}
-
-	/**
-	 */
-	public char getInvalidChar() {
-		return this.invalidChar;
-	}
-
-	/**
-	 */
-	public int getOffset() {
-		return this.offset;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/JSPTag.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/JSPTag.java
deleted file mode 100644
index 01c7bbb..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/JSPTag.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-/**
- * JSPTag interface
- */
-public interface JSPTag {
-	static final String COMMENT_CLOSE = "--%>";//$NON-NLS-1$
-	static final String COMMENT_OPEN = "<%--";//$NON-NLS-1$
-	static final String DECLARATION_TOKEN = "!";//$NON-NLS-1$
-	static final String DIRECTIVE_TOKEN = "@";//$NON-NLS-1$
-	static final String EXPRESSION_TOKEN = "=";//$NON-NLS-1$
-	static final String JSP_DECLARATION = "jsp:declaration";//$NON-NLS-1$
-	static final String JSP_DIRECTIVE = "jsp:directive";//$NON-NLS-1$
-	static final String JSP_EXPRESSION = "jsp:expression";//$NON-NLS-1$
-	static final String JSP_ROOT = "jsp:root";//$NON-NLS-1$
-
-	static final String JSP_SCRIPTLET = "jsp:scriptlet";//$NON-NLS-1$
-	static final String TAG_CLOSE = "%>";//$NON-NLS-1$
-	static final String TAG_OPEN = "<%";//$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ModelParserAdapter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ModelParserAdapter.java
deleted file mode 100644
index e36d4a1..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ModelParserAdapter.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- */
-public interface ModelParserAdapter extends INodeAdapter {
-
-	/**
-	 */
-	public boolean canBeImplicitTag(Element element);
-
-	/**
-	 */
-	public boolean canBeImplicitTag(Element element, Node child);
-
-	/**
-	 */
-	public boolean canContain(Element element, Node child);
-
-	/**
-	 */
-	public Element createCommentElement(Document document, String data, boolean isJSPTag);
-
-	/**
-	 */
-	public Element createImplicitElement(Document document, Node parent, Node child);
-
-	/**
-	 */
-	public String getFindRootName(String tagName);
-
-	/**
-	 */
-	public boolean isEndTag(IDOMElement element);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeContainer.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeContainer.java
deleted file mode 100644
index 64296b7..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeContainer.java
+++ /dev/null
@@ -1,514 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * NodeContainer class
- */
-public abstract class NodeContainer extends NodeImpl implements Node, NodeList {
-
-	/**
-	 */
-	private class ChildNodesCache implements NodeList {
-		private Node curChild = null;
-		private int curIndex = -1;
-		private int length = 0;
-
-		ChildNodesCache() {
-			initializeCache();
-		}
-
-		public int getLength() {
-			// atomic
-			return this.length;
-		}
-
-		private void initializeCache() {
-			// note we use the outter objects lockobject
-			// (since we are using their "children".
-			synchronized (lockObject) {
-				for (Node child = firstChild; child != null; child = child.getNextSibling()) {
-					this.length++;
-				}
-			}
-		}
-
-		public Node item(int index) {
-			synchronized (lockObject) {
-				if (this.length == 0)
-					return null;
-				if (index < 0)
-					return null;
-				if (index >= this.length)
-					return null;
-
-				if (this.curIndex < 0) { // first time
-					if (index * 2 >= this.length) { // search from the last
-						this.curIndex = this.length - 1;
-						this.curChild = lastChild;
-					} else { // search from the first
-						this.curIndex = 0;
-						this.curChild = firstChild;
-					}
-				}
-
-				if (index == this.curIndex)
-					return this.curChild;
-
-				if (index > this.curIndex) {
-					while (index > this.curIndex) {
-						this.curIndex++;
-						this.curChild = this.curChild.getNextSibling();
-					}
-				} else { // index < this.curIndex
-					while (index < this.curIndex) {
-						this.curIndex--;
-						this.curChild = this.curChild.getPreviousSibling();
-					}
-				}
-
-				return this.curChild;
-			}
-		}
-	}
-
-	private NodeList childNodesCache = null;
-
-	private boolean fChildEditable = true;
-	NodeImpl firstChild = null;
-	NodeImpl lastChild = null;
-
-	Object lockObject = new byte[0];
-
-	/**
-	 * NodeContainer constructor
-	 */
-	protected NodeContainer() {
-		super();
-	}
-
-	/**
-	 * NodeContainer constructor
-	 * 
-	 * @param that
-	 *            NodeContainer
-	 */
-	protected NodeContainer(NodeContainer that) {
-		super(that);
-	}
-
-	/**
-	 * appendChild method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param newChild
-	 *            org.w3c.dom.Node
-	 */
-	public Node appendChild(Node newChild) throws DOMException {
-		return insertBefore(newChild, null);
-	}
-
-	/**
-	 * cloneChildNodes method
-	 * 
-	 * @param container
-	 *            org.w3c.dom.Node
-	 * @param deep
-	 *            boolean
-	 */
-	protected void cloneChildNodes(Node newParent, boolean deep) {
-		if (newParent == null || newParent == this)
-			return;
-		if (!(newParent instanceof NodeContainer))
-			return;
-
-		NodeContainer container = (NodeContainer) newParent;
-		container.removeChildNodes();
-
-		for (Node child = getFirstChild(); child != null; child = child.getNextSibling()) {
-			Node cloned = child.cloneNode(deep);
-			if (cloned != null)
-				container.appendChild(cloned);
-		}
-	}
-
-	/**
-	 * getChildNodes method
-	 * 
-	 * @return org.w3c.dom.NodeList
-	 */
-	public NodeList getChildNodes() {
-		return this;
-	}
-
-	/**
-	 * getFirstChild method
-	 * 
-	 * @return org.w3c.dom.Node
-	 */
-	public Node getFirstChild() {
-		return this.firstChild;
-	}
-
-	/**
-	 * getLastChild method
-	 * 
-	 * @return org.w3c.dom.Node
-	 */
-	public Node getLastChild() {
-		return this.lastChild;
-	}
-
-	/**
-	 * getLength method
-	 * 
-	 * @return int
-	 */
-	public int getLength() {
-		if (this.firstChild == null)
-			return 0;
-		synchronized (lockObject) {
-			if (this.childNodesCache == null)
-				this.childNodesCache = new ChildNodesCache();
-			return this.childNodesCache.getLength();
-		}
-	}
-
-	/**
-	 */
-	public String getSource() {
-		StringBuffer buffer = new StringBuffer();
-
-		IStructuredDocumentRegion startStructuredDocumentRegion = getStartStructuredDocumentRegion();
-		if (startStructuredDocumentRegion != null) {
-			String source = startStructuredDocumentRegion.getText();
-			if (source != null)
-				buffer.append(source);
-		}
-
-		for (NodeImpl child = firstChild; child != null; child = (NodeImpl) child.getNextSibling()) {
-			String source = child.getSource();
-			if (source != null)
-				buffer.append(source);
-		}
-
-		IStructuredDocumentRegion endStructuredDocumentRegion = getEndStructuredDocumentRegion();
-		if (endStructuredDocumentRegion != null) {
-			String source = endStructuredDocumentRegion.getText();
-			if (source != null)
-				buffer.append(source);
-		}
-
-		return buffer.toString();
-	}
-
-	/**
-	 * hasChildNodes method
-	 * 
-	 * @return boolean
-	 */
-	public boolean hasChildNodes() {
-		return (this.firstChild != null);
-	}
-
-	/**
-	 * insertBefore method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param newChild
-	 *            org.w3c.dom.Node
-	 * @param refChild
-	 *            org.w3c.dom.Node
-	 */
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		if (newChild == null)
-			return null; // nothing to do
-		if (refChild != null && refChild.getParentNode() != this) {
-			throw new DOMException(DOMException.NOT_FOUND_ERR, new String());
-		}
-		if (!isChildEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-		if (newChild == refChild)
-			return newChild; // nothing to do
-
-		if (newChild.getNodeType() == DOCUMENT_FRAGMENT_NODE) {
-			// insert child nodes instead
-			for (Node child = newChild.getFirstChild(); child != null; child = newChild.getFirstChild()) {
-				newChild.removeChild(child);
-				insertBefore(child, refChild);
-			}
-			return newChild;
-		}
-		// synchronized in case another thread is getting item, or length
-		synchronized (lockObject) {
-			this.childNodesCache = null; // invalidate child nodes cache
-		}
-
-		NodeImpl child = (NodeImpl) newChild;
-		NodeImpl next = (NodeImpl) refChild;
-		NodeImpl prev = null;
-		Node oldParent = child.getParentNode();
-		if (oldParent != null)
-			oldParent.removeChild(child);
-		if (next == null) {
-			prev = this.lastChild;
-			this.lastChild = child;
-		} else {
-			prev = (NodeImpl) next.getPreviousSibling();
-			next.setPreviousSibling(child);
-		}
-		if (prev == null)
-			this.firstChild = child;
-		else
-			prev.setNextSibling(child);
-		child.setPreviousSibling(prev);
-		child.setNextSibling(next);
-		child.setParentNode(this);
-		// make sure having the same owner document
-		if (child.getOwnerDocument() == null) {
-			if (getNodeType() == DOCUMENT_NODE) {
-				child.setOwnerDocument((Document) this);
-			} else {
-				child.setOwnerDocument(getOwnerDocument());
-			}
-		}
-
-		notifyChildReplaced(child, null);
-
-		return child;
-	}
-
-	public boolean isChildEditable() {
-		if (!fChildEditable) {
-			DOMModelImpl model = (DOMModelImpl) getModel();
-			if (model != null && model.isReparsing()) {
-				return true;
-			}
-		}
-		return fChildEditable;
-	}
-
-	/**
-	 * isContainer method
-	 * 
-	 * @return boolean
-	 */
-	public boolean isContainer() {
-		return true;
-	}
-
-	/**
-	 * item method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param index
-	 *            int
-	 */
-	public Node item(int index) {
-		if (this.firstChild == null)
-			return null;
-		synchronized (lockObject) {
-			if (this.childNodesCache == null)
-				this.childNodesCache = new ChildNodesCache();
-			return this.childNodesCache.item(index);
-		}
-	}
-
-	/**
-	 * notifyChildReplaced method
-	 * 
-	 * @param newChild
-	 *            org.w3c.dom.Node
-	 * @param oldChild
-	 *            org.w3c.dom.Node
-	 */
-	protected void notifyChildReplaced(Node newChild, Node oldChild) {
-		DocumentImpl document = (DocumentImpl) getContainerDocument();
-		if (document == null)
-			return;
-
-		syncChildEditableState(newChild);
-
-		DOMModelImpl model = (DOMModelImpl) document.getModel();
-		if (model == null)
-			return;
-		model.childReplaced(this, newChild, oldChild);
-	}
-
-	/**
-	 * removeChild method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param oldChild
-	 *            org.w3c.dom.Node
-	 */
-	public Node removeChild(Node oldChild) throws DOMException {
-		if (oldChild == null)
-			return null;
-		if (oldChild.getParentNode() != this) {
-			throw new DOMException(DOMException.NOT_FOUND_ERR, new String());
-		}
-
-		if (!isChildEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		// synchronized in case another thread is getting item, or length
-		synchronized (lockObject) {
-			this.childNodesCache = null; // invalidate child nodes cache
-		}
-
-		NodeImpl child = (NodeImpl) oldChild;
-		NodeImpl prev = (NodeImpl) child.getPreviousSibling();
-		NodeImpl next = (NodeImpl) child.getNextSibling();
-
-		child.setEditable(true, true); // clear ReadOnly flags
-
-		if (prev == null)
-			this.firstChild = next;
-		else
-			prev.setNextSibling(next);
-		if (next == null)
-			this.lastChild = prev;
-		else
-			next.setPreviousSibling(prev);
-		child.setPreviousSibling(null);
-		child.setNextSibling(null);
-		child.setParentNode(null);
-
-		notifyChildReplaced(null, child);
-
-		return child;
-	}
-
-	/**
-	 * removeChildNodes method
-	 */
-	public void removeChildNodes() {
-		if (!isChildEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		Node nextChild = null;
-		for (Node child = getFirstChild(); child != null; child = nextChild) {
-			nextChild = child.getNextSibling();
-			removeChild(child);
-		}
-	}
-
-	/**
-	 * removeChildNodes method
-	 * 
-	 * @return org.w3c.dom.DocumentFragment
-	 * @param firstChild
-	 *            org.w3c.dom.Node
-	 * @param lastChild
-	 *            org.w3c.dom.Node
-	 */
-	public DocumentFragment removeChildNodes(Node firstChild, Node lastChild) {
-		if (!hasChildNodes())
-			return null;
-		if (!isChildEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		Document document = null;
-		if (getNodeType() == DOCUMENT_NODE)
-			document = (Document) this;
-		else
-			document = getOwnerDocument();
-		if (document == null)
-			return null;
-		DocumentFragment fragment = document.createDocumentFragment();
-		if (fragment == null)
-			return null;
-
-		if (firstChild == null)
-			firstChild = getFirstChild();
-		if (lastChild == null)
-			lastChild = getLastChild();
-		Node nextChild = null;
-		for (Node child = firstChild; child != null; child = nextChild) {
-			nextChild = child.getNextSibling();
-			removeChild(child);
-			fragment.appendChild(child);
-			if (child == lastChild)
-				break;
-		}
-
-		return fragment;
-	}
-
-	/**
-	 * replaceChild method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param newChild
-	 *            org.w3c.dom.Node
-	 * @param oldChild
-	 *            org.w3c.dom.Node
-	 */
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		if (!isChildEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		if (oldChild == null)
-			return newChild;
-		if (newChild != null)
-			insertBefore(newChild, oldChild);
-		return removeChild(oldChild);
-	}
-
-	public void setChildEditable(boolean editable) {
-		if (fChildEditable == editable) {
-			return;
-		}
-
-		ReadOnlyController roc = ReadOnlyController.getInstance();
-		Node node;
-		if (editable) {
-			for (node = getFirstChild(); node != null; node = node.getNextSibling()) {
-				roc.unlockNode((IDOMNode) node);
-			}
-		} else {
-			for (node = getFirstChild(); node != null; node = node.getNextSibling()) {
-				roc.lockNode((IDOMNode) node);
-			}
-		}
-
-		fChildEditable = editable;
-		notifyEditableChanged();
-	}
-
-	protected void syncChildEditableState(Node child) {
-		ReadOnlyController roc = ReadOnlyController.getInstance();
-		if (fChildEditable) {
-			roc.unlockNode((NodeImpl) child);
-		} else {
-			roc.lockNode((NodeImpl) child);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeImpl.java
deleted file mode 100644
index 698b534..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeImpl.java
+++ /dev/null
@@ -1,925 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
-import org.eclipse.wst.sse.core.internal.provisional.AbstractNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-
-
-/**
- * NodeImpl class
- */
-public abstract class NodeImpl extends AbstractNotifier implements IDOMNode {
-	// define one empty nodelist, for repeated use
-	private final static NodeList EMPTY_NODE_LIST = new NodeListImpl();
-
-	private boolean fDataEditable = true;
-	private IStructuredDocumentRegion flatNode = null;
-	private NodeImpl nextSibling = null;
-
-	private DocumentImpl ownerDocument = null;
-	private NodeImpl parentNode = null;
-	private NodeImpl previousSibling = null;
-
-	/**
-	 * NodeImpl constructor
-	 */
-	protected NodeImpl() {
-		super();
-	}
-
-	/**
-	 * NodeImpl constructor
-	 * 
-	 * @param that
-	 *            NodeImpl
-	 */
-	protected NodeImpl(NodeImpl that) {
-		if (that != null) {
-			this.ownerDocument = that.ownerDocument;
-		}
-	}
-
-	/**
-	 * appendChild method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param newChild
-	 *            org.w3c.dom.Node
-	 */
-	public Node appendChild(Node newChild) throws DOMException {
-		throw new DOMException(DOMException.HIERARCHY_REQUEST_ERR, new String());
-	}
-
-	/**
-	 * contains method
-	 * 
-	 * @return boolean
-	 * @param offset
-	 *            int
-	 */
-	public boolean contains(int offset) {
-		return (offset >= getStartOffset() && offset < getEndOffset());
-	}
-
-	/**
-	 * @param s
-	 * @param tagName
-	 * @return
-	 */
-	protected String createDOMExceptionMessage(short s, String tagName) {
-		String result = null;
-		// TODO: Should localize these messages, and provide /u escaped
-		// version of tagName
-		result = lookupMessage(s) + " " + tagName; //$NON-NLS-1$
-		return result;
-	}
-
-	/**
-	 * getAttributes method
-	 * 
-	 * @return org.w3c.dom.NamedNodeMap
-	 */
-	public NamedNodeMap getAttributes() {
-		return null;
-	}
-
-	/**
-	 */
-	protected String getCharValue(String name) {
-		DocumentImpl document = (DocumentImpl) getOwnerDocument();
-		if (document == null)
-			return null;
-		return document.getCharValue(name);
-	}
-
-	/**
-	 * getChildNodes method
-	 * 
-	 * @return org.w3c.dom.NodeList
-	 */
-	public NodeList getChildNodes() {
-		// As per DOM spec, correct behavior for getChildNodes is to return a
-		// zero length NodeList, not null, when there are no children.
-		// We'll use a common instance of an empty node list, just to prevent
-		// creating a trival object many many times.
-
-		return EMPTY_NODE_LIST;
-	}
-
-	/**
-	 * getCommonAncestor method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param node
-	 *            org.w3c.dom.Node
-	 */
-	public Node getCommonAncestor(Node node) {
-		if (node == null)
-			return null;
-
-		for (Node na = node; na != null; na = na.getParentNode()) {
-			for (Node ta = this; ta != null; ta = ta.getParentNode()) {
-				if (ta == na)
-					return ta;
-			}
-		}
-
-		return null; // not found
-	}
-
-	/**
-	 * getContainerDocument method
-	 * 
-	 * @return org.w3c.dom.Document
-	 */
-	public Document getContainerDocument() {
-		for (Node node = this; node != null; node = node.getParentNode()) {
-			if (node.getNodeType() == Node.DOCUMENT_NODE) {
-				return (Document) node;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * getEndOffset method
-	 * 
-	 * @return int
-	 */
-	public int getEndOffset() {
-		Node node = this;
-		while (node != null) {
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				ElementImpl element = (ElementImpl) node;
-				IStructuredDocumentRegion endStructuredDocumentRegion = element.getEndStructuredDocumentRegion();
-				if (endStructuredDocumentRegion != null)
-					return endStructuredDocumentRegion.getEnd();
-			}
-
-			Node last = node.getLastChild();
-			if (last != null) { // dig into the last
-				node = last;
-				continue;
-			}
-
-			IStructuredDocumentRegion lastStructuredDocumentRegion = ((NodeImpl) node).getStructuredDocumentRegion();
-			if (lastStructuredDocumentRegion != null)
-				return lastStructuredDocumentRegion.getEnd();
-
-			Node prev = node.getPreviousSibling();
-			if (prev != null) { // move to the previous
-				node = prev;
-				continue;
-			}
-
-			Node parent = node.getParentNode();
-			node = null;
-			while (parent != null) {
-				if (parent.getNodeType() == Node.ELEMENT_NODE) {
-					ElementImpl element = (ElementImpl) parent;
-					IStructuredDocumentRegion startStructuredDocumentRegion = element.getStartStructuredDocumentRegion();
-					if (startStructuredDocumentRegion != null)
-						return startStructuredDocumentRegion.getEnd();
-				}
-				Node parentPrev = parent.getPreviousSibling();
-				if (parentPrev != null) { // move to the previous
-					node = parentPrev;
-					break;
-				}
-				parent = parent.getParentNode();
-			}
-		}
-		return 0;
-	}
-
-	public IStructuredDocumentRegion getEndStructuredDocumentRegion() {
-		return null;
-	}
-
-	/**
-	 */
-	public FactoryRegistry getFactoryRegistry() {
-		IDOMModel model = getModel();
-		if (model != null) {
-			FactoryRegistry reg = model.getFactoryRegistry();
-			if (reg != null)
-				return reg;
-		}
-		return null;
-	}
-
-	/**
-	 * getFirstChild method
-	 * 
-	 * @return org.w3c.dom.Node
-	 */
-	public Node getFirstChild() {
-		return null;
-	}
-
-	/**
-	 * getFirstStructuredDocumentRegion method
-	 * 
-	 */
-	public IStructuredDocumentRegion getFirstStructuredDocumentRegion() {
-		return StructuredDocumentRegionUtil.getStructuredDocumentRegion(this.flatNode);
-	}
-
-	/**
-	 */
-	public int getIndex() {
-		Node parent = getParentNode();
-		if (parent == null)
-			return -1; // error
-		int index = 0;
-		for (Node child = parent.getFirstChild(); child != null; child = child.getNextSibling()) {
-			if (child == this)
-				return index;
-			index++;
-		}
-		return -1; // error
-	}
-
-	/**
-	 * getLastChild method
-	 * 
-	 * @return org.w3c.dom.Node
-	 */
-	public Node getLastChild() {
-		return null;
-	}
-
-	/**
-	 * getLastStructuredDocumentRegion method
-	 * 
-	 */
-	public IStructuredDocumentRegion getLastStructuredDocumentRegion() {
-		return StructuredDocumentRegionUtil.getStructuredDocumentRegion(this.flatNode);
-	}
-
-	/**
-	 */
-	public String getLocalName() {
-		return null;
-	}
-
-	/**
-	 * the default implementation can just refer to the owning document
-	 */
-	public IDOMModel getModel() {
-		if (this.ownerDocument == null)
-			return null;
-		return this.ownerDocument.getModel();
-	}
-
-	/**
-	 * all but attr return null
-	 */
-	public ITextRegion getNameRegion() {
-		return null;
-	}
-
-	/**
-	 */
-	public String getNamespaceURI() {
-		return null;
-	}
-
-	/**
-	 * getNextSibling method
-	 * 
-	 * @return org.w3c.dom.Node
-	 */
-	public Node getNextSibling() {
-		return this.nextSibling;
-	}
-
-	/**
-	 * getNodeAt method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param offset
-	 *            int
-	 */
-	Node getNodeAt(int offset) {
-		IDOMNode parent = this;
-		IDOMNode child = (IDOMNode) getFirstChild();
-		while (child != null) {
-			if (child.getEndOffset() <= offset) {
-				child = (IDOMNode) child.getNextSibling();
-				continue;
-			}
-			if (child.getStartOffset() > offset) {
-				break;
-			}
-
-			IStructuredDocumentRegion startStructuredDocumentRegion = child.getStartStructuredDocumentRegion();
-			if (startStructuredDocumentRegion != null) {
-				if (startStructuredDocumentRegion.getEnd() > offset)
-					return child;
-			}
-
-			// dig more
-			parent = child;
-			child = (IDOMNode) parent.getFirstChild();
-		}
-
-		return parent;
-	}
-
-	/**
-	 * getNodeValue method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeValue() throws DOMException {
-		return null;
-	}
-
-	/**
-	 * getOwnerDocument method
-	 * 
-	 * @return org.w3c.dom.Document
-	 */
-	public Document getOwnerDocument() {
-		return this.ownerDocument;
-	}
-
-	/**
-	 * getParentNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 */
-	public Node getParentNode() {
-		return this.parentNode;
-	}
-
-	/**
-	 */
-	public String getPrefix() {
-		return null;
-	}
-
-	/**
-	 * getPreviousSibling method
-	 * 
-	 * @return org.w3c.dom.Node
-	 */
-	public Node getPreviousSibling() {
-		return this.previousSibling;
-	}
-
-	/**
-	 */
-	public String getSource() {
-		if (this.flatNode == null)
-			return new String();
-		return this.flatNode.getText();
-	}
-
-	/**
-	 * getStartOffset method
-	 * 
-	 * @return int
-	 */
-	public int getStartOffset() {
-		if (this.flatNode != null)
-			return this.flatNode.getStart();
-		NodeImpl prev = (NodeImpl) getPreviousSibling();
-		if (prev != null)
-			return prev.getEndOffset();
-		Node parent = getParentNode();
-		if (parent != null && parent.getNodeType() == Node.ELEMENT_NODE) {
-			ElementImpl element = (ElementImpl) parent;
-			if (element.hasStartTag())
-				return element.getStartEndOffset();
-			return element.getStartOffset();
-		}
-		// final fallback to look into first child
-		NodeImpl child = (NodeImpl) getFirstChild();
-		while (child != null) {
-			IStructuredDocumentRegion childStructuredDocumentRegion = child.getStructuredDocumentRegion();
-			if (childStructuredDocumentRegion != null)
-				return childStructuredDocumentRegion.getStart();
-			child = (NodeImpl) child.getFirstChild();
-		}
-		return 0;
-	}
-
-	public IStructuredDocumentRegion getStartStructuredDocumentRegion() {
-		return getFirstStructuredDocumentRegion();
-	}
-
-	/**
-	 * Every node (indirectly) knows its structuredDocument
-	 */
-	public IStructuredDocument getStructuredDocument() {
-		return getModel().getStructuredDocument();
-	}
-
-	/**
-	 */
-	IStructuredDocumentRegion getStructuredDocumentRegion() {
-		return this.flatNode;
-	}
-
-	/**
-	 * all but attr return null
-	 */
-	public ITextRegion getValueRegion() {
-		return null;
-	}
-
-	/**
-	 */
-	public String getValueSource() {
-		return getNodeValue();
-	}
-
-	/**
-	 */
-	public boolean hasAttributes() {
-		return false;
-	}
-
-	/**
-	 * hasChildNodes method
-	 * 
-	 * @return boolean
-	 */
-	public boolean hasChildNodes() {
-		return false;
-	}
-
-	/**
-	 * hasProperties method
-	 * 
-	 * @return boolean
-	 */
-	public boolean hasProperties() {
-		return false;
-	}
-
-	/**
-	 * insertBefore method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param newChild
-	 *            org.w3c.dom.Node
-	 * @param refChild
-	 *            org.w3c.dom.Node
-	 */
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		throw new DOMException(DOMException.HIERARCHY_REQUEST_ERR, new String());
-	}
-
-	public boolean isChildEditable() {
-		return false;
-	}
-
-	/**
-	 */
-	public boolean isClosed() {
-		return true;
-	}
-
-	/**
-	 * isContainer method
-	 * 
-	 * @return boolean
-	 */
-	public boolean isContainer() {
-		return false;
-	}
-
-	public boolean isDataEditable() {
-		if (!fDataEditable) {
-			DOMModelImpl model = (DOMModelImpl) getModel();
-			if (model != null && model.isReparsing()) {
-				return true;
-			}
-		}
-		return fDataEditable;
-	}
-
-	/**
-	 */
-	public boolean isSupported(String feature, String version) {
-		if (this.ownerDocument == null)
-			return false;
-		DOMImplementation impl = this.ownerDocument.getImplementation();
-		if (impl == null)
-			return false;
-		return impl.hasFeature(feature, version);
-	}
-
-	/**
-	 * @param s
-	 * @return
-	 */
-	private String lookupMessage(short s) {
-		// TODO: make localized version
-		String result = null;
-		switch (s) {
-			case DOMException.INVALID_CHARACTER_ERR :
-				result = "INVALID_CHARACTER_ERR"; //$NON-NLS-1$
-				break;
-
-			default :
-				result = new String();
-				break;
-		}
-		return result;
-	}
-
-	/**
-	 * normalize method
-	 */
-	public void normalize() {
-		TextImpl prevText = null;
-		for (Node child = getFirstChild(); child != null; child = child.getNextSibling()) {
-			switch (child.getNodeType()) {
-				case TEXT_NODE : {
-					if (prevText == null) {
-						prevText = (TextImpl) child;
-						break;
-					}
-					Text text = (Text) child;
-					removeChild(text);
-					prevText.appendText(text);
-					child = prevText;
-					break;
-				}
-				case ELEMENT_NODE : {
-					Element element = (Element) child;
-					element.normalize();
-					prevText = null;
-					break;
-				}
-				default :
-					prevText = null;
-					break;
-			}
-		}
-	}
-
-	protected void notifyEditableChanged() {
-		DocumentImpl document = (DocumentImpl) getContainerDocument();
-		if (document == null)
-			return;
-		DOMModelImpl model = (DOMModelImpl) document.getModel();
-		if (model == null)
-			return;
-		model.editableChanged(this);
-	}
-
-	/**
-	 * notifyValueChanged method
-	 */
-	protected void notifyValueChanged() {
-		DocumentImpl document = (DocumentImpl) getContainerDocument();
-		if (document == null)
-			return;
-
-		syncDataEditableState();
-
-		DOMModelImpl model = (DOMModelImpl) document.getModel();
-		if (model == null)
-			return;
-		model.valueChanged(this);
-	}
-
-	/**
-	 * removeChild method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param oldChild
-	 *            org.w3c.dom.Node
-	 */
-	public Node removeChild(Node oldChild) throws DOMException {
-		throw new DOMException(DOMException.NOT_FOUND_ERR, new String());
-	}
-
-	/**
-	 * removeChildNodes method
-	 */
-	public void removeChildNodes() {
-	}
-
-	/**
-	 * removeChildNodes method
-	 * 
-	 * @return org.w3c.dom.DocumentFragment
-	 * @param firstChild
-	 *            org.w3c.dom.Node
-	 * @param lastChild
-	 *            org.w3c.dom.Node
-	 */
-	public DocumentFragment removeChildNodes(Node firstChild, Node lastChild) {
-		return null;
-	}
-
-	/**
-	 * replaceChild method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param newChild
-	 *            org.w3c.dom.Node
-	 * @param oldChild
-	 *            org.w3c.dom.Node
-	 */
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		throw new DOMException(DOMException.HIERARCHY_REQUEST_ERR, new String());
-	}
-
-	/**
-	 * Resets children values from IStructuredDocumentRegion.
-	 */
-	void resetStructuredDocumentRegions() {
-		for (NodeImpl child = (NodeImpl) getFirstChild(); child != null; child = (NodeImpl) child.getNextSibling()) {
-			child.resetStructuredDocumentRegions();
-		}
-		this.flatNode = null;
-	}
-
-	public void setChildEditable(boolean editable) {
-		// nop
-	}
-
-	public void setDataEditable(boolean editable) {
-		if (fDataEditable == editable) {
-			return;
-		}
-
-		ReadOnlyController roc = ReadOnlyController.getInstance();
-		if (editable) {
-			roc.unlockData(this);
-		}
-		else {
-			roc.lockData(this);
-		}
-
-		fDataEditable = editable;
-
-		notifyEditableChanged();
-	}
-
-	public void setEditable(boolean editable, boolean deep) {
-		if (deep) {
-			IDOMNode node = (IDOMNode) getFirstChild();
-			while (node != null) {
-				node.setEditable(editable, deep);
-				node = (IDOMNode) node.getNextSibling();
-			}
-		}
-		setChildEditable(editable);
-		setDataEditable(editable);
-	}
-
-	/**
-	 * setNextSibling method
-	 * 
-	 * @param nextSibling
-	 *            org.w3c.dom.Node
-	 */
-	protected void setNextSibling(Node nextSibling) {
-		this.nextSibling = (NodeImpl) nextSibling;
-	}
-
-	/**
-	 * setNodeValue method
-	 * 
-	 * @param nodeValue
-	 *            java.lang.String
-	 */
-	public void setNodeValue(String nodeValue) throws DOMException {
-	}
-
-	/**
-	 * setOwnerDocument method
-	 * 
-	 * @param ownerDocument
-	 *            org.w3c.dom.Document
-	 */
-	protected void setOwnerDocument(Document ownerDocument) {
-		this.ownerDocument = (DocumentImpl) ownerDocument;
-	}
-
-	/**
-	 */
-	protected void setOwnerDocument(Document ownerDocument, boolean deep) {
-		this.ownerDocument = (DocumentImpl) ownerDocument;
-
-		if (deep) {
-			for (NodeImpl child = (NodeImpl) getFirstChild(); child != null; child = (NodeImpl) child.getNextSibling()) {
-				child.setOwnerDocument(ownerDocument, deep);
-			}
-		}
-	}
-
-	/**
-	 * setParentNode method
-	 * 
-	 * @param parentNode
-	 *            org.w3c.dom.Node
-	 */
-	protected void setParentNode(Node parentNode) {
-		this.parentNode = (NodeImpl) parentNode;
-	}
-
-	/**
-	 */
-	public void setPrefix(String prefix) throws DOMException {
-	}
-
-	/**
-	 * setPreviousSibling method
-	 * 
-	 * @param previousSibling
-	 *            org.w3c.dom.Node
-	 */
-	protected void setPreviousSibling(Node previousSibling) {
-		this.previousSibling = (NodeImpl) previousSibling;
-	}
-
-	/**
-	 */
-	public void setSource(String source) throws InvalidCharacterException {
-		// not supported
-	}
-
-	/**
-	 */
-	void setStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		this.flatNode = flatNode;
-	}
-
-	/**
-	 */
-	public void setValueSource(String source) {
-		setNodeValue(source);
-	}
-
-	protected void syncDataEditableState() {
-		ReadOnlyController roc = ReadOnlyController.getInstance();
-		if (fDataEditable) {
-			roc.unlockData(this);
-		}
-		else {
-			roc.lockData(this);
-		}
-	}
-
-	/**
-	 * toString method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String toString() {
-		return getNodeName();
-	}
-
-	public int getLength() {
-		int result = -1;
-		int start = getStartOffset();
-		if (start >= 0) {
-			int end = getEndOffset();
-			if (end >= 0) {
-				result = end - start;
-				if (result < -1) {
-					result = -1;
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public short compareDocumentPosition(Node other) throws DOMException {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version."); //$NON-NLS-1$
-	};
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public String getBaseURI() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version."); //$NON-NLS-1$
-	};
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public Object getFeature(String feature, String version) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version."); //$NON-NLS-1$
-	};
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public String getTextContent() throws DOMException {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version."); //$NON-NLS-1$
-	};
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public Object getUserData(String key) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version."); //$NON-NLS-1$
-	};
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public boolean isDefaultNamespace(String namespaceURI) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version."); //$NON-NLS-1$
-	};
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public boolean isEqualNode(Node arg) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version."); //$NON-NLS-1$
-	};
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public boolean isSameNode(Node other) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version."); //$NON-NLS-1$
-	};
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public String lookupNamespaceURI(String prefix) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version."); //$NON-NLS-1$
-	};
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public String lookupPrefix(String namespaceURI) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version."); //$NON-NLS-1$
-	};
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public void setTextContent(String textContent) throws DOMException {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version."); //$NON-NLS-1$
-	};
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version."); //$NON-NLS-1$
-	};
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public TypeInfo getSchemaTypeInfo() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version."); //$NON-NLS-1$
-	};
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public boolean isId() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version."); //$NON-NLS-1$
-	};
-
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeIteratorImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeIteratorImpl.java
deleted file mode 100644
index c4a278b..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeIteratorImpl.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Node;
-import org.w3c.dom.traversal.NodeFilter;
-import org.w3c.dom.traversal.NodeIterator;
-
-/**
- * NodeIteratorImpl class
- */
-public class NodeIteratorImpl implements NodeIterator {
-	private NodeFilter filter = null;
-	private Node nextNode = null;
-
-	private Node rootNode = null;
-	private int whatToShow = NodeFilter.SHOW_ALL;
-
-	/**
-	 * NodeIteratorImpl constructor
-	 * 
-	 * @param rootNode
-	 *            org.w3c.dom.Node
-	 */
-	NodeIteratorImpl(Node rootNode, int whatToShow, NodeFilter filter) {
-		this.rootNode = rootNode;
-		this.nextNode = rootNode;
-		this.whatToShow = whatToShow;
-		this.filter = filter;
-	}
-
-	/**
-	 */
-	private final boolean acceptNode(Node node) {
-		if (this.whatToShow != NodeFilter.SHOW_ALL) {
-			if (node == null)
-				return false;
-			short nodeType = node.getNodeType();
-			switch (this.whatToShow) {
-				case NodeFilter.SHOW_ELEMENT :
-					if (nodeType != Node.ELEMENT_NODE)
-						return false;
-					break;
-				case NodeFilter.SHOW_ATTRIBUTE :
-					if (nodeType != Node.ATTRIBUTE_NODE)
-						return false;
-					break;
-				case NodeFilter.SHOW_TEXT :
-					if (nodeType != Node.TEXT_NODE)
-						return false;
-					break;
-				case NodeFilter.SHOW_CDATA_SECTION :
-					if (nodeType != Node.CDATA_SECTION_NODE)
-						return false;
-					break;
-				case NodeFilter.SHOW_ENTITY_REFERENCE :
-					if (nodeType != Node.ENTITY_REFERENCE_NODE)
-						return false;
-					break;
-				case NodeFilter.SHOW_ENTITY :
-					if (nodeType != Node.ENTITY_NODE)
-						return false;
-					break;
-				case NodeFilter.SHOW_PROCESSING_INSTRUCTION :
-					if (nodeType != Node.PROCESSING_INSTRUCTION_NODE)
-						return false;
-					break;
-				case NodeFilter.SHOW_COMMENT :
-					if (nodeType != Node.COMMENT_NODE)
-						return false;
-					break;
-				case NodeFilter.SHOW_DOCUMENT :
-					if (nodeType != Node.DOCUMENT_NODE)
-						return false;
-					break;
-				case NodeFilter.SHOW_DOCUMENT_TYPE :
-					if (nodeType != Node.DOCUMENT_TYPE_NODE)
-						return false;
-					break;
-				case NodeFilter.SHOW_DOCUMENT_FRAGMENT :
-					if (nodeType != Node.DOCUMENT_FRAGMENT_NODE)
-						return false;
-					break;
-				case NodeFilter.SHOW_NOTATION :
-					if (nodeType != Node.NOTATION_NODE)
-						return false;
-					break;
-				default :
-					return false;
-			}
-		}
-		if (this.filter != null) {
-			return (this.filter.acceptNode(node) == NodeFilter.FILTER_ACCEPT);
-		}
-		return true;
-	}
-
-	/**
-	 * Detaches the <code>NodeIterator</code> from the set which it iterated
-	 * over, releasing any computational resources and placing the iterator in
-	 * the INVALID state. After <code>detach</code> has been invoked, calls
-	 * to <code>nextNode</code> or <code>previousNode</code> will raise
-	 * the exception INVALID_STATE_ERR.
-	 */
-	public void detach() {
-		this.rootNode = null;
-		this.nextNode = null;
-		this.filter = null;
-	}
-
-	/**
-	 * The value of this flag determines whether the children of entity
-	 * reference nodes are visible to the iterator. If false, they and their
-	 * descendants will be rejected. Note that this rejection takes precedence
-	 * over <code>whatToShow</code> and the filter. Also note that this is
-	 * currently the only situation where <code>NodeIterators</code> may
-	 * reject a complete subtree rather than skipping individual nodes. <br>
-	 * <br>
-	 * To produce a view of the document that has entity references expanded
-	 * and does not expose the entity reference node itself, use the
-	 * <code>whatToShow</code> flags to hide the entity reference node and
-	 * set <code>expandEntityReferences</code> to true when creating the
-	 * iterator. To produce a view of the document that has entity reference
-	 * nodes but no entity expansion, use the <code>whatToShow</code> flags
-	 * to show the entity reference node and set
-	 * <code>expandEntityReferences</code> to false.
-	 */
-	public boolean getExpandEntityReferences() {
-		// not supported
-		return false;
-	}
-
-	/**
-	 * The <code>NodeFilter</code> used to screen nodes.
-	 */
-	public NodeFilter getFilter() {
-		return this.filter;
-	}
-
-	/**
-	 */
-	private final Node getNextNode() {
-		if (this.nextNode == null)
-			return null;
-		Node oldNext = this.nextNode;
-		Node child = this.nextNode.getFirstChild();
-		if (child != null) {
-			this.nextNode = child;
-			return oldNext;
-		}
-		for (Node node = this.nextNode; node != null && node != this.rootNode; node = node.getParentNode()) {
-			Node next = node.getNextSibling();
-			if (next != null) {
-				this.nextNode = next;
-				return oldNext;
-			}
-		}
-		this.nextNode = null;
-		return oldNext;
-	}
-
-	/**
-	 */
-	private final Node getPreviousNode() {
-		if (this.nextNode == this.rootNode)
-			return null;
-		Node prev = null;
-		if (this.nextNode == null) {
-			prev = this.rootNode; // never null
-		} else {
-			prev = this.nextNode.getPreviousSibling();
-			if (prev == null) {
-				this.nextNode = this.nextNode.getParentNode();
-				return this.nextNode;
-			}
-		}
-		Node last = prev.getLastChild();
-		while (last != null) {
-			prev = last;
-			last = prev.getLastChild();
-		}
-		this.nextNode = prev;
-		return this.nextNode;
-	}
-
-	/**
-	 * The root node of the <code>NodeIterator</code>, as specified when it
-	 * was created.
-	 */
-	public Node getRoot() {
-		return this.rootNode;
-	}
-
-	/**
-	 * This attribute determines which node types are presented via the
-	 * iterator. The available set of constants is defined in the
-	 * <code>NodeFilter</code> interface. Nodes not accepted by
-	 * <code>whatToShow</code> will be skipped, but their children may still
-	 * be considered. Note that this skip takes precedence over the filter, if
-	 * any.
-	 */
-	public int getWhatToShow() {
-		return this.whatToShow;
-	}
-
-	/**
-	 * Returns the next node in the set and advances the position of the
-	 * iterator in the set. After a <code>NodeIterator</code> is created,
-	 * the first call to <code>nextNode()</code> returns the first node in
-	 * the set.
-	 * 
-	 * @return The next <code>Node</code> in the set being iterated over, or
-	 *         <code>null</code> if there are no more members in that set.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if this method is called after
-	 *                the <code>detach</code> method was invoked.
-	 */
-	public Node nextNode() throws DOMException {
-		for (Node node = getNextNode(); node != null; node = getNextNode()) {
-			if (acceptNode(node))
-				return node;
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the previous node in the set and moves the position of the
-	 * <code>NodeIterator</code> backwards in the set.
-	 * 
-	 * @return The previous <code>Node</code> in the set being iterated
-	 *         over, or <code>null</code> if there are no more members in
-	 *         that set.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if this method is called after
-	 *                the <code>detach</code> method was invoked.
-	 */
-	public Node previousNode() throws DOMException {
-		for (Node node = getPreviousNode(); node != null; node = getPreviousNode()) {
-			if (acceptNode(node))
-				return node;
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeListImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeListImpl.java
deleted file mode 100644
index 4bfed52..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeListImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import java.util.Vector;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * NodeListImpl class
- */
-public class NodeListImpl implements NodeList {
-
-	Object lockObject = new byte[0];
-
-	private Vector nodes = null;
-
-	/**
-	 * NodeListImpl constructor
-	 */
-	public NodeListImpl() {
-		super();
-	}
-
-	/**
-	 * appendNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param node
-	 *            org.w3c.dom.Node
-	 */
-	protected Node appendNode(Node node) {
-		if (node == null)
-			return null;
-		if (this.nodes == null)
-			this.nodes = new Vector();
-		this.nodes.addElement(node);
-		return node;
-	}
-
-	/**
-	 * getLength method
-	 * 
-	 * @return int
-	 */
-	public int getLength() {
-		synchronized (lockObject) {
-			if (this.nodes == null)
-				return 0;
-			return this.nodes.size();
-		}
-	}
-
-	/**
-	 */
-	protected Node insertNode(Node node, int index) {
-		if (node == null)
-			return null;
-		if (this.nodes == null || index >= this.nodes.size()) {
-			return appendNode(node);
-		}
-		this.nodes.insertElementAt(node, index);
-		return node;
-	}
-
-	/**
-	 * item method
-	 * 
-	 * @return org.w3c.dom.Node
-	 */
-	public Node item(int index) {
-		synchronized (lockObject) {
-			if (this.nodes == null)
-				return null;
-			if (index < 0 || index >= this.nodes.size())
-				return null;
-			return (Node) this.nodes.elementAt(index);
-		}
-	}
-
-	/**
-	 * removeNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param index
-	 *            int
-	 */
-	protected Node removeNode(int index) {
-		if (this.nodes == null)
-			return null; // no node
-		if (index < 0 || index >= this.nodes.size())
-			return null; // invalid parameter
-
-		Node removed = (Node) this.nodes.elementAt(index);
-		this.nodes.removeElementAt(index);
-		return removed;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NotationImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NotationImpl.java
deleted file mode 100644
index e048949..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NotationImpl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Node;
-import org.w3c.dom.Notation;
-
-/**
- * NotationImpl class
- */
-public class NotationImpl extends NodeImpl implements Notation {
-
-	private String name = null;
-	private String publicId = null;
-	private String systemId = null;
-
-	/**
-	 * NotationImpl constructor
-	 */
-	protected NotationImpl() {
-		super();
-	}
-
-	/**
-	 * NotationImpl constructor
-	 * 
-	 * @param that
-	 *            NotationImpl
-	 */
-	protected NotationImpl(NotationImpl that) {
-		super(that);
-
-		if (that != null) {
-			this.name = that.name;
-			this.publicId = that.publicId;
-			this.systemId = that.systemId;
-		}
-	}
-
-	/**
-	 * cloneNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param deep
-	 *            boolean
-	 */
-	public Node cloneNode(boolean deep) {
-		NotationImpl cloned = new NotationImpl(this);
-		return cloned;
-	}
-
-	/**
-	 * getNodeName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeName() {
-		if (this.name == null)
-			return new String();
-		return this.name;
-	}
-
-	/**
-	 * getNodeType method
-	 * 
-	 * @return short
-	 */
-	public short getNodeType() {
-		return NOTATION_NODE;
-	}
-
-	/**
-	 * getPublicId method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getPublicId() {
-		return this.publicId;
-	}
-
-	/**
-	 * getSystemId method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getSystemId() {
-		return this.systemId;
-	}
-
-	/**
-	 * setName method
-	 * 
-	 * @param name
-	 *            java.lang.String
-	 */
-	protected void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * setPublicId method
-	 * 
-	 * @param publicId
-	 *            java.lang.String
-	 */
-	public void setPublicId(String publicId) {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-		this.publicId = publicId;
-	}
-
-	/**
-	 * setSystemId method
-	 * 
-	 * @param systemId
-	 *            java.lang.String
-	 */
-	public void setSystemId(String systemId) {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-		this.systemId = systemId;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ProcessingInstructionImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ProcessingInstructionImpl.java
deleted file mode 100644
index 2e6f804..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ProcessingInstructionImpl.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import java.util.Iterator;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Node;
-import org.w3c.dom.ProcessingInstruction;
-
-
-/**
- * ProcessingInstructionImpl class
- */
-public class ProcessingInstructionImpl extends NodeImpl implements ProcessingInstruction {
-	private String data = null;
-
-	private String target = null;
-
-	/**
-	 * ProcessingInstructionImpl constructor
-	 */
-	protected ProcessingInstructionImpl() {
-		super();
-	}
-
-	/**
-	 * ProcessingInstructionImpl constructor
-	 * 
-	 * @param that
-	 *            ProcessingInstructionImpl
-	 */
-	protected ProcessingInstructionImpl(ProcessingInstructionImpl that) {
-		super(that);
-
-		if (that != null) {
-			this.target = that.target;
-			this.data = that.getData();
-		}
-	}
-
-	/**
-	 * cloneNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param deep
-	 *            boolean
-	 */
-	public Node cloneNode(boolean deep) {
-		ProcessingInstructionImpl cloned = new ProcessingInstructionImpl(this);
-		return cloned;
-	}
-
-	/**
-	 * getData method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getData() {
-		if (this.data != null)
-			return this.data;
-
-		IStructuredDocumentRegion flatNode = getFirstStructuredDocumentRegion();
-		if (flatNode == null)
-			return new String();
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null)
-			return new String();
-
-		ITextRegion targetRegion = null;
-		ITextRegion dataRegion = null;
-		ITextRegion closeRegion = null;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_PI_OPEN)
-				continue;
-			if (regionType == DOMRegionContext.XML_PI_CLOSE) {
-				closeRegion = region;
-			}
-			else {
-				if (targetRegion == null)
-					targetRegion = region;
-				else if (dataRegion == null)
-					dataRegion = region;
-			}
-		}
-		if (dataRegion == null)
-			return new String();
-		int offset = dataRegion.getStart();
-		int end = flatNode.getLength();
-		if (closeRegion != null)
-			end = closeRegion.getStart();
-		String source = flatNode.getText();
-		return source.substring(offset, end);
-	}
-
-	/**
-	 * getNodeName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeName() {
-		return getTarget();
-	}
-
-	/**
-	 * getNodeType method
-	 * 
-	 * @return short
-	 */
-	public short getNodeType() {
-		return PROCESSING_INSTRUCTION_NODE;
-	}
-
-	/**
-	 * getNodeValue method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeValue() {
-		return getData();
-	}
-
-	/**
-	 * getTarget method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getTarget() {
-		if (this.target == null)
-			return new String();
-		return this.target;
-	}
-
-	/**
-	 */
-	public boolean isClosed() {
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode == null)
-			return true; // will be generated
-		String regionType = StructuredDocumentRegionUtil.getLastRegionType(flatNode);
-		return (regionType == DOMRegionContext.XML_PI_CLOSE);
-	}
-
-	/**
-	 */
-	void resetStructuredDocumentRegions() {
-		this.data = getData();
-		setStructuredDocumentRegion(null);
-	}
-
-	/**
-	 * setData method
-	 * 
-	 * @param data
-	 *            java.lang.String
-	 */
-	public void setData(String data) throws DOMException {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		this.data = data;
-
-		notifyValueChanged();
-	}
-
-	/**
-	 * setNodeValue method
-	 * 
-	 * @param nodeValue
-	 *            java.lang.String
-	 */
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setData(nodeValue);
-	}
-
-	/**
-	 */
-	void setStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		super.setStructuredDocumentRegion(flatNode);
-		if (flatNode != null)
-			this.data = null;
-	}
-
-	/**
-	 * setTarget method
-	 * 
-	 * @param target
-	 *            java.lang.String
-	 */
-	protected void setTarget(String target) {
-		this.target = target;
-	}
-
-	/**
-	 * toString method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append(getTarget());
-		buffer.append('(');
-		buffer.append(getData());
-		buffer.append(')');
-		return buffer.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/RangeImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/RangeImpl.java
deleted file mode 100644
index 24abe9e..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/RangeImpl.java
+++ /dev/null
@@ -1,630 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.w3c.dom.ranges.Range;
-import org.w3c.dom.ranges.RangeException;
-
-
-/**
- */
-public class RangeImpl implements Range {
-	private Node endContainer = null;
-	private int endOffset = 0;
-
-	private Node startContainer = null;
-	private int startOffset = 0;
-
-	/**
-	 */
-	protected RangeImpl() {
-		super();
-	}
-
-	/**
-	 */
-	protected RangeImpl(RangeImpl that) {
-		super();
-
-		if (that != null) {
-			this.startContainer = that.startContainer;
-			this.startOffset = that.startOffset;
-			this.endContainer = that.endContainer;
-			this.endOffset = that.endOffset;
-		}
-	}
-
-	/**
-	 * Duplicates the contents of a Range
-	 * 
-	 * @return A DocumentFragment that contains content equivalent to this
-	 *         Range.
-	 * @exception DOMException
-	 *                HIERARCHY_REQUEST_ERR: Raised if a DocumentType node
-	 *                would be extracted into the new DocumentFragment. <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public DocumentFragment cloneContents() throws DOMException {
-		// not supported
-		return null;
-	}
-
-	/**
-	 * Produces a new Range whose boundary-points are equal to the
-	 * boundary-points of the Range.
-	 * 
-	 * @return The duplicated Range.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public Range cloneRange() throws DOMException {
-		return new RangeImpl(this);
-	}
-
-	/**
-	 * Collapse a Range onto one of its boundary-points
-	 * 
-	 * @param toStartIf
-	 *            TRUE, collapses the Range onto its start; if FALSE,
-	 *            collapses it onto its end.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void collapse(boolean toStart) throws DOMException {
-		if (toStart) {
-			this.endContainer = this.startContainer;
-			this.endOffset = this.startOffset;
-		} else {
-			this.startContainer = this.endContainer;
-			this.startOffset = this.endOffset;
-		}
-	}
-
-	/**
-	 * Compare the boundary-points of two Ranges in a document.
-	 * 
-	 * @param howA
-	 *            code representing the type of comparison, as defined above.
-	 * @param sourceRangeThe
-	 *            <code>Range</code> on which this current
-	 *            <code>Range</code> is compared to.
-	 * @return -1, 0 or 1 depending on whether the corresponding
-	 *         boundary-point of the Range is respectively before, equal to,
-	 *         or after the corresponding boundary-point of
-	 *         <code>sourceRange</code>.
-	 * @exception DOMException
-	 *                WRONG_DOCUMENT_ERR: Raised if the two Ranges are not in
-	 *                the same Document or DocumentFragment. <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public short compareBoundaryPoints(short how, Range sourceRange) throws DOMException {
-		if (sourceRange == null)
-			return (short) 0; // error
-
-		Node container1 = null;
-		int offset1 = 0;
-		Node container2 = null;
-		int offset2 = 0;
-
-		switch (how) {
-			case START_TO_START :
-				container1 = this.startContainer;
-				offset1 = this.startOffset;
-				container2 = sourceRange.getStartContainer();
-				offset2 = sourceRange.getStartOffset();
-				break;
-			case START_TO_END :
-				container1 = this.startContainer;
-				offset1 = this.startOffset;
-				container2 = sourceRange.getEndContainer();
-				offset2 = sourceRange.getEndOffset();
-				break;
-			case END_TO_END :
-				container1 = this.endContainer;
-				offset1 = this.endOffset;
-				container2 = sourceRange.getEndContainer();
-				offset2 = sourceRange.getEndOffset();
-				break;
-			case END_TO_START :
-				container1 = this.endContainer;
-				offset1 = this.endOffset;
-				container2 = sourceRange.getStartContainer();
-				offset2 = sourceRange.getStartOffset();
-				break;
-			default :
-				return (short) 0; // error
-		}
-
-		return comparePoints(container1, offset1, container2, offset2);
-	}
-
-	/*
-	 */
-	protected short comparePoints(Node container1, int offset1, Node container2, int offset2) {
-		if (container1 == null || container2 == null)
-			return (short) 0; // error
-
-		if (container1 == container2) {
-			if (offset1 > offset2)
-				return (short) 1;
-			if (offset1 < offset2)
-				return (short) -1;
-			return 0;
-		}
-
-		// get node offsets
-		IDOMNode node1 = null;
-		if (container1.hasChildNodes()) {
-			Node child = container1.getFirstChild();
-			for (int i = 0; i < offset1; i++) {
-				Node next = child.getNextSibling();
-				if (next == null)
-					break;
-				child = next;
-			}
-			node1 = (IDOMNode) child;
-			offset1 = 0;
-		} else {
-			node1 = (IDOMNode) container1;
-		}
-		int nodeOffset1 = node1.getStartOffset();
-		IDOMNode node2 = null;
-		if (container2.hasChildNodes()) {
-			Node child = container2.getFirstChild();
-			for (int i = 0; i < offset2; i++) {
-				Node next = child.getNextSibling();
-				if (next == null)
-					break;
-				child = next;
-			}
-			node2 = (IDOMNode) child;
-			offset2 = 0;
-		} else {
-			node2 = (IDOMNode) container1;
-		}
-		int nodeOffset2 = node2.getStartOffset();
-
-		if (nodeOffset1 > nodeOffset2)
-			return (short) 1;
-		if (nodeOffset1 < nodeOffset2)
-			return (short) -1;
-		if (offset1 > offset2)
-			return (short) 1;
-		if (offset1 < offset2)
-			return (short) -1;
-		return (short) 0;
-	}
-
-	/**
-	 * Removes the contents of a Range from the containing document or
-	 * document fragment without returning a reference to the removed content.
-	 * 
-	 * @exception DOMException
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if any portion of
-	 *                the content of the Range is read-only or any of the
-	 *                nodes that contain any of the content of the Range are
-	 *                read-only. <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void deleteContents() throws DOMException {
-		// not supported
-	}
-
-	/**
-	 * Called to indicate that the Range is no longer in use and that the
-	 * implementation may relinquish any resources associated with this Range.
-	 * Subsequent calls to any methods or attribute getters on this Range will
-	 * result in a <code>DOMException</code> being thrown with an error code
-	 * of <code>INVALID_STATE_ERR</code>.
-	 * 
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void detach() throws DOMException {
-		this.startContainer = null;
-		this.startOffset = 0;
-		this.endContainer = null;
-		this.endOffset = 0;
-	}
-
-	/**
-	 * Moves the contents of a Range from the containing document or document
-	 * fragment to a new DocumentFragment.
-	 * 
-	 * @return A DocumentFragment containing the extracted contents.
-	 * @exception DOMException
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if any portion of
-	 *                the content of the Range is read-only or any of the
-	 *                nodes which contain any of the content of the Range are
-	 *                read-only. <br>
-	 *                HIERARCHY_REQUEST_ERR: Raised if a DocumentType node
-	 *                would be extracted into the new DocumentFragment. <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public DocumentFragment extractContents() throws DOMException {
-		// not supported
-		return null;
-	}
-
-	/**
-	 * TRUE if the Range is collapsed
-	 * 
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public boolean getCollapsed() throws DOMException {
-		if (this.startContainer == this.endContainer && this.startOffset == this.endOffset)
-			return true;
-		return false;
-	}
-
-	/**
-	 * The deepest common ancestor container of the Range's two
-	 * boundary-points.
-	 * 
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public Node getCommonAncestorContainer() throws DOMException {
-		if (this.startContainer == null)
-			return null;
-		return ((NodeImpl) this.startContainer).getCommonAncestor(this.endContainer);
-	}
-
-	/**
-	 * Node within which the Range ends
-	 * 
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public Node getEndContainer() throws DOMException {
-		return this.endContainer;
-	}
-
-	/**
-	 * Offset within the ending node of the Range.
-	 * 
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public int getEndOffset() throws DOMException {
-		return this.endOffset;
-	}
-
-	/**
-	 * Node within which the Range begins
-	 * 
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public Node getStartContainer() throws DOMException {
-		return this.startContainer;
-	}
-
-	/**
-	 * Offset within the starting node of the Range.
-	 * 
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public int getStartOffset() throws DOMException {
-		return this.startOffset;
-	}
-
-	/**
-	 * Inserts a node into the Document or DocumentFragment at the start of
-	 * the Range. If the container is a Text node, this will be split at the
-	 * start of the Range (as if the Text node's splitText method was
-	 * performed at the insertion point) and the insertion will occur between
-	 * the two resulting Text nodes. Adjacent Text nodes will not be
-	 * automatically merged. If the node to be inserted is a DocumentFragment
-	 * node, the children will be inserted rather than the DocumentFragment
-	 * node itself.
-	 * 
-	 * @param newNodeThe
-	 *            node to insert at the start of the Range
-	 * @exception DOMException
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if an ancestor
-	 *                container of the start of the Range is read-only. <br>
-	 *                WRONG_DOCUMENT_ERR: Raised if <code>newNode</code> and
-	 *                the container of the start of the Range were not created
-	 *                from the same document. <br>
-	 *                HIERARCHY_REQUEST_ERR: Raised if the container of the
-	 *                start of the Range is of a type that does not allow
-	 *                children of the type of <code>newNode</code> or if
-	 *                <code>newNode</code> is an ancestor of the container.
-	 *                <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if <code>newNode</code>
-	 *                is an Attr, Entity, Notation, or Document node.
-	 */
-	public void insertNode(Node newNode) throws RangeException, DOMException {
-		// not supported
-	}
-
-	/**
-	 * Select a node and its contents
-	 * 
-	 * @param refNodeThe
-	 *            node to select.
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if an ancestor of
-	 *                <code>refNode</code> is an Entity, Notation or
-	 *                DocumentType node or if <code>refNode</code> is a
-	 *                Document, DocumentFragment, Attr, Entity, or Notation
-	 *                node.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void selectNode(Node refNode) throws RangeException, DOMException {
-		if (refNode == null)
-			return;
-		Node parent = refNode.getParentNode();
-		if (parent == null)
-			return;
-		int index = ((NodeImpl) refNode).getIndex();
-		if (index < 0)
-			return;
-		setStart(parent, index);
-		setEnd(parent, index + 1);
-	}
-
-	/**
-	 * Select the contents within a node
-	 * 
-	 * @param refNodeNode
-	 *            to select from
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if <code>refNode</code>
-	 *                or an ancestor of <code>refNode</code> is an Entity,
-	 *                Notation or DocumentType node.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void selectNodeContents(Node refNode) throws RangeException, DOMException {
-		if (refNode == null)
-			return;
-		if (refNode.getNodeType() == Node.TEXT_NODE) {
-			Text text = (Text) refNode;
-			setStart(refNode, 0);
-			setEnd(refNode, text.getLength());
-		} else {
-			NodeList childNodes = refNode.getChildNodes();
-			int length = (childNodes != null ? childNodes.getLength() : 0);
-			setStart(refNode, 0);
-			setEnd(refNode, length);
-		}
-	}
-
-	/**
-	 * Sets the attributes describing the end of a Range.
-	 * 
-	 * @param refNodeThe
-	 *            <code>refNode</code> value. This parameter must be
-	 *            different from <code>null</code>.
-	 * @param offsetThe
-	 *            <code>endOffset</code> value.
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if <code>refNode</code>
-	 *                or an ancestor of <code>refNode</code> is an Entity,
-	 *                Notation, or DocumentType node.
-	 * @exception DOMException
-	 *                INDEX_SIZE_ERR: Raised if <code>offset</code> is
-	 *                negative or greater than the number of child units in
-	 *                <code>refNode</code>. Child units are 16-bit units if
-	 *                <code>refNode</code> is a type of CharacterData node
-	 *                (e.g., a Text or Comment node) or a
-	 *                ProcessingInstruction node. Child units are Nodes in all
-	 *                other cases. <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void setEnd(Node refNode, int offset) throws RangeException, DOMException {
-		this.endContainer = refNode;
-		this.endOffset = offset;
-	}
-
-	/**
-	 * Sets the end of a Range to be after a node
-	 * 
-	 * @param refNodeRange
-	 *            ends after <code>refNode</code>.
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if the root container of
-	 *                <code>refNode</code> is not an Attr, Document or
-	 *                DocumentFragment node or if <code>refNode</code> is a
-	 *                Document, DocumentFragment, Attr, Entity, or Notation
-	 *                node.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void setEndAfter(Node refNode) throws RangeException, DOMException {
-		if (refNode == null)
-			return;
-		Node parent = refNode.getParentNode();
-		if (parent == null)
-			return;
-		int index = ((NodeImpl) refNode).getIndex();
-		if (index < 0)
-			return;
-		setEnd(parent, index + 1);
-	}
-
-	/**
-	 * Sets the end position to be before a node.
-	 * 
-	 * @param refNodeRange
-	 *            ends before <code>refNode</code>
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if the root container of
-	 *                <code>refNode</code> is not an Attr, Document, or
-	 *                DocumentFragment node or if <code>refNode</code> is a
-	 *                Document, DocumentFragment, Attr, Entity, or Notation
-	 *                node.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void setEndBefore(Node refNode) throws RangeException, DOMException {
-		if (refNode == null)
-			return;
-		Node parent = refNode.getParentNode();
-		if (parent == null)
-			return;
-		int index = ((NodeImpl) refNode).getIndex();
-		if (index < 0)
-			return;
-		setEnd(parent, index);
-	}
-
-	/**
-	 * Sets the attributes describing the start of the Range.
-	 * 
-	 * @param refNodeThe
-	 *            <code>refNode</code> value. This parameter must be
-	 *            different from <code>null</code>.
-	 * @param offsetThe
-	 *            <code>startOffset</code> value.
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if <code>refNode</code>
-	 *                or an ancestor of <code>refNode</code> is an Entity,
-	 *                Notation, or DocumentType node.
-	 * @exception DOMException
-	 *                INDEX_SIZE_ERR: Raised if <code>offset</code> is
-	 *                negative or greater than the number of child units in
-	 *                <code>refNode</code>. Child units are 16-bit units if
-	 *                <code>refNode</code> is a type of CharacterData node
-	 *                (e.g., a Text or Comment node) or a
-	 *                ProcessingInstruction node. Child units are Nodes in all
-	 *                other cases. <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void setStart(Node refNode, int offset) throws RangeException, DOMException {
-		this.startContainer = refNode;
-		this.startOffset = offset;
-	}
-
-	/**
-	 * Sets the start position to be after a node
-	 * 
-	 * @param refNodeRange
-	 *            starts after <code>refNode</code>
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if the root container of
-	 *                <code>refNode</code> is not an Attr, Document, or
-	 *                DocumentFragment node or if <code>refNode</code> is a
-	 *                Document, DocumentFragment, Attr, Entity, or Notation
-	 *                node.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void setStartAfter(Node refNode) throws RangeException, DOMException {
-		if (refNode == null)
-			return;
-		Node parent = refNode.getParentNode();
-		if (parent == null)
-			return;
-		int index = ((NodeImpl) refNode).getIndex();
-		if (index < 0)
-			return;
-		setStart(parent, index + 1);
-	}
-
-	/**
-	 * Sets the start position to be before a node
-	 * 
-	 * @param refNodeRange
-	 *            starts before <code>refNode</code>
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if the root container of
-	 *                <code>refNode</code> is not an Attr, Document, or
-	 *                DocumentFragment node or if <code>refNode</code> is a
-	 *                Document, DocumentFragment, Attr, Entity, or Notation
-	 *                node.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void setStartBefore(Node refNode) throws RangeException, DOMException {
-		if (refNode == null)
-			return;
-		Node parent = refNode.getParentNode();
-		if (parent == null)
-			return;
-		int index = ((NodeImpl) refNode).getIndex();
-		if (index < 0)
-			return;
-		setStart(parent, index);
-	}
-
-	/**
-	 * Reparents the contents of the Range to the given node and inserts the
-	 * node at the position of the start of the Range.
-	 * 
-	 * @param newParentThe
-	 *            node to surround the contents with.
-	 * @exception DOMException
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if an ancestor
-	 *                container of either boundary-point of the Range is
-	 *                read-only. <br>
-	 *                WRONG_DOCUMENT_ERR: Raised if <code> newParent</code>
-	 *                and the container of the start of the Range were not
-	 *                created from the same document. <br>
-	 *                HIERARCHY_REQUEST_ERR: Raised if the container of the
-	 *                start of the Range is of a type that does not allow
-	 *                children of the type of <code>newParent</code> or if
-	 *                <code>newParent</code> is an ancestor of the container
-	 *                or if <code>node</code> would end up with a child node
-	 *                of a type not allowed by the type of <code>node</code>.
-	 *                <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 * @exception RangeException
-	 *                BAD_BOUNDARYPOINTS_ERR: Raised if the Range partially
-	 *                selects a non-text node. <br>
-	 *                INVALID_NODE_TYPE_ERR: Raised if <code> node</code> is
-	 *                an Attr, Entity, DocumentType, Notation, Document, or
-	 *                DocumentFragment node.
-	 */
-	public void surroundContents(Node newParent) throws RangeException, DOMException {
-		// not supported
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ReadOnlyController.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ReadOnlyController.java
deleted file mode 100644
index d453a10..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ReadOnlyController.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Node;
-
-
-class ReadOnlyController {
-
-	class Span {
-		int length;
-		int offset;
-
-		Span(int offset, int length) {
-			this.offset = offset;
-			this.length = length;
-		}
-	}
-
-	private static ReadOnlyController fInstance;
-
-	static synchronized ReadOnlyController getInstance() {
-		if (fInstance == null) {
-			fInstance = new ReadOnlyController();
-		}
-		return fInstance;
-	}
-
-	static private void lock(IStructuredDocument doc, int offset, int length, boolean canInsertBefore, boolean canInsertAfter) {
-		if (doc == null) {
-			return;
-		}
-		doc.makeReadOnly(offset, length);
-	}
-
-	static private void lock(IStructuredDocumentRegion node, boolean canInsertBefore, boolean canInsertAfter) {
-		if (node == null) {
-			return;
-		}
-		IStructuredDocument doc = node.getParentDocument();
-		if (doc == null) {
-			return;
-		}
-		doc.makeReadOnly(node.getStart(), node.getLength());
-	}
-
-	static private void unlock(IStructuredDocumentRegion node) {
-		if (node == null) {
-			return;
-		}
-		IStructuredDocument doc = node.getParentDocument();
-		if (doc == null) {
-			return;
-		}
-		doc.clearReadOnly(node.getStart(), node.getLength());
-	}
-
-	private ReadOnlyController() {
-		super();
-	}
-
-	private Span getDataSpan(IDOMNode node) {
-		switch (node.getNodeType()) {
-			case Node.ELEMENT_NODE :
-				return getDataSpanForElement((IDOMElement) node);
-			case Node.TEXT_NODE :
-				return getDataSpanForText((IDOMText) node);
-			default :
-				return new Span(0, -1);
-		}
-	}
-
-	private Span getDataSpanForElement(IDOMElement node) {
-		IStructuredDocumentRegion docRegion = node.getStartStructuredDocumentRegion();
-		if (docRegion == null) {
-			return new Span(0, -1);
-		}
-
-		ITextRegionList regions = docRegion.getRegions();
-		if (regions == null) {
-			return new Span(0, -1);
-		}
-
-		String startType;
-		String endType;
-		if (node.isCommentTag()) {
-			startType = DOMRegionContext.XML_COMMENT_OPEN;
-			endType = DOMRegionContext.XML_COMMENT_CLOSE;
-		} else {
-			startType = DOMRegionContext.XML_TAG_NAME;
-			endType = DOMRegionContext.XML_TAG_CLOSE;
-		}
-
-		int startOffset = -1;
-		int endOffset = -1;
-		ITextRegion prevRegion = null;
-		ITextRegion region;
-		for (int i = 0; i < regions.size(); i++) {
-			region = regions.get(i);
-			String type = region.getType();
-			if (type == startType) {
-				startOffset = region.getEnd();
-			} else if (type == endType && prevRegion != null) {
-				endOffset = prevRegion.getTextEnd();
-			}
-			prevRegion = region;
-		}
-
-		if (0 <= startOffset && 0 <= endOffset) {
-			return new Span(startOffset, endOffset - startOffset);
-		} else {
-			return new Span(0, -1);
-		}
-	}
-
-	private Span getDataSpanForText(IDOMText node) {
-		IStructuredDocumentRegion docRegion = ((NodeImpl) node).getStructuredDocumentRegion();
-		if (docRegion == null) {
-			return new Span(0, -1);
-		}
-		return new Span(0, docRegion.getLength());
-	}
-
-	/**
-	 * This method is used from parent's setChildEditable()
-	 * 
-	 * case 1:<parent><node attr="value"/> <node2></parent>
-	 * x####################x case 2:<parent><node attr="value"> <child>
-	 * </child> </node> </parent> x###################? ?#######x (? :
-	 * editable if node.isEditable() == true)
-	 */
-	void lockBoth(IDOMNode node) {
-		if (node == null) {
-			return;
-		}
-
-		IStructuredDocumentRegion flatNode;
-		boolean canInsert = false;
-
-		// end node (element)
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			flatNode = node.getEndStructuredDocumentRegion();
-			if (flatNode != null) {
-				canInsert = node.isChildEditable();
-				lock(flatNode, canInsert, false);
-			}
-		}
-		// start node
-		flatNode = node.getStartStructuredDocumentRegion();
-		if (flatNode != null) {
-			lock(flatNode, false, canInsert);
-		}
-	}
-
-	void lockData(IDOMNode node) {
-		if (node == null) {
-			return;
-		}
-
-		Span span = getDataSpan(node);
-		if (0 <= span.length) {
-			lock(node.getModel().getStructuredDocument(), node.getStartOffset() + span.offset, span.length, false, false);
-		}
-	}
-
-	/**
-	 * lock itself and all descendants
-	 */
-	void lockDeep(IDOMNode node) {
-		if (node == null) {
-			return;
-		}
-
-		int offset = node.getStartOffset();
-		int length = node.getEndOffset() - offset;
-
-		boolean canInsert = true;
-		IDOMNode parent = (IDOMNode) node.getParentNode();
-		if (parent != null && !parent.isChildEditable()) {
-			canInsert = false;
-		}
-		lock(node.getStructuredDocument(), offset, length, canInsert, canInsert);
-	}
-
-	/**
-	 * This method is used from parent's setChildEditable()
-	 * 
-	 * case 1:<parent><node attr="value"/> <node2></parent> x######x x##x
-	 * case 2:<parent><node attr="value"> <child></child> </node> </parent>
-	 * x######x x#? ?#######x (? : editable if node.isEditable() == true)
-	 */
-	void lockNode(IDOMNode node) {
-		if (node == null) {
-			return;
-		}
-		if (!node.isDataEditable()) {
-			lockBoth(node);
-			return;
-		}
-
-		IStructuredDocumentRegion flatNode;
-		boolean canInsert = false;
-
-		// end node (element)
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			flatNode = node.getEndStructuredDocumentRegion();
-			if (flatNode != null) {
-				canInsert = node.isChildEditable();
-				lock(flatNode, canInsert, false);
-			}
-		}
-		// start node
-		flatNode = node.getStartStructuredDocumentRegion();
-		if (flatNode != null) {
-			Span span = getDataSpan(node);
-			if (0 <= span.length) {
-				IStructuredDocument structuredDocument = flatNode.getParentDocument();
-				int offset, length;
-				offset = flatNode.getStart();
-				length = span.offset;
-				lock(structuredDocument, offset, length, false, false);
-				offset = offset + span.offset + span.length;
-				length = flatNode.getEnd() - offset;
-				lock(structuredDocument, offset, length, canInsert, false);
-			} else {
-				lock(flatNode, false, canInsert);
-			}
-		}
-	}
-
-	private void unlock(IStructuredDocument doc, int offset, int length) {
-		if (doc == null) {
-			return;
-		}
-		doc.clearReadOnly(offset, length);
-	}
-
-	void unlockBoth(IDOMNode node) {
-		if (node == null) {
-			return;
-		}
-
-		IStructuredDocumentRegion flatNode;
-		// start node
-		flatNode = node.getStartStructuredDocumentRegion();
-		if (flatNode != null) {
-			unlock(flatNode);
-		}
-		// end node
-		flatNode = node.getEndStructuredDocumentRegion();
-		if (flatNode != null) {
-			unlock(flatNode);
-		}
-	}
-
-	void unlockData(IDOMNode node) {
-		if (node == null) {
-			return;
-		}
-
-		Span span = getDataSpan(node);
-		if (0 <= span.length) {
-			unlock(node.getModel().getStructuredDocument(), span.offset, span.length);
-		}
-	}
-
-	void unlockDeep(IDOMNode node) {
-		if (node == null) {
-			return;
-		}
-
-		int offset = node.getStartOffset();
-		int length = node.getEndOffset() - offset;
-
-		unlock(node.getStructuredDocument(), offset, length);
-	}
-
-	void unlockNode(IDOMNode node) {
-		if (node == null) {
-			return;
-		}
-
-		IStructuredDocumentRegion flatNode;
-		// end node
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			flatNode = node.getEndStructuredDocumentRegion();
-			if (flatNode != null) {
-				unlock(flatNode);
-			}
-		}
-
-		// start node
-		flatNode = node.getStartStructuredDocumentRegion();
-		if (flatNode != null) {
-			if (node.isDataEditable()) {
-				unlock(flatNode);
-			} else {
-				Span span = getDataSpan(node);
-				if (span.length <= 0) {
-					unlock(flatNode);
-				} else {
-					IStructuredDocument structuredDocument = flatNode.getParentDocument();
-					int offset, length;
-					offset = flatNode.getStart();
-					length = span.offset - offset;
-					unlock(structuredDocument, offset, length);
-					offset = span.offset + span.length;
-					length = flatNode.getEnd() - span.offset;
-					unlock(structuredDocument, offset, length);
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/SourceValidator.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/SourceValidator.java
deleted file mode 100644
index d739a36..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/SourceValidator.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-import org.eclipse.wst.xml.core.internal.XMLCoreMessages;
-import org.eclipse.wst.xml.core.internal.provisional.IXMLCharEntity;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-
-/**
- */
-public class SourceValidator {
-
-	private NodeImpl node = null;
-
-	/**
-	 */
-	public SourceValidator(Node node) {
-		super();
-
-		if (node != null) {
-			this.node = (NodeImpl) node;
-		}
-	}
-
-	/**
-	 */
-	public String convertSource(String source) {
-		if (source == null)
-			return null;
-		if (this.node == null)
-			return null; // error
-
-		// setup conversion conditions
-		boolean acceptTag = false;
-		boolean acceptClose = false;
-		boolean acceptQuote = false;
-		boolean acceptAmpersand = false;
-		boolean acceptEntityRef = true;
-		boolean acceptJSPEnd = true;
-		String endTagName = null;
-		if (this.node.getNodeType() == Node.ATTRIBUTE_NODE) {
-			IDOMDocument document = (IDOMDocument) this.node.getOwnerDocument();
-			if (document != null && document.isJSPType())
-				acceptTag = true;
-			if (acceptTag) {
-				Attr attr = (Attr) this.node;
-				ElementImpl element = (ElementImpl) attr.getOwnerElement();
-				if (element != null && element.isJSPTag())
-					acceptTag = false;
-			}
-			// if the source does not include single quote,
-			// double quote is valid
-			acceptQuote = (source.indexOf('\'') < 0);
-		} else if (this.node.getNodeType() == Node.TEXT_NODE) {
-			TextImpl text = (TextImpl) this.node;
-			if (text.isJSPContent()) {
-				int index = source.indexOf(JSPTag.TAG_CLOSE);
-				if (index < 0)
-					return source;
-				acceptTag = true;
-				acceptClose = true;
-				acceptQuote = true;
-				acceptAmpersand = true;
-				acceptJSPEnd = false;
-			} else if (text.isCDATAContent()) {
-				endTagName = text.getParentNode().getNodeName();
-				if (endTagName == null)
-					return null; // error
-				acceptTag = true;
-				acceptClose = true;
-				acceptQuote = true;
-				acceptAmpersand = true;
-			}
-		} else {
-			IDOMDocument document = null;
-			if (this.node.getNodeType() == Node.DOCUMENT_NODE) {
-				document = (IDOMDocument) this.node;
-			} else {
-				document = (IDOMDocument) this.node.getOwnerDocument();
-			}
-			if (document != null && document.isJSPType())
-				acceptTag = true;
-		}
-
-		StringBuffer buffer = null;
-		int copiedLength = 0;
-		int length = source.length();
-		for (int i = 0; i < length; i++) {
-			String ref = null;
-			char c = source.charAt(i);
-			switch (c) {
-				case '<' :
-					if (acceptTag) {
-						if (endTagName != null) {
-							if (!matchEndTag(source, i + 1, endTagName))
-								continue;
-						} else {
-							int skip = skipTag(source, i + 1);
-							if (skip >= 0) {
-								i += skip;
-								continue;
-							}
-						}
-						// invalid JSP tag
-					}
-					ref = IXMLCharEntity.LT_REF;
-					break;
-				case '>' :
-					if (acceptClose)
-						continue;
-					ref = IXMLCharEntity.GT_REF;
-					break;
-				case '&' :
-					if (acceptAmpersand)
-						continue;
-					if (acceptEntityRef) {
-						int skip = skipEntityRef(source, i + 1);
-						if (skip >= 0) {
-							i += skip;
-							continue;
-						}
-					}
-					ref = IXMLCharEntity.AMP_REF;
-					break;
-				case '"' :
-					if (acceptQuote)
-						continue;
-					ref = IXMLCharEntity.QUOT_REF;
-					break;
-				case '%' :
-					if (acceptJSPEnd)
-						continue;
-					if (source.charAt(i + 1) != '>')
-						continue;
-					i++;
-					ref = IXMLCharEntity.GT_REF;
-					break;
-				default :
-					continue;
-			}
-
-			if (ref != null) {
-				if (buffer == null) {
-					buffer = new StringBuffer(length + 8);
-				}
-				if (i > copiedLength) {
-					buffer.append(source.substring(copiedLength, i));
-				}
-				buffer.append(ref);
-				copiedLength = i + 1; // skip this character
-			}
-		}
-
-		if (buffer != null) {
-			if (copiedLength < length) {
-				buffer.append(source.substring(copiedLength, length));
-			}
-			return buffer.toString();
-		}
-		return source;
-	}
-
-	/**
-	 */
-	private final boolean matchEndTag(String source, int offset, String endTagName) {
-		if (source == null || endTagName == null)
-			return false;
-		int length = source.length();
-		if (offset < 0 || offset >= length)
-			return false;
-		if (source.charAt(offset) != '/')
-			return false;
-		offset++;
-		int end = offset + endTagName.length();
-		if (end > length)
-			return false;
-		return endTagName.equalsIgnoreCase(source.substring(offset, end));
-	}
-
-	/**
-	 */
-	private final int skipEntityRef(String source, int offset) {
-		if (source == null)
-			return -1;
-		if (offset < 0 || offset >= source.length())
-			return -1;
-		DocumentImpl document = (DocumentImpl) this.node.getOwnerDocument();
-		if (document == null)
-			return -1; // error
-
-		int end = source.indexOf(';', offset);
-		if (end < 0 || end == offset)
-			return -1;
-		String name = source.substring(offset, end);
-		if (name == null || document.getCharValue(name) == null)
-			return -1;
-		return (end + 1 - offset);
-	}
-
-	/**
-	 */
-	private final int skipTag(String source, int offset) {
-		if (source == null)
-			return -1;
-		if (offset < 0 || offset >= source.length())
-			return -1;
-
-		int end = offset;
-		if (source.charAt(offset) == '%') {
-			// JSP tag
-			int found = source.indexOf(JSPTag.TAG_CLOSE, offset + 1);
-			if (found < 0)
-				return -1; // invalid JSP tag
-			end = found + 2;
-		} else {
-			// normal tag
-			int found = source.indexOf('>', offset);
-			if (found < 0)
-				return -1; // invalid tag
-			end = found + 1;
-		}
-		return (end - offset);
-	}
-
-	/**
-	 */
-	public boolean validateSource(String source) throws InvalidCharacterException {
-		if (source == null)
-			return true;
-		if (this.node == null)
-			return false; // error
-		String message = null;
-
-		// setup validation conditions
-		boolean acceptTag = false;
-		boolean acceptClose = false;
-		boolean acceptQuote = true;
-		boolean acceptEntityRef = true;
-		String endTagName = null;
-		if (this.node.getNodeType() == Node.ATTRIBUTE_NODE) {
-			IDOMDocument document = (IDOMDocument) this.node.getOwnerDocument();
-			if (document != null && document.isJSPType())
-				acceptTag = true;
-			if (acceptTag) {
-				Attr attr = (Attr) this.node;
-				ElementImpl element = (ElementImpl) attr.getOwnerElement();
-				if (element != null && element.isJSPTag())
-					acceptTag = false;
-			}
-			// if the source does not include single quote,
-			// double quote is valid
-			acceptQuote = (source.indexOf('\'') < 0);
-		} else if (this.node.getNodeType() == Node.TEXT_NODE) {
-			TextImpl text = (TextImpl) this.node;
-			if (text.isJSPContent()) {
-				int index = source.indexOf(JSPTag.TAG_CLOSE);
-				if (index < 0)
-					return true;
-				message = XMLCoreMessages.Invalid_character_gt_fo_ERROR_;
-				throw new InvalidCharacterException(message, '>', index + 1);
-			} else if (text.isCDATAContent()) {
-				endTagName = text.getParentNode().getNodeName();
-				if (endTagName == null)
-					return false; // error
-				acceptTag = true;
-				acceptClose = true;
-			}
-		} else {
-			IDOMDocument document = null;
-			if (this.node.getNodeType() == Node.DOCUMENT_NODE) {
-				document = (IDOMDocument) this.node;
-			} else {
-				document = (IDOMDocument) this.node.getOwnerDocument();
-			}
-			if (document != null && document.isJSPType())
-				acceptTag = true;
-		}
-
-		char c = 0;
-		int length = source.length();
-		for (int i = 0; i < length; i++) {
-			c = source.charAt(i);
-			switch (c) {
-				case '<' :
-					if (acceptTag) {
-						if (endTagName != null) {
-							if (!matchEndTag(source, i + 1, endTagName))
-								continue;
-						} else {
-							int skip = skipTag(source, i + 1);
-							if (skip >= 0) {
-								i += skip;
-								continue;
-							}
-						}
-						// invalid tag
-					}
-					message = XMLCoreMessages.Invalid_character_lt_fo_ERROR_;
-					break;
-				case '>' :
-					if (acceptClose)
-						continue;
-					message = XMLCoreMessages.Invalid_character_gt_fo_ERROR_;
-					break;
-				case '&' :
-					if (acceptEntityRef) {
-						if (endTagName != null)
-							continue;
-						int skip = skipEntityRef(source, i + 1);
-						if (skip >= 0) {
-							i += skip;
-							continue;
-						}
-						// invalid entity reference
-					}
-					message = XMLCoreMessages.Invalid_character_amp_fo_ERROR_;
-					break;
-				case '"' :
-					if (acceptQuote)
-						continue;
-					message = XMLCoreMessages.Invalid_character__f_EXC_;
-					break;
-				default :
-					continue;
-			}
-
-			if (message != null) {
-				throw new InvalidCharacterException(message, c, i);
-			}
-		}
-
-		return true;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionChecker.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionChecker.java
deleted file mode 100644
index 5252318..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionChecker.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import java.io.IOException;
-import java.io.Writer;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-
-
-/**
- * This class is only for debug purpose.
- */
-public class StructuredDocumentRegionChecker {
-	String EOL = System.getProperty("line.separator"); //$NON-NLS-1$
-
-	private int offset = 0;
-	Writer testWriter = null;
-
-	/**
-	 */
-	public StructuredDocumentRegionChecker() {
-		super();
-	}
-
-	public StructuredDocumentRegionChecker(Writer writer) {
-		super();
-		testWriter = writer;
-	}
-
-	/**
-	 */
-	private void checkChildNodes(Node node) {
-		for (Node child = node.getFirstChild(); child != null; child = child.getNextSibling()) {
-			checkNode(child);
-		}
-	}
-
-	/**
-	 */
-	public void checkModel(IDOMModel model) {
-		checkChildNodes(model.getDocument());
-	}
-
-	/**
-	 */
-	private void checkNode(Node node) {
-		checkStructuredDocumentRegion(((NodeImpl) node).getStructuredDocumentRegion());
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			checkChildNodes(node);
-			checkStructuredDocumentRegion(((ElementImpl) node).getEndStructuredDocumentRegion());
-		}
-	}
-
-	/**
-	 */
-	private void checkStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return;
-
-		if (flatNode instanceof StructuredDocumentRegionContainer) {
-			StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) flatNode;
-			int n = container.getStructuredDocumentRegionCount();
-			for (int i = 0; i < n; i++) {
-				IStructuredDocumentRegion c = container.getStructuredDocumentRegion(i);
-				if (c == null) {
-					reportError("null"); //$NON-NLS-1$
-					continue;
-				}
-				checkStructuredDocumentRegion(c);
-			}
-			return;
-		}
-
-		int start = flatNode.getStart();
-		if (start < this.offset)
-			reportError("overwrap"); //$NON-NLS-1$
-		if (start > this.offset)
-			reportError("gap"); //$NON-NLS-1$
-		int end = flatNode.getEnd();
-		this.offset = end;
-
-		if (flatNode instanceof StructuredDocumentRegionProxy) {
-			StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) flatNode;
-			IStructuredDocumentRegion p = proxy.getStructuredDocumentRegion();
-			if (p == null) {
-				reportError("null"); //$NON-NLS-1$
-				return;
-			}
-			int s = p.getStart();
-			int e = p.getEnd();
-			if (s > start || e < end)
-				reportError("out"); //$NON-NLS-1$
-			if (s == start && e == end)
-				reportWarning("vain"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 */
-	private void reportError(String message) {
-		String msg = "StructuredDocumentRegionChecker : error : " + message; //$NON-NLS-1$
-		if (testWriter != null) {
-			try {
-				testWriter.write(msg + EOL);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		} else {
-			System.out.println(msg);
-		}
-		throw new StructuredDocumentRegionManagementException();
-	}
-
-	/**
-	 */
-	private void reportWarning(String message) {
-		String msg = "StructuredDocumentRegionChecker : warning : " + message; //$NON-NLS-1$
-		if (testWriter != null) {
-			try {
-				testWriter.write(msg + EOL);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		} else {
-			System.out.println(msg);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionContainer.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionContainer.java
deleted file mode 100644
index 8ee9f5b..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionContainer.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import java.util.Vector;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-
-class StructuredDocumentRegionContainer implements IStructuredDocumentRegion {
-
-	private Vector flatNodes = new Vector(2);
-
-	/**
-	 */
-	StructuredDocumentRegionContainer() {
-		super();
-	}
-
-
-	public void addRegion(ITextRegion aRegion) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-
-	}
-
-	public void adjust(int i) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-
-	}
-
-	public void adjustLength(int i) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-
-	}
-
-	public void adjustStart(int i) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-
-	}
-
-	public void adjustTextLength(int i) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-
-	}
-
-	/**
-	 */
-	void appendStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return;
-		if (flatNode instanceof StructuredDocumentRegionContainer) {
-			StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) flatNode;
-			if (container.getStructuredDocumentRegionCount() > 0) {
-				this.flatNodes.addAll(container.flatNodes);
-			}
-		}
-		else {
-			this.flatNodes.addElement(flatNode);
-		}
-	}
-
-	public boolean containsOffset(int i) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public boolean containsOffset(ITextRegion region, int i) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public void equatePositions(ITextRegion region) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-
-	}
-
-	public ITextRegion getDeepestRegionAtCharacterOffset(int offset) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public int getEnd() {
-		IStructuredDocumentRegion last = getLastStructuredDocumentRegion();
-		if (last == null)
-			return 0;
-		return last.getEnd();
-	}
-
-	/**
-	 */
-	public int getEndOffset() {
-		return getEnd();
-	}
-
-	public int getEndOffset(ITextRegion containedRegion) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public ITextRegion getFirstRegion() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	IStructuredDocumentRegion getFirstStructuredDocumentRegion() {
-		if (this.flatNodes.isEmpty())
-			return null;
-		return (IStructuredDocumentRegion) this.flatNodes.elementAt(0);
-	}
-
-	/**
-	 */
-	public String getFullText() {
-		return getText();
-	}
-
-	/**
-	 */
-	public String getFullText(ITextRegion aRegion) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public String getFullText(String context) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public ITextRegion getLastRegion() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	IStructuredDocumentRegion getLastStructuredDocumentRegion() {
-		int size = this.flatNodes.size();
-		if (size == 0)
-			return null;
-		return (IStructuredDocumentRegion) this.flatNodes.elementAt(size - 1);
-	}
-
-	/** 
-	 */
-	public int getLength() {
-		return (getEnd() - getStart());
-	}
-
-	public IStructuredDocumentRegion getNext() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public int getNumberOfRegions() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public ITextRegionContainer getParent() {
-		return null;
-	}
-
-	public IStructuredDocument getParentDocument() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public IStructuredDocumentRegion getPrevious() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public ITextRegion getRegionAtCharacterOffset(int offset) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public ITextRegionList getRegions() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public int getStart() {
-		IStructuredDocumentRegion first = getFirstStructuredDocumentRegion();
-		if (first == null)
-			return 0;
-		return first.getStart();
-	}
-
-	/**
-	 */
-	public int getStartOffset() {
-		return getStart();
-	}
-
-	public int getStartOffset(ITextRegion containedRegion) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public IStructuredDocument getStructuredDocument() {
-		IStructuredDocumentRegion first = getFirstStructuredDocumentRegion();
-		if (first == null)
-			return null;
-		return first.getParentDocument();
-	}
-
-	/**
-	 */
-	IStructuredDocumentRegion getStructuredDocumentRegion(int index) {
-		if (index < 0 || index >= this.flatNodes.size())
-			return null;
-		return (IStructuredDocumentRegion) this.flatNodes.elementAt(index);
-	}
-
-	/**
-	 */
-	int getStructuredDocumentRegionCount() {
-		return this.flatNodes.size();
-	}
-
-	/**
-	 */
-	public String getText() {
-		int size = this.flatNodes.size();
-		if (size == 0)
-			return new String();
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; i < size; i++) {
-			IStructuredDocumentRegion flatNode = (IStructuredDocumentRegion) this.flatNodes.elementAt(i);
-			if (flatNode == null)
-				continue;
-			buffer.append(flatNode.getText());
-		}
-		return buffer.toString();
-	}
-
-	/**
-	 */
-	public String getText(ITextRegion aRegion) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public String getText(String context) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public int getTextEnd() {
-		return getEnd();
-	}
-
-	/**
-	 */
-	public int getTextEndOffset() {
-		return getTextEnd();
-	}
-
-	public int getTextEndOffset(ITextRegion containedRegion) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 * The text length is equal to length if there is no white space at the
-	 * end of a region. Otherwise it is smaller than length.
-	 */
-	public int getTextLength() {
-		return (getTextEnd() - getStart());
-	}
-
-	/**
-	 */
-	public String getType() {
-		return "StructuredDocumentRegionContainer";//$NON-NLS-1$
-	}
-
-	/**
-	 */
-	void insertStructuredDocumentRegion(IStructuredDocumentRegion flatNode, int index) {
-		if (flatNode == null)
-			return;
-		if (index < 0)
-			return;
-		int size = this.flatNodes.size();
-		if (index > size)
-			return;
-		if (index == size) {
-			appendStructuredDocumentRegion(flatNode);
-			return;
-		}
-		this.flatNodes.insertElementAt(flatNode, index);
-	}
-
-	public boolean isDeleted() {
-		// I'll assume never really needed here
-		return false;
-	}
-
-	public boolean isEnded() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	IStructuredDocumentRegion removeStructuredDocumentRegion(int index) {
-		if (index < 0 || index >= this.flatNodes.size())
-			return null;
-		IStructuredDocumentRegion flatNode = (IStructuredDocumentRegion) this.flatNodes.elementAt(index);
-		this.flatNodes.removeElementAt(index);
-		return flatNode;
-	}
-
-	/**
-	 */
-	IStructuredDocumentRegion removeStructuredDocumentRegion(IStructuredDocumentRegion oldStructuredDocumentRegion) {
-		if (oldStructuredDocumentRegion == null)
-			return null;
-		int size = this.flatNodes.size();
-		for (int i = 0; i < size; i++) {
-			IStructuredDocumentRegion flatNode = (IStructuredDocumentRegion) this.flatNodes.elementAt(i);
-			if (flatNode == oldStructuredDocumentRegion) {
-				this.flatNodes.removeElementAt(i);
-				return flatNode;
-			}
-		}
-		return null; // not found
-	}
-
-	/**
-	 */
-	IStructuredDocumentRegion replaceStructuredDocumentRegion(IStructuredDocumentRegion flatNode, int index) {
-		if (flatNode == null)
-			return removeStructuredDocumentRegion(index);
-		if (index < 0 || index >= this.flatNodes.size())
-			return null;
-		IStructuredDocumentRegion oldStructuredDocumentRegion = (IStructuredDocumentRegion) this.flatNodes.elementAt(index);
-		this.flatNodes.setElementAt(flatNode, index);
-		return oldStructuredDocumentRegion;
-	}
-
-	public boolean sameAs(IStructuredDocumentRegion region, int shift) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public boolean sameAs(ITextRegion region, int shift) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public boolean sameAs(ITextRegion oldRegion, IStructuredDocumentRegion documentRegion, ITextRegion newRegion, int shift) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public void setDeleted(boolean deleted) {
-		// I'll assume never really needed here
-	}
-
-	public void setEnded(boolean hasEnd) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public void setLength(int newLength) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public void setNext(IStructuredDocumentRegion newNext) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public void setParentDocument(IStructuredDocument document) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public void setPrevious(IStructuredDocumentRegion newPrevious) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public void setRegions(ITextRegionList embeddedRegions) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public void setStart(int newStart) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 * toString method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append('{');
-		int count = getStructuredDocumentRegionCount();
-		for (int i = 0; i < count; i++) {
-			if (i != 0)
-				buffer.append(',');
-			IStructuredDocumentRegion flatNode = getStructuredDocumentRegion(i);
-			if (flatNode == null)
-				buffer.append("null");//$NON-NLS-1$
-			else
-				buffer.append(flatNode.toString());
-		}
-		buffer.append('}');
-		return buffer.toString();
-	}
-
-	public StructuredDocumentEvent updateRegion(Object requester, IStructuredDocumentRegion flatnode, String changes, int start, int end) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionManagementException.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionManagementException.java
deleted file mode 100644
index 8e144af..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionManagementException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;
-
-
-
-/**
- */
-public class StructuredDocumentRegionManagementException extends SourceEditingRuntimeException {
-
-	/**
-	 * Default <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * StructuredDocumentRegionManagementException constructor
-	 */
-	public StructuredDocumentRegionManagementException() {
-		super("IStructuredDocumentRegion management failed.");//$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionProxy.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionProxy.java
deleted file mode 100644
index bc0bcbf..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionProxy.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-
-class StructuredDocumentRegionProxy implements IStructuredDocumentRegion {
-	private IStructuredDocumentRegion flatNode = null;
-	private int length = 0;
-
-	private int offset = 0;
-
-	/**
-	 */
-	StructuredDocumentRegionProxy() {
-		super();
-	}
-
-	/**
-	 */
-	StructuredDocumentRegionProxy(int offset, int length) {
-		super();
-
-		this.offset = offset;
-		this.length = length;
-	}
-
-	/**
-	 */
-	StructuredDocumentRegionProxy(int offset, int length, IStructuredDocumentRegion flatNode) {
-		super();
-
-		this.offset = offset;
-		this.length = length;
-		this.flatNode = flatNode;
-		if (this.flatNode != null)
-			this.offset -= this.flatNode.getStart();
-	}
-
-	public void addRegion(ITextRegion aRegion) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-
-	}
-
-	public void adjust(int i) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-
-	}
-
-	public void adjustLength(int i) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-
-	}
-
-	public void adjustStart(int i) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-
-	}
-
-	public void adjustTextLength(int i) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-
-	}
-
-	public boolean containsOffset(int i) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public boolean containsOffset(ITextRegion region, int i) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public void equatePositions(ITextRegion region) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-
-	}
-
-	public ITextRegion getDeepestRegionAtCharacterOffset(int offset) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public int getEnd() {
-		int flatNodeOffset = 0;
-		if (this.flatNode != null)
-			flatNodeOffset = this.flatNode.getStart();
-		return flatNodeOffset + this.offset + this.length;
-	}
-
-	public int getEndOffset() {
-		return getEnd();
-	}
-
-	public int getEndOffset(ITextRegion containedRegion) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public ITextRegion getFirstRegion() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public String getFullText() {
-		return getText();
-	}
-
-	public String getFullText(ITextRegion aRegion) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public String getFullText(String context) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public ITextRegion getLastRegion() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public int getLength() {
-		return this.length;
-	}
-
-	public IStructuredDocumentRegion getNext() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public int getNumberOfRegions() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	int getOffset() {
-		int flatNodeOffset = 0;
-		if (this.flatNode != null)
-			flatNodeOffset = this.flatNode.getStart();
-		return flatNodeOffset + this.offset;
-	}
-
-	/**
-	 */
-	public ITextRegionContainer getParent() {
-		return null;
-	}
-
-	public IStructuredDocument getParentDocument() {
-		return null;
-		// throw new Error("intentionally not implemented since should never
-		// be called");
-	}
-
-	public IStructuredDocumentRegion getPrevious() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public ITextRegion getRegionAtCharacterOffset(int offset) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public ITextRegionList getRegions() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public int getStart() {
-		int flatNodeOffset = 0;
-		if (this.flatNode != null)
-			flatNodeOffset = this.flatNode.getStart();
-		return flatNodeOffset + this.offset;
-	}
-
-	/**
-	 */
-	public int getStartOffset() {
-		return getStart();
-	}
-
-	public int getStartOffset(ITextRegion containedRegion) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public IStructuredDocument getStructuredDocument() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/** 
-	 */
-	IStructuredDocumentRegion getStructuredDocumentRegion() {
-		return this.flatNode;
-	}
-
-	/**
-	 */
-	public String getText() {
-		if (this.flatNode == null)
-			return new String();
-		String text = this.flatNode.getText();
-		if (text == null)
-			return new String();
-		int end = this.offset + this.length;
-		return text.substring(this.offset, end);
-	}
-
-	/**
-	 */
-	public String getText(ITextRegion aRegion) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public String getText(String context) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public int getTextEnd() {
-		return getEnd();
-	}
-
-	/**
-	 */
-	public int getTextEndOffset() {
-		return getTextEnd();
-	}
-
-	public int getTextEndOffset(ITextRegion containedRegion) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 * The text length is equal to length if there is no white space at the
-	 * end of a region. Otherwise it is smaller than length.
-	 */
-	public int getTextLength() {
-		return getLength();
-	}
-
-	/**
-	 */
-	public String getType() {
-		return "StructuredDocumentRegionProxy";//$NON-NLS-1$
-	}
-
-	public boolean isDeleted() {
-		// I'll assume never really needed here
-		return false;
-	}
-
-	public boolean isEnded() {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public boolean sameAs(IStructuredDocumentRegion region, int shift) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	public boolean sameAs(ITextRegion region, int shift) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public boolean sameAs(ITextRegion oldRegion, IStructuredDocumentRegion documentRegion, ITextRegion newRegion, int shift) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public void setDeleted(boolean deleted) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public void setEnded(boolean hasEnd) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 * had to make public, due to API transition.
-	 */
-	public void setLength(int length) {
-		this.length = length;
-	}
-
-	public void setNext(IStructuredDocumentRegion newNext) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	void setOffset(int offset) {
-		this.offset = offset;
-		if (this.flatNode != null)
-			this.offset -= this.flatNode.getStart();
-	}
-
-	public void setParentDocument(IStructuredDocument document) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public void setPrevious(IStructuredDocumentRegion newPrevious) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public void setRegions(ITextRegionList embeddedRegions) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	public void setStart(int newStart) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-
-	/**
-	 */
-	void setStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		if (this.flatNode != null)
-			this.offset += this.flatNode.getStart();
-		this.flatNode = flatNode;
-		if (this.flatNode != null)
-			this.offset -= flatNode.getStart();
-	}
-
-	/**
-	 * toString method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append('[');
-		buffer.append(getStart());
-		buffer.append(',');
-		buffer.append(getEnd());
-		buffer.append(']');
-		buffer.append('(');
-		if (this.flatNode != null)
-			buffer.append(this.flatNode.toString());
-		else
-			buffer.append("null");//$NON-NLS-1$
-		buffer.append(')');
-		return buffer.toString();
-	}
-
-	public StructuredDocumentEvent updateRegion(Object requester, IStructuredDocumentRegion flatnode, String changes, int start, int end) {
-		throw new Error("intentionally not implemented since should never be called"); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionUtil.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionUtil.java
deleted file mode 100644
index 036800f..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionUtil.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-/**
- * Provides convenient functions to handle IStructuredDocumentRegion and
- * ITextRegion.
- */
-class StructuredDocumentRegionUtil {
-
-	/**
-	 * Extracts contents enclosed with quotes. Quotes may be double or single.
-	 */
-	static String getAttrValue(IStructuredDocumentRegion flatNode, ITextRegion region) {
-		if (region == null)
-			return null;
-		if (flatNode == null)
-			return null;
-		String value = flatNode.getText(region);
-		if (value == null)
-			return null;
-		int length = value.length();
-		if (length == 0)
-			return value;
-		char firstChar = value.charAt(0);
-		if (firstChar == '"' || firstChar == '\'') {
-			if (length == 1)
-				return null;
-			if (value.charAt(length - 1) == firstChar)
-				length--;
-			return value.substring(1, length);
-		}
-		return value;
-	}
-
-	/**
-	 * Extracts the name without heading '&' and tailing ';'.
-	 */
-	static String getEntityRefName(IStructuredDocumentRegion flatNode, ITextRegion region) {
-		if (region == null)
-			return null;
-		String ref = flatNode.getText(region);
-		int length = ref.length();
-		if (length == 0)
-			return ref;
-		int offset = 0;
-		if (ref.charAt(0) == '&')
-			offset = 1;
-		if (ref.charAt(length - 1) == ';')
-			length--;
-		if (offset >= length)
-			return null;
-		return ref.substring(offset, length);
-	}
-
-	/**
-	 * Returns the first region.
-	 */
-	static ITextRegion getFirstRegion(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return null;
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null || regions.size() == 0)
-			return null;
-		return regions.get(0);
-	}
-
-	/**
-	 * Returns the type of the first region.
-	 */
-	static String getFirstRegionType(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return DOMRegionContext.UNDEFINED;
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null || regions.size() == 0)
-			return DOMRegionContext.UNDEFINED;
-		ITextRegion region = regions.get(0);
-		return region.getType();
-	}
-
-	/**
-	 */
-	static IStructuredDocumentRegion getFirstStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return null;
-		if (flatNode instanceof StructuredDocumentRegionContainer) {
-			flatNode = ((StructuredDocumentRegionContainer) flatNode).getFirstStructuredDocumentRegion();
-		}
-		if (flatNode instanceof StructuredDocumentRegionProxy) {
-			flatNode = ((StructuredDocumentRegionProxy) flatNode).getStructuredDocumentRegion();
-		}
-		return flatNode;
-	}
-
-	/**
-	 * Returns the last region.
-	 */
-	static ITextRegion getLastRegion(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return null;
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null || regions.size() == 0)
-			return null;
-		return regions.get(regions.size() - 1);
-	}
-
-	/**
-	 * Returns the type of the first region.
-	 */
-	static String getLastRegionType(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return DOMRegionContext.UNDEFINED;
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null || regions.size() == 0)
-			return DOMRegionContext.UNDEFINED;
-		ITextRegion region = regions.get(regions.size() - 1);
-		return region.getType();
-	}
-
-	/**
-	 */
-	static IStructuredDocumentRegion getLastStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return null;
-		if (flatNode instanceof StructuredDocumentRegionContainer) {
-			flatNode = ((StructuredDocumentRegionContainer) flatNode).getLastStructuredDocumentRegion();
-		}
-		if (flatNode instanceof StructuredDocumentRegionProxy) {
-			flatNode = ((StructuredDocumentRegionProxy) flatNode).getStructuredDocumentRegion();
-		}
-		return flatNode;
-	}
-
-	/**
-	 */
-	static IStructuredDocumentRegion getStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return null;
-		if (flatNode instanceof StructuredDocumentRegionProxy) {
-			flatNode = ((StructuredDocumentRegionProxy) flatNode).getStructuredDocumentRegion();
-		}
-		return flatNode;
-	}
-
-	StructuredDocumentRegionUtil() {
-		super();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/TagAdapter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/TagAdapter.java
deleted file mode 100644
index 55d8f98..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/TagAdapter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-/**
- */
-public interface TagAdapter extends INodeAdapter {
-
-	/**
-	 */
-	String getEndTag(IDOMElement element);
-
-	/**
-	 */
-	String getStartTag(IDOMElement element);
-
-	/**
-	 */
-	boolean isEndTag();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/TextImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/TextImpl.java
deleted file mode 100644
index 255604c..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/TextImpl.java
+++ /dev/null
@@ -1,1176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
-import org.eclipse.wst.xml.core.internal.provisional.document.ISourceGenerator;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-
-/**
- * TextImpl class
- */
-public class TextImpl extends CharacterDataImpl implements IDOMText {
-
-	/**
-	 */
-	private class StringPair {
-		private String fFirst = null;
-		private String fSecond = null;
-
-		StringPair(String first, String second) {
-			this.fFirst = first;
-			this.fSecond = second;
-		}
-
-		String getFirst() {
-			return this.fFirst;
-		}
-
-		String getSecond() {
-			return this.fSecond;
-		}
-	}
-
-	private String fSource = null;
-
-	/**
-	 * TextImpl constructor
-	 */
-	protected TextImpl() {
-		super();
-	}
-
-	/**
-	 * TextImpl constructor
-	 * 
-	 * @param that
-	 *            TextImpl
-	 */
-	protected TextImpl(TextImpl that) {
-		super(that);
-
-		if (that != null) {
-			this.fSource = that.getSource();
-		}
-	}
-
-	/**
-	 * appendData method
-	 * 
-	 * @param arg
-	 *            java.lang.String
-	 */
-	public void appendData(String arg) throws DOMException {
-		if (arg == null || arg.length() == 0)
-			return;
-
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		String newSource = getSource(arg);
-		if (newSource == null)
-			return;
-		String source = getSource();
-		if (source != null)
-			setTextSource(source + newSource);
-		else
-			setTextSource(newSource);
-	}
-
-	/**
-	 */
-	IStructuredDocumentRegion appendStructuredDocumentRegion(IStructuredDocumentRegion newStructuredDocumentRegion) {
-		if (newStructuredDocumentRegion == null)
-			return null;
-
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode == null) {
-			setStructuredDocumentRegion(newStructuredDocumentRegion);
-			return newStructuredDocumentRegion;
-		}
-
-		if (flatNode instanceof StructuredDocumentRegionContainer) {
-			StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) flatNode;
-			container.appendStructuredDocumentRegion(newStructuredDocumentRegion);
-		}
-		else {
-			StructuredDocumentRegionContainer container = new StructuredDocumentRegionContainer();
-			container.appendStructuredDocumentRegion(flatNode);
-			container.appendStructuredDocumentRegion(newStructuredDocumentRegion);
-			setStructuredDocumentRegion(container);
-		}
-
-		return newStructuredDocumentRegion;
-	}
-
-	/**
-	 * appendText method
-	 * 
-	 * @param text
-	 *            org.w3c.dom.Text
-	 */
-	public void appendText(Text newText) {
-		if (newText == null)
-			return;
-
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		TextImpl text = (TextImpl) newText;
-		String newSource = text.getSource();
-		if (newSource == null && newSource.length() == 0)
-			return;
-		String source = getSource();
-		if (source != null)
-			setTextSource(source + newSource);
-		else
-			setTextSource(newSource);
-	}
-
-	/**
-	 * cloneNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 * @param deep
-	 *            boolean
-	 */
-	public Node cloneNode(boolean deep) {
-		TextImpl cloned = new TextImpl(this);
-		return cloned;
-	}
-
-	/**
-	 * deleteData method
-	 * 
-	 * @param offset
-	 *            int
-	 * @param count
-	 *            int
-	 */
-	public void deleteData(int offset, int count) throws DOMException {
-		if (count == 0)
-			return;
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-		if (count < 0 || offset < 0) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-
-		String source = getSource();
-		if (source == null || source.length() == 0) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-		StringPair pair = substringSourceExcluded(source, offset, count);
-		if (pair == null)
-			return;
-		source = null;
-		String first = pair.getFirst();
-		if (first != null)
-			source = first;
-		String second = pair.getSecond();
-		if (second != null) {
-			if (source != null)
-				source += second;
-			else
-				source = second;
-		}
-		if (source == null)
-			source = new String(); // delete all
-		setTextSource(source);
-	}
-
-	/**
-	 * getData method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getData() throws DOMException {
-		if (this.fSource != null)
-			return getData(this.fSource);
-		String data = super.getData();
-		if (data != null)
-			return data;
-		return getData(getStructuredDocumentRegion());
-	}
-
-	/**
-	 */
-	private String getData(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return new String();
-
-		if (flatNode instanceof StructuredDocumentRegionContainer) {
-			StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) flatNode;
-			int length = container.getLength();
-			if (length < 16)
-				length = 16; // default
-			StringBuffer buffer = new StringBuffer(length);
-			int count = container.getStructuredDocumentRegionCount();
-			for (int i = 0; i < count; i++) {
-				IStructuredDocumentRegion content = container.getStructuredDocumentRegion(i);
-				String data = getData(content);
-				if (data == null)
-					continue;
-				buffer.append(data);
-			}
-			return buffer.toString();
-		}
-
-		if (flatNode instanceof StructuredDocumentRegionProxy) {
-			return flatNode.getText();
-		}
-
-		ITextRegion region = StructuredDocumentRegionUtil.getFirstRegion(flatNode);
-		if (region != null) {
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_ENTITY_REFERENCE || regionType == DOMRegionContext.XML_CHAR_REFERENCE) {
-				String name = StructuredDocumentRegionUtil.getEntityRefName(flatNode, region);
-				if (name != null) {
-					DocumentImpl document = (DocumentImpl) getOwnerDocument();
-					if (document != null) {
-						String value = document.getCharValue(name);
-						if (value != null)
-							return value;
-					}
-				}
-			}
-		}
-
-		return flatNode.getText();
-	}
-
-	/**
-	 * Returns data for the source
-	 */
-	private String getData(String source) {
-		if (source == null)
-			return null;
-		StringBuffer buffer = null;
-		int offset = 0;
-		int length = source.length();
-		int ref = source.indexOf('&');
-		while (ref >= 0) {
-			int end = source.indexOf(';', ref + 1);
-			if (end > ref + 1) {
-				String name = source.substring(ref + 1, end);
-				String value = getCharValue(name);
-				if (value != null) {
-					if (buffer == null)
-						buffer = new StringBuffer(length);
-					if (ref > offset)
-						buffer.append(source.substring(offset, ref));
-					buffer.append(value);
-					offset = end + 1;
-					ref = end;
-				}
-			}
-			ref = source.indexOf('&', ref + 1);
-		}
-		if (buffer == null)
-			return source;
-		if (length > offset)
-			buffer.append(source.substring(offset));
-		return buffer.toString();
-	}
-
-	/**
-	 * getFirstStructuredDocumentRegion method
-	 * 
-	 */
-	public IStructuredDocumentRegion getFirstStructuredDocumentRegion() {
-		return StructuredDocumentRegionUtil.getFirstStructuredDocumentRegion(getStructuredDocumentRegion());
-	}
-
-	/**
-	 * getLastStructuredDocumentRegion method
-	 * 
-	 */
-	public IStructuredDocumentRegion getLastStructuredDocumentRegion() {
-		return StructuredDocumentRegionUtil.getLastStructuredDocumentRegion(getStructuredDocumentRegion());
-	}
-
-	/**
-	 * getNodeName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getNodeName() {
-		return "#text";//$NON-NLS-1$
-	}
-
-	/**
-	 * getNodeType method
-	 * 
-	 * @return short
-	 */
-	public short getNodeType() {
-		return TEXT_NODE;
-	}
-
-	/**
-	 */
-	public String getSource() {
-		if (this.fSource != null)
-			return this.fSource;
-		String data = super.getData();
-		if (data != null && data.length() > 0) {
-			String source = getSource(data);
-			if (source != null)
-				return source;
-		}
-		return super.getSource();
-	}
-
-	/**
-	 * Returns source for the data
-	 */
-	private String getSource(String data) {
-		if (data == null)
-			return null;
-		IDOMModel model = getModel();
-		if (model == null)
-			return null; // error
-		ISourceGenerator generator = model.getGenerator();
-		if (generator == null)
-			return null; // error
-		return generator.generateTextData(this, data);
-	}
-
-	/**
-	 */
-	String getTextSource() {
-		return this.fSource;
-	}
-
-	/**
-	 */
-	public String getValueSource() {
-		return getSource();
-	}
-
-	/**
-	 */
-	boolean hasStructuredDocumentRegion(IStructuredDocumentRegion askedStructuredDocumentRegion) {
-		if (askedStructuredDocumentRegion == null)
-			return false;
-
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode == null)
-			return false;
-
-		if (flatNode == askedStructuredDocumentRegion)
-			return true;
-
-		if (flatNode instanceof StructuredDocumentRegionProxy) {
-			StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) flatNode;
-			if (proxy.getStructuredDocumentRegion() == askedStructuredDocumentRegion)
-				return true;
-			return false;
-		}
-
-		if (flatNode instanceof StructuredDocumentRegionContainer) {
-			StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) flatNode;
-			int count = container.getStructuredDocumentRegionCount();
-			for (int i = 0; i < count; i++) {
-				IStructuredDocumentRegion content = container.getStructuredDocumentRegion(i);
-				if (content == null)
-					continue;
-				if (content == askedStructuredDocumentRegion)
-					return true;
-				if (content instanceof StructuredDocumentRegionProxy) {
-					StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) content;
-					if (proxy.getStructuredDocumentRegion() == askedStructuredDocumentRegion)
-						return true;
-				}
-			}
-			return false;
-		}
-
-		return false;
-	}
-
-	/**
-	 * insertData method
-	 * 
-	 * @param offset
-	 *            int
-	 * @param arg
-	 *            java.lang.String
-	 */
-	public void insertData(int offset, String arg) throws DOMException {
-		if (arg == null || arg.length() == 0)
-			return;
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-		if (offset < 0) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-
-		String source = getSource();
-		if (source == null || source.length() == 0) {
-			if (offset > 0) {
-				throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-			}
-			source = getSource(arg);
-			if (source != null)
-				setTextSource(source);
-			return;
-		}
-
-		StringPair pair = substringSourceExcluded(source, offset, 0);
-		if (pair == null)
-			return; // error
-		StringBuffer buffer = new StringBuffer(source.length() + arg.length());
-		String first = pair.getFirst();
-		if (first != null)
-			buffer.append(first);
-		source = getSource(arg);
-		if (source != null)
-			buffer.append(source);
-		String second = pair.getSecond();
-		if (second != null)
-			buffer.append(second);
-		setTextSource(buffer.toString());
-	}
-
-	/**
-	 */
-	IStructuredDocumentRegion insertStructuredDocumentRegion(IStructuredDocumentRegion newStructuredDocumentRegion, IStructuredDocumentRegion nextStructuredDocumentRegion) {
-		if (newStructuredDocumentRegion == null)
-			return null;
-		if (nextStructuredDocumentRegion == null)
-			return appendStructuredDocumentRegion(newStructuredDocumentRegion);
-
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode == null)
-			return null; // error
-
-		if (flatNode == nextStructuredDocumentRegion) {
-			StructuredDocumentRegionContainer container = new StructuredDocumentRegionContainer();
-			container.appendStructuredDocumentRegion(newStructuredDocumentRegion);
-			container.appendStructuredDocumentRegion(flatNode);
-			setStructuredDocumentRegion(container);
-			return newStructuredDocumentRegion;
-		}
-
-		if (flatNode instanceof StructuredDocumentRegionContainer) {
-			StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) flatNode;
-			int count = container.getStructuredDocumentRegionCount();
-			for (int i = 0; i < count; i++) {
-				IStructuredDocumentRegion content = container.getStructuredDocumentRegion(i);
-				if (content == nextStructuredDocumentRegion) {
-					container.insertStructuredDocumentRegion(newStructuredDocumentRegion, i);
-					return newStructuredDocumentRegion;
-				}
-			}
-			return null; // error
-		}
-
-		return null; // error
-	}
-
-	/**
-	 * insertText method
-	 * 
-	 * @param text
-	 *            org.w3c.dom.Text
-	 * @param offset
-	 *            int
-	 */
-	public void insertText(Text newText, int offset) throws DOMException {
-		if (newText == null)
-			return;
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-		TextImpl text = (TextImpl) newText;
-		String newSource = text.getSource();
-		if (newSource == null && newSource.length() == 0)
-			return;
-		if (offset < 0) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-
-		String source = getSource();
-		if (source == null || source.length() == 0) {
-			if (offset > 0) {
-				throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-			}
-			setTextSource(newSource);
-			return;
-		}
-
-		StringPair pair = substringSourceExcluded(source, offset, 0);
-		if (pair == null)
-			return; // error
-		StringBuffer buffer = new StringBuffer(source.length() + newSource.length());
-		String first = pair.getFirst();
-		if (first != null)
-			buffer.append(first);
-		buffer.append(newSource);
-		String second = pair.getSecond();
-		if (second != null)
-			buffer.append(second);
-		setTextSource(buffer.toString());
-	}
-
-	/**
-	 * isCDATAContent method
-	 * 
-	 * @return boolean
-	 */
-	public boolean isCDATAContent() {
-		Node parent = getParentNode();
-		if (parent == null || parent.getNodeType() != Node.ELEMENT_NODE)
-			return false;
-		ElementImpl element = (ElementImpl) parent;
-		return element.isCDATAContainer();
-	}
-
-	/**
-	 */
-	public boolean isInvalid() {
-		return isInvalid(getStructuredDocumentRegion());
-	}
-
-	/**
-	 */
-	private boolean isInvalid(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return false;
-
-		if (flatNode instanceof StructuredDocumentRegionContainer) {
-			StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) flatNode;
-			int count = container.getStructuredDocumentRegionCount();
-			for (int i = 0; i < count; i++) {
-				IStructuredDocumentRegion content = container.getStructuredDocumentRegion(i);
-				if (isInvalid(content))
-					return true;
-			}
-			return false;
-		}
-
-		if (flatNode instanceof StructuredDocumentRegionProxy) {
-			StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) flatNode;
-			return isInvalid(proxy.getStructuredDocumentRegion());
-		}
-
-		String regionType = StructuredDocumentRegionUtil.getFirstRegionType(flatNode);
-		if (regionType != DOMRegionContext.XML_CONTENT && isNotNestedContent(regionType) && regionType != DOMRegionContext.XML_ENTITY_REFERENCE && regionType != DOMRegionContext.XML_CHAR_REFERENCE && regionType != DOMRegionContext.BLOCK_TEXT && regionType != DOMRegionContext.WHITE_SPACE) {
-			return true;
-		}
-
-		return false;
-	}
-
-	protected boolean isNotNestedContent(String regionType) {
-		boolean result = true;
-		return result;
-	}
-
-	/**
-	 */
-	boolean isSharingStructuredDocumentRegion(IStructuredDocumentRegion sharedStructuredDocumentRegion) {
-		if (sharedStructuredDocumentRegion == null)
-			return false;
-
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode == null)
-			return false;
-
-		if (flatNode == sharedStructuredDocumentRegion)
-			return false;
-
-		if (flatNode instanceof StructuredDocumentRegionProxy) {
-			StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) flatNode;
-			if (proxy.getStructuredDocumentRegion() == sharedStructuredDocumentRegion)
-				return true;
-			return false;
-		}
-
-		if (flatNode instanceof StructuredDocumentRegionContainer) {
-			StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) flatNode;
-			int count = container.getStructuredDocumentRegionCount();
-			for (int i = 0; i < count; i++) {
-				IStructuredDocumentRegion content = container.getStructuredDocumentRegion(i);
-				if (content == null)
-					continue;
-				if (content == sharedStructuredDocumentRegion)
-					return false;
-				if (content instanceof StructuredDocumentRegionProxy) {
-					StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) content;
-					if (proxy.getStructuredDocumentRegion() == sharedStructuredDocumentRegion)
-						return true;
-				}
-			}
-			return false;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns whether this text node contains <a
-	 * href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204#infoitem.character'>
-	 * element content whitespace</a>, often abusively called "ignorable
-	 * whitespace". The text node is determined to contain whitespace in
-	 * element content during the load of the document or if validation occurs
-	 * while using <code>Document.normalizeDocument()</code>.
-	 * 
-	 * @see DOM Level 3
-	 */
-	public boolean isElementContentWhitespace() {
-		return isWhitespace();
-	}
-
-	/**
-	 */
-	public boolean isWhitespace() {
-		String data = getData();
-		if (data == null)
-			return true;
-		int length = data.length();
-		for (int i = 0; i < length; i++) {
-			if (!Character.isWhitespace(data.charAt(i)))
-				return false;
-		}
-		return true;
-	}
-
-	/**
-	 */
-	IStructuredDocumentRegion removeStructuredDocumentRegion(IStructuredDocumentRegion oldStructuredDocumentRegion) {
-		if (oldStructuredDocumentRegion == null)
-			return null;
-
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode == null)
-			return null; // error
-
-		if (flatNode == oldStructuredDocumentRegion) {
-			setStructuredDocumentRegion(null);
-			return oldStructuredDocumentRegion;
-		}
-
-		if (flatNode instanceof StructuredDocumentRegionProxy) {
-			StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) flatNode;
-			if (proxy.getStructuredDocumentRegion() == oldStructuredDocumentRegion) {
-				// removed with proxy
-				setStructuredDocumentRegion(null);
-				return oldStructuredDocumentRegion;
-			}
-			return null; // error
-		}
-
-		if (flatNode instanceof StructuredDocumentRegionContainer) {
-			StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) flatNode;
-			int count = container.getStructuredDocumentRegionCount();
-			for (int i = 0; i < count; i++) {
-				IStructuredDocumentRegion content = container.getStructuredDocumentRegion(i);
-				if (content == oldStructuredDocumentRegion) {
-					container.removeStructuredDocumentRegion(i);
-					if (container.getStructuredDocumentRegionCount() == 1) {
-						// get back to single IStructuredDocumentRegion
-						setStructuredDocumentRegion(container.getStructuredDocumentRegion(0));
-					}
-					return oldStructuredDocumentRegion;
-				}
-
-				if (content instanceof StructuredDocumentRegionProxy) {
-					StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) content;
-					if (proxy.getStructuredDocumentRegion() == oldStructuredDocumentRegion) {
-						// removed with proxy
-						container.removeStructuredDocumentRegion(i);
-						if (container.getStructuredDocumentRegionCount() == 1) {
-							// get back to single IStructuredDocumentRegion
-							setStructuredDocumentRegion(container.getStructuredDocumentRegion(0));
-						}
-						return oldStructuredDocumentRegion;
-					}
-				}
-			}
-			return null; // error
-		}
-
-		return null; // error
-	}
-
-	/**
-	 * replaceData method
-	 * 
-	 * @param offset
-	 *            int
-	 * @param count
-	 *            int
-	 * @param arg
-	 *            java.lang.String
-	 */
-	public void replaceData(int offset, int count, String arg) throws DOMException {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-		if (arg == null || arg.length() == 0) {
-			deleteData(offset, count);
-			return;
-		}
-		if (count == 0) {
-			insertData(offset, arg);
-			return;
-		}
-		if (offset < 0 || count < 0) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-
-		String source = getSource();
-		if (source == null || source.length() == 0) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-
-		StringPair pair = substringSourceExcluded(source, offset, count);
-		if (pair == null)
-			return; // error
-		StringBuffer buffer = new StringBuffer(source.length() + arg.length());
-		String first = pair.getFirst();
-		if (first != null)
-			buffer.append(first);
-		source = getSource(arg);
-		if (source != null)
-			buffer.append(source);
-		String second = pair.getSecond();
-		if (second != null)
-			buffer.append(second);
-		setTextSource(buffer.toString());
-	}
-
-	/**
-	 */
-	IStructuredDocumentRegion replaceStructuredDocumentRegion(IStructuredDocumentRegion newStructuredDocumentRegion, IStructuredDocumentRegion oldStructuredDocumentRegion) {
-		if (oldStructuredDocumentRegion == null)
-			return null;
-		if (newStructuredDocumentRegion == null)
-			return removeStructuredDocumentRegion(oldStructuredDocumentRegion);
-
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode == null)
-			return null; // error
-
-		if (flatNode == oldStructuredDocumentRegion) {
-			setStructuredDocumentRegion(newStructuredDocumentRegion);
-			return oldStructuredDocumentRegion;
-		}
-
-		if (flatNode instanceof StructuredDocumentRegionProxy) {
-			StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) flatNode;
-			if (proxy.getStructuredDocumentRegion() == oldStructuredDocumentRegion) {
-				if (newStructuredDocumentRegion instanceof StructuredDocumentRegionProxy) {
-					// proxy must not be nested
-					setStructuredDocumentRegion(newStructuredDocumentRegion);
-				}
-				else {
-					proxy.setStructuredDocumentRegion(newStructuredDocumentRegion);
-				}
-				return oldStructuredDocumentRegion;
-			}
-			return null; // error
-		}
-
-		if (flatNode instanceof StructuredDocumentRegionContainer) {
-			StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) flatNode;
-			int count = container.getStructuredDocumentRegionCount();
-			for (int i = 0; i < count; i++) {
-				IStructuredDocumentRegion content = container.getStructuredDocumentRegion(i);
-				if (content == null)
-					continue; // error
-				if (content == oldStructuredDocumentRegion) {
-					container.replaceStructuredDocumentRegion(newStructuredDocumentRegion, i);
-					return oldStructuredDocumentRegion;
-				}
-
-				if (content instanceof StructuredDocumentRegionProxy) {
-					StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) content;
-					if (proxy.getStructuredDocumentRegion() == oldStructuredDocumentRegion) {
-						if (newStructuredDocumentRegion instanceof StructuredDocumentRegionProxy) {
-							// proxy must not be nested
-							container.replaceStructuredDocumentRegion(newStructuredDocumentRegion, i);
-						}
-						else {
-							proxy.setStructuredDocumentRegion(newStructuredDocumentRegion);
-						}
-						return oldStructuredDocumentRegion;
-					}
-				}
-			}
-			return null; // error
-		}
-
-		return null; // error
-	}
-
-	/**
-	 */
-	void resetStructuredDocumentRegions() {
-		String source = getSource();
-		if (source != null && source.length() > 0)
-			this.fSource = source;
-		super.resetStructuredDocumentRegions();
-	}
-
-	/**
-	 * getData method
-	 * 
-	 * @return java.lang.String
-	 */
-	public void setData(String data) throws DOMException {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		this.fSource = null;
-		super.setData(data);
-	}
-
-	/**
-	 */
-	public void setSource(String source) throws InvalidCharacterException {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		SourceValidator validator = new SourceValidator(this);
-		if (validator.validateSource(source))
-			setTextSource(source);
-	}
-
-	/**
-	 */
-	void setStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		super.setStructuredDocumentRegion(flatNode);
-		if (flatNode != null)
-			this.fSource = null;
-	}
-
-	/**
-	 */
-	public void setTextSource(String source) {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		this.fSource = source;
-
-		notifyValueChanged();
-	}
-
-	/**
-	 */
-	public void setValueSource(String source) {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-
-		SourceValidator validator = new SourceValidator(this);
-		setTextSource(validator.convertSource(source));
-	}
-
-	/**
-	 * splitText method
-	 * 
-	 * @return org.w3c.dom.Text
-	 * @param offset
-	 *            int
-	 */
-	public Text splitText(int offset) throws DOMException {
-		if (!isDataEditable()) {
-			throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, new String());
-		}
-		if (offset < 0) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-		int length = getLength();
-		if (offset > length) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-		Document document = getOwnerDocument();
-		if (document == null)
-			return null;
-
-		String source = null;
-		if (offset < length) {
-			int count = length - offset;
-			source = substringSource(offset, count);
-			deleteData(offset, count);
-		}
-		TextImpl text = (TextImpl) document.createTextNode(null);
-		if (source != null)
-			text.setTextSource(source);
-
-		Node parent = getParentNode();
-		if (parent != null)
-			parent.insertBefore(text, getNextSibling());
-
-		return text;
-	}
-
-	/**
-	 */
-	Text splitText(IStructuredDocumentRegion nextStructuredDocumentRegion) {
-		if (nextStructuredDocumentRegion == null)
-			return null;
-
-		IStructuredDocumentRegion flatNode = getStructuredDocumentRegion();
-		if (flatNode == null || !(flatNode instanceof StructuredDocumentRegionContainer))
-			return null; // error
-
-		StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) flatNode;
-		int count = container.getStructuredDocumentRegionCount();
-		int index = 0;
-		for (; index < count; index++) {
-			if (container.getStructuredDocumentRegion(index) == nextStructuredDocumentRegion)
-				break;
-		}
-		if (index >= count) {
-			// this is the case nextStructuredDocumentRegion is a new
-			// IStructuredDocumentRegion
-			// search gap by offset
-			int offset = nextStructuredDocumentRegion.getStart();
-			for (index = 0; index < count; index++) {
-				IStructuredDocumentRegion content = container.getStructuredDocumentRegion(index);
-				if (content == null)
-					continue; // error
-				if (content.getStart() >= offset)
-					break;
-			}
-			if (index >= count)
-				return null; // error
-		}
-		if (index == 0)
-			return this; // nothing to do
-
-		Document document = getOwnerDocument();
-		if (document == null)
-			return null; // error
-		Node parent = getParentNode();
-		if (parent == null)
-			return null; // error
-		TextImpl nextText = (TextImpl) document.createTextNode(null);
-		if (nextText == null)
-			return null; // error
-
-		for (; index < count; count--) {
-			nextText.appendStructuredDocumentRegion(container.removeStructuredDocumentRegion(index));
-		}
-
-		// normalize IStructuredDocumentRegion
-		if (index == 1) {
-			setStructuredDocumentRegion(container.getStructuredDocumentRegion(0));
-		}
-
-		parent.insertBefore(nextText, getNextSibling());
-		return nextText;
-	}
-
-	/**
-	 * Retruns data for the range
-	 */
-	private String substringData(String data, int offset, int count) throws DOMException {
-		// sure offset and count are non-negative
-		if (count == 0)
-			return new String();
-		if (data == null) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-		int length = data.length();
-		if (offset > length) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-		int end = offset + count;
-		if (end > length) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-		return data.substring(offset, end);
-	}
-
-	/**
-	 * Returns source for the range specified by: offset: data offset count:
-	 * data count
-	 */
-	private String substringSource(int offset, int count) throws DOMException {
-		// sure offset and count are non-negative
-		if (this.fSource != null)
-			return substringSource(this.fSource, offset, count);
-
-		String data = super.getData();
-		if (data != null && data.length() > 0) {
-			data = substringData(data, offset, count);
-			if (data == null)
-				return new String();
-			String source = getSource(data);
-			if (source != null)
-				return source;
-		}
-
-		return substringSource(getSource(), offset, count);
-	}
-
-	/**
-	 * Returns source for the range specified by: offset: data offset count:
-	 * data count
-	 */
-	private String substringSource(String source, int offset, int count) throws DOMException {
-		// sure offset and count are non-negative
-		if (count == 0)
-			return new String();
-		if (source == null) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-
-		int length = source.length();
-		int end = offset + count;
-
-		// find character reference
-		int ref = source.indexOf('&');
-		while (ref >= 0) {
-			if (ref >= end)
-				break;
-			int refEnd = source.indexOf(';', ref + 1);
-			if (refEnd > ref + 1) {
-				String name = source.substring(ref + 1, refEnd);
-				if (getCharValue(name) != null) {
-					// found, shift for source offsets
-					int refCount = refEnd - ref;
-					if (ref < offset)
-						offset += refCount;
-					if (ref < end)
-						end += refCount;
-					ref = refEnd;
-				}
-			}
-			ref = source.indexOf('&', ref + 1);
-		}
-
-		if (offset > length || end > length) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-
-		return source.substring(offset, end);
-	}
-
-	/**
-	 * Returns sources before and after the range specified by: offset: data
-	 * offset count: data count
-	 */
-	private StringPair substringSourceExcluded(String source, int offset, int count) throws DOMException {
-		// sure offset and count are non-negative
-		if (source == null) {
-			if (offset == 0 && count == 0)
-				return new StringPair(null, null);
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-
-		int length = source.length();
-		int end = offset + count;
-
-		// find character reference
-		int ref = source.indexOf('&');
-		while (ref >= 0) {
-			if (ref >= end)
-				break;
-			int refEnd = source.indexOf(';', ref + 1);
-			if (refEnd > ref + 1) {
-				String name = source.substring(ref + 1, refEnd);
-				if (getCharValue(name) != null) {
-					// found, shift for source offsets
-					int refCount = refEnd - ref;
-					if (ref < offset)
-						offset += refCount;
-					if (ref < end)
-						end += refCount;
-					ref = refEnd;
-				}
-			}
-			ref = source.indexOf('&', ref + 1);
-		}
-
-		if (offset > length || end > length) {
-			throw new DOMException(DOMException.INDEX_SIZE_ERR, new String());
-		}
-
-		String first = (offset > 0 ? source.substring(0, offset) : null);
-		String second = (end < length ? source.substring(end, length) : null);
-		return new StringPair(first, second);
-	}
-
-	public String getWholeText() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Implemented in this version."); //$NON-NLS-1$
-	}
-    /**
-	 * Replaces the text of the current node and all logically-adjacent text
-	 * nodes with the specified text. All logically-adjacent text nodes are
-	 * removed including the current node unless it was the recipient of the
-	 * replacement text. <br>
-	 * This method returns the node which received the replacement text. The
-	 * returned node is:
-	 * <ul>
-	 * <li><code>null</code>, when the replacement text is the empty
-	 * string; </li>
-	 * <li>the current node, except when the current node is read-only; </li>
-	 * <li> a new <code>Text</code> node of the same type (
-	 * <code>Text</code> or <code>CDATASection</code>) as the current
-	 * node inserted at the location of the replacement. </li>
-	 * </ul>
-	 * <br>
-	 * For instance, in the above example calling
-	 * <code>replaceWholeText</code> on the <code>Text</code> node that
-	 * contains "bar" with "yo" in argument results in the following: <br>
-	 * Where the nodes to be removed are read-only descendants of an
-	 * <code>EntityReference</code>, the <code>EntityReference</code>
-	 * must be removed instead of the read-only nodes. If any
-	 * <code>EntityReference</code> to be removed has descendants that are
-	 * not <code>EntityReference</code>, <code>Text</code>, or
-	 * <code>CDATASection</code> nodes, the <code>replaceWholeText</code>
-	 * method must fail before performing any modification of the document,
-	 * raising a <code>DOMException</code> with the code
-	 * <code>NO_MODIFICATION_ALLOWED_ERR</code>. <br>
-	 * For instance, in the example below calling
-	 * <code>replaceWholeText</code> on the <code>Text</code> node that
-	 * contains "bar" fails, because the <code>EntityReference</code> node
-	 * "ent" contains an <code>Element</code> node which cannot be removed.
-	 * 
-	 * @param content
-	 *            The content of the replacing <code>Text</code> node.
-	 * @return The <code>Text</code> node created with the specified
-	 *         content.
-	 * @exception DOMException
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if one of the
-	 *                <code>Text</code> nodes being replaced is readonly.
-	 * @see DOM Level 3
-	 */
-    public Text replaceWholeText(String content)
-                                 throws DOMException {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented"); //$NON-NLS-1$
-    }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLGeneratorImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLGeneratorImpl.java
deleted file mode 100644
index b5708a6..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLGeneratorImpl.java
+++ /dev/null
@@ -1,735 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.eclipse.wst.xml.core.internal.commentelement.impl.CommentElementRegistry;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.provisional.IXMLCharEntity;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.document.ISourceGenerator;
-import org.w3c.dom.Attr;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Comment;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.EntityReference;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-
-/** 
- */
-public class XMLGeneratorImpl implements ISourceGenerator {
-	private static final String CDATA_CLOSE = "]]>";//$NON-NLS-1$
-	private static final String CDATA_OPEN = "<![CDATA[";//$NON-NLS-1$
-	private static final String COMMENT_CLOSE = "-->";//$NON-NLS-1$
-	private static final String COMMENT_OPEN = "<!--";//$NON-NLS-1$
-	private static final String DOCTYPE_OPEN = "<!DOCTYPE";//$NON-NLS-1$
-	private static final String EMPTY_CLOSE = " />";//$NON-NLS-1$
-	private static final String END_OPEN = "</";//$NON-NLS-1$
-
-	private static XMLGeneratorImpl instance = null;
-	private static final String PI_CLOSE = "?>";//$NON-NLS-1$
-	private static final String PI_OPEN = "<?";//$NON-NLS-1$
-	private static final String PUBLIC_ID = "PUBLIC";//$NON-NLS-1$
-	private static final String SSI_PREFIX = "ssi";//$NON-NLS-1$
-	//private static final String SSI_FEATURE = "SSI";//$NON-NLS-1$
-	private static final String SSI_TOKEN = "#";//$NON-NLS-1$
-	private static final String SYSTEM_ID = "SYSTEM";//$NON-NLS-1$
-	private static final String TAG_CLOSE = ">";//$NON-NLS-1$
-
-	/**
-	 */
-	public synchronized static ISourceGenerator getInstance() {
-		if (instance == null)
-			instance = new XMLGeneratorImpl();
-		return instance;
-	}
-
-	/**
-	 */
-	//private boolean isCommentTag(XMLElement element) {
-	//	if (element == null) return false;
-	//	DocumentImpl document = (DocumentImpl)element.getOwnerDocument();
-	//	if (document == null) return false;
-	//	DocumentTypeAdapter adapter = document.getDocumentTypeAdapter();
-	//	if (adapter == null) return false;
-	//	if (!adapter.hasFeature(SSI_FEATURE)) return false;
-	//	String prefix = element.getPrefix();
-	//	return (prefix != null && prefix.equals(SSI_PREFIX));
-	//}
-	/**
-	 * Helper to modify the tag name in sub-classes
-	 */
-	private static void setTagName(Element element, String tagName) {
-		if (element == null || tagName == null)
-			return;
-		((ElementImpl) element).setTagName(tagName);
-	}
-
-	/**
-	 * XMLModelGenerator constructor
-	 */
-	private XMLGeneratorImpl() {
-		super();
-	}
-
-	/**
-	 */
-	public String generateAttrName(Attr attr) {
-		if (attr == null)
-			return null;
-		String attrName = attr.getName();
-		if (attrName == null)
-			return null;
-		if (attrName.startsWith(JSPTag.TAG_OPEN)) {
-			if (!attrName.endsWith(JSPTag.TAG_CLOSE)) {
-				// close JSP
-				return (attrName + JSPTag.TAG_CLOSE);
-			}
-		}
-		if (((IDOMAttr) attr).isGlobalAttr() && CMNodeUtil.getAttributeDeclaration(attr) != null) {
-			switch (getAttrNameCase(attr)) {
-				case DocumentTypeAdapter.UPPER_CASE :
-					attrName = attrName.toUpperCase();
-					break;
-				case DocumentTypeAdapter.LOWER_CASE :
-					attrName = attrName.toLowerCase();
-					break;
-				default :
-					// ASIS_CASE
-					break;
-			}
-		}
-		return attrName;
-	}
-
-	/**
-	 */
-	public String generateAttrValue(Attr attr) {
-		return generateAttrValue(attr, (char) 0); // no quote preference
-	}
-
-	/**
-	 */
-	public String generateAttrValue(Attr attr, char quote) {
-		if (attr == null)
-			return null;
-		String name = attr.getName();
-		SourceValidator validator = new SourceValidator(attr);
-		String value = validator.convertSource(((IDOMNode) attr).getValueSource());
-		if (value == null || value.length() == 0) {
-			if (name != null && name.startsWith(JSPTag.TAG_OPEN))
-				return null;
-			if (isBooleanAttr(attr)) {
-				if (((AttrImpl) attr).isXMLAttr()) {
-					// generate the name as value
-					value = attr.getName();
-				} else {
-					// not to generate '=' and value for HTML boolean
-					return null;
-				}
-			}
-		}
-		return generateAttrValue(value, quote);
-	}
-
-	/**
-	 */
-	public String generateAttrValue(String value, char quote) {
-		// assume the valid is already validated not to include both quotes
-		if (quote == '"') {
-			if ((value != null) && (value.indexOf('"') >= 0))
-				quote = '\''; // force
-		} else if (quote == '\'') {
-			if ((value != null) && (value.indexOf('\'') >= 0))
-				quote = '"'; // force
-		} else { // no preference
-			if ((value != null) && (value.indexOf('"') < 0))
-				quote = '"';
-			else
-				quote = '\'';
-		}
-
-		int length = (value == null ? 0 : value.length());
-		StringBuffer buffer = new StringBuffer(length + 2);
-		buffer.append(quote);
-		if (value != null)
-			buffer.append(value);
-		buffer.append(quote);
-		return buffer.toString();
-	}
-
-	/**
-	 * generateCDATASection method
-	 * 
-	 * @return java.lang.String
-	 * @param comment
-	 *            org.w3c.dom.CDATASection
-	 */
-	public String generateCDATASection(CDATASection cdata) {
-		if (cdata == null)
-			return null;
-
-		String data = cdata.getData();
-		int length = (data != null ? data.length() : 0);
-		StringBuffer buffer = new StringBuffer(length + 16);
-		buffer.append(CDATA_OPEN);
-		if (data != null)
-			buffer.append(data);
-		buffer.append(CDATA_CLOSE);
-		return buffer.toString();
-	}
-
-	/**
-	 * generateChild method
-	 * 
-	 * @return java.lang.String
-	 * @param org.w3c.dom.Node
-	 */
-	public String generateChild(Node parentNode) {
-		if (parentNode == null)
-			return null;
-		if (!parentNode.hasChildNodes())
-			return null;
-
-		StringBuffer buffer = new StringBuffer();
-		for (Node child = parentNode.getFirstChild(); child != null; child = child.getNextSibling()) {
-			String childSource = generateSource(child);
-			if (childSource != null)
-				buffer.append(childSource);
-		}
-		return buffer.toString();
-	}
-
-	/**
-	 */
-	public String generateCloseTag(Node node) {
-		if (node == null)
-			return null;
-
-		switch (node.getNodeType()) {
-			case Node.ELEMENT_NODE : {
-				ElementImpl element = (ElementImpl) node;
-				if (element.isCommentTag()) {
-					if (element.isJSPTag())
-						return JSPTag.COMMENT_CLOSE;
-					return COMMENT_CLOSE;
-				}
-				if (element.isJSPTag())
-					return JSPTag.TAG_CLOSE;
-				if (element.isEmptyTag())
-					return EMPTY_CLOSE;
-				return TAG_CLOSE;
-			}
-			case Node.COMMENT_NODE : {
-				CommentImpl comment = (CommentImpl) node;
-				if (comment.isJSPTag())
-					return JSPTag.COMMENT_CLOSE;
-				return COMMENT_CLOSE;
-			}
-			case Node.DOCUMENT_TYPE_NODE :
-				return TAG_CLOSE;
-			case Node.PROCESSING_INSTRUCTION_NODE :
-				return PI_CLOSE;
-			case Node.CDATA_SECTION_NODE :
-				return CDATA_CLOSE;
-			default :
-				break;
-		}
-
-		return null;
-	}
-
-	/**
-	 * generateComment method
-	 * 
-	 * @return java.lang.String
-	 * @param comment
-	 *            org.w3c.dom.Comment
-	 */
-	public String generateComment(Comment comment) {
-		if (comment == null)
-			return null;
-
-		String data = comment.getData();
-		int length = (data != null ? data.length() : 0);
-		StringBuffer buffer = new StringBuffer(length + 8);
-		CommentImpl impl = (CommentImpl) comment;
-		if (!impl.isJSPTag())
-			buffer.append(COMMENT_OPEN);
-		else
-			buffer.append(JSPTag.COMMENT_OPEN);
-		if (data != null)
-			buffer.append(data);
-		if (!impl.isJSPTag())
-			buffer.append(COMMENT_CLOSE);
-		else
-			buffer.append(JSPTag.COMMENT_CLOSE);
-		return buffer.toString();
-	}
-
-	/**
-	 * generateDoctype method
-	 * 
-	 * @return java.lang.String
-	 * @param docType
-	 *            org.w3c.dom.DocumentType
-	 */
-	public String generateDoctype(DocumentType docType) {
-		if (docType == null)
-			return null;
-
-		String name = docType.getName();
-		int length = (name != null ? name.length() : 0);
-		StringBuffer buffer = new StringBuffer(length + 16);
-		buffer.append(DOCTYPE_OPEN);
-		buffer.append(' ');
-		if (name != null)
-			buffer.append(name);
-		DocumentTypeImpl dt = (DocumentTypeImpl) docType;
-		String publicID = dt.getPublicId();
-		String systemID = dt.getSystemId();
-		if (publicID != null) {
-			buffer.append(' ');
-			buffer.append(PUBLIC_ID);
-			buffer.append(' ');
-			buffer.append('"');
-			buffer.append(publicID);
-			buffer.append('"');
-			if (systemID != null) {
-				buffer.append(' ');
-				buffer.append('"');
-				buffer.append(systemID);
-				buffer.append('"');
-			}
-		} else {
-			if (systemID != null) {
-				buffer.append(' ');
-				buffer.append(SYSTEM_ID);
-				buffer.append(' ');
-				buffer.append('"');
-				buffer.append(systemID);
-				buffer.append('"');
-			}
-		}
-		buffer.append('>');
-		return buffer.toString();
-	}
-
-	/**
-	 * generateElement method
-	 * 
-	 * @return java.lang.String
-	 * @param element
-	 *            Element
-	 */
-	public String generateElement(Element element) {
-		if (element == null)
-			return null;
-
-		// if empty tag is preferrable, generate as empty tag
-		ElementImpl impl = (ElementImpl) element;
-		if (impl.preferEmptyTag())
-			impl.setEmptyTag(true);
-
-		StringBuffer buffer = new StringBuffer();
-		String startTag = generateStartTag(element);
-		if (startTag != null)
-			buffer.append(startTag);
-		String child = generateChild(element);
-		if (child != null)
-			buffer.append(child);
-		String endTag = generateEndTag(element);
-		if (endTag != null)
-			buffer.append(endTag);
-		return buffer.toString();
-	}
-
-	/**
-	 * generateEndTag method
-	 * 
-	 * @return java.lang.String
-	 * @param element
-	 *            org.w3c.dom.Element
-	 */
-	public String generateEndTag(Element element) {
-		if (element == null)
-			return null;
-
-		ElementImpl impl = (ElementImpl) element;
-
-		// first check if tag adapter exists
-		TagAdapter adapter = (TagAdapter) impl.getExistingAdapter(TagAdapter.class);
-		if (adapter != null) {
-			String endTag = adapter.getEndTag(impl);
-			if (endTag != null)
-				return endTag;
-		}
-
-		if (impl.isEmptyTag())
-			return null;
-		if (!impl.isContainer())
-			return null;
-		if (impl.isJSPTag())
-			return JSPTag.TAG_CLOSE;
-
-		String tagName = generateTagName(element);
-		int length = (tagName != null ? tagName.length() : 0);
-		StringBuffer buffer = new StringBuffer(length + 4);
-		buffer.append(END_OPEN);
-		if (tagName != null)
-			buffer.append(tagName);
-		buffer.append('>');
-		return buffer.toString();
-	}
-
-	/**
-	 * generateEntityRef method
-	 * 
-	 * @return java.lang.String
-	 * @param entityRef
-	 *            org.w3c.dom.EntityReference
-	 */
-	public String generateEntityRef(EntityReference entityRef) {
-		if (entityRef == null)
-			return null;
-
-		String name = entityRef.getNodeName();
-		int length = (name != null ? name.length() : 0);
-		StringBuffer buffer = new StringBuffer(length + 4);
-		buffer.append('&');
-		if (name != null)
-			buffer.append(name);
-		buffer.append(';');
-		return buffer.toString();
-	}
-
-	/**
-	 * generatePI method
-	 * 
-	 * @return java.lang.String
-	 * @param pi
-	 *            org.w3c.dom.ProcessingInstruction
-	 */
-	public String generatePI(ProcessingInstruction pi) {
-		if (pi == null)
-			return null;
-
-		String target = pi.getTarget();
-		String data = pi.getData();
-		int length = (target != null ? target.length() : 0);
-		if (data != null)
-			length += data.length();
-		StringBuffer buffer = new StringBuffer(length + 8);
-		buffer.append(PI_OPEN);
-		if (target != null)
-			buffer.append(target);
-		buffer.append(' ');
-		if (data != null)
-			buffer.append(data);
-		buffer.append(PI_CLOSE);
-		return buffer.toString();
-	}
-
-	/**
-	 * generateSource method
-	 * 
-	 * @return java.lang.String
-	 * @param node
-	 *            org.w3c.dom.Node
-	 */
-	public String generateSource(Node node) {
-		switch (node.getNodeType()) {
-			case Node.ELEMENT_NODE :
-				return generateElement((Element) node);
-			case Node.TEXT_NODE :
-				return generateText((Text) node);
-			case Node.COMMENT_NODE :
-				return generateComment((Comment) node);
-			case Node.DOCUMENT_TYPE_NODE :
-				return generateDoctype((DocumentType) node);
-			case Node.PROCESSING_INSTRUCTION_NODE :
-				return generatePI((ProcessingInstruction) node);
-			case Node.CDATA_SECTION_NODE :
-				return generateCDATASection((CDATASection) node);
-			case Node.ENTITY_REFERENCE_NODE :
-				return generateEntityRef((EntityReference) node);
-			default :
-				// DOCUMENT
-				break;
-		}
-		return generateChild(node);
-	}
-
-	/**
-	 * generateStartTag method
-	 * 
-	 * @return java.lang.String
-	 * @param element
-	 *            Element
-	 */
-	public String generateStartTag(Element element) {
-		if (element == null)
-			return null;
-
-		ElementImpl impl = (ElementImpl) element;
-
-		if (impl.isJSPTag()) {
-			// check if JSP content type and JSP Document
-			IDOMDocument document = (IDOMDocument) element.getOwnerDocument();
-			if (document != null && document.isJSPType()) {
-				if (document.isJSPDocument() && !impl.hasChildNodes()) {
-					impl.setJSPTag(false);
-				}
-			} else {
-				impl.setJSPTag(false);
-			}
-		}
-		if (impl.isCommentTag() && impl.getExistingAdapter(TagAdapter.class) == null) {
-			CommentElementRegistry registry = CommentElementRegistry.getInstance();
-			registry.setupCommentElement(impl);
-		}
-
-		// first check if tag adapter exists
-		TagAdapter adapter = (TagAdapter) impl.getExistingAdapter(TagAdapter.class);
-		if (adapter != null) {
-			String startTag = adapter.getStartTag(impl);
-			if (startTag != null)
-				return startTag;
-		}
-
-		StringBuffer buffer = new StringBuffer();
-
-		if (impl.isCommentTag()) {
-			if (impl.isJSPTag())
-				buffer.append(JSPTag.COMMENT_OPEN);
-			else
-				buffer.append(COMMENT_OPEN);
-			String tagName = generateTagName(element);
-			if (tagName != null)
-				buffer.append(tagName);
-		} else if (impl.isJSPTag()) {
-			buffer.append(JSPTag.TAG_OPEN);
-			String tagName = generateTagName(element);
-			if (tagName != null)
-				buffer.append(tagName);
-			if (impl.isContainer())
-				return buffer.toString(); // JSP container
-		} else {
-			buffer.append('<');
-			String tagName = generateTagName(element);
-			if (tagName != null)
-				buffer.append(tagName);
-		}
-
-		NamedNodeMap attributes = element.getAttributes();
-		int length = attributes.getLength();
-		for (int i = 0; i < length; i++) {
-			AttrImpl attr = (AttrImpl) attributes.item(i);
-			if (attr == null)
-				continue;
-			buffer.append(' ');
-			String attrName = generateAttrName(attr);
-			if (attrName != null)
-				buffer.append(attrName);
-			String attrValue = generateAttrValue(attr);
-			if (attrValue != null) {
-				// attr name only for HTML boolean and JSP
-				buffer.append('=');
-				buffer.append(attrValue);
-			}
-		}
-
-		String closeTag = generateCloseTag(element);
-		if (closeTag != null)
-			buffer.append(closeTag);
-
-		return buffer.toString();
-	}
-
-	/**
-	 */
-	public String generateTagName(Element element) {
-		if (element == null)
-			return null;
-		IDOMElement xe = (IDOMElement) element;
-		String tagName = element.getTagName();
-		if (tagName == null)
-			return null;
-		if (xe.isJSPTag()) {
-			if (tagName.equals(JSPTag.JSP_EXPRESSION))
-				return JSPTag.EXPRESSION_TOKEN;
-			if (tagName.equals(JSPTag.JSP_DECLARATION))
-				return JSPTag.DECLARATION_TOKEN;
-			if (tagName.equals(JSPTag.JSP_DIRECTIVE))
-				return JSPTag.DIRECTIVE_TOKEN;
-			if (tagName.startsWith(JSPTag.JSP_DIRECTIVE)) {
-				int offset = JSPTag.JSP_DIRECTIVE.length() + 1; // after '.'
-				return (JSPTag.DIRECTIVE_TOKEN + tagName.substring(offset));
-			}
-			return (xe.isCommentTag()) ? tagName : null;
-		} else if (tagName.startsWith(JSPTag.TAG_OPEN)) {
-			if (!tagName.endsWith(JSPTag.TAG_CLOSE)) {
-				// close JSP
-				return (tagName + JSPTag.TAG_CLOSE);
-			}
-		} else if (xe.isCommentTag()) {
-			String prefix = element.getPrefix();
-			if (prefix.equals(SSI_PREFIX)) {
-				return (SSI_TOKEN + element.getLocalName());
-			}
-		} else {
-			if (!xe.isJSPTag() && xe.isGlobalTag() && // global tag
-						CMNodeUtil.getElementDeclaration(xe) != null) {
-				String newName = tagName;
-				switch (getTagNameCase(xe)) {
-					case DocumentTypeAdapter.UPPER_CASE :
-						newName = tagName.toUpperCase();
-						break;
-					case DocumentTypeAdapter.LOWER_CASE :
-						newName = tagName.toLowerCase();
-						break;
-				}
-				if (newName != tagName) {
-					tagName = newName;
-					setTagName(element, tagName);
-				}
-			}
-		}
-		return tagName;
-	}
-
-	/**
-	 * generateText method
-	 * 
-	 * @return java.lang.String
-	 * @param text
-	 *            org.w3c.dom.Text
-	 */
-	public String generateText(Text text) {
-		if (text == null)
-			return null;
-		TextImpl impl = (TextImpl) text;
-		String source = impl.getTextSource();
-		if (source != null)
-			return source;
-		return generateTextData(text, impl.getData());
-	}
-
-	/**
-	 */
-	public String generateTextData(Text text, String data) {
-		if (data == null)
-			return null;
-		if (text == null)
-			return null;
-		TextImpl impl = (TextImpl) text;
-		if (impl.isJSPContent() || impl.isCDATAContent()) {
-			return new SourceValidator(impl).convertSource(data);
-		}
-		String source = data;
-
-		// convert special characters to character entities
-		StringBuffer buffer = null;
-		int offset = 0;
-		int length = data.length();
-		for (int i = 0; i < length; i++) {
-			String name = getCharName(data.charAt(i));
-			if (name == null)
-				continue;
-			if (buffer == null)
-				buffer = new StringBuffer(length + 8);
-			if (i > offset)
-				buffer.append(data.substring(offset, i));
-			buffer.append('&');
-			buffer.append(name);
-			buffer.append(';');
-			offset = i + 1;
-		}
-		if (buffer != null) {
-			if (length > offset)
-				buffer.append(data.substring(offset));
-			source = buffer.toString();
-		}
-
-		if (source == null || source.length() == 0)
-			return null;
-		return source;
-	}
-
-	/**
-	 */
-	private int getAttrNameCase(Attr attr) {
-		DocumentImpl document = (DocumentImpl) attr.getOwnerDocument();
-		if (document == null)
-			return DocumentTypeAdapter.STRICT_CASE;
-		DocumentTypeAdapter adapter = (DocumentTypeAdapter) document.getAdapterFor(DocumentTypeAdapter.class);
-		if (adapter == null)
-			return DocumentTypeAdapter.STRICT_CASE;
-		return adapter.getAttrNameCase();
-	}
-
-	/**
-	 */
-	private String getCharName(char c) {
-		switch (c) {
-			case '<' :
-				return IXMLCharEntity.LT_NAME;
-			case '>' :
-				return IXMLCharEntity.GT_NAME;
-			case '&' :
-				return IXMLCharEntity.AMP_NAME;
-			case '"' :
-				return IXMLCharEntity.QUOT_NAME;
-		}
-		return null;
-	}
-
-	/**
-	 */
-	private int getTagNameCase(Element element) {
-		DocumentImpl document = (DocumentImpl) element.getOwnerDocument();
-		if (document == null)
-			return DocumentTypeAdapter.STRICT_CASE;
-		DocumentTypeAdapter adapter = (DocumentTypeAdapter) document.getAdapterFor(DocumentTypeAdapter.class);
-		if (adapter == null)
-			return DocumentTypeAdapter.STRICT_CASE;
-		return adapter.getTagNameCase();
-	}
-
-	/**
-	 */
-	private boolean isBooleanAttr(Attr attr) {
-		if (attr == null)
-			return false;
-		CMAttributeDeclaration decl = CMNodeUtil.getAttributeDeclaration(attr);
-		if (decl == null)
-			return false;
-		CMDataType type = decl.getAttrType();
-		if (type == null)
-			return false;
-		String values[] = type.getEnumeratedValues();
-		if (values == null)
-			return false;
-		return (values.length == 1 && values[0].equals(decl.getAttrName()));
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelContext.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelContext.java
deleted file mode 100644
index 6a799f7..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelContext.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-/**
- * XMLModelContext class
- */
-class XMLModelContext {
-	private Node nextNode = null;
-	private Node parentNode = null;
-
-	//	private XMLModelImpl model = null;
-	private Node rootNode = null;
-
-	/**
-	 * XMLModelContext constructor
-	 * 
-	 * @param rootNode
-	 *            org.w3c.dom.Node
-	 */
-	XMLModelContext(Node rootNode) {
-		super();
-
-		this.rootNode = rootNode;
-	}
-
-	/**
-	 * findEndTag method
-	 * 
-	 * @return org.w3c.dom.Element
-	 * @param tagName
-	 *            java.lang.String
-	 */
-	Element findEndTag(String tagName) {
-		if (tagName == null)
-			return null;
-		if (this.parentNode == null)
-			return null;
-
-		for (Node parent = this.parentNode.getParentNode(); parent != null; parent = parent.getParentNode()) {
-			if (parent.getNodeType() != Node.ELEMENT_NODE)
-				break;
-			ElementImpl element = (ElementImpl) parent;
-			if (element.hasEndTag()) {
-				if (element.matchTagName(tagName))
-					return element;
-				// if ancestor element has end tag stop search
-				break;
-			}
-			if (element.getNextSibling() != null)
-				break;
-		}
-
-		return null;
-	}
-
-	/**
-	 */
-	Text findNextText() {
-		Node node = this.nextNode;
-		while (node != null) {
-			if (node != this.nextNode && node.getNodeType() == Node.TEXT_NODE) {
-				TextImpl text = (TextImpl) node;
-				// skip empty text
-				if (text.getStructuredDocumentRegion() != null)
-					return text;
-			}
-			Node child = node.getFirstChild();
-			if (child != null) {
-				node = child;
-				continue;
-			}
-			while (node != null) {
-				Node next = node.getNextSibling();
-				if (next != null) {
-					node = next;
-					break;
-				}
-				node = node.getParentNode();
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * findPreviousText method
-	 * 
-	 * @return org.w3c.dom.Text
-	 */
-	Text findPreviousText() {
-		if (this.parentNode == null)
-			return null;
-		Node node = null;
-		if (this.nextNode != null)
-			node = this.nextNode.getPreviousSibling();
-		else
-			node = this.parentNode.getLastChild();
-		if (node == null || node.getNodeType() != Node.TEXT_NODE)
-			return null;
-		return (Text) node;
-	}
-
-	/**
-	 * findStartTag method
-	 * 
-	 * @return org.w3c.dom.Element
-	 * @param tagName
-	 *            java.lang.String
-	 */
-	Element findStartTag(String tagName, String rootName) {
-		if (tagName == null)
-			return null;
-
-		// check previous for empty content element
-		Node prev = null;
-		if (this.nextNode != null)
-			prev = this.nextNode.getPreviousSibling();
-		else if (this.parentNode != null)
-			prev = this.parentNode.getLastChild();
-		if (prev != null && prev.getNodeType() == Node.ELEMENT_NODE) {
-			ElementImpl element = (ElementImpl) prev;
-			if (!element.hasEndTag() && !element.isEmptyTag() && element.matchTagName(tagName))
-				return element;
-		}
-
-		for (Node parent = this.parentNode; parent != null; parent = parent.getParentNode()) {
-			if (parent.getNodeType() != Node.ELEMENT_NODE)
-				break;
-			ElementImpl element = (ElementImpl) parent;
-			if (element.matchTagName(tagName))
-				return element;
-			if (rootName != null && element.matchTagName(rootName))
-				break;
-		}
-
-		return null;
-	}
-
-	/**
-	 * getNextNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 */
-	Node getNextNode() {
-		return this.nextNode;
-	}
-
-	/**
-	 * getParentNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 */
-	Node getParentNode() {
-		return this.parentNode;
-	}
-
-	/**
-	 * getRootNode method
-	 * 
-	 * @return org.w3c.dom.Node
-	 */
-	Node getRootNode() {
-		return this.rootNode;
-	}
-
-	/**
-	 * setLast method
-	 */
-	void setLast() {
-		if (this.parentNode == null)
-			return;
-		if (this.nextNode != null) {
-			Node prev = this.nextNode.getPreviousSibling();
-			if (prev == null || prev.getNodeType() != Node.ELEMENT_NODE)
-				return;
-			ElementImpl element = (ElementImpl) prev;
-			if (element.hasEndTag() || !element.isContainer() || element.isEmptyTag())
-				return;
-			setParentNode(prev);
-		}
-
-		// find last open parent
-		Node parent = this.parentNode;
-		Node last = parent.getLastChild();
-		while (last != null) {
-			if (last.getNodeType() != Node.ELEMENT_NODE)
-				break;
-			ElementImpl element = (ElementImpl) last;
-			if (element.hasEndTag() || !element.isContainer() || element.isEmptyTag())
-				break;
-			parent = element;
-			last = parent.getLastChild();
-		}
-		if (parent != this.parentNode)
-			setParentNode(parent);
-	}
-
-	/**
-	 * setNextNode method
-	 * 
-	 * @param nextNode
-	 *            org.w3c.dom.Node
-	 */
-	void setNextNode(Node nextNode) {
-		this.nextNode = nextNode;
-		if (nextNode == null)
-			return;
-		this.parentNode = nextNode.getParentNode();
-	}
-
-	/**
-	 * setParentNode method
-	 * 
-	 * @param parentNode
-	 *            org.w3c.dom.Node
-	 */
-	void setParentNode(Node parentNode) {
-		this.parentNode = parentNode;
-		this.nextNode = null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelNotifier.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelNotifier.java
deleted file mode 100644
index bc6779b..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelNotifier.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * 
- * XMLModelNotifier manages the notification process. Clients should not use
- * extend or reference.
- * 
- * ISSUE: should be internalized.
- */
-
-public interface XMLModelNotifier {
-
-	/**
-	 * attrReplaced method
-	 * 
-	 * @param element
-	 *            org.w3c.dom.Element
-	 * @param newAttr
-	 *            org.w3c.dom.Attr
-	 * @param oldAttr
-	 *            org.w3c.dom.Attr
-	 */
-	void attrReplaced(Element element, Attr newAttr, Attr oldAttr);
-
-	/**
-	 * Signal that changing is starting.
-	 * 
-	 */
-	void beginChanging();
-
-	/**
-	 * Signal that changing is starting with a brand new model.
-	 * 
-	 */
-	void beginChanging(boolean newModel);
-
-	/**
-	 * Cancel pending notifications. This is called in the context of
-	 * "reinitialization" so is assumed ALL notifications can be safely
-	 * canceled, assuming that once factories and adapters are re-initialized
-	 * they will be re-notified as text is set in model, if still appropriate.
-	 */
-	void cancelPending();
-
-	/**
-	 * childReplaced method
-	 * 
-	 * @param parentNode
-	 *            org.w3c.dom.Node
-	 * @param newChild
-	 *            org.w3c.dom.Node
-	 * @param oldChild
-	 *            org.w3c.dom.Node
-	 */
-	void childReplaced(Node parentNode, Node newChild, Node oldChild);
-
-	/**
-	 * Editable state changed for node.
-	 * 
-	 */
-	void editableChanged(Node node);
-
-	/**
-	 * Signal changing is finished.
-	 * 
-	 */
-	void endChanging();
-
-	/**
-	 * Signal end tag changed.
-	 * 
-	 * @param element
-	 * 
-	 */
-	void endTagChanged(Element element);
-
-	/**
-	 * Used to reflect state of model.
-	 * 
-	 * @return true if model had changed.
-	 * 
-	 */
-	boolean hasChanged();
-
-	/**
-	 * Used to reflect state of parsing process.
-	 * 
-	 * @return true if model is currently changing.
-	 */
-	boolean isChanging();
-
-	/**
-	 * signal property changed
-	 * 
-	 * @param node
-	 */
-	void propertyChanged(Node node);
-
-	/**
-	 * signal start tag changed
-	 * 
-	 * @param element
-	 */
-	void startTagChanged(Element element);
-
-	/**
-	 * signal structured changed.
-	 * 
-	 * @param node
-	 */
-	void structureChanged(Node node);
-
-	/**
-	 * valueChanged method
-	 * 
-	 * @param node
-	 *            org.w3c.dom.Node
-	 */
-	void valueChanged(Node node);
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelNotifierImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelNotifierImpl.java
deleted file mode 100644
index cd59f14..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelNotifierImpl.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class XMLModelNotifierImpl implements XMLModelNotifier {
-
-	/* end: for debugging only */
-	private class NotifyEvent {
-		Object changedFeature;
-		boolean discarded;
-		Object newValue;
-		// note: don't initialize instance variables, since
-		// that causes double assignments, and lots of these are created.
-		INodeNotifier notifier;
-		Object oldValue;
-		int pos;
-		String reason;
-		int type;
-
-		NotifyEvent(INodeNotifier notifier, int type, Object changedFeature, Object oldValue, Object newValue, int pos) {
-			this.notifier = notifier;
-			this.type = type;
-			this.changedFeature = changedFeature;
-			this.oldValue = oldValue;
-			this.newValue = newValue;
-			this.pos = pos;
-			this.reason = ""; //$NON-NLS-1$
-		}
-	}
-
-	private final static String ADDED_THEN_REMOVED = "Discard: Added then removed rule"; //$NON-NLS-1$
-	private final static boolean fOptimizeDeferred = true;
-	private final static boolean fOptimizeDeferredAccordingToParentAdded = true;
-	private final static boolean fOptimizeDeferredAccordingToParentRemoved = true;
-	private final static String PARENT_IS_ADDED = "Disarded: Parent has just been added"; //$NON-NLS-1$
-	/* start: for debugging only */
-	private final static String PARENT_IS_REMOVED_TOO = "Discard: Parent was removed too"; //$NON-NLS-1$
-	private final static String PARENT_IS_REPARENTED = "Not Discard: Parent was removed so this implies reparenting"; //$NON-NLS-1$
-	private Node changedRoot = null;
-
-	private boolean changing = false;
-	private boolean doingNewModel = false;
-	private Vector events = null;
-	private boolean flushing = false;
-
-	/**
-	 */
-	public XMLModelNotifierImpl() {
-		super();
-	}
-
-	/**
-	 * attrReplaced method
-	 * 
-	 * @param element
-	 *            org.w3c.dom.Element
-	 * @param newAttr
-	 *            org.w3c.dom.Attr
-	 * @param oldAttr
-	 *            org.w3c.dom.Attr
-	 */
-	public void attrReplaced(Element element, Attr newAttr, Attr oldAttr) {
-		if (element == null)
-			return;
-		Attr attr = null;
-		String oldValue = null;
-		String newValue = null;
-		if (oldAttr != null) {
-			attr = oldAttr;
-			oldValue = oldAttr.getValue();
-		}
-		if (newAttr != null) {
-			attr = newAttr;
-			newValue = newAttr.getValue();
-		}
-		IDOMNode notifier = (IDOMNode) element;
-		int offset = notifier.getStartOffset();
-		notify(notifier, INodeNotifier.CHANGE, attr, oldValue, newValue, offset);
-		propertyChanged(notifier);
-	}
-
-	/**
-	 */
-	public void beginChanging() {
-		this.changing = true;
-	}
-
-	/**
-	 */
-	public void beginChanging(boolean newModel) {
-		beginChanging();
-		this.doingNewModel = newModel;
-	}
-
-	public void cancelPending() {
-		// we don't want to change the size of this array, since
-		// the array may be being processed, in the defferred notification
-		// loop, but we can signal that all
-		// should be discarded, so any remaining ones will be ignored.
-		if (this.events != null) {
-			Iterator iterator = this.events.iterator();
-			while (iterator.hasNext()) {
-				NotifyEvent event = (NotifyEvent) iterator.next();
-				event.discarded = true;
-			}
-		}
-		// this cancel is presumably being called as a function of
-		// "reinitiailization" so we can ignore changes to the
-		// old root, and changes to the new one will be triggered during
-		// reinitialization.
-		changedRoot = null;
-	}
-
-	/**
-	 * childReplaced method
-	 * 
-	 * @param parentNode
-	 *            org.w3c.dom.Node
-	 * @param newChild
-	 *            org.w3c.dom.Node
-	 * @param oldChild
-	 *            org.w3c.dom.Node
-	 */
-	public void childReplaced(Node parentNode, Node newChild, Node oldChild) {
-		if (parentNode == null)
-			return;
-		IDOMNode notifier = (IDOMNode) parentNode;
-		int type = INodeNotifier.CHANGE;
-		if (newChild == null)
-			type = INodeNotifier.REMOVE;
-		else if (oldChild == null)
-			type = INodeNotifier.ADD;
-		int offset = notifier.getStartOffset();
-		notify(notifier, type, oldChild, oldChild, newChild, offset);
-		structureChanged(notifier);
-	}
-
-	public void editableChanged(Node node) {
-		if (node == null)
-			return;
-		IDOMNode notifier = (IDOMNode) node;
-		int offset = notifier.getStartOffset();
-		notify(notifier, INodeNotifier.CHANGE, null, null, null, offset);
-		propertyChanged(notifier);
-	}
-
-	/**
-	 */
-	public void endChanging() {
-		this.doingNewModel = false;
-		if (!this.changing)
-			return; // avoid nesting calls
-		notifyDeferred();
-		if (this.changedRoot != null) {
-			notifyStructureChanged(this.changedRoot);
-			if (Debug.debugNotifyDeferred) {
-				String p = this.changedRoot.getNodeName();
-				System.out.println("Deferred STRUCUTRE_CHANGED: " + p); //$NON-NLS-1$
-			}
-			this.changedRoot = null;
-		}
-		this.changing = false;
-	}
-
-	/**
-	 */
-	public void endTagChanged(Element element) {
-		if (element == null)
-			return;
-		IDOMNode notifier = (IDOMNode) element;
-		int offset = notifier.getStartOffset();
-		notify(notifier, INodeNotifier.CHANGE, null, null, null, offset);
-		propertyChanged(element);
-	}
-
-	/**
-	 */
-	public boolean hasChanged() {
-		return (this.events != null);
-	}
-
-	/**
-	 */
-	public boolean isChanging() {
-		return this.changing;
-	}
-
-	/**
-	 */
-	private void notify(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		if (notifier == null)
-			return;
-		if (this.changing && !this.flushing) {
-			// defer notification
-			if (this.events == null)
-				this.events = new Vector();
-			// we do not defer anything if we are doing a new Model,
-			// except for the document event, since all others are
-			// trivial and not needed at that initial point.
-			// But even for that one document event, in the new model case,
-			// it is still important to defer it.
-			if ((!doingNewModel) || (((Node) notifier).getNodeType() == Node.DOCUMENT_NODE)) {
-				this.events.addElement(new NotifyEvent(notifier, eventType, changedFeature, oldValue, newValue, pos));
-			}
-			return;
-		}
-		try {
-			// Its important to "keep going" if exception occurs, since this
-			// notification
-			// comes in between "about to change" and "changed" events. We do
-			// log, however,
-			// since would indicate a program error.
-			notifier.notify(eventType, changedFeature, oldValue, newValue, pos);
-		} catch (Exception e) {
-			Logger.logException("A structured model client threw following exception during adapter notification (" + INodeNotifier.EVENT_TYPE_STRINGS[eventType] + " )", e); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 */
-	private void notifyDeferred() {
-		if (this.events == null)
-			return;
-		if (this.flushing)
-			return;
-		this.flushing = true; // force notification
-		int count = this.events.size();
-		for (int i = 0; i < count; i++) {
-			NotifyEvent event = (NotifyEvent) this.events.elementAt(i);
-			if (event == null)
-				continue; // error
-			if (event.discarded)
-				continue;
-			if (!doingNewModel && fOptimizeDeferred) {
-				// check redundant events (no need to check if doing NewModel,
-				// since
-				// shouldn't be redunancies)
-				if (event.type == INodeNotifier.ADD) {
-					for (int n = i + 1; n < count; n++) {
-						NotifyEvent next = (NotifyEvent) this.events.elementAt(n);
-						if (next == null)
-							continue; // error
-						if (next.type == INodeNotifier.REMOVE && next.oldValue == event.newValue) {
-							// Added then removed later, discard both
-							event.discarded = true;
-							next.discarded = true;
-							if (Debug.debugNotifyDeferred) {
-								event.reason = event.reason + ADDED_THEN_REMOVED + "(see " + n + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-								next.reason = next.reason + ADDED_THEN_REMOVED + "(see " + i + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-							}
-							break;
-						}
-					}
-					if (event.discarded)
-						continue;
-					if (fOptimizeDeferredAccordingToParentAdded) {
-						for (int p = 0; p < i; p++) {
-							NotifyEvent prev = (NotifyEvent) this.events.elementAt(p);
-							if (prev == null)
-								continue; // error
-							if (prev.type == INodeNotifier.REMOVE && prev.oldValue == event.notifier) {
-								// parent is reparented, do not discard
-								if (Debug.debugNotifyDeferred) {
-									event.reason = event.reason + PARENT_IS_REPARENTED + "(see " + p + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-								}
-								break;
-							} else if (prev.type == INodeNotifier.ADD && prev.newValue == event.notifier) {
-								// parent has been added, discard this
-								event.discarded = true;
-								if (Debug.debugNotifyDeferred) {
-									event.reason = event.reason + PARENT_IS_ADDED + "(see " + p + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-								}
-								break;
-							}
-						}
-						if (event.discarded)
-							continue;
-					}
-				} else if (event.type == INodeNotifier.REMOVE) {
-					if (fOptimizeDeferredAccordingToParentRemoved) {
-						for (int n = i + 1; n < count; n++) {
-							NotifyEvent next = (NotifyEvent) this.events.elementAt(n);
-							if (next == null)
-								continue; // error
-							if (next.type == INodeNotifier.REMOVE) {
-								if (next.oldValue == event.notifier) {
-									// parent will be removed, discard this
-									event.discarded = true;
-									if (Debug.debugNotifyDeferred) {
-										event.reason = event.reason + PARENT_IS_REMOVED_TOO + "(see " + n + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-									}
-									break;
-								}
-							}
-						}
-						if (event.discarded)
-							continue;
-					}
-				}
-			}
-			notify(event.notifier, event.type, event.changedFeature, event.oldValue, event.newValue, event.pos);
-		}
-		if (Debug.debugNotifyDeferred) {
-			for (int l = 0; l < count; l++) {
-				NotifyEvent event = (NotifyEvent) this.events.elementAt(l);
-				Object o = null;
-				String t = null;
-				if (event.type == INodeNotifier.ADD) {
-					o = event.newValue;
-					t = " + "; //$NON-NLS-1$
-				} else if (event.type == INodeNotifier.REMOVE) {
-					o = event.oldValue;
-					t = " - "; //$NON-NLS-1$
-				}
-				if (o instanceof Element) {
-					String p = ((Node) event.notifier).getNodeName();
-					String c = ((Node) o).getNodeName();
-					String d = (event.discarded ? "! " : "  "); //$NON-NLS-1$ //$NON-NLS-2$
-					System.out.println(d + p + t + c);
-				}
-			}
-		}
-		this.flushing = false;
-		this.events = null;
-	}
-
-	/**
-	 */
-	private void notifyStructureChanged(Node root) {
-		if (root == null)
-			return;
-		INodeNotifier notifier = (INodeNotifier) root;
-		try {
-			// Its important to "keep going" if exception occurs, since this
-			// notification
-			// comes in between "about to change" and "changed" events. We do
-			// log, however,
-			// since would indicate a program error.
-			notifier.notify(INodeNotifier.STRUCTURE_CHANGED, null, null, null, -1);
-		} catch (Exception e) {
-			Logger.logException("A structured model client threw following exception during adapter notification (" + INodeNotifier.EVENT_TYPE_STRINGS[INodeNotifier.STRUCTURE_CHANGED] + " )", e); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-	}
-
-	/**
-	 */
-	public void propertyChanged(Node node) {
-	}
-
-	/**
-	 * @param node
-	 */
-	private void setCommonRootIfNeeded(Node node) {
-		// defer notification
-		if (this.changedRoot == null) {
-			this.changedRoot = node;
-		} else {
-			// tiny optimization: if previous commonAncestor (changedRoot) is
-			// already 'document',
-			// or if already equal to this 'node',
-			// then no need to re-calculate
-			if (changedRoot.getNodeType() != Node.DOCUMENT_NODE && changedRoot != node) {
-				Node common = ((NodeImpl) this.changedRoot).getCommonAncestor(node);
-				if (common != null)
-					this.changedRoot = common;
-				else
-					this.changedRoot = node;
-			}
-		}
-	}
-
-	/**
-	 */
-	public void startTagChanged(Element element) {
-		if (element == null)
-			return;
-		IDOMNode notifier = (IDOMNode) element;
-		int offset = notifier.getStartOffset();
-		notify(notifier, INodeNotifier.CHANGE, null, null, null, offset);
-		propertyChanged(element);
-	}
-
-	/**
-	 */
-	public void structureChanged(Node node) {
-		if (node == null)
-			return;
-		if (isChanging()) {
-			setCommonRootIfNeeded(node);
-			if (Debug.debugNotifyDeferred) {
-				String p = this.changedRoot.getNodeName();
-				System.out.println("requested STRUCUTRE_CHANGED: " + p); //$NON-NLS-1$
-			}
-			return;
-		}
-		if (Debug.debugNotifyDeferred) {
-			String p = node.getNodeName();
-			System.out.println("STRUCUTRE_CHANGED: " + p); //$NON-NLS-1$
-		}
-		notifyStructureChanged(node);
-	}
-
-	/**
-	 * valueChanged method
-	 * 
-	 * @param node
-	 *            org.w3c.dom.Node
-	 */
-	public void valueChanged(Node node) {
-		if (node == null)
-			return;
-		IDOMNode notifier = null;
-		if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
-			Attr attr = (Attr) node;
-			notifier = (IDOMNode) attr.getOwnerElement();
-			// TODO_dmw: experimental: changed 06/29/2004 to send "strucuture
-			// changed" even for attribute value changes
-			// there are pros and cons to considering attribute value
-			// "structure changed". Will (re)consider
-			// setCommonRootIfNeeded(notifier);
-			if (notifier == null)
-				return;
-			String value = attr.getValue();
-			int offset = notifier.getStartOffset();
-			notify(notifier, INodeNotifier.CHANGE, attr, null, value, offset);
-		} else {
-			// note: we do not send structured changed event for content
-			// changed
-			notifier = (IDOMNode) node;
-			String value = node.getNodeValue();
-			int offset = notifier.getStartOffset();
-			notify(notifier, INodeNotifier.CHANGE, null, null, value, offset);
-			if (node.getNodeType() != Node.ELEMENT_NODE) {
-				IDOMNode parent = (IDOMNode) node.getParentNode();
-				if (parent != null) {
-					notify(parent, INodeNotifier.CONTENT_CHANGED, node, null, value, offset);
-				}
-			}
-		}
-		propertyChanged(notifier);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelParser.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelParser.java
deleted file mode 100644
index fe5d250..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelParser.java
+++ /dev/null
@@ -1,2424 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.commentelement.impl.CommentElementConfiguration;
-import org.eclipse.wst.xml.core.internal.commentelement.impl.CommentElementRegistry;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-
-/**
- * XMLModelParser
- */
-public class XMLModelParser {
-	private XMLModelContext context = null;
-	private DOMModelImpl model = null;
-
-	/**
-	 */
-	protected XMLModelParser(DOMModelImpl model) {
-		super();
-
-		if (model != null) {
-			this.model = model;
-		}
-	}
-
-	/**
-	 */
-	protected boolean canBeImplicitTag(Element element) {
-		ModelParserAdapter adapter = getParserAdapter();
-		if (adapter != null) {
-			return adapter.canBeImplicitTag(element);
-		}
-		return false;
-	}
-
-	/**
-	 */
-	protected boolean canBeImplicitTag(Element element, Node child) {
-		ModelParserAdapter adapter = getParserAdapter();
-		if (adapter != null) {
-			return adapter.canBeImplicitTag(element, child);
-		}
-		return false;
-	}
-
-	/**
-	 */
-	protected boolean canContain(Element element, Node child) {
-		if (element == null || child == null)
-			return false;
-		ElementImpl impl = (ElementImpl) element;
-		if (impl.isEndTag())
-			return false; // invalid (floating) end tag
-		if (!impl.isContainer())
-			return false;
-		if (child.getNodeType() != Node.TEXT_NODE) {
-			if (impl.isJSPContainer() || impl.isCDATAContainer()) {
-				// accepts only Text child
-				return false;
-			}
-		}
-		ModelParserAdapter adapter = getParserAdapter();
-		if (adapter != null) {
-			return adapter.canContain(element, child);
-		}
-		return true;
-	}
-
-	/**
-	 */
-	private void changeAttrEqual(IStructuredDocumentRegion flatNode, ITextRegion region) {
-		int offset = flatNode.getStart();
-		if (offset < 0)
-			return;
-		NodeImpl root = (NodeImpl) this.context.getRootNode();
-		if (root == null)
-			return;
-		Node node = root.getNodeAt(offset);
-		if (node == null)
-			return;
-		if (node.getNodeType() != Node.ELEMENT_NODE) {
-			if (node.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) {
-				// just notify the change instead of setting data
-				ProcessingInstructionImpl pi = (ProcessingInstructionImpl) node;
-				pi.notifyValueChanged();
-			}
-			return;
-		}
-		// actually, do nothing
-	}
-
-	/**
-	 * changeAttrName method
-	 * 
-	 */
-	private void changeAttrName(IStructuredDocumentRegion flatNode, ITextRegion region) {
-		int offset = flatNode.getStart();
-		if (offset < 0)
-			return;
-		NodeImpl root = (NodeImpl) this.context.getRootNode();
-		if (root == null)
-			return;
-		Node node = root.getNodeAt(offset);
-		if (node == null)
-			return;
-		if (node.getNodeType() != Node.ELEMENT_NODE) {
-			if (node.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) {
-				// just notify the change instead of setting data
-				ProcessingInstructionImpl pi = (ProcessingInstructionImpl) node;
-				pi.notifyValueChanged();
-			}
-			return;
-		}
-
-		ElementImpl element = (ElementImpl) node;
-		NamedNodeMap attributes = element.getAttributes();
-		if (attributes == null)
-			return;
-		int length = attributes.getLength();
-		for (int i = 0; i < length; i++) {
-			AttrImpl attr = (AttrImpl) attributes.item(i);
-			if (attr == null)
-				continue;
-			if (attr.getNameRegion() != region)
-				continue;
-
-			String name = flatNode.getText(region);
-			attr.setName(name);
-			break;
-		}
-	}
-
-	/**
-	 * changeAttrValue method
-	 * 
-	 */
-	private void changeAttrValue(IStructuredDocumentRegion flatNode, ITextRegion region) {
-		int offset = flatNode.getStart();
-		if (offset < 0)
-			return;
-		NodeImpl root = (NodeImpl) this.context.getRootNode();
-		if (root == null)
-			return;
-		Node node = root.getNodeAt(offset);
-		if (node == null)
-			return;
-		if (node.getNodeType() != Node.ELEMENT_NODE) {
-			if (node.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) {
-				// just notify the change instead of setting data
-				ProcessingInstructionImpl pi = (ProcessingInstructionImpl) node;
-				pi.notifyValueChanged();
-			}
-			return;
-		}
-
-		ElementImpl element = (ElementImpl) node;
-		NamedNodeMap attributes = element.getAttributes();
-		if (attributes == null)
-			return;
-		int length = attributes.getLength();
-		for (int i = 0; i < length; i++) {
-			AttrImpl attr = (AttrImpl) attributes.item(i);
-			if (attr == null)
-				continue;
-			if (attr.getValueRegion() != region)
-				continue;
-			// just notify the change instead of setting value
-			attr.notifyValueChanged();
-			break;
-		}
-	}
-
-	/**
-	 * changeData method
-	 * 
-	 */
-	private void changeData(IStructuredDocumentRegion flatNode, ITextRegion region) {
-		int offset = flatNode.getStart();
-		if (offset < 0)
-			return;
-		NodeImpl root = (NodeImpl) this.context.getRootNode();
-		if (root == null)
-			return;
-		Node node = root.getNodeAt(offset);
-		if (node == null)
-			return;
-		switch (node.getNodeType()) {
-			case Node.TEXT_NODE : {
-				TextImpl text = (TextImpl) node;
-				if (text.isSharingStructuredDocumentRegion(flatNode)) {
-					// has consecutive text sharing IStructuredDocumentRegion
-					changeStructuredDocumentRegion(flatNode);
-					return;
-				}
-				this.context.setNextNode(node);
-				cleanupText();
-				break;
-			}
-			case Node.CDATA_SECTION_NODE :
-			case Node.PROCESSING_INSTRUCTION_NODE :
-				break;
-			case Node.COMMENT_NODE :
-			case Node.ELEMENT_NODE :
-				// comment tag
-				changeStructuredDocumentRegion(flatNode);
-				return;
-			default :
-				return;
-		}
-
-		// just notify the change instead of setting data
-		NodeImpl impl = (NodeImpl) node;
-		impl.notifyValueChanged();
-	}
-
-	/**
-	 */
-	private void changeEndTag(IStructuredDocumentRegion flatNode, ITextRegionList newRegions, ITextRegionList oldRegions) {
-		int offset = flatNode.getStart();
-		if (offset < 0)
-			return; // error
-		NodeImpl root = (NodeImpl) this.context.getRootNode();
-		if (root == null)
-			return; // error
-		Node node = root.getNodeAt(offset);
-		if (node == null)
-			return; // error
-
-		if (node.getNodeType() != Node.ELEMENT_NODE) {
-			changeStructuredDocumentRegion(flatNode);
-			return;
-		}
-
-		// check if change is only for close tag
-		if (newRegions != null) {
-			Iterator e = newRegions.iterator();
-			while (e.hasNext()) {
-				ITextRegion region = (ITextRegion) e.next();
-				String regionType = region.getType();
-				if (regionType == DOMRegionContext.XML_TAG_CLOSE)
-					continue;
-
-				// other region has changed
-				changeStructuredDocumentRegion(flatNode);
-				return;
-			}
-		}
-		if (oldRegions != null) {
-			Iterator e = oldRegions.iterator();
-			while (e.hasNext()) {
-				ITextRegion region = (ITextRegion) e.next();
-				String regionType = region.getType();
-				if (regionType == DOMRegionContext.XML_TAG_CLOSE)
-					continue;
-
-				// other region has changed
-				changeStructuredDocumentRegion(flatNode);
-				return;
-			}
-		}
-
-		// change for close tag has no impact
-		// do nothing
-	}
-
-	/**
-	 * changeRegion method
-	 * 
-	 */
-	void changeRegion(IStructuredDocumentRegion flatNode, ITextRegion region) {
-		if (flatNode == null || region == null)
-			return;
-		if (this.model.getDocument() == null)
-			return;
-		this.context = new XMLModelContext(this.model.getDocument());
-
-		// optimize typical cases
-		String regionType = region.getType();
-		if (regionType == DOMRegionContext.XML_CONTENT || regionType == DOMRegionContext.XML_COMMENT_TEXT || regionType == DOMRegionContext.XML_CDATA_TEXT || regionType == DOMRegionContext.BLOCK_TEXT || isNestedContent(regionType)) {
-			changeData(flatNode, region);
-		}
-		else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-			changeAttrName(flatNode, region);
-		}
-		else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-			changeAttrValue(flatNode, region);
-		}
-		else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) {
-			changeAttrEqual(flatNode, region);
-		}
-		else if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedTagName(regionType)) {
-			changeTagName(flatNode, region);
-		}
-		else {
-			changeStructuredDocumentRegion(flatNode);
-		}
-	}
-
-
-
-	/**
-	 */
-	private void changeStartTag(IStructuredDocumentRegion flatNode, ITextRegionList newRegions, ITextRegionList oldRegions) {
-		int offset = flatNode.getStart();
-		if (offset < 0)
-			return; // error
-		NodeImpl root = (NodeImpl) this.context.getRootNode();
-		if (root == null)
-			return; // error
-		Node node = root.getNodeAt(offset);
-		if (node == null)
-			return; // error
-
-		if (node.getNodeType() != Node.ELEMENT_NODE) {
-			changeStructuredDocumentRegion(flatNode);
-			return;
-		}
-		ElementImpl element = (ElementImpl) node;
-
-		// check if changes are only for attributes and close tag
-		boolean tagNameUnchanged = false;
-		if (newRegions != null) {
-			Iterator e = newRegions.iterator();
-			while (e.hasNext()) {
-				ITextRegion region = (ITextRegion) e.next();
-				String regionType = region.getType();
-				if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME || regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS || regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)
-					continue;
-				if (regionType == DOMRegionContext.XML_TAG_CLOSE) {
-					// change from empty tag may have impact on structure
-					if (!element.isEmptyTag())
-						continue;
-				}
-				else if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedTagName(regionType)) {
-					String oldTagName = element.getTagName();
-					String newTagName = flatNode.getText(region);
-					if (oldTagName != null && newTagName != null && oldTagName.equals(newTagName)) {
-						// the tag name is unchanged
-						tagNameUnchanged = true;
-						continue;
-					}
-				}
-
-				// other region has changed
-				changeStructuredDocumentRegion(flatNode);
-				return;
-			}
-		}
-		if (oldRegions != null) {
-			Iterator e = oldRegions.iterator();
-			while (e.hasNext()) {
-				ITextRegion region = (ITextRegion) e.next();
-				String regionType = region.getType();
-				if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME || regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS || regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)
-					continue;
-				if (regionType == DOMRegionContext.XML_TAG_CLOSE) {
-					// change from empty tag may have impact on structure
-					if (!element.isEmptyTag())
-						continue;
-				}
-				else if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedTagName(regionType)) {
-					// if new tag name is unchanged, it's OK
-					if (tagNameUnchanged)
-						continue;
-				}
-
-				// other region has changed
-				changeStructuredDocumentRegion(flatNode);
-				return;
-			}
-		}
-
-		// update attributes
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null)
-			return; // error
-		NamedNodeMap attributes = element.getAttributes();
-		if (attributes == null)
-			return; // error
-
-		// first remove attributes
-		int regionIndex = 0;
-		int attrIndex = 0;
-		AttrImpl attr = null;
-		while (attrIndex < attributes.getLength()) {
-			attr = (AttrImpl) attributes.item(attrIndex);
-			if (attr == null) { // error
-				attrIndex++;
-				continue;
-			}
-			ITextRegion nameRegion = attr.getNameRegion();
-			if (nameRegion == null) { // error
-				element.removeAttributeNode(attr);
-				continue;
-			}
-			boolean found = false;
-			for (int i = regionIndex; i < regions.size(); i++) {
-				ITextRegion region = regions.get(i);
-				if (region == nameRegion) {
-					regionIndex = i + 1; // next region
-					found = true;
-					break;
-				}
-			}
-			if (found) {
-				attrIndex++;
-			}
-			else {
-				element.removeAttributeNode(attr);
-			}
-		}
-
-		// insert or update attributes
-		attrIndex = 0; // reset to first
-		AttrImpl newAttr = null;
-		ITextRegion oldValueRegion = null;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-				if (newAttr != null) {
-					// insert deferred new attribute
-					element.insertAttributeNode(newAttr, attrIndex++);
-					newAttr = null;
-				}
-				else if (attr != null && oldValueRegion != null) {
-					// notify existing attribute value removal
-					attr.notifyValueChanged();
-				}
-
-				oldValueRegion = null;
-				attr = (AttrImpl) attributes.item(attrIndex);
-				if (attr != null && attr.getNameRegion() == region) {
-					// existing attribute
-					attrIndex++;
-					// clear other regions
-					oldValueRegion = attr.getValueRegion();
-					attr.setEqualRegion(null);
-					attr.setValueRegion(null);
-				}
-				else {
-					String name = flatNode.getText(region);
-					attr = (AttrImpl) this.model.getDocument().createAttribute(name);
-					if (attr != null)
-						attr.setNameRegion(region);
-					// defer insertion of new attribute
-					newAttr = attr;
-				}
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) {
-				if (attr != null) {
-					attr.setEqualRegion(region);
-				}
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-				if (attr != null) {
-					attr.setValueRegion(region);
-					if (attr != newAttr && oldValueRegion != region) {
-						// notify existing attribute value changed
-						attr.notifyValueChanged();
-					}
-					oldValueRegion = null;
-					attr = null;
-				}
-			}
-		}
-
-		if (newAttr != null) {
-			// insert deferred new attribute
-			element.appendAttributeNode(newAttr);
-		}
-		else if (attr != null && oldValueRegion != null) {
-			// notify existing attribute value removal
-			attr.notifyValueChanged();
-		}
-	}
-
-	/**
-	 * changeStructuredDocumentRegion method
-	 * 
-	 */
-	private void changeStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null)
-			return;
-		if (this.model.getDocument() == null)
-			return;
-
-		setupContext(flatNode);
-
-		removeStructuredDocumentRegion(flatNode);
-		// make sure the parent is set to deepest level
-		// when end tag has been removed
-		this.context.setLast();
-		insertStructuredDocumentRegion(flatNode);
-
-		cleanupText();
-		cleanupEndTag();
-	}
-
-	/**
-	 */
-	private void changeTagName(IStructuredDocumentRegion flatNode, ITextRegion region) {
-		int offset = flatNode.getStart();
-		if (offset < 0)
-			return; // error
-		NodeImpl root = (NodeImpl) this.context.getRootNode();
-		if (root == null)
-			return; // error
-		Node node = root.getNodeAt(offset);
-		if (node == null)
-			return; // error
-
-		if (node.getNodeType() != Node.ELEMENT_NODE) {
-			changeStructuredDocumentRegion(flatNode);
-			return;
-		}
-
-		ElementImpl element = (ElementImpl) node;
-		String newTagName = flatNode.getText(region);
-		if (newTagName == null || !element.matchTagName(newTagName)) {
-			// the tag name is changed
-			changeStructuredDocumentRegion(flatNode);
-			return;
-		}
-
-		// the tag name is unchanged
-		// this happens when typing spaces after the tag name
-		// do nothing, but...
-		// if it's not a change in the end tag of an element with the start
-		// tag,
-		// and case has been changed, set to element and notify
-		if (!element.hasStartTag() || StructuredDocumentRegionUtil.getFirstRegionType(flatNode) != DOMRegionContext.XML_END_TAG_OPEN) {
-			String tagName = element.getTagName();
-			if (tagName == null || !tagName.equals(newTagName)) {
-				element.setTagName(newTagName);
-				element.notifyValueChanged();
-			}
-		}
-	}
-
-	/**
-	 * cleanupContext method
-	 */
-	private void cleanupEndTag() {
-		Node parent = this.context.getParentNode();
-		Node next = this.context.getNextNode();
-		while (parent != null) {
-			while (next != null) {
-				if (next.getNodeType() == Node.ELEMENT_NODE) {
-					ElementImpl element = (ElementImpl) next;
-					if (element.isEndTag()) {
-						// floating end tag
-						String tagName = element.getTagName();
-						String rootName = getFindRootName(tagName);
-						ElementImpl start = (ElementImpl) this.context.findStartTag(tagName, rootName);
-						if (start != null) {
-							insertEndTag(start);
-							// move the end tag from 'element' to 'start'
-							start.addEndTag(element);
-							removeNode(element);
-							parent = this.context.getParentNode();
-							next = this.context.getNextNode();
-							continue;
-						}
-					}
-				}
-
-				Node first = next.getFirstChild();
-				if (first != null) {
-					parent = next;
-					next = first;
-					this.context.setNextNode(next);
-				}
-				else {
-					next = next.getNextSibling();
-					this.context.setNextNode(next);
-				}
-			}
-
-			if (parent.getNodeType() == Node.ELEMENT_NODE) {
-				ElementImpl element = (ElementImpl) parent;
-				if (!element.hasEndTag() && element.hasStartTag() && element.getNextSibling() == null) {
-					String tagName = element.getTagName();
-					ElementImpl end = (ElementImpl) this.context.findEndTag(tagName);
-					if (end != null) {
-						// move the end tag from 'end' to 'element'
-						element.addEndTag(end);
-						removeEndTag(end);
-						this.context.setParentNode(parent); // reset context
-						continue;
-					}
-				}
-			}
-
-			next = parent.getNextSibling();
-			parent = parent.getParentNode();
-			if (next != null) {
-				this.context.setNextNode(next);
-			}
-			else {
-				this.context.setParentNode(parent);
-			}
-		}
-	}
-
-	/**
-	 */
-	private void cleanupText() {
-		Node parent = this.context.getParentNode();
-		if (parent == null)
-			return; // error
-		Node next = this.context.getNextNode();
-		Node prev = (next == null ? parent.getLastChild() : next.getPreviousSibling());
-
-		TextImpl nextText = null;
-		TextImpl prevText = null;
-		if (next != null && next.getNodeType() == Node.TEXT_NODE) {
-			nextText = (TextImpl) next;
-		}
-		if (prev != null && prev.getNodeType() == Node.TEXT_NODE) {
-			prevText = (TextImpl) prev;
-		}
-		if (nextText == null && prevText == null)
-			return;
-		if (nextText != null && prevText != null) {
-			// consecutive Text nodes created by setupContext(),
-			// concat them
-			IStructuredDocumentRegion flatNode = nextText.getStructuredDocumentRegion();
-			if (flatNode != null)
-				prevText.appendStructuredDocumentRegion(flatNode);
-			Node newNext = next.getNextSibling();
-			parent.removeChild(next);
-			next = null;
-			this.context.setNextNode(newNext);
-		}
-
-		TextImpl childText = (prevText != null ? prevText : nextText);
-		if (childText.getNextSibling() == null && childText.getPreviousSibling() == null) {
-			if (parent.getNodeType() == Node.ELEMENT_NODE) {
-				ElementImpl parentElement = (ElementImpl) parent;
-				if (!parentElement.hasStartTag() && !parentElement.hasEndTag()) {
-					if (childText.isWhitespace() || childText.isInvalid()) {
-						// implicit parent is not required
-						Node newParent = parent.getParentNode();
-						if (newParent != null) {
-							Node newNext = parent.getNextSibling();
-							newParent.removeChild(parent);
-							parent.removeChild(childText);
-							newParent.insertBefore(childText, newNext);
-							if (childText == next) {
-								this.context.setNextNode(childText);
-							}
-							else if (newNext != null) {
-								this.context.setNextNode(newNext);
-							}
-							else {
-								this.context.setParentNode(newParent);
-							}
-							// try again
-							cleanupText();
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This routine create an Element from comment data for comment style
-	 * elements, such as SSI and METADATA
-	 */
-	protected Element createCommentElement(String data, boolean isJSPTag) {
-		String trimmedData = data.trim();
-		CommentElementConfiguration[] configs = CommentElementRegistry.getInstance().getConfigurations();
-		for (int iConfig = 0; iConfig < configs.length; iConfig++) {
-			CommentElementConfiguration config = configs[iConfig];
-			if ((isJSPTag && !config.acceptJSPComment()) || (!isJSPTag && !config.acceptXMLComment())) {
-				continue;
-			}
-			String[] prefixes = config.getPrefix();
-			for (int iPrefix = 0; iPrefix < prefixes.length; iPrefix++) {
-				if (trimmedData.startsWith(prefixes[iPrefix])) {
-					return config.createElement(this.model.getDocument(), data, isJSPTag);
-				}
-			}
-		}
-		ModelParserAdapter adapter = getParserAdapter();
-		if (adapter != null) {
-			return adapter.createCommentElement(this.model.getDocument(), data, isJSPTag);
-		}
-		return null;
-	}
-
-	/**
-	 * This routine create an implicit Element for given parent and child,
-	 * such as HTML, BODY, HEAD, and TBODY for HTML document.
-	 */
-	protected Element createImplicitElement(Node parent, Node child) {
-		ModelParserAdapter adapter = getParserAdapter();
-		if (adapter != null) {
-			return adapter.createImplicitElement(this.model.getDocument(), parent, child);
-		}
-		return null;
-	}
-
-	/**
-	 */
-	private void demoteNodes(Node root, Node newParent, Node oldParent, Node next) {
-		if (newParent.getNodeType() != Node.ELEMENT_NODE)
-			return;
-		ElementImpl newElement = (ElementImpl) newParent;
-
-		// find next
-		while (next == null) {
-			if (oldParent.getNodeType() != Node.ELEMENT_NODE)
-				return;
-			ElementImpl oldElement = (ElementImpl) oldParent;
-			if (oldElement.hasEndTag())
-				return;
-			oldParent = oldElement.getParentNode();
-			if (oldParent == null)
-				return; // error
-			next = oldElement.getNextSibling();
-		}
-
-		while (next != null) {
-			boolean done = false;
-			if (next.getNodeType() == Node.ELEMENT_NODE) {
-				ElementImpl nextElement = (ElementImpl) next;
-				if (!nextElement.hasStartTag()) {
-					Node nextChild = nextElement.getFirstChild();
-					if (nextChild != null) {
-						// demote children
-						next = nextChild;
-						oldParent = nextElement;
-						continue;
-					}
-
-					if (nextElement.hasEndTag()) {
-						if (nextElement.matchEndTag(newElement)) {
-							// stop at the matched invalid end tag
-							next = nextElement.getNextSibling();
-							oldParent.removeChild(nextElement);
-							newElement.addEndTag(nextElement);
-
-							if (newElement == root)
-								return;
-							Node p = newElement.getParentNode();
-							// check if reached to top
-							if (p == null || p == oldParent || p.getNodeType() != Node.ELEMENT_NODE)
-								return;
-							newElement = (ElementImpl) p;
-							done = true;
-						}
-					}
-					else {
-						// remove implicit element
-						next = nextElement.getNextSibling();
-						oldParent.removeChild(nextElement);
-						done = true;
-					}
-				}
-			}
-
-			if (!done) {
-				if (!canContain(newElement, next)) {
-					if (newElement == root)
-						return;
-					Node p = newElement.getParentNode();
-					// check if reached to top
-					if (p == null || p == oldParent || p.getNodeType() != Node.ELEMENT_NODE)
-						return;
-					newElement = (ElementImpl) p;
-					continue;
-				}
-
-				Node child = next;
-				next = next.getNextSibling();
-				oldParent.removeChild(child);
-				insertNode(newElement, child, null);
-				Node childParent = child.getParentNode();
-				if (childParent != newElement) {
-					newElement = (ElementImpl) childParent;
-				}
-			}
-
-			// find next parent and sibling
-			while (next == null) {
-				if (oldParent.getNodeType() != Node.ELEMENT_NODE)
-					return;
-				ElementImpl oldElement = (ElementImpl) oldParent;
-
-				// dug parent must not have children at this point
-				if (!oldElement.hasChildNodes() && !oldElement.hasStartTag()) {
-					oldParent = oldElement.getParentNode();
-					if (oldParent == null)
-						return; // error
-					next = oldElement;
-					break;
-				}
-
-				if (oldElement.hasEndTag())
-					return;
-				oldParent = oldElement.getParentNode();
-				if (oldParent == null)
-					return; // error
-				next = oldElement.getNextSibling();
-			}
-		}
-	}
-
-	private ModelParserAdapter getParserAdapter() {
-		return (ModelParserAdapter) this.model.getDocument().getAdapterFor(ModelParserAdapter.class);
-	}
-	
-	/**
-	 */
-	protected String getFindRootName(String tagName) {
-		ModelParserAdapter adapter = getParserAdapter();
-		if (adapter != null) {
-			return adapter.getFindRootName(tagName);
-		}
-		return null;
-	}
-
-	/**
-	 */
-	protected final IDOMModel getModel() {
-		return this.model;
-	}
-
-	/**
-	 * insertCDATASection method
-	 * 
-	 */
-	private void insertCDATASection(IStructuredDocumentRegion flatNode) {
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null)
-			return;
-
-		CDATASectionImpl cdata = null;
-		try {
-			cdata = (CDATASectionImpl) this.model.getDocument().createCDATASection(null);
-		}
-		catch (DOMException ex) {
-		}
-		if (cdata == null) { // CDATA section might not be supported
-			insertInvalidDecl(flatNode); // regard as invalid decl
-			return;
-		}
-
-		cdata.setStructuredDocumentRegion(flatNode);
-		insertNode(cdata);
-	}
-
-	/**
-	 * insertComment method
-	 * 
-	 */
-	private void insertComment(IStructuredDocumentRegion flatNode) {
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null)
-			return;
-
-		String data = null;
-		boolean isJSPTag = false;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			String regionType = region.getType();
-			if (isNestedCommentOpen(regionType)) {
-				isJSPTag = true;
-			}
-			else if (regionType == DOMRegionContext.XML_COMMENT_TEXT || isNestedCommentText(regionType)) {
-				if (data == null) {
-					data = flatNode.getText(region);
-				}
-			}
-		}
-
-		if (data != null) {
-			ElementImpl element = (ElementImpl) createCommentElement(data, isJSPTag);
-			if (element != null) {
-				if (!isEndTag(element)) {
-					element.setStartStructuredDocumentRegion(flatNode);
-					insertStartTag(element);
-					return;
-				}
-
-				// end tag
-				element.setEndStructuredDocumentRegion(flatNode);
-
-				String tagName = element.getTagName();
-				String rootName = getFindRootName(tagName);
-				ElementImpl start = (ElementImpl) this.context.findStartTag(tagName, rootName);
-				if (start != null) { // start tag found
-					insertEndTag(start);
-					start.addEndTag(element);
-					return;
-				}
-
-				// invalid end tag
-				insertNode(element);
-				return;
-			}
-		}
-
-		CommentImpl comment = (CommentImpl) this.model.getDocument().createComment(null);
-		if (comment == null)
-			return;
-		if (isJSPTag)
-			comment.setJSPTag(true);
-		comment.setStructuredDocumentRegion(flatNode);
-		insertNode(comment);
-	}
-
-	/**
-	 * insertDecl method
-	 * 
-	 */
-	private void insertDecl(IStructuredDocumentRegion flatNode) {
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null)
-			return;
-
-		boolean isDocType = false;
-		String name = null;
-		String publicId = null;
-		String systemId = null;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_DOCTYPE_DECLARATION) {
-				isDocType = true;
-			}
-			else if (regionType == DOMRegionContext.XML_DOCTYPE_NAME) {
-				if (name == null)
-					name = flatNode.getText(region);
-			}
-			else if (regionType == DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBREF) {
-				if (publicId == null)
-					publicId = StructuredDocumentRegionUtil.getAttrValue(flatNode, region);
-			}
-			else if (regionType == DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSREF) {
-				if (systemId == null)
-					systemId = StructuredDocumentRegionUtil.getAttrValue(flatNode, region);
-			}
-		}
-
-		// invalid declaration
-		if (!isDocType) {
-			insertInvalidDecl(flatNode);
-			return;
-		}
-
-		DocumentTypeImpl docType = (DocumentTypeImpl) this.model.getDocument().createDoctype(name);
-		if (docType == null)
-			return;
-		if (publicId != null)
-			docType.setPublicId(publicId);
-		if (systemId != null)
-			docType.setSystemId(systemId);
-		docType.setStructuredDocumentRegion(flatNode);
-		insertNode(docType);
-	}
-
-	/**
-	 * insertEndTag method can be used by subclasses, but not overrided.
-	 * 
-	 * @param element
-	 *            org.w3c.dom.Element
-	 */
-	protected void insertEndTag(Element element) {
-		if (element == null)
-			return;
-
-		Node newParent = element.getParentNode();
-		if (newParent == null)
-			return; // error
-
-		if (!((ElementImpl) element).isContainer()) {
-			// just update context
-			Node elementNext = element.getNextSibling();
-			if (elementNext != null)
-				this.context.setNextNode(elementNext);
-			else
-				this.context.setParentNode(newParent);
-			return;
-		}
-
-		// promote children
-		Node newNext = element.getNextSibling();
-		Node oldParent = this.context.getParentNode();
-		if (oldParent == null)
-			return; // error
-		Node oldNext = this.context.getNextNode();
-		promoteNodes(element, newParent, newNext, oldParent, oldNext);
-
-		// update context
-		// re-check the next sibling
-		newNext = element.getNextSibling();
-		if (newNext != null)
-			this.context.setNextNode(newNext);
-		else
-			this.context.setParentNode(newParent);
-	}
-
-	/**
-	 * insertEndTag method
-	 * 
-	 */
-	private void insertEndTag(IStructuredDocumentRegion flatNode) {
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null)
-			return;
-
-		String tagName = null;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedTagName(regionType)) {
-				if (tagName == null)
-					tagName = flatNode.getText(region);
-			}
-		}
-
-		if (tagName == null) { // invalid end tag
-			insertText(flatNode); // regard as invalid text
-			return;
-		}
-
-		String rootName = getFindRootName(tagName);
-		ElementImpl start = (ElementImpl) this.context.findStartTag(tagName, rootName);
-		if (start != null) { // start tag found
-			insertEndTag(start);
-			start.setEndStructuredDocumentRegion(flatNode);
-			return;
-		}
-
-		// invalid end tag
-		ElementImpl end = null;
-		try {
-			end = (ElementImpl) this.model.getDocument().createElement(tagName);
-		}
-		catch (DOMException ex) {
-		}
-		if (end == null) { // invalid end tag
-			insertText(flatNode); // regard as invalid text
-			return;
-		}
-		end.setEndStructuredDocumentRegion(flatNode);
-		insertNode(end);
-	}
-
-	/**
-	 * insertEntityRef method
-	 * 
-	 */
-	private void insertEntityRef(IStructuredDocumentRegion flatNode) {
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null)
-			return;
-
-		String name = null;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_ENTITY_REFERENCE || regionType == DOMRegionContext.XML_CHAR_REFERENCE) {
-				if (name == null)
-					name = StructuredDocumentRegionUtil.getEntityRefName(flatNode, region);
-			}
-		}
-
-		if (name == null) { // invalid entity
-			insertText(flatNode);
-			return;
-		}
-
-		// ISSUE: avoid this cast
-		String value = ((DocumentImpl)this.model.getDocument()).getCharValue(name);
-		if (value != null) { // character entity
-			TextImpl text = (TextImpl) this.context.findPreviousText();
-			if (text != null) { // existing text found
-				// do not append data
-				text.appendStructuredDocumentRegion(flatNode);
-				// notify the change
-				text.notifyValueChanged();
-				return;
-			}
-
-			// new text
-			text = (TextImpl) this.model.getDocument().createTextNode(null);
-			if (text == null)
-				return;
-			text.setStructuredDocumentRegion(flatNode);
-			insertNode(text);
-			return;
-		}
-
-		// general entity reference
-		EntityReferenceImpl ref = null;
-		try {
-			ref = (EntityReferenceImpl) this.model.getDocument().createEntityReference(name);
-		}
-		catch (DOMException ex) {
-		}
-		if (ref == null) { // entity reference might not be supported
-			insertText(flatNode); // regard as invalid text
-			return;
-		}
-
-		ref.setStructuredDocumentRegion(flatNode);
-		insertNode(ref);
-	}
-
-	/**
-	 * insertInvalidDecl method
-	 * 
-	 */
-	private void insertInvalidDecl(IStructuredDocumentRegion flatNode) {
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null)
-			return;
-
-		ElementImpl element = null;
-		try {
-			element = (ElementImpl) this.model.getDocument().createElement("!");//$NON-NLS-1$
-		}
-		catch (DOMException ex) {
-		}
-		if (element == null) { // invalid tag
-			insertText(flatNode); // regard as invalid text
-			return;
-		}
-		element.setEmptyTag(true);
-		element.setStartStructuredDocumentRegion(flatNode);
-		insertNode(element);
-	}
-
-	/**
-	 * insertJSPTag method
-	 * 
-	 */
-	private void insertNestedTag(IStructuredDocumentRegion flatNode) {
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null)
-			return;
-
-		String tagName = null;
-		AttrImpl attr = null;
-		Vector attrNodes = null;
-		boolean isCloseTag = false;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			String regionType = region.getType();
-			if (isNestedTagOpen(regionType) || isNestedTagName(regionType)) {
-				tagName = computeNestedTag(regionType, tagName, flatNode, region);
-			}
-			else if (isNestedTagClose(regionType)) {
-				isCloseTag = true;
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-				String name = flatNode.getText(region);
-				attr = (AttrImpl) this.model.getDocument().createAttribute(name);
-				if (attr != null) {
-					attr.setNameRegion(region);
-					if (attrNodes == null)
-						attrNodes = new Vector();
-					attrNodes.addElement(attr);
-				}
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) {
-				if (attr != null) {
-					attr.setEqualRegion(region);
-				}
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-				if (attr != null) {
-					attr.setValueRegion(region);
-					attr = null;
-				}
-			}
-		}
-
-		if (tagName == null) {
-			if (isCloseTag) {
-				// close JSP tag
-				Node parent = this.context.getParentNode();
-				if (parent != null && parent.getNodeType() == Node.ELEMENT_NODE) {
-					ElementImpl start = (ElementImpl) parent;
-					if (start.isJSPContainer()) {
-						insertEndTag(start);
-						start.setEndStructuredDocumentRegion(flatNode);
-						return;
-					}
-				}
-			}
-			// invalid JSP tag
-			insertText(flatNode); // regard as invalid text
-			return;
-		}
-
-		ElementImpl element = null;
-		try {
-			element = (ElementImpl) this.model.getDocument().createElement(tagName);
-		}
-		catch (DOMException ex) {
-		}
-		if (element == null) { // invalid tag
-			insertText(flatNode); // regard as invalid text
-			return;
-		}
-		if (attrNodes != null) {
-			Enumeration ae = attrNodes.elements();
-			while (ae.hasMoreElements()) {
-				Attr a = (Attr) ae.nextElement();
-				if (a == null)
-					continue;
-				element.appendAttributeNode(a);
-			}
-		}
-		element.setJSPTag(true);
-		element.setStartStructuredDocumentRegion(flatNode);
-		insertStartTag(element);
-	}
-
-	protected boolean isNestedTagClose(String regionType) {
-		boolean result = false;
-		return result;
-	}
-
-	protected boolean isNestedTagOpen(String regionType) {
-		boolean result = false;
-		return result;
-	}
-
-	protected String computeNestedTag(String regionType, String tagName, IStructuredDocumentRegion structuredDocumentRegion, ITextRegion region) {
-		return tagName;
-	}
-
-	/**
-	 * insertNode method
-	 * 
-	 * @param child
-	 *            org.w3c.dom.Node
-	 */
-	private void insertNode(Node node) {
-		if (node == null)
-			return;
-		if (this.context == null)
-			return;
-
-		Node parent = this.context.getParentNode();
-		if (parent == null)
-			return;
-		Node next = this.context.getNextNode();
-		while (parent.getNodeType() == Node.ELEMENT_NODE) {
-			ElementImpl element = (ElementImpl) parent;
-			if (canContain(element, node)) {
-				if (!element.hasStartTag() && next == element.getFirstChild()) {
-					// first child of implicit tag
-					// deletege to the parent
-					parent = element.getParentNode();
-					if (parent == null)
-						return;
-					next = element;
-					this.context.setNextNode(next);
-					continue;
-				}
-				break;
-			}
-			parent = element.getParentNode();
-			if (parent == null)
-				return;
-
-			// promote siblings
-			Node newNext = element.getNextSibling();
-			Node child = next;
-			while (child != null) {
-				Node nextChild = child.getNextSibling();
-				element.removeChild(child);
-				parent.insertBefore(child, newNext);
-				child = nextChild;
-			}
-
-			// leave the old end tag where it is
-			if (element.hasEndTag()) {
-				Element end = element.removeEndTag();
-				if (end != null) {
-					parent.insertBefore(end, newNext);
-					if (next == null)
-						next = end;
-				}
-			}
-			if (!element.hasStartTag()) {
-				// implicit element
-				if (!element.hasChildNodes()) {
-					parent.removeChild(element);
-				}
-			}
-
-			// update context
-			if (next == null)
-				next = newNext;
-			if (next != null)
-				this.context.setNextNode(next);
-			else
-				this.context.setParentNode(parent);
-		}
-
-		insertNode(parent, node, next);
-		next = node.getNextSibling();
-		if (next != null)
-			this.context.setNextNode(next);
-		else
-			this.context.setParentNode(node.getParentNode());
-	}
-
-	/**
-	 */
-	private void insertNode(Node parent, Node node, Node next) {
-		while (next != null && next.getNodeType() == Node.ELEMENT_NODE) {
-			ElementImpl nextElement = (ElementImpl) next;
-			if (nextElement.hasStartTag())
-				break;
-			if (!canBeImplicitTag(nextElement, node))
-				break;
-			parent = nextElement;
-			next = nextElement.getFirstChild();
-		}
-		Element implicitElement = createImplicitElement(parent, node);
-		if (implicitElement != null)
-			node = implicitElement;
-		parent.insertBefore(node, next);
-	}
-
-	/**
-	 * insertPI method
-	 * 
-	 */
-	private void insertPI(IStructuredDocumentRegion flatNode) {
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null)
-			return;
-
-		String target = null;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_PI_OPEN || regionType == DOMRegionContext.XML_PI_CLOSE)
-				continue;
-			if (target == null)
-				target = flatNode.getText(region);
-		}
-
-		ProcessingInstructionImpl pi = (ProcessingInstructionImpl) this.model.getDocument().createProcessingInstruction(target, null);
-		if (pi == null)
-			return;
-		pi.setStructuredDocumentRegion(flatNode);
-		insertNode(pi);
-	}
-
-	/**
-	 * insertStartTag method can be used by subclasses, but not overridden.
-	 * 
-	 * @param element
-	 *            org.w3c.dom.Element
-	 */
-	protected void insertStartTag(Element element) {
-		if (element == null)
-			return;
-		if (this.context == null)
-			return;
-
-		insertNode(element);
-
-		ElementImpl newElement = (ElementImpl) element;
-		if (newElement.isEmptyTag() || !newElement.isContainer())
-			return;
-
-		// demote siblings
-		Node parent = this.context.getParentNode();
-		if (parent == null)
-			return; // error
-		Node next = this.context.getNextNode();
-		demoteNodes(element, element, parent, next);
-
-		// update context
-		Node firstChild = element.getFirstChild();
-		if (firstChild != null)
-			this.context.setNextNode(firstChild);
-		else
-			this.context.setParentNode(element);
-	}
-
-	/**
-	 * insertStartTag method
-	 * 
-	 */
-	private void insertStartTag(IStructuredDocumentRegion flatNode) {
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null)
-			return;
-
-		String tagName = null;
-		boolean isEmptyTag = false;
-		AttrImpl attr = null;
-		Vector attrNodes = null;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedTagName(regionType)) {
-				if (tagName == null)
-					tagName = flatNode.getText(region);
-			}
-			else if (regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE) {
-				isEmptyTag = true;
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-				String name = flatNode.getText(region);
-				attr = (AttrImpl) this.model.getDocument().createAttribute(name);
-				if (attr != null) {
-					attr.setNameRegion(region);
-					if (attrNodes == null)
-						attrNodes = new Vector();
-					attrNodes.addElement(attr);
-				}
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) {
-				if (attr != null) {
-					attr.setEqualRegion(region);
-				}
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-				if (attr != null) {
-					attr.setValueRegion(region);
-					attr = null;
-				}
-			}
-		}
-
-		if (tagName == null) { // invalid start tag
-			insertText(flatNode); // regard as invalid text
-			return;
-		}
-
-		ElementImpl element = null;
-		try {
-			element = (ElementImpl) this.model.getDocument().createElement(tagName);
-		}
-		catch (DOMException ex) {
-			// typically invalid name
-		}
-		if (element == null) { // invalid tag
-			insertText(flatNode); // regard as invalid text
-			return;
-		}
-		if (attrNodes != null) {
-			Enumeration ae = attrNodes.elements();
-			while (ae.hasMoreElements()) {
-				Attr a = (Attr) ae.nextElement();
-				if (a == null)
-					continue;
-				element.appendAttributeNode(a);
-			}
-		}
-		if (isEmptyTag)
-			element.setEmptyTag(true);
-		element.setStartStructuredDocumentRegion(flatNode);
-		insertStartTag(element);
-	}
-
-	/**
-	 * insertStructuredDocumentRegion method
-	 * 
-	 */
-	protected void insertStructuredDocumentRegion(IStructuredDocumentRegion flatNode) {
-		String regionType = StructuredDocumentRegionUtil.getFirstRegionType(flatNode);
-		if (regionType == DOMRegionContext.XML_TAG_OPEN) {
-			insertStartTag(flatNode);
-		}
-		else if (regionType == DOMRegionContext.XML_END_TAG_OPEN) {
-			insertEndTag(flatNode);
-		}
-		else if (regionType == DOMRegionContext.XML_COMMENT_OPEN || isNestedCommentOpen(regionType)) {
-			insertComment(flatNode);
-		}
-		else if (regionType == DOMRegionContext.XML_ENTITY_REFERENCE || regionType == DOMRegionContext.XML_CHAR_REFERENCE) {
-			insertEntityRef(flatNode);
-		}
-		else if (regionType == DOMRegionContext.XML_DECLARATION_OPEN) {
-			insertDecl(flatNode);
-		}
-		else if (regionType == DOMRegionContext.XML_PI_OPEN) {
-			insertPI(flatNode);
-		}
-		else if (regionType == DOMRegionContext.XML_CDATA_OPEN) {
-			insertCDATASection(flatNode);
-		}
-		else if (isNestedTag(regionType)) {
-			insertNestedTag(flatNode);
-		}
-		else {
-			insertText(flatNode);
-		}
-	}
-
-	protected boolean isNestedTag(String regionType) {
-		boolean result = false;
-		return result;
-	}
-
-	protected boolean isNestedCommentText(String regionType) {
-		boolean result = false;
-		return result;
-	}
-
-
-	protected boolean isNestedCommentOpen(String regionType) {
-		boolean result = false;
-		return result;
-	}
-
-	protected boolean isNestedTagName(String regionType) {
-		boolean result = false;
-		return result;
-	}
-
-	protected boolean isNestedContent(String regionType) {
-		boolean result = false;
-		return result;
-	}
-
-	/**
-	 * insertText method Can be called from subclasses, not to be overrided or
-	 * re-implemented.
-	 * 
-	 */
-	protected void insertText(IStructuredDocumentRegion flatNode) {
-		TextImpl text = (TextImpl) this.context.findPreviousText();
-		if (text != null) { // existing text found
-			text.appendStructuredDocumentRegion(flatNode);
-			// notify the change
-			text.notifyValueChanged();
-			return;
-		}
-
-		// new text
-		text = (TextImpl) this.model.getDocument().createTextNode(null);
-		if (text == null)
-			return;
-		text.setStructuredDocumentRegion(flatNode);
-		insertNode(text);
-	}
-
-	/**
-	 */
-	protected boolean isEndTag(IDOMElement element) {
-		ModelParserAdapter adapter = getParserAdapter();
-		if (adapter != null) {
-			return adapter.isEndTag(element);
-		}
-		return element.isEndTag();
-	}
-
-	/**
-	 */
-	private void promoteNodes(Node root, Node newParent, Node newNext, Node oldParent, Node next) {
-		ElementImpl newElement = null;
-		if (newParent.getNodeType() == Node.ELEMENT_NODE) {
-			newElement = (ElementImpl) newParent;
-		}
-
-		Node rootParent = root.getParentNode();
-		while (oldParent != rootParent) {
-			while (next != null) {
-				boolean done = false;
-				boolean endTag = false;
-				if (next.getNodeType() == Node.ELEMENT_NODE) {
-					ElementImpl nextElement = (ElementImpl) next;
-					if (!nextElement.hasStartTag()) {
-						Node nextChild = nextElement.getFirstChild();
-						if (nextChild != null) {
-							// promote children
-							next = nextChild;
-							oldParent = nextElement;
-							continue;
-						}
-
-						if (nextElement.hasEndTag()) {
-							if (nextElement.matchEndTag(newElement)) {
-								endTag = true;
-							}
-						}
-						else {
-							// remove implicit element
-							next = nextElement.getNextSibling();
-							oldParent.removeChild(nextElement);
-							done = true;
-						}
-					}
-				}
-
-				if (!done) {
-					if (!endTag && newElement != null && !canContain(newElement, next)) {
-						newParent = newElement.getParentNode();
-						if (newParent == null)
-							return; // error
-						Node elementNext = newElement.getNextSibling();
-						// promote siblings
-						promoteNodes(newElement, newParent, elementNext, newElement, newNext);
-						newNext = newElement.getNextSibling();
-						if (newParent.getNodeType() == Node.ELEMENT_NODE) {
-							newElement = (ElementImpl) newParent;
-						}
-						else {
-							newElement = null;
-						}
-						continue;
-					}
-
-					Node child = next;
-					next = next.getNextSibling();
-					oldParent.removeChild(child);
-					insertNode(newParent, child, newNext);
-					Node childParent = child.getParentNode();
-					if (childParent != newParent) {
-						newParent = childParent;
-						newElement = (ElementImpl) newParent;
-						newNext = child.getNextSibling();
-					}
-				}
-			}
-
-			if (oldParent.getNodeType() != Node.ELEMENT_NODE)
-				return;
-			ElementImpl oldElement = (ElementImpl) oldParent;
-			oldParent = oldElement.getParentNode();
-			if (oldParent == null)
-				return; // error
-			next = oldElement.getNextSibling();
-
-			if (oldElement.hasEndTag()) {
-				Element end = null;
-				if (!oldElement.hasChildNodes() && !oldElement.hasStartTag()) {
-					oldParent.removeChild(oldElement);
-					end = oldElement;
-				}
-				else {
-					end = oldElement.removeEndTag();
-				}
-				if (end != null) {
-					insertNode(newParent, end, newNext);
-					Node endParent = end.getParentNode();
-					if (endParent != newParent) {
-						newParent = endParent;
-						newElement = (ElementImpl) newParent;
-						newNext = end.getNextSibling();
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * removeEndTag method
-	 * 
-	 * @param element
-	 *            org.w3c.dom.Element
-	 */
-	private void removeEndTag(Element element) {
-		if (element == null)
-			return;
-		if (this.context == null)
-			return;
-
-		Node parent = element.getParentNode();
-		if (parent == null)
-			return; // error
-
-		if (!((ElementImpl) element).isContainer()) {
-			// just update context
-			Node elementNext = element.getNextSibling();
-			if (elementNext != null)
-				this.context.setNextNode(elementNext);
-			else
-				this.context.setParentNode(parent);
-			return;
-		}
-
-		// demote siblings
-		Node next = element.getNextSibling();
-		ElementImpl newElement = (ElementImpl) element;
-		// find new parent
-		for (Node last = newElement.getLastChild(); last != null; last = last.getLastChild()) {
-			if (last.getNodeType() != Node.ELEMENT_NODE)
-				break;
-			ElementImpl lastElement = (ElementImpl) last;
-			if (lastElement.hasEndTag() || lastElement.isEmptyTag() || !lastElement.isContainer())
-				break;
-			newElement = lastElement;
-		}
-		Node lastChild = newElement.getLastChild();
-		demoteNodes(element, newElement, parent, next);
-
-		// update context
-		Node newNext = null;
-		if (lastChild != null)
-			newNext = lastChild.getNextSibling();
-		else
-			newNext = newElement.getFirstChild();
-		if (newNext != null)
-			this.context.setNextNode(newNext);
-		else
-			this.context.setParentNode(newElement);
-	}
-
-	/**
-	 * Remove the specified node if it is no longer required implicit tag with
-	 * remaining child nodes promoted.
-	 */
-	private Element removeImplicitElement(Node parent) {
-		if (parent == null)
-			return null;
-		if (parent.getNodeType() != Node.ELEMENT_NODE)
-			return null;
-		ElementImpl element = (ElementImpl) parent;
-		if (!element.isImplicitTag())
-			return null;
-		if (canBeImplicitTag(element))
-			return null;
-
-		Node elementParent = element.getParentNode();
-		if (elementParent == null)
-			return null; // error
-		Node firstChild = element.getFirstChild();
-		Node child = firstChild;
-		Node elementNext = element.getNextSibling();
-		while (child != null) {
-			Node nextChild = child.getNextSibling();
-			element.removeChild(child);
-			elementParent.insertBefore(child, elementNext);
-			child = nextChild;
-		}
-
-		// reset context
-		if (this.context.getParentNode() == element) {
-			Node oldNext = this.context.getNextNode();
-			if (oldNext != null) {
-				this.context.setNextNode(oldNext);
-			}
-			else {
-				if (elementNext != null) {
-					this.context.setNextNode(elementNext);
-				}
-				else {
-					this.context.setParentNode(elementParent);
-				}
-			}
-		}
-		else if (this.context.getNextNode() == element) {
-			if (firstChild != null) {
-				this.context.setNextNode(firstChild);
-			}
-			else {
-				if (elementNext != null) {
-					this.context.setNextNode(elementNext);
-				}
-				else {
-					this.context.setParentNode(elementParent);
-				}
-			}
-		}
-
-		removeNode(element);
-		return element;
-	}
-
-	/**
-	 * removeNode method
-	 * 
-	 * @param node
-	 *            org.w3c.dom.Node
-	 */
-	private void removeNode(Node node) {
-		if (node == null)
-			return;
-		if (this.context == null)
-			return;
-
-		Node parent = node.getParentNode();
-		if (parent == null)
-			return;
-		Node next = node.getNextSibling();
-		Node prev = node.getPreviousSibling();
-
-		// update context
-		Node oldParent = this.context.getParentNode();
-		if (node == oldParent) {
-			if (next != null)
-				this.context.setNextNode(next);
-			else
-				this.context.setParentNode(parent);
-		}
-		else {
-			Node oldNext = this.context.getNextNode();
-			if (node == oldNext) {
-				this.context.setNextNode(next);
-			}
-		}
-
-		parent.removeChild(node);
-
-		if (removeImplicitElement(parent) != null)
-			return;
-
-		// demote sibling
-		if (prev != null && prev.getNodeType() == Node.ELEMENT_NODE) {
-			ElementImpl newElement = (ElementImpl) prev;
-			if (!newElement.hasEndTag() && !newElement.isEmptyTag() && newElement.isContainer()) {
-				// find new parent
-				for (Node last = newElement.getLastChild(); last != null; last = last.getLastChild()) {
-					if (last.getNodeType() != Node.ELEMENT_NODE)
-						break;
-					ElementImpl lastElement = (ElementImpl) last;
-					if (lastElement.hasEndTag() || lastElement.isEmptyTag() || !lastElement.isContainer())
-						break;
-					newElement = lastElement;
-				}
-				Node lastChild = newElement.getLastChild();
-				demoteNodes(prev, newElement, parent, next);
-
-				// update context
-				Node newNext = null;
-				if (lastChild != null)
-					newNext = lastChild.getNextSibling();
-				else
-					newNext = newElement.getFirstChild();
-				if (newNext != null)
-					this.context.setNextNode(newNext);
-				else
-					this.context.setParentNode(newElement);
-			}
-		}
-	}
-
-	/**
-	 * removeStartTag method
-	 * 
-	 * @param element
-	 *            org.w3c.dom.Element
-	 */
-	private void removeStartTag(Element element) {
-		if (element == null)
-			return;
-		if (this.context == null)
-			return;
-
-		// for implicit tag
-		ElementImpl oldElement = (ElementImpl) element;
-		if (canBeImplicitTag(oldElement)) {
-			Node newParent = null;
-			Node prev = oldElement.getPreviousSibling();
-			if (prev != null && prev.getNodeType() == Node.ELEMENT_NODE) {
-				ElementImpl prevElement = (ElementImpl) prev;
-				if (!prevElement.hasEndTag()) {
-					if (prevElement.hasStartTag() || prevElement.matchTagName(oldElement.getTagName())) {
-						newParent = prevElement;
-					}
-				}
-			}
-			if (newParent == null) {
-				// this element should stay as implicit tag
-				// just remove all attributes
-				oldElement.removeStartTag();
-
-				// update context
-				Node child = oldElement.getFirstChild();
-				if (child != null) {
-					this.context.setNextNode(child);
-				}
-				else if (oldElement.hasEndTag()) {
-					this.context.setParentNode(oldElement);
-				}
-				return;
-			}
-		}
-		// for comment tag
-		if (oldElement.isCommentTag())
-			oldElement.removeStartTag();
-
-		// promote children
-		Node elementParent = element.getParentNode();
-		Node parent = elementParent;
-		if (parent == null)
-			return;
-		Node first = element.getFirstChild();
-		Node firstElement = null; // for the case first is removed as end
-		// tag
-		if (first != null) {
-			// find new parent for children
-			ElementImpl newElement = null;
-			for (Node last = element.getPreviousSibling(); last != null; last = last.getLastChild()) {
-				if (last.getNodeType() != Node.ELEMENT_NODE)
-					break;
-				ElementImpl lastElement = (ElementImpl) last;
-				if (lastElement.hasEndTag() || lastElement.isEmptyTag() || !lastElement.isContainer())
-					break;
-				newElement = lastElement;
-			}
-			Node next = first;
-			if (newElement != null) {
-				while (next != null) {
-					if (!newElement.hasEndTag() && newElement.hasStartTag() && next.getNodeType() == Node.ELEMENT_NODE) {
-						ElementImpl nextElement = (ElementImpl) next;
-						if (!nextElement.hasStartTag() && nextElement.hasEndTag() && nextElement.matchEndTag(newElement)) {
-							// stop at the matched invalid end tag
-							Node elementChild = nextElement.getFirstChild();
-							while (elementChild != null) {
-								Node nextChild = elementChild.getNextSibling();
-								nextElement.removeChild(elementChild);
-								newElement.appendChild(elementChild);
-								elementChild = nextChild;
-							}
-
-							next = nextElement.getNextSibling();
-							element.removeChild(nextElement);
-							newElement.addEndTag(nextElement);
-							if (nextElement == first)
-								firstElement = newElement;
-
-							Node newParent = newElement.getParentNode();
-							if (newParent == parent)
-								break;
-							if (newParent == null || newParent.getNodeType() != Node.ELEMENT_NODE)
-								break; // error
-							newElement = (ElementImpl) newParent;
-							continue;
-						}
-					}
-					if (!canContain(newElement, next)) {
-						Node newParent = newElement.getParentNode();
-						if (newParent == parent)
-							break;
-						if (newParent == null || newParent.getNodeType() != Node.ELEMENT_NODE)
-							break; // error
-						newElement = (ElementImpl) newParent;
-						continue;
-					}
-					Node child = next;
-					next = next.getNextSibling();
-					element.removeChild(child);
-					newElement.appendChild(child);
-				}
-				newElement = null;
-			}
-			if (parent.getNodeType() == Node.ELEMENT_NODE) {
-				newElement = (ElementImpl) parent;
-			}
-			while (next != null) {
-				if (newElement == null || canContain(newElement, next)) {
-					Node child = next;
-					next = next.getNextSibling();
-					element.removeChild(child);
-					parent.insertBefore(child, element);
-					continue;
-				}
-
-				parent = newElement.getParentNode();
-				if (parent == null)
-					return;
-
-				// promote siblings
-				Node newNext = newElement.getNextSibling();
-				Node child = element;
-				while (child != null) {
-					Node nextChild = child.getNextSibling();
-					newElement.removeChild(child);
-					parent.insertBefore(child, newNext);
-					child = nextChild;
-				}
-
-				// leave the old end tag where it is
-				if (newElement.hasEndTag()) {
-					Element end = newElement.removeEndTag();
-					if (end != null) {
-						parent.insertBefore(end, newNext);
-					}
-				}
-				if (!newElement.hasStartTag()) {
-					// implicit element
-					if (!newElement.hasChildNodes()) {
-						parent.removeChild(newElement);
-					}
-				}
-
-				if (parent.getNodeType() == Node.ELEMENT_NODE) {
-					newElement = (ElementImpl) parent;
-				}
-				else {
-					newElement = null;
-				}
-			}
-		}
-
-		Node newNext = element;
-		Node startElement = null; // for the case element is removed as end
-		// tag
-		if (oldElement.hasEndTag()) {
-			// find new parent for invalid end tag and siblings
-			ElementImpl newElement = null;
-			for (Node last = element.getPreviousSibling(); last != null; last = last.getLastChild()) {
-				if (last.getNodeType() != Node.ELEMENT_NODE)
-					break;
-				ElementImpl lastElement = (ElementImpl) last;
-				if (lastElement.hasEndTag() || lastElement.isEmptyTag() || !lastElement.isContainer())
-					break;
-				newElement = lastElement;
-			}
-			if (newElement != null) {
-				// demote invalid end tag and sibling
-				Node next = element;
-				while (next != null) {
-					if (!newElement.hasEndTag() && newElement.hasStartTag() && next.getNodeType() == Node.ELEMENT_NODE) {
-						ElementImpl nextElement = (ElementImpl) next;
-						if (!nextElement.hasStartTag() && nextElement.hasEndTag() && nextElement.matchEndTag(newElement)) {
-							// stop at the matched invalid end tag
-							Node elementChild = nextElement.getFirstChild();
-							while (elementChild != null) {
-								Node nextChild = elementChild.getNextSibling();
-								nextElement.removeChild(elementChild);
-								newElement.appendChild(elementChild);
-								elementChild = nextChild;
-							}
-
-							next = nextElement.getNextSibling();
-							parent.removeChild(nextElement);
-							newElement.addEndTag(nextElement);
-							if (nextElement == newNext)
-								startElement = newElement;
-
-							Node newParent = newElement.getParentNode();
-							if (newParent == parent)
-								break;
-							if (newParent == null || newParent.getNodeType() != Node.ELEMENT_NODE)
-								break; // error
-							newElement = (ElementImpl) newParent;
-							continue;
-						}
-					}
-					if (!canContain(newElement, next)) {
-						Node newParent = newElement.getParentNode();
-						if (newParent == parent)
-							break;
-						if (newParent == null || newParent.getNodeType() != Node.ELEMENT_NODE)
-							break; // error
-						newElement = (ElementImpl) newParent;
-						continue;
-					}
-					Node child = next;
-					next = next.getNextSibling();
-					parent.removeChild(child);
-					if (child == oldElement) {
-						if (!oldElement.isCommentTag()) {
-							// clone (re-create) end tag
-							Element end = oldElement.removeEndTag();
-							if (end != null) {
-								child = end;
-								newNext = end;
-							}
-						}
-					}
-					newElement.appendChild(child);
-				}
-			}
-			else {
-				if (!oldElement.isCommentTag()) {
-					// clone (re-create) end tag
-					Element end = oldElement.removeEndTag();
-					if (end != null) {
-						parent.insertBefore(end, oldElement);
-						parent.removeChild(oldElement);
-						newNext = end;
-					}
-				}
-			}
-		}
-		else {
-			newNext = oldElement.getNextSibling();
-			parent.removeChild(oldElement);
-		}
-
-		// update context
-		Node oldParent = this.context.getParentNode();
-		Node oldNext = this.context.getNextNode();
-		if (element == oldParent) {
-			if (oldNext != null) {
-				this.context.setNextNode(oldNext); // reset for new parent
-			}
-			else if (newNext != null) {
-				this.context.setNextNode(newNext);
-			}
-			else {
-				this.context.setParentNode(parent);
-			}
-		}
-		else if (element == oldNext) {
-			if (firstElement != null) {
-				this.context.setParentNode(firstElement);
-			}
-			else if (first != null) {
-				this.context.setNextNode(first);
-			}
-			else if (startElement != null) {
-				this.context.setParentNode(startElement);
-			}
-			else {
-				this.context.setNextNode(newNext);
-			}
-		}
-
-		removeImplicitElement(elementParent);
-	}
-
-	/**
-	 * removeStructuredDocumentRegion method
-	 * 
-	 */
-	private void removeStructuredDocumentRegion(IStructuredDocumentRegion oldStructuredDocumentRegion) {
-		NodeImpl next = (NodeImpl) this.context.getNextNode();
-		if (next != null) {
-			short nodeType = next.getNodeType();
-			if (nodeType != Node.ELEMENT_NODE) {
-				IStructuredDocumentRegion flatNode = next.getStructuredDocumentRegion();
-				if (flatNode == oldStructuredDocumentRegion) {
-					removeNode(next);
-					return;
-				}
-				if (nodeType != Node.TEXT_NODE) {
-					throw new StructuredDocumentRegionManagementException();
-				}
-				if (flatNode == null) {
-					// this is the case for empty Text
-					// remove and continue
-					removeNode(next);
-					removeStructuredDocumentRegion(oldStructuredDocumentRegion);
-					return;
-				}
-				TextImpl text = (TextImpl) next;
-				boolean isShared = text.isSharingStructuredDocumentRegion(oldStructuredDocumentRegion);
-				if (isShared) {
-					// make sure there is next Text node sharing this
-					TextImpl nextText = (TextImpl) this.context.findNextText();
-					if (nextText == null || !nextText.hasStructuredDocumentRegion(oldStructuredDocumentRegion)) {
-						isShared = false;
-					}
-				}
-				oldStructuredDocumentRegion = text.removeStructuredDocumentRegion(oldStructuredDocumentRegion);
-				if (oldStructuredDocumentRegion == null) {
-					throw new StructuredDocumentRegionManagementException();
-				}
-				if (text.getStructuredDocumentRegion() == null) {
-					// this is the case partial IStructuredDocumentRegion is
-					// removed
-					removeNode(text);
-				}
-				else {
-					// notify the change
-					text.notifyValueChanged();
-				}
-				// if shared, continue to remove IStructuredDocumentRegion
-				// from them
-				if (isShared)
-					removeStructuredDocumentRegion(oldStructuredDocumentRegion);
-				return;
-			}
-
-			ElementImpl element = (ElementImpl) next;
-			if (element.hasStartTag()) {
-				IStructuredDocumentRegion flatNode = element.getStartStructuredDocumentRegion();
-				if (flatNode != oldStructuredDocumentRegion) {
-					throw new StructuredDocumentRegionManagementException();
-				}
-				if (element.hasEndTag() || element.hasChildNodes()) {
-					element.setStartStructuredDocumentRegion(null);
-					removeStartTag(element);
-				}
-				else {
-					removeNode(element);
-				}
-			}
-			else {
-				Node child = element.getFirstChild();
-				if (child != null) {
-					this.context.setNextNode(child);
-					removeStructuredDocumentRegion(oldStructuredDocumentRegion);
-					return;
-				}
-
-				if (!element.hasEndTag()) {
-					// implicit element
-					removeNode(element);
-					removeStructuredDocumentRegion(oldStructuredDocumentRegion);
-					return;
-				}
-
-				IStructuredDocumentRegion flatNode = element.getEndStructuredDocumentRegion();
-				if (flatNode != oldStructuredDocumentRegion) {
-					throw new StructuredDocumentRegionManagementException();
-				}
-				removeNode(element);
-			}
-			return;
-		}
-
-		Node parent = this.context.getParentNode();
-		if (parent == null || parent.getNodeType() != Node.ELEMENT_NODE) {
-			throw new StructuredDocumentRegionManagementException();
-		}
-
-		ElementImpl end = (ElementImpl) parent;
-		if (end.hasEndTag()) {
-			IStructuredDocumentRegion flatNode = end.getEndStructuredDocumentRegion();
-			if (flatNode != oldStructuredDocumentRegion) {
-				throw new StructuredDocumentRegionManagementException();
-			}
-			if (!end.hasStartTag() && !end.hasChildNodes()) {
-				this.context.setNextNode(end);
-				removeNode(end);
-			}
-			else {
-				end.setEndStructuredDocumentRegion(null);
-				removeEndTag(end);
-			}
-			return;
-		}
-
-		next = (NodeImpl) end.getNextSibling();
-		if (next != null) {
-			this.context.setNextNode(next);
-			removeStructuredDocumentRegion(oldStructuredDocumentRegion);
-			return;
-		}
-
-		parent = (NodeImpl) end.getParentNode();
-		if (parent != null) {
-			this.context.setParentNode(parent);
-			removeStructuredDocumentRegion(oldStructuredDocumentRegion);
-			return;
-		}
-	}
-
-	/**
-	 * replaceRegions method
-	 * 
-	 * @param newRegions
-	 *            java.util.Vector
-	 * @param oldRegions
-	 *            java.util.Vector
-	 */
-	void replaceRegions(IStructuredDocumentRegion flatNode, ITextRegionList newRegions, ITextRegionList oldRegions) {
-		if (flatNode == null)
-			return;
-		if (this.model.getDocument() == null)
-			return;
-		this.context = new XMLModelContext(this.model.getDocument());
-
-		// optimize typical cases
-		String regionType = StructuredDocumentRegionUtil.getFirstRegionType(flatNode);
-		if (regionType == DOMRegionContext.XML_TAG_OPEN) {
-			changeStartTag(flatNode, newRegions, oldRegions);
-		}
-		else if (regionType == DOMRegionContext.XML_END_TAG_OPEN) {
-			changeEndTag(flatNode, newRegions, oldRegions);
-		}
-		else {
-			changeStructuredDocumentRegion(flatNode);
-		}
-	}
-
-	/**
-	 * replaceStructuredDocumentRegions method
-	 * 
-	 */
-	void replaceStructuredDocumentRegions(IStructuredDocumentRegionList newStructuredDocumentRegions, IStructuredDocumentRegionList oldStructuredDocumentRegions) {
-		if (this.model.getDocument() == null)
-			return;
-		this.context = new XMLModelContext(this.model.getDocument());
-
-		int newCount = (newStructuredDocumentRegions != null ? newStructuredDocumentRegions.getLength() : 0);
-		int oldCount = (oldStructuredDocumentRegions != null ? oldStructuredDocumentRegions.getLength() : 0);
-
-		if (oldCount > 0) {
-			setupContext(oldStructuredDocumentRegions.item(0));
-			// Node startParent = this.context.getParentNode();
-
-			Enumeration e = oldStructuredDocumentRegions.elements();
-			while (e.hasMoreElements()) {
-				IStructuredDocumentRegion flatNode = (IStructuredDocumentRegion) e.nextElement();
-				if (flatNode == null)
-					continue;
-				removeStructuredDocumentRegion(flatNode);
-			}
-		}
-		else {
-			if (newCount == 0)
-				return;
-			setupContext(newStructuredDocumentRegions.item(0));
-		}
-		// make sure the parent is set to deepest level
-		// when end tag has been removed
-		this.context.setLast();
-
-		if (newCount > 0) {
-			Enumeration e = newStructuredDocumentRegions.elements();
-			while (e.hasMoreElements()) {
-				IStructuredDocumentRegion flatNode = (IStructuredDocumentRegion) e.nextElement();
-				if (flatNode == null)
-					continue;
-				insertStructuredDocumentRegion(flatNode);
-			}
-		}
-
-		cleanupText();
-		cleanupEndTag();
-	}
-
-	/**
-	 * setupContext method
-	 * 
-	 */
-	private void setupContext(IStructuredDocumentRegion startStructuredDocumentRegion) {
-		int offset = startStructuredDocumentRegion.getStart();
-		if (offset < 0)
-			return;
-		NodeImpl root = (NodeImpl) this.context.getRootNode();
-		if (root == null)
-			return;
-
-		if (offset == 0) {
-			// at the beggining of document
-			Node child = root.getFirstChild();
-			if (child != null)
-				this.context.setNextNode(child);
-			else
-				this.context.setParentNode(root);
-			return;
-		}
-
-		NodeImpl node = (NodeImpl) root.getNodeAt(offset);
-		if (node == null) {
-			// might be at the end of document
-			this.context.setParentNode(root);
-			this.context.setLast();
-			return;
-		}
-
-		if (offset == node.getStartOffset()) {
-			this.context.setNextNode(node);
-			return;
-		}
-
-		if (node.getNodeType() == Node.TEXT_NODE) {
-			TextImpl text = (TextImpl) node;
-			Text nextText = text.splitText(startStructuredDocumentRegion);
-			// notify the change
-			text.notifyValueChanged();
-			if (nextText == null)
-				return; // error
-			this.context.setNextNode(nextText);
-			return;
-		}
-
-		for (Node child = node.getFirstChild(); child != null; child = child.getNextSibling()) {
-			if (offset >= ((NodeImpl) child).getEndOffset())
-				continue;
-			this.context.setNextNode(child);
-			return;
-		}
-		this.context.setParentNode(node);
-		this.context.setLast();
-	}
-
-	protected XMLModelContext getContext() {
-		return context;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelUpdater.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelUpdater.java
deleted file mode 100644
index 1cbbc25..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelUpdater.java
+++ /dev/null
@@ -1,1700 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.document;
-
-
-
-import java.util.Enumeration;
-import java.util.Iterator;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.document.ISourceGenerator;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-
-/**
- * XMLModelUpdater class
- */
-public class XMLModelUpdater {
-	private int diff = 0;
-	private int gapLength = 0;
-	private int gapOffset = 0;
-	private IStructuredDocumentRegion gapStructuredDocumentRegion = null;
-	private ISourceGenerator generator = null;
-	private DOMModelImpl model = null;
-	private NodeImpl nextNode = null;
-	private NodeImpl parentNode = null;
-
-	protected XMLModelUpdater(DOMModelImpl model) {
-		super();
-
-		if (model != null) {
-			this.model = model;
-			this.generator = model.getGenerator();
-		}
-	}
-
-	/**
-	 * changeAttrValue method
-	 * 
-	 * @param attrNode
-	 *            org.w3c.dom.Attr
-	 */
-	private void changeAttrName(Attr attrNode) {
-		if (attrNode == null)
-			return;
-
-		AttrImpl attr = (AttrImpl) attrNode;
-		ElementImpl element = (ElementImpl) attr.getOwnerElement();
-		if (element == null)
-			return;
-
-		if (element.isCommentTag()) {
-			changeStartTag(element);
-			return;
-		}
-
-		int offset = element.getStartOffset();
-		int start = offset;
-		int end = offset;
-
-		String name = attr.getName();
-		if (name == null)
-			name = new String();
-		ITextRegion nameRegion = attr.getNameRegion();
-		if (nameRegion == null)
-			return; // error
-		start += nameRegion.getStart();
-		// use getTextEnd() because getEnd() may include the tailing spaces
-		end += nameRegion.getTextEnd();
-
-		replaceSource(name, start, end);
-	}
-
-	/**
-	 * changeAttrValue method
-	 * 
-	 * @param attrNode
-	 *            org.w3c.dom.Attr
-	 */
-	private void changeAttrValue(Attr attrNode) {
-		if (attrNode == null)
-			return;
-
-		AttrImpl attr = (AttrImpl) attrNode;
-		ElementImpl element = (ElementImpl) attr.getOwnerElement();
-		if (element == null)
-			return;
-
-		if (element.isCommentTag()) {
-			changeStartTag(element);
-			return;
-		}
-
-		int offset = element.getStartOffset();
-		int start = offset;
-		int end = offset;
-
-		String value = null;
-		ITextRegion valueRegion = attr.getValueRegion();
-		if (valueRegion != null) {
-			char quote = 0; // no quote preference
-			// DW: 4/16/2003 due to change in structuredDocument ... we need a
-			// flatnode to
-			// get at region values. For now I'll assume this is always the
-			// first
-			// flatnode .. may need to make smarter later (e.g. to search for
-			// the flatnode that this.valueRegion belongs to.
-			IStructuredDocumentRegion documentRegion = element.getFirstStructuredDocumentRegion();
-			String oldValue = documentRegion.getText(valueRegion);
-			if (oldValue != null && oldValue.length() > 0) {
-				char firstChar = oldValue.charAt(0);
-				if (firstChar == '"' || firstChar == '\'') {
-					quote = firstChar;
-				}
-			}
-
-			ITextRegion startRegion = valueRegion;
-
-			value = this.generator.generateAttrValue(attr, quote);
-			if (value == null) {
-				value = new String();
-				// remove equal too
-				ITextRegion equalRegion = attr.getEqualRegion();
-				if (equalRegion != null)
-					startRegion = equalRegion;
-			}
-			attr.setValueRegion(valueRegion); // reset value
-
-			start += startRegion.getStart();
-			// use getTextEnd() because getEnd() may include the tailing
-			// spaces
-			end += valueRegion.getTextEnd();
-		}
-		else {
-			ITextRegion equalRegion = attr.getEqualRegion();
-
-			value = this.generator.generateAttrValue(attr);
-			if (value == null) {
-				if (equalRegion == null)
-					return; // nothng to do
-				value = new String();
-				// remove equal
-				start += equalRegion.getStart();
-				end += equalRegion.getTextEnd();
-			}
-			else {
-				if (equalRegion != null) {
-					// use getTextEnd() because getEnd() may include the
-					// tailing spaces
-					start += equalRegion.getTextEnd();
-				}
-				else {
-					ITextRegion nameRegion = attr.getNameRegion();
-					if (nameRegion == null)
-						return; // must never happen
-					// use getTextEnd() because getEnd() may include the
-					// tailing spaces
-					start += nameRegion.getTextEnd();
-					value = '=' + value;
-				}
-				end = start;
-			}
-		}
-
-		replaceSource(value, start, end);
-	}
-
-	/**
-	 */
-	void changeEndTag(Element element) {
-		String source = this.generator.generateEndTag(element);
-		if (source == null)
-			return;
-		int length = source.length();
-		if (length == 0)
-			return;
-
-		ElementImpl impl = (ElementImpl) element;
-		int offset = impl.getEndStartOffset();
-		int start = offset;
-		int end = offset;
-		if (impl.hasEndTag()) {
-			end = impl.getEndOffset();
-			this.gapStructuredDocumentRegion = impl.getEndStructuredDocumentRegion();
-			impl.setEndStructuredDocumentRegion(new StructuredDocumentRegionProxy(offset, length));
-		}
-
-		replaceSource(source, start, end);
-	}
-
-	/**
-	 * changeName method
-	 * 
-	 * @param node
-	 *            org.w3c.dom.Node
-	 */
-	void changeName(Node node) {
-		if (node == null)
-			return;
-		if (getStructuredDocument() == null)
-			return;
-
-		// support changing name of attribute for setPrefix()
-		short nodeType = node.getNodeType();
-		if (nodeType == Node.ATTRIBUTE_NODE) {
-			changeAttrName((Attr) node);
-			return;
-		}
-
-		// not supported
-		return;
-	}
-
-	void changeRegion(IStructuredDocumentRegion flatNode, ITextRegion region) {
-		// future_TODO: optimize
-
-		NodeImpl root = (NodeImpl) this.model.getDocument();
-		this.parentNode = root;
-		this.nextNode = (NodeImpl) root.getFirstChild();
-
-		removeGapStructuredDocumentRegion(flatNode);
-		insertGapStructuredDocumentRegionBefore(flatNode.getStart());
-		changeStructuredDocumentRegion(flatNode);
-		insertGapStructuredDocumentRegionAfter(flatNode.getEnd());
-	}
-
-	/**
-	 * This is a fallback method to regenerate the start tag.
-	 */
-	void changeStartTag(Element element) {
-		if (element == null)
-			return;
-		ElementImpl impl = (ElementImpl) element;
-
-		if (!impl.hasStartTag() && !impl.hasEndTag()) {
-			// need to generate the start and the end tags
-			Node parent = element.getParentNode();
-			if (parent != null) {
-				replaceChild(parent, element, element);
-				return;
-			}
-			// else error
-		}
-
-		String source = this.generator.generateStartTag(element);
-		if (source == null)
-			return;
-		int length = source.length();
-		if (length == 0)
-			return;
-
-		int offset = impl.getStartOffset();
-		int start = offset;
-		int end = offset;
-		if (impl.hasStartTag()) {
-			end = impl.getStartEndOffset();
-			this.gapStructuredDocumentRegion = impl.getStartStructuredDocumentRegion();
-		}
-		impl.setStartStructuredDocumentRegion(new StructuredDocumentRegionProxy(offset, length));
-
-		replaceSource(source, start, end);
-	}
-
-	private void changeStructuredDocumentRegion(IStructuredDocumentRegion oldStructuredDocumentRegion) {
-		if (oldStructuredDocumentRegion == null)
-			return; // error
-		if (this.parentNode == null)
-			return; // error
-
-		int oldOffset = oldStructuredDocumentRegion.getStart();
-		int oldEnd = oldStructuredDocumentRegion.getEnd();
-		boolean isEndTag = false;
-
-		// find owner node
-		NodeImpl ownerNode = null;
-		while (this.parentNode != null) {
-			if (this.nextNode != null) {
-				IStructuredDocumentRegion nextStructuredDocumentRegion = this.nextNode.getStructuredDocumentRegion();
-				if (nextStructuredDocumentRegion != null) {
-					if (nextStructuredDocumentRegion == oldStructuredDocumentRegion) {
-						ownerNode = this.nextNode;
-						break;
-					}
-					int nextOffset = nextStructuredDocumentRegion.getStart();
-					if (nextOffset == oldOffset) { // found
-						ownerNode = this.nextNode;
-						break;
-					}
-					if (this.nextNode.getNodeType() == Node.TEXT_NODE) {
-						TextImpl text = (TextImpl) this.nextNode;
-						if (text.hasStructuredDocumentRegion(oldStructuredDocumentRegion)) {
-							ownerNode = this.nextNode;
-							break;
-						}
-						int nextEnd = nextStructuredDocumentRegion.getEnd();
-						if (nextOffset < oldEnd && nextEnd > oldOffset) {
-							ownerNode = this.nextNode;
-							break;
-						}
-					}
-				}
-
-				Node child = this.nextNode.getFirstChild();
-				if (child != null) {
-					this.parentNode = this.nextNode;
-					this.nextNode = (NodeImpl) child;
-					continue;
-				}
-
-				if (this.nextNode.getNodeType() == Node.ELEMENT_NODE) {
-					this.parentNode = this.nextNode;
-					this.nextNode = null;
-					continue;
-				}
-
-				this.nextNode = (NodeImpl) this.nextNode.getNextSibling();
-				if (this.nextNode != null)
-					continue;
-			}
-
-			if (this.parentNode.getNodeType() == Node.ELEMENT_NODE) {
-				ElementImpl element = (ElementImpl) this.parentNode;
-				IStructuredDocumentRegion endStructuredDocumentRegion = element.getEndStructuredDocumentRegion();
-				if (endStructuredDocumentRegion != null) {
-					if (endStructuredDocumentRegion == oldStructuredDocumentRegion) {
-						ownerNode = this.parentNode;
-						isEndTag = true;
-						break;
-					}
-					int endOffset = endStructuredDocumentRegion.getStart();
-					if (endOffset == oldOffset) { // found
-						ownerNode = this.parentNode;
-						isEndTag = true;
-						break;
-					}
-				}
-			}
-
-			this.nextNode = (NodeImpl) this.parentNode.getNextSibling();
-			this.parentNode = (NodeImpl) this.parentNode.getParentNode();
-		}
-		if (ownerNode == null)
-			throw new StructuredDocumentRegionManagementException();
-
-		short nodeType = ownerNode.getNodeType();
-		if (nodeType == Node.ELEMENT_NODE) {
-			ElementImpl element = (ElementImpl) ownerNode;
-			if (isEndTag) {
-				element.setEndStructuredDocumentRegion(oldStructuredDocumentRegion);
-			}
-			else {
-				element.setStartStructuredDocumentRegion(oldStructuredDocumentRegion);
-				updateAttrRegions(element, oldStructuredDocumentRegion);
-			}
-		}
-		else if (nodeType == Node.TEXT_NODE) {
-			TextImpl text = (TextImpl) ownerNode;
-
-			IStructuredDocumentRegion flatNode = text.getStructuredDocumentRegion();
-			if (flatNode == oldStructuredDocumentRegion) {
-				int newOffset = oldOffset;
-				int newEnd = oldEnd;
-				if (oldOffset == this.gapOffset) {
-					newOffset += this.diff;
-				}
-				else {
-					newEnd = this.gapOffset;
-				}
-				int newLength = newEnd - newOffset;
-				IStructuredDocumentRegion newStructuredDocumentRegion = new StructuredDocumentRegionProxy(newOffset, newLength, oldStructuredDocumentRegion);
-				text.setStructuredDocumentRegion(newStructuredDocumentRegion);
-
-				if (oldEnd > newEnd) {
-					this.nextNode = (NodeImpl) text.getNextSibling();
-					changeStructuredDocumentRegion(oldStructuredDocumentRegion);
-				}
-				return;
-			}
-
-			if (flatNode instanceof StructuredDocumentRegionProxy) {
-				StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) flatNode;
-				int offset = proxy.getOffset();
-				int end = offset + proxy.getLength();
-				if (proxy.getStructuredDocumentRegion() == null) {
-					if (offset == oldOffset && end == oldEnd) {
-						text.setStructuredDocumentRegion(oldStructuredDocumentRegion);
-					}
-					else {
-						if (end > oldEnd) {
-							StructuredDocumentRegionContainer container = new StructuredDocumentRegionContainer();
-							container.appendStructuredDocumentRegion(oldStructuredDocumentRegion);
-							proxy.setOffset(oldEnd);
-							proxy.setLength(end - oldEnd);
-							container.appendStructuredDocumentRegion(proxy);
-							text.setStructuredDocumentRegion(container);
-						}
-						else {
-							proxy.setStructuredDocumentRegion(oldStructuredDocumentRegion);
-
-							if (end < oldEnd) { // to be shared
-								this.nextNode = (NodeImpl) text.getNextSibling();
-								changeStructuredDocumentRegion(oldStructuredDocumentRegion);
-							}
-						}
-					}
-					return;
-				}
-
-				if (offset >= this.gapOffset) {
-					proxy.setOffset(offset + this.diff);
-					end += this.diff;
-				}
-				if (end < oldEnd) { // to be shared
-					this.nextNode = (NodeImpl) text.getNextSibling();
-					changeStructuredDocumentRegion(oldStructuredDocumentRegion);
-					return;
-				}
-			}
-			else if (flatNode instanceof StructuredDocumentRegionContainer) {
-				StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) flatNode;
-				int count = container.getStructuredDocumentRegionCount();
-				for (int i = 0; i < count; i++) {
-					IStructuredDocumentRegion content = container.getStructuredDocumentRegion(i);
-					if (content == null)
-						continue; // error
-					if (content == oldStructuredDocumentRegion) {
-						int newOffset = oldOffset;
-						int newEnd = oldEnd;
-						if (oldOffset == this.gapOffset) {
-							newOffset += this.diff;
-						}
-						else {
-							newEnd = this.gapOffset;
-						}
-						int newLength = newEnd - newOffset;
-						IStructuredDocumentRegion newStructuredDocumentRegion = new StructuredDocumentRegionProxy(newOffset, newLength, oldStructuredDocumentRegion);
-						container.replaceStructuredDocumentRegion(newStructuredDocumentRegion, i);
-
-						if (oldEnd > newEnd) { // to be shared
-							this.nextNode = (NodeImpl) text.getNextSibling();
-							changeStructuredDocumentRegion(oldStructuredDocumentRegion);
-						}
-						return;
-					}
-
-					if (content instanceof StructuredDocumentRegionProxy) {
-						StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) content;
-						int offset = proxy.getOffset();
-						int end = offset + proxy.getLength();
-						if (end <= oldOffset)
-							continue;
-						if (proxy.getStructuredDocumentRegion() == null) {
-							if (offset == oldOffset && end == oldEnd) {
-								container.replaceStructuredDocumentRegion(oldStructuredDocumentRegion, i);
-							}
-							else {
-								if (end > oldEnd) {
-									container.insertStructuredDocumentRegion(oldStructuredDocumentRegion, i);
-									proxy.setOffset(oldEnd);
-									proxy.setLength(end - oldEnd);
-								}
-								else {
-									proxy.setStructuredDocumentRegion(oldStructuredDocumentRegion);
-
-									if (end < oldEnd) { // to be shared
-										this.nextNode = (NodeImpl) text.getNextSibling();
-										changeStructuredDocumentRegion(oldStructuredDocumentRegion);
-									}
-								}
-							}
-							return;
-						}
-
-						if (offset >= this.gapOffset) {
-							proxy.setOffset(offset + this.diff);
-							end += this.diff;
-						}
-						if (end < oldEnd) { // to be shared
-							this.nextNode = (NodeImpl) text.getNextSibling();
-							changeStructuredDocumentRegion(oldStructuredDocumentRegion);
-							return;
-						}
-					}
-				}
-			}
-			else {
-				throw new StructuredDocumentRegionManagementException();
-			}
-		}
-		else {
-			ownerNode.setStructuredDocumentRegion(oldStructuredDocumentRegion);
-		}
-	}
-
-	/**
-	 */
-	private void changeTextData(Text text) {
-		if (text == null)
-			return;
-
-		String source = this.generator.generateSource(text);
-		if (source == null)
-			source = new String();
-		int length = source.length();
-
-		TextImpl impl = (TextImpl) text;
-		int start = impl.getStartOffset();
-		int end = impl.getEndOffset();
-		int offset = start;
-
-		// make sure previous tag is closed
-		Node prev = text.getPreviousSibling();
-		if (prev != null) {
-			String preTag = getCloseTag((IDOMNode) prev);
-			if (preTag != null && preTag.length() > 0) {
-				offset += preTag.length();
-				source = preTag + source;
-			}
-		}
-		else {
-			Node parent = text.getParentNode();
-			if (parent != null && parent.getNodeType() == Node.ELEMENT_NODE) {
-				ElementImpl element = (ElementImpl) parent;
-				String preTag = getStartCloseTag(element);
-				if (preTag != null && preTag.length() > 0) {
-					offset += preTag.length();
-					StringBuffer buffer = new StringBuffer();
-					buffer.append(preTag);
-					buffer.append(source);
-					if (text.getNextSibling() == null && !element.hasEndTag() && (element.isJSPContainer() || element.isCDATAContainer())) {
-						// need to generate the end tag
-						String postTag = this.generator.generateEndTag(element);
-						if (postTag != null) {
-							int postLength = postTag.length();
-							if (postLength > 0) {
-								buffer.append(postTag);
-								int postOffset = offset + length;
-								IStructuredDocumentRegion flatNode = new StructuredDocumentRegionProxy(postOffset, postLength);
-								element.setEndStructuredDocumentRegion(flatNode);
-							}
-						}
-					}
-					source = buffer.toString();
-				}
-			}
-		}
-
-		this.gapStructuredDocumentRegion = impl.getStructuredDocumentRegion();
-		IStructuredDocumentRegion newStructuredDocumentRegion = null;
-		if (length > 0)
-			newStructuredDocumentRegion = new StructuredDocumentRegionProxy(offset, length);
-		impl.setStructuredDocumentRegion(newStructuredDocumentRegion);
-
-		replaceSource(source, start, end);
-	}
-
-	/**
-	 * changeValue method
-	 * 
-	 * @param node
-	 *            org.w3c.dom.Node
-	 */
-	void changeValue(Node node) {
-		if (node == null)
-			return;
-		if (getStructuredDocument() == null)
-			return;
-
-		short nodeType = node.getNodeType();
-		if (nodeType == Node.TEXT_NODE) {
-			changeTextData((Text) node);
-			return;
-		}
-		if (nodeType == Node.ATTRIBUTE_NODE) {
-			changeAttrValue((Attr) node);
-			return;
-		}
-		if (nodeType == Node.ELEMENT_NODE) {
-			changeStartTag((Element) node);
-			return;
-		}
-
-		String source = this.generator.generateSource(node);
-		if (source == null)
-			source = new String();
-		int length = source.length();
-
-		NodeImpl impl = (NodeImpl) node;
-		int start = impl.getStartOffset();
-		int end = impl.getEndOffset();
-
-		this.gapStructuredDocumentRegion = impl.getStructuredDocumentRegion();
-		IStructuredDocumentRegion flatNode = null;
-		if (length > 0)
-			flatNode = new StructuredDocumentRegionProxy(start, length);
-		impl.setStructuredDocumentRegion(flatNode);
-
-		replaceSource(source, start, end);
-	}
-
-	/**
-	 */
-	private String getAttrValueClose(IDOMElement element) {
-		if (element == null)
-			return null;
-
-		IStructuredDocumentRegion flatNode = element.getStartStructuredDocumentRegion();
-		if (flatNode == null)
-			return null;
-		ITextRegion region = StructuredDocumentRegionUtil.getLastRegion(flatNode);
-		if (region == null || region.getType() != DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)
-			return null;
-		String value = flatNode.getText(region);
-		if (value == null)
-			return null;
-		int length = value.length();
-		if (length == 0)
-			return null;
-
-		// check open JSP tag
-		boolean closeJSPTag = false;
-		int offset = value.indexOf(JSPTag.TAG_OPEN);
-		while (offset >= 0) {
-			offset = value.indexOf(JSPTag.TAG_CLOSE, offset + 2);
-			if (offset < 0) {
-				closeJSPTag = true;
-				break;
-			}
-			offset = value.indexOf(JSPTag.TAG_OPEN, offset + 2);
-		}
-
-		// check quote
-		boolean closeQuote = false;
-		char firstChar = value.charAt(0);
-		if (firstChar == '"' || firstChar == '\'') {
-			if (closeJSPTag || length == 1 || value.charAt(length - 1) != firstChar) {
-				closeQuote = true;
-			}
-		}
-
-		if (!closeJSPTag && !closeQuote)
-			return null;
-
-		StringBuffer buffer = new StringBuffer();
-		if (closeJSPTag)
-			buffer.append(JSPTag.TAG_CLOSE);
-		if (closeQuote)
-			buffer.append(firstChar);
-		return buffer.toString();
-	}
-
-	/**
-	 * Gather close tags recursively.
-	 */
-	private String getCloseTag(IDOMNode node) {
-		if (node == null || node.isClosed())
-			return null;
-
-		if (node.getNodeType() != Node.ELEMENT_NODE) {
-			return this.generator.generateCloseTag(node);
-		}
-
-		ElementImpl element = (ElementImpl) node;
-		if (element.hasEndTag()) {
-			// end tag is not closed
-			return this.generator.generateCloseTag(element);
-		}
-
-		// no end tag
-		int offset = element.getEndOffset();
-		StringBuffer buffer = new StringBuffer();
-
-		IDOMNode lastChild = (IDOMNode) element.getLastChild();
-		if (lastChild == null) {
-			if (!element.isStartTagClosed()) {
-				if (element.preferEmptyTag())
-					element.setEmptyTag(true);
-				String closeTag = getStartCloseTag(element);
-				if (closeTag != null) {
-					int length = closeTag.length();
-					if (length > 0) {
-						buffer.append(closeTag);
-						offset += length;
-					}
-				}
-			}
-		}
-		else {
-			String closeTag = getCloseTag(lastChild);
-			if (closeTag != null) {
-				int length = closeTag.length();
-				if (length > 0) {
-					buffer.append(closeTag);
-					offset += length;
-				}
-			}
-		}
-
-		String endTag = this.generator.generateEndTag(element);
-		if (endTag != null) {
-			int length = endTag.length();
-			if (length > 0) {
-				buffer.append(endTag);
-				IStructuredDocumentRegion flatNode = new StructuredDocumentRegionProxy(offset, length);
-				element.setEndStructuredDocumentRegion(flatNode);
-			}
-		}
-
-		return buffer.toString();
-	}
-
-	/**
-	 */
-	private String getStartCloseTag(IDOMElement element) {
-		if (element == null || element.isStartTagClosed())
-			return null;
-
-		StringBuffer buffer = new StringBuffer();
-		String attrValueClose = getAttrValueClose(element);
-		if (attrValueClose != null)
-			buffer.append(attrValueClose);
-		String closeTag = this.generator.generateCloseTag(element);
-		if (closeTag != null)
-			buffer.append(closeTag);
-		return buffer.toString();
-	}
-
-	private IStructuredDocument getStructuredDocument() {
-		if (model == null)
-			return null;
-		return model.getStructuredDocument();
-	}
-
-	/**
-	 */
-	void initialize() {
-		this.gapStructuredDocumentRegion = null;
-		this.gapOffset = 0;
-		this.gapLength = 0;
-		this.diff = 0;
-		this.parentNode = null;
-		this.nextNode = null;
-	}
-
-	private void insertGapStructuredDocumentRegionAfter(int endOffset) {
-		if (this.gapStructuredDocumentRegion == null)
-			return;
-
-		if (this.gapStructuredDocumentRegion instanceof StructuredDocumentRegionProxy) {
-			StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) this.gapStructuredDocumentRegion;
-			IStructuredDocumentRegion flatNode = proxy.getStructuredDocumentRegion();
-			if (flatNode != null)
-				insertStructuredDocumentRegion(flatNode);
-		}
-		else if (this.gapStructuredDocumentRegion instanceof StructuredDocumentRegionContainer) {
-			StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) this.gapStructuredDocumentRegion;
-			int count = container.getStructuredDocumentRegionCount();
-			for (int i = 0; i < count; i++) {
-				IStructuredDocumentRegion content = container.getStructuredDocumentRegion(i);
-				if (content == null)
-					continue;
-				if (content.getStart() < endOffset)
-					continue;
-				if (content instanceof StructuredDocumentRegionProxy) {
-					StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) content;
-					IStructuredDocumentRegion flatNode = proxy.getStructuredDocumentRegion();
-					if (flatNode != null)
-						insertStructuredDocumentRegion(flatNode);
-				}
-				else {
-					insertStructuredDocumentRegion(content);
-				}
-			}
-		}
-		else {
-			insertStructuredDocumentRegion(this.gapStructuredDocumentRegion);
-		}
-	}
-
-	private void insertGapStructuredDocumentRegionBefore(int startOffset) {
-		if (this.gapStructuredDocumentRegion == null)
-			return;
-
-		if (this.gapStructuredDocumentRegion instanceof StructuredDocumentRegionProxy) {
-			StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) this.gapStructuredDocumentRegion;
-			IStructuredDocumentRegion flatNode = proxy.getStructuredDocumentRegion();
-			if (flatNode != null)
-				insertStructuredDocumentRegion(flatNode);
-		}
-		else if (this.gapStructuredDocumentRegion instanceof StructuredDocumentRegionContainer) {
-			StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) this.gapStructuredDocumentRegion;
-			int count = container.getStructuredDocumentRegionCount();
-			for (int i = 0; i < count; i++) {
-				IStructuredDocumentRegion content = container.getStructuredDocumentRegion(i);
-				if (content == null)
-					continue;
-				if (content.getStart() >= startOffset)
-					return;
-				if (content instanceof StructuredDocumentRegionProxy) {
-					StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) content;
-					IStructuredDocumentRegion flatNode = proxy.getStructuredDocumentRegion();
-					if (flatNode != null)
-						insertStructuredDocumentRegion(flatNode);
-				}
-				else {
-					insertStructuredDocumentRegion(content);
-				}
-			}
-		}
-		else {
-			insertStructuredDocumentRegion(this.gapStructuredDocumentRegion);
-		}
-	}
-
-	/**
-	 */
-	private void insertStructuredDocumentRegion(IStructuredDocumentRegion newStructuredDocumentRegion) {
-		if (newStructuredDocumentRegion == null)
-			return; // error
-		if (this.parentNode == null)
-			return; // error
-
-		int newOffset = newStructuredDocumentRegion.getStart();
-		int newEnd = newStructuredDocumentRegion.getEnd();
-		boolean isEndTag = false;
-
-		// find owner node
-		NodeImpl ownerNode = null;
-		while (this.parentNode != null) {
-			if (this.nextNode != null) {
-				IStructuredDocumentRegion nextStructuredDocumentRegion = this.nextNode.getStructuredDocumentRegion();
-				if (nextStructuredDocumentRegion != null) {
-					int nextOffset = nextStructuredDocumentRegion.getStart();
-					if (nextOffset == newOffset) { // found
-						ownerNode = this.nextNode;
-						break;
-					}
-					if (this.nextNode.getNodeType() == Node.TEXT_NODE) {
-						int nextEnd = nextStructuredDocumentRegion.getEnd();
-						if (nextOffset < newEnd && nextEnd > newOffset) {
-							ownerNode = this.nextNode;
-							break;
-						}
-					}
-				}
-
-				Node child = this.nextNode.getFirstChild();
-				if (child != null) {
-					this.parentNode = this.nextNode;
-					this.nextNode = (NodeImpl) child;
-					continue;
-				}
-
-				if (this.nextNode.getNodeType() == Node.ELEMENT_NODE) {
-					this.parentNode = this.nextNode;
-					this.nextNode = null;
-					continue;
-				}
-
-				this.nextNode = (NodeImpl) this.nextNode.getNextSibling();
-				if (this.nextNode != null)
-					continue;
-			}
-
-			if (this.parentNode.getNodeType() == Node.ELEMENT_NODE) {
-				ElementImpl element = (ElementImpl) this.parentNode;
-				IStructuredDocumentRegion endStructuredDocumentRegion = element.getEndStructuredDocumentRegion();
-				if (endStructuredDocumentRegion != null) {
-					int endOffset = endStructuredDocumentRegion.getStart();
-					if (endOffset == newOffset) { // found
-						ownerNode = this.parentNode;
-						isEndTag = true;
-						break;
-					}
-				}
-			}
-
-			this.nextNode = (NodeImpl) this.parentNode.getNextSibling();
-			this.parentNode = (NodeImpl) this.parentNode.getParentNode();
-		}
-		if (ownerNode == null)
-			throw new StructuredDocumentRegionManagementException();
-
-		short nodeType = ownerNode.getNodeType();
-		if (nodeType == Node.ELEMENT_NODE) {
-			ElementImpl element = (ElementImpl) ownerNode;
-			if (isEndTag) {
-				element.setEndStructuredDocumentRegion(newStructuredDocumentRegion);
-			}
-			else {
-				element.setStartStructuredDocumentRegion(newStructuredDocumentRegion);
-				updateAttrRegions(element, newStructuredDocumentRegion);
-			}
-		}
-		else if (nodeType == Node.TEXT_NODE) {
-			TextImpl text = (TextImpl) ownerNode;
-			IStructuredDocumentRegion oldStructuredDocumentRegion = text.getStructuredDocumentRegion();
-			if (oldStructuredDocumentRegion == null) {
-				throw new StructuredDocumentRegionManagementException();
-			}
-			int oldOffset = oldStructuredDocumentRegion.getStart();
-			int oldEnd = oldStructuredDocumentRegion.getEnd();
-			if (oldOffset == newOffset && oldEnd == newEnd) {
-				text.setStructuredDocumentRegion(newStructuredDocumentRegion);
-				return;
-			}
-
-			if (oldStructuredDocumentRegion instanceof StructuredDocumentRegionProxy) {
-				StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) oldStructuredDocumentRegion;
-				if (oldEnd > newEnd) {
-					StructuredDocumentRegionContainer container = new StructuredDocumentRegionContainer();
-					if (oldOffset == newOffset) {
-						container.appendStructuredDocumentRegion(newStructuredDocumentRegion);
-					}
-					else {
-						StructuredDocumentRegionProxy newProxy = new StructuredDocumentRegionProxy();
-						newProxy.setOffset(oldOffset);
-						newProxy.setLength(newEnd - oldOffset);
-						newProxy.setStructuredDocumentRegion(newStructuredDocumentRegion);
-						container.appendStructuredDocumentRegion(newProxy);
-					}
-					proxy.setOffset(newEnd);
-					proxy.setLength(oldEnd - newEnd);
-					container.appendStructuredDocumentRegion(proxy);
-					text.setStructuredDocumentRegion(container);
-				}
-				else {
-					proxy.setStructuredDocumentRegion(newStructuredDocumentRegion);
-
-					if (oldEnd < newEnd) { // to be shared
-						this.nextNode = (NodeImpl) text.getNextSibling();
-						insertStructuredDocumentRegion(newStructuredDocumentRegion);
-					}
-				}
-				return;
-			}
-
-			if (oldStructuredDocumentRegion instanceof StructuredDocumentRegionContainer) {
-				StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) oldStructuredDocumentRegion;
-				int count = container.getStructuredDocumentRegionCount();
-				for (int i = 0; i < count; i++) {
-					IStructuredDocumentRegion content = container.getStructuredDocumentRegion(i);
-					if (content == null)
-						continue; // error
-					int offset = content.getStart();
-					int end = content.getEnd();
-					if (end <= newOffset)
-						continue;
-					if (offset == newOffset && end == newEnd) {
-						container.replaceStructuredDocumentRegion(newStructuredDocumentRegion, i);
-						return;
-					}
-
-					if (content instanceof StructuredDocumentRegionProxy) {
-						StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) content;
-						if (end > newEnd) {
-							if (offset == newOffset) {
-								container.insertStructuredDocumentRegion(newStructuredDocumentRegion, i);
-							}
-							else {
-								StructuredDocumentRegionProxy newProxy = new StructuredDocumentRegionProxy();
-								newProxy.setOffset(offset);
-								newProxy.setLength(newEnd - offset);
-								newProxy.setStructuredDocumentRegion(newStructuredDocumentRegion);
-								container.insertStructuredDocumentRegion(newProxy, i);
-							}
-							proxy.setOffset(newEnd);
-							proxy.setLength(end - newEnd);
-							return;
-						}
-						else {
-							proxy.setStructuredDocumentRegion(newStructuredDocumentRegion);
-							if (end == newEnd)
-								return;
-						}
-					}
-				}
-
-				if (oldEnd < newEnd) { // to be shared
-					this.nextNode = (NodeImpl) text.getNextSibling();
-					insertStructuredDocumentRegion(newStructuredDocumentRegion);
-				}
-				return;
-			}
-			else {
-				throw new StructuredDocumentRegionManagementException();
-			}
-		}
-		else {
-			ownerNode.setStructuredDocumentRegion(newStructuredDocumentRegion);
-		}
-	}
-
-	private void removeGapStructuredDocumentRegion(IStructuredDocumentRegion oldStructuredDocumentRegion) {
-		if (this.gapStructuredDocumentRegion == null)
-			return;
-
-		if (this.gapStructuredDocumentRegion == oldStructuredDocumentRegion) {
-			this.gapStructuredDocumentRegion = null;
-			return;
-		}
-
-		if (this.gapStructuredDocumentRegion instanceof StructuredDocumentRegionProxy) {
-			StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) this.gapStructuredDocumentRegion;
-			IStructuredDocumentRegion flatNode = proxy.getStructuredDocumentRegion();
-			if (flatNode == oldStructuredDocumentRegion)
-				this.gapStructuredDocumentRegion = null;
-		}
-		else if (this.gapStructuredDocumentRegion instanceof StructuredDocumentRegionContainer) {
-			StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) this.gapStructuredDocumentRegion;
-			int count = container.getStructuredDocumentRegionCount();
-			for (int i = 0; i < count; i++) {
-				IStructuredDocumentRegion content = container.getStructuredDocumentRegion(i);
-				if (content == null)
-					continue;
-				if (content == oldStructuredDocumentRegion) {
-					if (count > 1)
-						container.removeStructuredDocumentRegion(i);
-					else
-						this.gapStructuredDocumentRegion = null;
-					return;
-				}
-				if (content instanceof StructuredDocumentRegionProxy) {
-					StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) content;
-					if (proxy.getStructuredDocumentRegion() == oldStructuredDocumentRegion) {
-						if (count > 1)
-							container.removeStructuredDocumentRegion(i);
-						else
-							this.gapStructuredDocumentRegion = null;
-						return;
-					}
-				}
-			}
-		}
-	}
-
-	private void removeStructuredDocumentRegion(IStructuredDocumentRegion oldStructuredDocumentRegion) {
-		if (oldStructuredDocumentRegion == null)
-			return; // error
-		if (this.parentNode == null)
-			return; // error
-
-		int gapEnd = this.gapOffset + this.gapLength;
-		int oldOffset = oldStructuredDocumentRegion.getStart();
-		int oldEnd = oldStructuredDocumentRegion.getEnd();
-		if (oldOffset >= this.gapOffset && oldEnd <= gapEnd)
-			return; // do nothing
-		int oldLength = oldEnd - oldOffset;
-		if (oldOffset >= gapEnd)
-			oldOffset += this.diff;
-
-		// find owner node
-		NodeImpl ownerNode = null;
-		ElementImpl ownerEndTag = null;
-		TextImpl ownerText = null;
-		while (this.parentNode != null) {
-			if (this.nextNode != null) {
-				if (this.nextNode.getStructuredDocumentRegion() == oldStructuredDocumentRegion) {
-					ownerNode = this.nextNode;
-					break;
-				}
-				if (this.nextNode.getNodeType() == Node.TEXT_NODE) {
-					TextImpl text = (TextImpl) this.nextNode;
-					if (text.hasStructuredDocumentRegion(oldStructuredDocumentRegion)) {
-						ownerNode = this.nextNode;
-						ownerText = text;
-						break;
-					}
-				}
-
-				Node child = this.nextNode.getFirstChild();
-				if (child != null) {
-					this.parentNode = this.nextNode;
-					this.nextNode = (NodeImpl) child;
-					continue;
-				}
-
-				if (this.nextNode.getNodeType() == Node.ELEMENT_NODE) {
-					this.parentNode = this.nextNode;
-					this.nextNode = null;
-					continue;
-				}
-
-				this.nextNode = (NodeImpl) this.nextNode.getNextSibling();
-				if (this.nextNode != null)
-					continue;
-			}
-
-			if (this.parentNode.getNodeType() == Node.ELEMENT_NODE) {
-				ElementImpl element = (ElementImpl) this.parentNode;
-				if (element.getEndStructuredDocumentRegion() == oldStructuredDocumentRegion) {
-					ownerNode = this.parentNode;
-					ownerEndTag = element;
-					break;
-				}
-			}
-
-			this.nextNode = (NodeImpl) this.parentNode.getNextSibling();
-			this.parentNode = (NodeImpl) this.parentNode.getParentNode();
-		}
-		if (ownerNode == null)
-			throw new StructuredDocumentRegionManagementException();
-
-		if (ownerText != null) {
-			IStructuredDocumentRegion flatNode = ownerText.getStructuredDocumentRegion();
-			if (flatNode == oldStructuredDocumentRegion) {
-				IStructuredDocumentRegion newStructuredDocumentRegion = new StructuredDocumentRegionProxy(oldOffset, oldLength);
-				ownerText.setStructuredDocumentRegion(newStructuredDocumentRegion);
-				return;
-			}
-
-			if (flatNode instanceof StructuredDocumentRegionProxy) {
-				StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) flatNode;
-				if (proxy.getStructuredDocumentRegion() != oldStructuredDocumentRegion) {
-					throw new StructuredDocumentRegionManagementException();
-				}
-				int offset = proxy.getOffset();
-				int end = offset + proxy.getLength();
-				if (offset >= this.gapOffset) {
-					proxy.setOffset(offset + this.diff);
-				}
-				proxy.setStructuredDocumentRegion(null);
-				if (end < oldEnd && (end < this.gapOffset || oldEnd > gapEnd)) { // has
-					// shared
-					removeStructuredDocumentRegion(oldStructuredDocumentRegion);
-					return;
-				}
-			}
-			else if (flatNode instanceof StructuredDocumentRegionContainer) {
-				StructuredDocumentRegionContainer container = (StructuredDocumentRegionContainer) flatNode;
-				int count = container.getStructuredDocumentRegionCount();
-				for (int i = 0; i < count; i++) {
-					IStructuredDocumentRegion content = container.getStructuredDocumentRegion(i);
-					if (content == null)
-						continue; // error
-					if (content == oldStructuredDocumentRegion) {
-						IStructuredDocumentRegion newStructuredDocumentRegion = new StructuredDocumentRegionProxy(oldOffset, oldLength);
-						container.replaceStructuredDocumentRegion(newStructuredDocumentRegion, i);
-						return;
-					}
-
-					if (content instanceof StructuredDocumentRegionProxy) {
-						StructuredDocumentRegionProxy proxy = (StructuredDocumentRegionProxy) content;
-						if (proxy.getStructuredDocumentRegion() == oldStructuredDocumentRegion) {
-							int offset = proxy.getOffset();
-							int end = offset + proxy.getLength();
-							if (offset >= this.gapOffset) {
-								proxy.setOffset(offset + this.diff);
-							}
-							proxy.setStructuredDocumentRegion(null);
-							if (end < oldEnd && (end < this.gapOffset || oldEnd > gapEnd)) { // has
-								// shared
-								removeStructuredDocumentRegion(oldStructuredDocumentRegion);
-								return;
-							}
-						}
-					}
-				}
-			}
-			else {
-				throw new StructuredDocumentRegionManagementException();
-			}
-		}
-		else {
-			IStructuredDocumentRegion newStructuredDocumentRegion = new StructuredDocumentRegionProxy(oldOffset, oldLength);
-			if (ownerEndTag != null) {
-				ownerEndTag.setEndStructuredDocumentRegion(newStructuredDocumentRegion);
-			}
-			else {
-				ownerNode.setStructuredDocumentRegion(newStructuredDocumentRegion);
-			}
-		}
-	}
-
-	/**
-	 * replaceAttr method
-	 * 
-	 * @param ownerElement
-	 *            org.w3c.dom.Element
-	 * @param newAttr
-	 *            org.w3c.dom.Attr
-	 * @param oldAttr
-	 *            org.w3c.dom.Attr
-	 */
-	void replaceAttr(Element ownerElement, Attr newAttr, Attr oldAttr) {
-		if (ownerElement == null)
-			return;
-		if (getStructuredDocument() == null)
-			return;
-
-		ElementImpl element = (ElementImpl) ownerElement;
-		if (!element.hasStartTag()) {
-			changeStartTag(element);
-			return;
-		}
-		if (element.isCommentTag()) {
-			changeStartTag(element);
-			return;
-		}
-
-		int offset = element.getStartOffset();
-		int start = offset;
-		int end = offset;
-
-		boolean insertSpace = false;
-		String attrValueClose = null;
-		if (oldAttr != null) {
-			AttrImpl impl = (AttrImpl) oldAttr;
-			ITextRegion nameRegion = impl.getNameRegion();
-			if (nameRegion == null)
-				return; // must never happen
-			ITextRegion lastRegion = impl.getValueRegion();
-			if (lastRegion != null) {
-				end += lastRegion.getEnd();
-			}
-			else {
-				lastRegion = impl.getEqualRegion();
-				if (lastRegion != null) {
-					end += lastRegion.getEnd();
-				}
-				else {
-					end += nameRegion.getEnd();
-					lastRegion = nameRegion;
-				}
-			}
-			// check there are extra space before the last attribute
-			IStructuredDocumentRegion flatNode = element.getStartStructuredDocumentRegion();
-			if (flatNode == null)
-				return; // must never happen
-			ITextRegionList regions = flatNode.getRegions();
-			if (regions == null)
-				return; // must never happen
-			ITextRegion prevRegion = null;
-			ITextRegion nextRegion = null;
-			for (int i = 0; i < regions.size(); i++) {
-				ITextRegion region = regions.get(i);
-				if (region == nameRegion) {
-					if (i > 0) {
-						prevRegion = regions.get(i - 1);
-					}
-				}
-				if (region == lastRegion) {
-					if (i + 1 < regions.size()) {
-						nextRegion = regions.get(i + 1);
-					}
-					break;
-				}
-			}
-			boolean isLastAttr = false;
-			if (nextRegion != null) {
-				String regionType = nextRegion.getType();
-				if (regionType == DOMRegionContext.XML_TAG_CLOSE || regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE || isNestedTagClose(regionType)) {
-					isLastAttr = true;
-				}
-			}
-			if (isLastAttr && prevRegion != null) {
-				start += prevRegion.getTextEnd();
-			}
-			else {
-				start += nameRegion.getStart();
-			}
-
-			// impl.resetRegions(ownerElement);
-			impl.resetRegions(element);
-		}
-		else { // append attribute
-			IStructuredDocumentRegion flatNode = element.getStartStructuredDocumentRegion();
-			if (flatNode == null)
-				return; // must never happen
-
-			attrValueClose = getAttrValueClose(element);
-			if (attrValueClose != null && attrValueClose.length() > 0) {
-				insertSpace = true;
-				start = flatNode.getEndOffset();
-				end = start;
-			}
-			else {
-				ITextRegionList regions = flatNode.getRegions();
-				if (regions == null)
-					return; // must never happen
-				int attrStart = 0;
-				for (int i = regions.size() - 1; i >= 0; i--) {
-					ITextRegion region = regions.get(i);
-					String regionType = region.getType();
-					if (regionType == DOMRegionContext.XML_TAG_CLOSE || regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE || isNestedTagClose(regionType))
-						continue;
-					int regionEnd = region.getEnd();
-					if (regionEnd == region.getTextEnd())
-						insertSpace = true;
-					attrStart = regionEnd;
-					break;
-				}
-				if (attrStart == 0)
-					return; // not found, must never happen
-				start += attrStart;
-				end = start;
-			}
-		}
-
-		String source = null;
-		if (newAttr != null) {
-			int size = 2;
-			if (attrValueClose != null)
-				size += attrValueClose.length();
-			String name = this.generator.generateAttrName(newAttr);
-			if (name != null)
-				size += name.length();
-			String value = this.generator.generateAttrValue(newAttr);
-			if (value != null)
-				size += value.length();
-			StringBuffer buffer = new StringBuffer(size);
-			if (attrValueClose != null)
-				buffer.append(attrValueClose);
-			if (insertSpace)
-				buffer.append(' ');
-			buffer.append(name);
-			if (value != null) {
-				buffer.append('=');
-				buffer.append(value);
-			}
-			source = buffer.toString();
-		}
-
-		replaceSource(source, start, end);
-	}
-
-	protected boolean isNestedTagClose(String regionType) {
-		boolean result = false;
-		return result;
-	}
-
-	/**
-	 * replaceChild method
-	 * 
-	 * @param parentNode
-	 *            org.w3c.dom.Node
-	 * @param newChild
-	 *            org.w3c.dom.Node
-	 * @param oldChild
-	 *            org.w3c.dom.Node
-	 */
-	void replaceChild(Node parentNode, Node newChild, Node oldChild) {
-		if (parentNode == null)
-			return;
-		if (newChild == null && oldChild == null)
-			return;
-		if (getStructuredDocument() == null)
-			return;
-
-		int start = 0;
-		int end = 0;
-		String preTag = null;
-		String postTag = null;
-		ElementImpl postElement = null;
-		if (oldChild != null) {
-			NodeImpl node = (NodeImpl) oldChild;
-			start = node.getStartOffset();
-			end = node.getEndOffset();
-			if (oldChild.getNodeType() == Node.TEXT_NODE) {
-				this.gapStructuredDocumentRegion = node.getStructuredDocumentRegion();
-			}
-			node.resetStructuredDocumentRegions(); // reset values from
-			// IStructuredDocumentRegion
-		}
-		else {
-			NodeImpl prev = (NodeImpl) newChild.getPreviousSibling();
-			if (prev != null) {
-				start = prev.getEndOffset();
-				end = start;
-				preTag = getCloseTag(prev);
-			}
-			else {
-				// first child
-				NodeImpl next = (NodeImpl) newChild.getNextSibling();
-				if (next != null) {
-					start = next.getStartOffset();
-					end = start;
-					if (parentNode.getNodeType() == Node.ELEMENT_NODE) {
-						preTag = getStartCloseTag((IDOMElement) parentNode);
-					}
-				}
-				else {
-					// newly having a child
-					if (parentNode.getNodeType() == Node.ELEMENT_NODE) {
-						ElementImpl element = (ElementImpl) parentNode;
-						if (element.isEmptyTag()) { // empty tag format
-							// need to generate the start and the end tags
-							end = element.getEndOffset();
-							start = end - 2; // for "/>"
-							element.setEmptyTag(false);
-							preTag = this.generator.generateCloseTag(element);
-							postTag = this.generator.generateEndTag(element);
-							postElement = element;
-						}
-						else if (!element.hasStartTag()) {
-							start = element.getStartOffset();
-							end = start;
-							// invalid end tag or implicit tag
-							// need to generate the start tag
-							preTag = this.generator.generateStartTag(element);
-							if (preTag != null) {
-								int length = preTag.length();
-								if (length > 0) {
-									IStructuredDocumentRegion flatNode = new StructuredDocumentRegionProxy(start, length);
-									element.setStartStructuredDocumentRegion(flatNode);
-								}
-							}
-							if (!element.hasEndTag()) {
-								// implicit tag
-								// need to generate the end tags
-								postTag = this.generator.generateEndTag(element);
-								postElement = element;
-							}
-						}
-						else {
-							start = element.getStartEndOffset();
-							end = start;
-							preTag = getStartCloseTag(element);
-							if (preTag != null && preTag.length() > 0) {
-								if (!element.hasEndTag() && (element.isJSPContainer() || element.isCDATAContainer())) {
-									// need to generate the end tag
-									postTag = this.generator.generateEndTag(element);
-									postElement = element;
-								}
-							}
-						}
-					}
-					// else might DOCUMENT_NODE, start and end are 0
-				}
-			}
-		}
-
-		String source = null;
-		if (newChild != null) {
-			StringBuffer buffer = new StringBuffer();
-			int offset = start;
-			if (preTag != null) {
-				int length = preTag.length();
-				if (length > 0) {
-					offset += length;
-					buffer.append(preTag);
-				}
-			}
-
-			NodeImpl node = (NodeImpl) newChild;
-			while (node != null) {
-				if (node.getNodeType() == Node.ELEMENT_NODE) {
-					ElementImpl element = (ElementImpl) node;
-					if (element.preferEmptyTag())
-						element.setEmptyTag(true);
-					IStructuredDocumentRegion flatNode = null;
-					String startTag = this.generator.generateStartTag(element);
-					if (startTag != null) {
-						int length = startTag.length();
-						if (length > 0) {
-							buffer.append(startTag);
-							flatNode = new StructuredDocumentRegionProxy(offset, length);
-							offset += length;
-						}
-					}
-					element.setStartStructuredDocumentRegion(flatNode);
-				}
-				else {
-					String content = this.generator.generateSource(node);
-					if (content == null)
-						content = new String();
-					int length = content.length();
-					IStructuredDocumentRegion flatNode = null;
-					if (length > 0) {
-						buffer.append(content);
-						flatNode = new StructuredDocumentRegionProxy(offset, length);
-						offset += length;
-					}
-					node.setStructuredDocumentRegion(flatNode);
-				}
-
-				NodeImpl child = (NodeImpl) node.getFirstChild();
-				if (child != null) {
-					node = child;
-					continue;
-				}
-
-				if (node.getNodeType() == Node.ELEMENT_NODE) {
-					ElementImpl element = (ElementImpl) node;
-					IStructuredDocumentRegion flatNode = null;
-					String endTag = this.generator.generateEndTag(element);
-					if (endTag != null) {
-						int length = endTag.length();
-						if (length > 0) {
-							buffer.append(endTag);
-							flatNode = new StructuredDocumentRegionProxy(offset, length);
-							offset += length;
-						}
-					}
-					element.setEndStructuredDocumentRegion(flatNode);
-				}
-
-				while (node != null) {
-					if (node == newChild) {
-						node = null;
-						break;
-					}
-					NodeImpl next = (NodeImpl) node.getNextSibling();
-					if (next != null) {
-						node = next;
-						break;
-					}
-
-					node = (NodeImpl) node.getParentNode();
-					if (node.getNodeType() != Node.ELEMENT_NODE)
-						continue;
-					ElementImpl element = (ElementImpl) node;
-					IStructuredDocumentRegion flatNode = null;
-					String endTag = this.generator.generateEndTag(element);
-					if (endTag != null) {
-						int length = endTag.length();
-						if (length > 0) {
-							buffer.append(endTag);
-							flatNode = new StructuredDocumentRegionProxy(offset, length);
-							offset += length;
-						}
-					}
-					element.setEndStructuredDocumentRegion(flatNode);
-				}
-			}
-
-			if (postTag != null) {
-				int length = postTag.length();
-				if (length > 0) {
-					buffer.append(postTag);
-					if (postElement != null) {
-						IStructuredDocumentRegion flatNode = new StructuredDocumentRegionProxy(offset, length);
-						postElement.setEndStructuredDocumentRegion(flatNode);
-					}
-				}
-			}
-			source = buffer.toString();
-		}
-
-		if (start == end && (source == null || source.length() == 0)) {
-			// no thing changed
-			return;
-		}
-
-		replaceSource(source, start, end);
-	}
-
-	void replaceRegions(IStructuredDocumentRegion flatNode, ITextRegionList newRegions, ITextRegionList oldRegions) {
-		// future_TODO: optimize
-
-		NodeImpl root = (NodeImpl) this.model.getDocument();
-		this.parentNode = root;
-		this.nextNode = (NodeImpl) root.getFirstChild();
-
-		removeGapStructuredDocumentRegion(flatNode);
-		insertGapStructuredDocumentRegionBefore(flatNode.getStart());
-		changeStructuredDocumentRegion(flatNode);
-		insertGapStructuredDocumentRegionAfter(flatNode.getEnd());
-	}
-
-	/**
-	 * Wraps IStructuredDocumentRegion.replaceText() and sets contextual
-	 * information.
-	 */
-	private void replaceSource(String source, int start, int end) {
-		int inserted = 0;
-		if (source == null)
-			source = new String();
-		else
-			inserted = source.length();
-		int removed = end - start;
-		if (inserted == 0 && removed == 0)
-			return;
-
-		this.gapOffset = start;
-		this.gapLength = removed;
-		this.diff = inserted - removed;
-		// Note: due to bug
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3619
-		// for now assume "ignore readonly" region is ok -- assume DOM itself
-		// checks if
-		// ok to insert or not. In reality, we may have to make or "contains"
-		// method more
-		// better. Or, we may have to "perculate up" the parameter for clients
-		// to tell us programatically
-		// that its ok to insert/format in a read-only region.
-		getStructuredDocument().replaceText(this.model, this.gapOffset, this.gapLength, source, true);
-	}
-
-	void replaceStructuredDocumentRegions(IStructuredDocumentRegionList newStructuredDocumentRegions, IStructuredDocumentRegionList oldStructuredDocumentRegions) {
-		NodeImpl root = (NodeImpl) this.model.getDocument();
-
-		if (oldStructuredDocumentRegions != null) {
-			this.parentNode = root;
-			this.nextNode = (NodeImpl) root.getFirstChild();
-
-			Enumeration e = oldStructuredDocumentRegions.elements();
-			while (e.hasMoreElements()) {
-				IStructuredDocumentRegion flatNode = (IStructuredDocumentRegion) e.nextElement();
-				if (flatNode == null)
-					continue;
-				removeStructuredDocumentRegion(flatNode);
-				removeGapStructuredDocumentRegion(flatNode);
-			}
-		}
-
-		if (newStructuredDocumentRegions != null) {
-			this.parentNode = root;
-			this.nextNode = (NodeImpl) root.getFirstChild();
-
-			IStructuredDocumentRegion lastStructuredDocumentRegion = null;
-			Enumeration e = newStructuredDocumentRegions.elements();
-			while (e.hasMoreElements()) {
-				IStructuredDocumentRegion flatNode = (IStructuredDocumentRegion) e.nextElement();
-				if (flatNode == null)
-					continue;
-				if (lastStructuredDocumentRegion == null)
-					insertGapStructuredDocumentRegionBefore(flatNode.getStart());
-				insertStructuredDocumentRegion(flatNode);
-				lastStructuredDocumentRegion = flatNode;
-			}
-			if (lastStructuredDocumentRegion != null) {
-				insertGapStructuredDocumentRegionAfter(lastStructuredDocumentRegion.getEnd());
-			}
-			else {
-				insertGapStructuredDocumentRegionBefore(this.gapOffset);
-				// make sure to restore all backuped StructuredDocumentRegions
-				insertGapStructuredDocumentRegionAfter(this.gapOffset);
-			}
-		}
-		else {
-			this.parentNode = root;
-			this.nextNode = (NodeImpl) root.getFirstChild();
-
-			insertGapStructuredDocumentRegionBefore(this.gapOffset);
-			// make sure to restore all backuped StructuredDocumentRegions
-			insertGapStructuredDocumentRegionAfter(this.gapOffset);
-		}
-	}
-
-	/**
-	 */
-	private void updateAttrRegions(Element element, IStructuredDocumentRegion flatNode) {
-
-		// update attributes
-		ITextRegionList regions = flatNode.getRegions();
-		if (regions == null)
-			return;
-		NamedNodeMap attributes = element.getAttributes();
-		if (attributes == null)
-			return;
-		int index = -1;
-		AttrImpl attr = null;
-		Iterator e = regions.iterator();
-		while (e.hasNext()) {
-			ITextRegion region = (ITextRegion) e.next();
-			String regionType = region.getType();
-			if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-				attr = (AttrImpl) attributes.item(++index);
-				if (attr != null) {
-					attr.setNameRegion(region);
-					// reset other regions
-					attr.setEqualRegion(null);
-					attr.setValueRegion(null);
-				}
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) {
-				if (attr != null)
-					attr.setEqualRegion(region);
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-				if (attr != null) {
-					attr.setValueRegion(region);
-					attr = null;
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/encoding/XMLDocumentCharsetDetector.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/encoding/XMLDocumentCharsetDetector.java
deleted file mode 100644
index cf328de..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/encoding/XMLDocumentCharsetDetector.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.encoding;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.sse.core.internal.document.DocumentReader;
-import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLResourceEncodingDetector;
-
-
-/**
- * This class reads and parses first of XML file to get encoding.
- *  
- */
-public class XMLDocumentCharsetDetector extends XMLResourceEncodingDetector implements IDocumentCharsetDetector {
-
-	/**
-	 * XMLLoader constructor comment.
-	 */
-	public XMLDocumentCharsetDetector() {
-		super();
-	}
-
-	public void set(IDocument document) {
-		set(new DocumentReader(document, 0));
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/encoding/XMLDocumentLoader.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/encoding/XMLDocumentLoader.java
deleted file mode 100644
index 2c80b01..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/encoding/XMLDocumentLoader.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.encoding;
-
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.wst.sse.core.internal.document.AbstractDocumentLoader;
-import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
-import org.eclipse.wst.xml.core.internal.parser.XMLStructuredDocumentReParser;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-
-
-/**
- * This class reads an XML file and creates an XML Structured Model.
- * 
- */
-public class XMLDocumentLoader extends AbstractDocumentLoader {
-
-	public XMLDocumentLoader() {
-		super();
-	}
-
-	public IDocumentPartitioner getDefaultDocumentPartitioner() {
-		return new StructuredTextPartitionerForXML();
-	}
-
-	public IDocumentCharsetDetector getDocumentEncodingDetector() {
-		if (fDocumentEncodingDetector == null) {
-			fDocumentEncodingDetector = new XMLDocumentCharsetDetector();
-		}
-		return fDocumentEncodingDetector;
-	}
-
-	public RegionParser getParser() {
-		return new XMLSourceParser();
-	}
-
-	protected String getPreferredNewLineDelimiter() {
-		return ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForXML.ContentTypeID_XML);
-	}
-
-	protected String getSpecDefaultEncoding() {
-		// by default, UTF-8 as per XML spec
-		final String enc = "UTF-8"; //$NON-NLS-1$
-		return enc;
-	}
-
-	protected IEncodedDocument newEncodedDocument() {
-		IStructuredDocument structuredDocument = StructuredDocumentFactory.getNewStructuredDocumentInstance(getParser());
-		if (structuredDocument instanceof BasicStructuredDocument) {
-			((BasicStructuredDocument) structuredDocument).setReParser(new XMLStructuredDocumentReParser());
-		}
-		return structuredDocument;
-	}
-
-	public IDocumentLoader newInstance() {
-		return new XMLDocumentLoader();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/EmbeddedXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/EmbeddedXML.java
deleted file mode 100644
index 823a357..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/EmbeddedXML.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.modelhandler;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
-import org.eclipse.wst.sse.core.internal.ltk.parser.JSPCapableParser;
-import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryAdapterFactoryForEmbeddedXML;
-
-
-public class EmbeddedXML implements EmbeddedTypeHandler {
-
-	private static List supportedMimeTypes;
-	public String ContentTypeID_EmbeddedXML = "org.eclipse.wst.xml.core.contenttype.EmbeddedXML"; //$NON-NLS-1$
-
-	/**
-	 * Constructor for EmbeddedXML.
-	 */
-	public EmbeddedXML() {
-		super();
-	}
-
-	/*
-	 * @see EmbeddedContentType#getAdapterFactories()
-	 */
-	public List getAdapterFactories() {
-		List factories = new ArrayList();
-		factories.add(new ModelQueryAdapterFactoryForEmbeddedXML());
-		// factories.addAll(PluginContributedFactoryReader.getInstance().getFactories(this));
-		return factories;
-	}
-
-	/**
-	 * @see EmbeddedContentType#getFamilyId()
-	 */
-	public String getFamilyId() {
-		return ModelHandlerForXML.AssociatedContentTypeID;
-	}
-
-	public List getSupportedMimeTypes() {
-		if (supportedMimeTypes == null) {
-			supportedMimeTypes = new ArrayList();
-			supportedMimeTypes.add("text/xml"); //$NON-NLS-1$
-		}
-		return supportedMimeTypes;
-	}
-
-	public void initializeFactoryRegistry(FactoryRegistry registry) {
-		//TODO: initialize
-	}
-
-	/*
-	 * @see EmbeddedContentType#initializeParser(RegionParser)
-	 */
-	public void initializeParser(JSPCapableParser parser) {
-		// nothing to initialize for "pure" XML
-		// compare with XHTML
-	}
-
-	public boolean isDefault() {
-		return false;
-	}
-
-	public EmbeddedTypeHandler newInstance() {
-		return new EmbeddedXML();
-	}
-
-	public void uninitializeFactoryRegistry(FactoryRegistry registry) {
-		// TODO: need to undo anything we did in initialize
-
-	}
-
-	public void uninitializeParser(JSPCapableParser parser) {
-		// need to undo anything we did in initialize
-	}
-
-	public boolean canHandleMimeType(String mimeType) {
-		boolean canHandle = getSupportedMimeTypes().contains(mimeType);
-		if(!canHandle) {
-			canHandle = mimeType.endsWith("+xml");
-		}
-		return canHandle;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/ModelHandlerForXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/ModelHandlerForXML.java
deleted file mode 100644
index d777a2a..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/ModelHandlerForXML.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.modelhandler;
-
-import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.AbstractModelHandler;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.provisional.IModelLoader;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentCharsetDetector;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
-
-
-/**
- * Provides generic XML model handling. It is also marked as the default
- * content type handler. There should be only one implementation of the
- * default.
- */
-public class ModelHandlerForXML extends AbstractModelHandler implements IModelHandler {
-	/**
-	 * Needs to match what's in plugin registry. In fact, can be overwritten
-	 * at run time with what's in registry! (so should never be 'final')
-	 */
-	static String AssociatedContentTypeID = "org.eclipse.core.runtime.xml"; //$NON-NLS-1$
-	/**
-	 * Needs to match what's in plugin registry. In fact, can be overwritten
-	 * at run time with what's in registry! (so should never be 'final')
-	 */
-	private static String ModelHandlerID = "org.eclipse.wst.xml.core.modelhandler"; //$NON-NLS-1$
-
-	public ModelHandlerForXML() {
-		super();	
-		setId(ModelHandlerID);
-		setAssociatedContentTypeId(AssociatedContentTypeID);
-	}
-
-	public IDocumentLoader getDocumentLoader() {
-		return new XMLDocumentLoader();
-	}
-
-	public IDocumentCharsetDetector getEncodingDetector() {
-		return new XMLDocumentCharsetDetector();
-	}
-
-	public IModelLoader getModelLoader() {
-		return new XMLModelLoader();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/XMLModelLoader.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/XMLModelLoader.java
deleted file mode 100644
index 9729bb9..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/XMLModelLoader.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.modelhandler;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.sse.core.internal.PropagatingAdapter;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.model.AbstractModelLoader;
-import org.eclipse.wst.sse.core.internal.provisional.IModelLoader;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.xml.core.internal.DebugAdapterFactory;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryAdapterFactoryForXML;
-import org.eclipse.wst.xml.core.internal.propagate.PropagatingAdapterFactoryImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-
-/**
- * This class reads an XML file and creates an XML Structured Model.
- *  
- */
-public class XMLModelLoader extends AbstractModelLoader {
-
-	//	private static final String STR_ENCODING = "encoding"; //$NON-NLS-1$
-
-	/**
-	 * XMLLoader constructor comment.
-	 */
-	public XMLModelLoader() {
-		super();
-	}
-
-	public List getAdapterFactories() {
-		List result = new ArrayList();
-		INodeAdapterFactory factory = null;
-		factory = new ModelQueryAdapterFactoryForXML();
-		result.add(factory);
-		// Does XML need propagating adapter? Or just JSP?
-		factory = new PropagatingAdapterFactoryImpl();
-		result.add(factory);
-		return result;
-	}
-
-	public IDocumentLoader getDocumentLoader() {
-		if (documentLoaderInstance == null) {
-			documentLoaderInstance = new XMLDocumentLoader();
-		}
-		return documentLoaderInstance;
-	}
-
-	public IModelLoader newInstance() {
-		return new XMLModelLoader();
-	}
-
-	public IStructuredModel newModel() {
-		return new DOMModelImpl();
-	}
-
-	protected void preLoadAdapt(IStructuredModel structuredModel) {
-		super.preLoadAdapt(structuredModel);
-		IDOMModel domModel = (IDOMModel) structuredModel;
-		// if there is a model in the adapter, this will adapt it to
-		// first node. After that the PropagatingAdater spreads over the
-		// children being
-		// created. Each time that happends, a side effect is to
-		// also "spread" sprecific registered adapters,
-		// they two can propigate is needed.
-		((INodeNotifier) domModel.getDocument()).getAdapterFor(PropagatingAdapter.class);
-
-		if (Debug.debugNotificationAndEvents) {
-			PropagatingAdapter propagatingAdapter = (PropagatingAdapter) ((INodeNotifier) domModel.getDocument()).getAdapterFor(PropagatingAdapter.class);
-			propagatingAdapter.addAdaptOnCreateFactory(new DebugAdapterFactory());
-		}
-
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryAdapterFactoryForEmbeddedXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryAdapterFactoryForEmbeddedXML.java
deleted file mode 100644
index 4542cdb..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryAdapterFactoryForEmbeddedXML.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.modelquery;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-
-
-public class ModelQueryAdapterFactoryForEmbeddedXML extends ModelQueryAdapterFactoryForXML {
-
-
-	/**
-	 * Constructor for ModelQueryAdapterFactoryForEmbeddedXML.
-	 */
-	public ModelQueryAdapterFactoryForEmbeddedXML() {
-		this(ModelQueryAdapter.class, false);
-	}
-
-	/**
-	 * Constructor for ModelQueryAdapterFactoryForEmbeddedXML.
-	 * 
-	 * @param adapterKey
-	 * @param registerAdapters
-	 */
-	protected ModelQueryAdapterFactoryForEmbeddedXML(Object adapterKey, boolean registerAdapters) {
-		super(adapterKey, registerAdapters);
-	}
-
-	/**
-	 * @see org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory#adapt(INodeNotifier)
-	 */
-	public INodeAdapter adapt(INodeNotifier object) {
-		return adaptNew(object);
-	}
-
-	protected void configureDocumentManager(CMDocumentManager mgr) {
-		super.configureDocumentManager(mgr);
-		mgr.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD, true);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryAdapterFactoryForXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryAdapterFactoryForXML.java
deleted file mode 100644
index 8ab049d..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryAdapterFactoryForXML.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.modelquery;
-
-
-
-import java.io.File;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.IModelStateListener;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapterImpl;
-
-
-public class ModelQueryAdapterFactoryForXML extends AbstractAdapterFactory implements IModelStateListener {
-
-	protected ModelQueryAdapterImpl modelQueryAdapterImpl;
-	protected IStructuredModel stateNotifier = null;
-
-	/**
-	 * ModelQueryAdapterFactoryForXML constructor comment.
-	 */
-	public ModelQueryAdapterFactoryForXML() {
-		this(ModelQueryAdapter.class, true);
-	}
-
-	/**
-	 * ModelQueryAdapterFactoryForXML constructor comment.
-	 * 
-	 * @param adapterKey
-	 *            java.lang.Object
-	 * @param registerAdapters
-	 *            boolean
-	 */
-	public ModelQueryAdapterFactoryForXML(Object adapterKey, boolean registerAdapters) {
-		super(adapterKey, registerAdapters);
-	}
-
-	protected boolean autoLoadCM() {
-		// until the existence of a CMDocumentRequesterFactory to create the
-		// load requests,
-		// return true
-		return true;
-	}
-
-	protected void configureDocumentManager(CMDocumentManager mgr) {
-		// this depends on there being a CMDocumentRequesterFactory installed
-		mgr.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD, autoLoadCM());
-	}
-
-	public INodeAdapterFactory copy() {
-
-		return new ModelQueryAdapterFactoryForXML(this.adapterKey, this.shouldRegisterAdapter);
-	}
-
-	/**
-	 * createAdapter method comment.
-	 */
-	protected INodeAdapter createAdapter(INodeNotifier target) {
-
-		if (org.eclipse.wst.sse.core.internal.util.Debug.displayInfo)
-			System.out.println("-----------------------ModelQueryAdapterFactoryForXML.createAdapter" + target); //$NON-NLS-1$
-		if (modelQueryAdapterImpl == null) {
-			if (target instanceof IDOMNode) {
-				IDOMNode xmlNode = (IDOMNode) target;
-				IStructuredModel model = stateNotifier = xmlNode.getModel();
-				stateNotifier.addModelStateListener(this);
-				String baseLocation = null;
-				String modelBaseLocation = model.getBaseLocation();
-				if (modelBaseLocation != null) {
-					File file = new Path(modelBaseLocation).toFile();
-					if (file.exists()) {
-						baseLocation = file.getAbsolutePath();
-					}
-					else {
-						IPath basePath = new Path(modelBaseLocation);
-						IPath derivedPath = null;
-						if (basePath.segmentCount() > 1)
-							derivedPath = ResourcesPlugin.getWorkspace().getRoot().getFile(basePath).getLocation();
-						else
-							derivedPath = ResourcesPlugin.getWorkspace().getRoot().getLocation().append(basePath);
-						if (derivedPath != null) {
-							baseLocation = derivedPath.toString();
-						}
-					}
-				}
-				if (org.eclipse.wst.sse.core.internal.util.Debug.displayInfo)
-					System.out.println("----------------ModelQueryAdapterFactoryForXML... baseLocation : " + baseLocation); //$NON-NLS-1$
-
-				CMDocumentCache cmDocumentCache = new CMDocumentCache();
-				ModelQuery modelQuery = null;
-				URIResolver idResolver = null;
-
-				if (org.eclipse.wst.sse.core.internal.util.Debug.displayInfo)
-					System.out.println("********XMLModelQueryImpl"); //$NON-NLS-1$
-				idResolver = new XMLCatalogIdResolver(baseLocation, model.getResolver());
-				modelQuery = new XMLModelQueryImpl(cmDocumentCache, idResolver);
-
-				// cs todo...
-				// for now we create a CMDocumentCache on a 'per editor' basis
-				// in the future we need to support a CMDocumentCache that is
-				// shared between editors
-				// nsd comment: may not be appropriate depending on
-				CMDocumentManager documentManager = modelQuery.getCMDocumentManager();
-				if (documentManager != null) {
-					configureDocumentManager(documentManager);
-				}
-				modelQueryAdapterImpl = new ModelQueryAdapterImpl(cmDocumentCache, modelQuery, idResolver);
-			}
-		}
-		return modelQueryAdapterImpl;
-	}
-
-	/**
-	 * @see IModelStateListener#modelAboutToBeChanged(IStructuredModel)
-	 */
-	public void modelAboutToBeChanged(IStructuredModel model) {
-	}
-
-	/**
-	 * @see IModelStateListener#modelChanged(IStructuredModel)
-	 */
-	public void modelChanged(IStructuredModel model) {
-	}
-
-	/**
-	 * @see IModelStateListener#modelDirtyStateChanged(IStructuredModel,
-	 *      boolean)
-	 */
-	public void modelDirtyStateChanged(IStructuredModel model, boolean isDirty) {
-	}
-
-	/**
-	 * @see IModelStateListener#modelResourceDeleted(IStructuredModel)
-	 */
-	public void modelResourceDeleted(IStructuredModel model) {
-	}
-
-	/**
-	 * @see IModelStateListener#modelResourceMoved(IStructuredModel,
-	 *      IStructuredModel)
-	 */
-	public void modelResourceMoved(IStructuredModel oldModel, IStructuredModel newModel) {
-		stateNotifier.removeModelStateListener(this);
-		stateNotifier = newModel;
-		updateResolver(stateNotifier);
-		stateNotifier.addModelStateListener(this);
-	}
-
-	public void release() {
-		super.release();
-		if (stateNotifier != null)
-			stateNotifier.removeModelStateListener(this);
-		stateNotifier = null;
-		if (modelQueryAdapterImpl != null)
-			modelQueryAdapterImpl.release();
-	}
-
-	protected void updateResolver(IStructuredModel model) {
-		String baseLocation = model.getBaseLocation();
-		IFile baseFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(model.getBaseLocation()));
-		if (baseFile != null) {
-			baseLocation = baseFile.getLocation().toString();
-		}
-		modelQueryAdapterImpl.setIdResolver(new XMLCatalogIdResolver(baseLocation, model.getResolver()));
-	}
-
-	public void modelAboutToBeReinitialized(IStructuredModel structuredModel) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public void modelReinitialized(IStructuredModel structuredModel) {
-		updateResolver(structuredModel);
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryUtil.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryUtil.java
deleted file mode 100644
index fd7572f..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryUtil.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.modelquery;
-
-
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.w3c.dom.Document;
-
-
-/**
- * This class is used to associate ModelQuery (and related data) with a
- * Document (or IStructuredModel).
- */
-public class ModelQueryUtil {
-
-	public static CMDocumentCache getCMDocumentCache(Document node) {
-		ModelQueryAdapter modelQueryAdapter = getModelQueryAdapter(node);
-		return modelQueryAdapter != null ? modelQueryAdapter.getCMDocumentCache() : null;
-	}
-
-	public static URIResolver getIdResolver(Document node) {
-		ModelQueryAdapter modelQueryAdapter = getModelQueryAdapter(node);
-		return modelQueryAdapter != null ? modelQueryAdapter.getIdResolver() : null;
-	}
-
-	public static ModelQuery getModelQuery(Document node) {
-		ModelQueryAdapter modelQueryAdapter = getModelQueryAdapter(node);
-		return modelQueryAdapter != null ? modelQueryAdapter.getModelQuery() : null;
-	}
-
-	public static ModelQuery getModelQuery(IStructuredModel model) {
-		if ((!(model instanceof IDOMModel)) || model == null)
-			return null;
-		return getModelQuery(((IDOMModel) model).getDocument());
-	}
-
-	public static ModelQueryAdapter getModelQueryAdapter(Document node) {
-		ModelQueryAdapter result = null;
-
-		if (node instanceof INodeNotifier) {
-			INodeNotifier notifier = (INodeNotifier) node;
-			result = (ModelQueryAdapter) notifier.getAdapterFor(ModelQueryAdapter.class);
-		}
-
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLCatalogIdResolver.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLCatalogIdResolver.java
deleted file mode 100644
index 83a36c5..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLCatalogIdResolver.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.modelquery;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.sse.core.internal.util.URIResolver;
-
-
-// TODO cs : remove this class and utilize the common URIResolver directly
-// We need to update some of the ModelQuery related code to pass the 'baseLocation' thru
-// and then there'll be node need for this class. 
-// 
-public class XMLCatalogIdResolver implements org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver {
-	protected String resourceLocation;
-
-	protected URIResolver uriresolver;
-
-	private XMLCatalogIdResolver() {
-		super();
-	}
-	private XMLCatalogIdResolver(String resourceLocation) {
-		this.resourceLocation = resourceLocation;
-	}
-
-	public XMLCatalogIdResolver(String resourceLocation, URIResolver uriresolver) {
-		this(resourceLocation);
-		this.uriresolver = uriresolver;
-	}
-
-
-	/**
-	 * Gets the resourceLocation.
-	 * 
-	 * @return Returns a String
-	 */
-	private String getResourceLocation() {
-		String location = resourceLocation;
-		if (location == null) {
-			if (uriresolver != null)
-				location = uriresolver.getFileBaseLocation();
-		}
-		return location;
-	}
-
-
-	public String resolve(String base, String publicId, String systemId) {
-
-		String result = systemId;
-		
-		if (base == null) {
-			base = getResourceLocation();
-		}
-		
-		result = URIResolverPlugin.createResolver().resolve(base, publicId, systemId);	
-		return result;
-	}
-    
-    public String resolvePhysicalLocation(String baseLocation, String publicId, String logicalLocation) {
-      return URIResolverPlugin.createResolver().resolvePhysicalLocation(baseLocation, publicId, logicalLocation);
-    }
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryAssociationProvider.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryAssociationProvider.java
deleted file mode 100644
index 0e85393..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryAssociationProvider.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.modelquery;
-
-
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.XMLAssociationProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.w3c.dom.Document;
-
-/**
- * XMLModelQueryAssociationProvider
- */
-class XMLModelQueryAssociationProvider extends XMLAssociationProvider {
-
-	protected URIResolver idResolver;
-
-	public XMLModelQueryAssociationProvider(CMDocumentCache cache, URIResolver idResolver) {
-		super(cache);
-		this.idResolver = idResolver;
-	}
-
-	protected String resolveGrammarURI(Document document, String publicId, String systemId) {
-		
-		/*
-		 * Fix for bug 110356
-		 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=110356
-		 * 
-		 * TODO: XMLCatalogURIResolverExtension was contributed to "postnormalization" 
-		 * stage, but not to "physical" stage.  We have to reconcile that.
-		 */
-		String resolvedId = idResolver.resolve(null, publicId, systemId); // initially we had only this call
-		if(resolvedId == null){
-			String location = systemId;
-			if(location == null){
-				location = publicId;
-			}
-			// try physical location
-			resolvedId = idResolver.resolvePhysicalLocation(null, publicId, location);
-		}
-		return resolvedId;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryImpl.java
deleted file mode 100644
index 2992a79..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.modelquery;
-
-
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.ModelQueryImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.MovableModelQuery;
-
-
-public class XMLModelQueryImpl extends ModelQueryImpl implements MovableModelQuery {
-
-	protected CMDocumentCache fCache = null;
-
-	public XMLModelQueryImpl(CMDocumentCache cache, URIResolver idResolver) {
-		super(new XMLModelQueryAssociationProvider(cache, idResolver));
-		fCache = cache;
-	}
-
-	/**
-	 * @see MovableModelQuery#setIdResolver(URIResolver)
-	 */
-	public void setIdResolver(URIResolver newIdResolver) {
-		modelQueryAssociationProvider = new XMLModelQueryAssociationProvider(fCache, newIdResolver);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/BlockStructuredDocumentRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/BlockStructuredDocumentRegion.java
deleted file mode 100644
index 280206c..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/BlockStructuredDocumentRegion.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser;
-
-
-
-import org.eclipse.wst.sse.core.internal.ltk.parser.IBlockedStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocumentRegion;
-
-
-public class BlockStructuredDocumentRegion extends BasicStructuredDocumentRegion implements IBlockedStructuredDocumentRegion {
-
-	private String partitionType;
-
-	/**
-	 * A BlockStructuredDocumentRegion is like a IStructuredDocumentRegion,
-	 * but is the result of a "block scan".
-	 */
-	public BlockStructuredDocumentRegion() {
-		super();
-	}
-
-	public String getPartitionType() {
-		if (partitionType == null) {
-			// eventually can look up surroundingTag name
-			// but this field is primarily entended for future
-			// extensibility. This may change.
-			//partitionType = "org.eclipse.wst.sse.core." + tagname;
-		}
-		return partitionType;
-	}
-
-	public void setPartitionType(String partitionType) {
-		this.partitionType = partitionType;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/ContextRegionContainer.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/ContextRegionContainer.java
deleted file mode 100644
index 2cdc7e7..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/ContextRegionContainer.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser;
-
-
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.text.TextRegionListImpl;
-import org.eclipse.wst.xml.core.internal.Logger;
-
-
-public class ContextRegionContainer implements ITextRegionContainer {
-	protected int length;
-	protected ITextRegionCollection parent;
-	protected ITextRegionList regions;
-	protected int start;
-	protected int textLength;
-	protected String type;
-
-	public ContextRegionContainer() {
-		super();
-		regions = new TextRegionListImpl();
-
-	}
-
-	/**
-	 * these "deep" parenting is not normal, but just in case.
-	 */
-	private IStructuredDocument _getParentDocument() {
-		// go up enough parents to get to document
-		ITextRegionCollection parent = getParent();
-		while (!(parent instanceof IStructuredDocumentRegion)) {
-			// would be an error not to be container, but
-			// won't check for it now
-			parent = ((ITextRegionContainer) parent).getParent();
-		}
-		return ((IStructuredDocumentRegion) parent).getParentDocument();
-	}
-
-
-	public void adjust(int i) {
-
-		start += i;
-		// I erroneously added length and textLength
-		// TODO: may want to rename this method to adjustStart
-		//length += i;
-		//textLength += i;
-
-	}
-
-	public void adjustLength(int i) {
-		length += i;
-	}
-
-	public void adjustStart(int i) {
-		start += i;
-	}
-
-
-	public void adjustTextLength(int i) {
-		textLength += i;
-
-	}
-
-	public boolean containsOffset(int i) {
-
-		return getStartOffset() <= i && i < getEndOffset();
-	}
-
-	public boolean containsOffset(ITextRegion containedRegion, int offset) {
-		return getStartOffset(containedRegion) <= offset && offset < getEndOffset(containedRegion);
-	}
-
-	/**
-	 * This method is just to equate positions. clients may (will probably)
-	 * still need to make calls to equate regions, parent, etc.
-	 */
-	public void equatePositions(ITextRegion region) {
-		start = region.getStart();
-		length = region.getLength();
-		textLength = region.getTextLength();
-	}
-
-	public int getEnd() {
-		return start + length;
-	}
-
-	public int getEndOffset() {
-		// our startOffset take into account our parent, and our start
-		return getStartOffset() + getLength();
-	}
-
-	public int getEndOffset(ITextRegion containedRegion) {
-		return getStartOffset(containedRegion) + containedRegion.getLength();
-	}
-
-	public ITextRegion getFirstRegion() {
-		return getRegions().get(0);
-	}
-
-	public String getFullText() {
-		return getParent().getFullText(this);
-	}
-
-	public String getFullText(org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion aRegion) {
-		// Must be proxied here since aRegion should always be a child of
-		// *this* container and indexed from
-		// this container's offset
-		return parent.getFullText().substring(start + aRegion.getStart(), start + aRegion.getEnd());
-	}
-
-	public ITextRegion getLastRegion() {
-		return getRegions().get(getRegions().size() - 1);
-	}
-
-	public int getLength() {
-		return length;
-	}
-
-
-	public int getNumberOfRegions() {
-		return getRegions().size();
-	}
-
-	public ITextRegionCollection getParent() {
-		return parent;
-	}
-
-	/**
-	 * The parameter offset refers to the overall offset in the document.
-	 */
-	public ITextRegion getRegionAtCharacterOffset(int offset) {
-		ITextRegion result = null;
-		if (regions != null) {
-			// transform the requested offset to the "scale" that
-			// regions are stored in, which are all relative to the
-			// start point.
-			//int transformedOffset = offset - getStartOffset();
-			//
-			int length = getRegions().size();
-			for (int i = 0; i < length; i++) {
-				ITextRegion region = getRegions().get(i);
-				if (org.eclipse.wst.sse.core.internal.util.Debug.debugStructuredDocument) {
-					System.out.println("region(s) in IStructuredDocumentRegion::getRegionAtCharacterOffset: " + region); //$NON-NLS-1$
-					System.out.println("       requested offset: " + offset); //$NON-NLS-1$
-					//System.out.println(" transformedOffset: " +
-					// transformedOffset); //$NON-NLS-1$
-					System.out.println("       region start: " + region.getStart()); //$NON-NLS-1$
-					System.out.println("       region end: " + region.getEnd()); //$NON-NLS-1$
-					System.out.println("       region type: " + region.getType()); //$NON-NLS-1$
-					System.out.println("       region class: " + region.getClass()); //$NON-NLS-1$
-
-				}
-				if ((getStartOffset(region) <= offset) && (offset < getEndOffset(region))) {
-					result = region;
-					break;
-				}
-			}
-		}
-		return result;
-	}
-
-	public ITextRegionList getRegions() {
-		return regions;
-	}
-
-	public int getStart() {
-		return start;
-	}
-
-	public int getStartOffset() {
-		return getParent().getStartOffset() + getStart();
-	}
-
-	public int getStartOffset(ITextRegion containedRegion) {
-		// it is an error to pass null to this method
-		// ISSUE: need better "spec" on error behavior: 
-		// for now will return zero as this will roughly 
-		// work for some cases (and avoid NPE).
-		if (containedRegion == null) {
-			return getStartOffset();
-		}
-		return getStartOffset() + containedRegion.getStart();
-	}
-
-	/**
-	 * same as getFullText for this region type ... do we need to take white
-	 * space off?
-	 */
-
-	public String getText() {
-		String result = null;
-		try {
-			IStructuredDocument parentDocument = _getParentDocument();
-			result = parentDocument.get(start, length);
-		} catch (BadLocationException e) {
-			Logger.logException("program error: unreachable exception", e); //$NON-NLS-1$
-		}
-		return result;
-	}
-
-	public String getText(org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion aRegion) {
-		// Must be proxied here since aRegion should always be a child of
-		// *this* container and indexed from
-		// this container's offset
-		return parent.getText().substring(start + aRegion.getStart(), start + aRegion.getTextEnd());
-	}
-
-	public int getTextEnd() {
-		return start + textLength;
-	}
-
-	public int getTextEndOffset() {
-		ITextRegion region = regions.get(regions.size() - 1);
-		// our startOffset take into account our parent, and our start
-		// (pa) 10/4 changed to be based on text end
-		//           it used to return incorrect value for embedded region containers
-		//
-
-		// TODO CRITICAL -- need to re-work this work around, so doesn't
-		// depend on XMLRegionContext
-		//		// this is a workaround for 226823///////////
-		//		for (int i = regions.size() - 1; i >= 0 && region.getType() ==
-		// XMLRegionContext.WHITE_SPACE; i--)
-		//			region = (ITextRegion) regions.get(i);
-		//		/////////////////////////////////////////////
-
-		return getStartOffset() + region.getTextEnd();
-	}
-
-	public int getTextEndOffset(ITextRegion containedRegion) {
-		int result = 0;
-		if (regions != null) {
-			int length = getRegions().size();
-			for (int i = 0; i < length; i++) {
-				ITextRegion region = getRegions().get(i);
-				if (region == containedRegion) {
-					result = getStartOffset(region) + region.getTextEnd();
-					break;
-				}
-			}
-		}
-		return result;
-	}
-
-	public int getTextLength() {
-		return textLength;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setLength(int i) {
-		length = i;
-	}
-
-	public void setParent(ITextRegionCollection parentRegion) {
-		parent = parentRegion;
-	}
-
-	public void setRegions(ITextRegionList containedRegions) {
-		regions = containedRegions;
-	}
-
-	public void setStart(int i) {
-		start = i;
-	}
-
-	public void setTextLength(int i) {
-		textLength = i;
-	}
-
-	public void setType(String string) {
-		type = string;
-	}
-
-	public String toString() {
-		String className = getClass().getName();
-		String shortClassName = className.substring(className.lastIndexOf(".") + 1); //$NON-NLS-1$
-		String result = "Container!!! " + shortClassName + "--> " + getType() + ": " + getStart() + "-" + getTextEnd() + (getTextEnd() != getEnd() ? ("/" + getEnd()) : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-		return result;
-	}
-
-	public StructuredDocumentEvent updateRegion(Object requester, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent result = null;
-		// FUTURE_TO_DO: need to implement region level parsing in
-		// ITextRegionContainer::updateModel
-		// never being called?
-		return result;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/IntStack.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/IntStack.java
deleted file mode 100644
index b871545..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/IntStack.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser;
-
-
-
-/*
- * 
- * A non-resizable class implementing the behavior of java.util.Stack, but
- * directly for the <code> integer </code> primitive.
- */
-import java.util.EmptyStackException;
-
-public class IntStack {
-	private int[] list = null;
-
-	private int size = 0;
-
-	public IntStack() {
-		this(100);
-	}
-
-	public IntStack(int maxdepth) {
-		super();
-		list = new int[maxdepth];
-		initialize();
-	}
-
-	public boolean empty() {
-		return size == 0;
-	}
-
-	public int get(int slot) {
-		return list[slot];
-	}
-
-	void initialize() {
-		for (int i = 0; i < list.length; i++)
-			list[i] = -1;
-	}
-
-	/**
-	 * Returns the int at the top of the stack without removing it
-	 * 
-	 * @return int at the top of this stack.
-	 * @exception EmptyStackException
-	 *                when empty.
-	 */
-	public int peek() {
-		if (size == 0)
-			throw new EmptyStackException();
-		return list[size - 1];
-	}
-
-	/**
-	 * Removes and returns the int at the top of the stack
-	 * 
-	 * @return int at the top of this stack.
-	 * @exception EmptyStackException
-	 *                when empty.
-	 */
-	public int pop() {
-		int value = peek();
-		list[size - 1] = -1;
-		size--;
-		return value;
-	}
-
-	/**
-	 * Pushes an item onto the top of this stack.
-	 * 
-	 * @param newValue -
-	 *            the int to be pushed onto this stack.
-	 * @return the <code>newValue</code> argument.
-	 */
-	public int push(int newValue) {
-		if (size == list.length) {
-			throw new StackOverflowError();
-		}
-		list[size++] = newValue;
-		return newValue;
-	}
-
-	public int size() {
-		return list.length;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/RegionFactory.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/RegionFactory.java
deleted file mode 100644
index 5f08934..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/RegionFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser;
-
-
-
-import org.eclipse.wst.sse.core.internal.parser.ContextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-
-
-public class RegionFactory {
-
-	public RegionFactory() {
-		super();
-	}
-
-	public ITextRegion createToken(ITextRegionContainer parent, String context, int start, int textLength, int length) {
-		return this.createToken(parent, context, start, textLength, length, null, null);
-	}
-
-	public ITextRegion createToken(ITextRegionContainer parent, String context, int start, int textLength, int length, String lang, String surroundingTag) {
-		ITextRegion newRegion = createToken(context, start, textLength, length);
-		// DW, 4/16/2003 token regions no longer have parents
-		//newRegion.setParent(parent);
-		return newRegion;
-	}
-
-	public ITextRegion createToken(String context, int start, int textLength, int length) {
-		return this.createToken(context, start, textLength, length, null, null);
-	}
-
-	public ITextRegion createToken(String context, int start, int textLength, int length, String lang, String surroundingTag) {
-		ITextRegion newRegion = new ContextRegion(context, start, textLength, length);
-		return newRegion;
-
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XML10Names.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XML10Names.java
deleted file mode 100644
index ec137b0..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XML10Names.java
+++ /dev/null
@@ -1,592 +0,0 @@
-/* The following code was generated by JFlex 1.4 on 7/5/05 1:40 AM */
-
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*nlsXXX*/
-package org.eclipse.wst.xml.core.internal.parser;
-
-
-
-
-/**
- * This class is a scanner generated by 
- * <a href="http://www.jflex.de/">JFlex</a> 1.4
- * on 7/5/05 1:40 AM from the specification file
- * <tt>D:/builds/Workspaces/PureHeadWTP_M7/org.eclipse.wst.xml.core/DevTimeSupport/HeadParsers/XML10Names.jFlex</tt>
- */
-public final class XML10Names {
-
-  /** This character denotes the end of file */
-  private static final int YYEOF = -1;
-
-  /** initial size of the lookahead buffer */
-  private static final int ZZ_BUFFERSIZE = 2048;
-
-  /** lexical states */
-  private static final int YYINITIAL = 0;
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final String ZZ_CMAP_PACKED = 
-    "\11\0\1\1\1\2\2\0\1\1\22\0\1\1\14\0\1\0\2\0"+
-    "\12\0\1\3\6\0\32\3\4\0\1\3\1\0\32\3\74\0\1\0"+
-    "\10\0\27\3\1\0\37\3\1\0\72\3\2\0\13\3\2\0\10\3"+
-    "\1\0\65\3\1\0\104\3\11\0\44\3\3\0\2\3\4\0\36\3"+
-    "\70\0\131\3\22\0\7\3\16\0\2\0\56\0\106\0\32\0\2\0"+
-    "\44\0\1\3\1\0\3\3\1\0\1\3\1\0\24\3\1\0\54\3"+
-    "\1\0\7\3\3\0\1\3\1\0\1\3\1\0\1\3\1\0\1\3"+
-    "\1\0\22\3\15\0\14\3\1\0\102\3\1\0\14\3\1\0\44\3"+
-    "\1\0\4\0\11\0\65\3\2\0\2\3\2\0\2\3\3\0\34\3"+
-    "\2\0\10\3\2\0\2\3\67\0\46\3\2\0\1\3\7\0\46\3"+
-    "\12\0\21\0\1\0\27\0\1\0\3\0\1\0\1\0\1\0\2\0"+
-    "\1\0\1\0\13\0\33\3\5\0\3\3\56\0\32\3\5\0\1\0"+
-    "\12\3\10\0\15\0\12\0\6\0\1\0\107\3\2\0\5\3\1\0"+
-    "\17\3\1\0\4\3\1\0\1\3\17\0\2\3\2\0\1\0\4\0"+
-    "\2\0\12\0\u0207\0\3\0\1\0\65\3\2\0\1\0\1\3\20\0"+
-    "\3\0\4\0\3\0\12\3\2\0\2\0\12\0\21\0\3\0\1\0"+
-    "\10\3\2\0\2\3\2\0\26\3\1\0\7\3\1\0\1\3\3\0"+
-    "\4\3\2\0\1\0\1\0\7\0\2\0\2\0\2\0\3\0\11\0"+
-    "\1\0\4\0\2\3\1\0\3\3\2\0\2\0\12\0\2\3\20\0"+
-    "\1\0\2\0\6\3\4\0\2\3\2\0\26\3\1\0\7\3\1\0"+
-    "\2\3\1\0\2\3\1\0\2\3\2\0\1\0\1\0\5\0\4\0"+
-    "\2\0\2\0\3\0\13\0\4\3\1\0\1\3\7\0\12\0\2\0"+
-    "\3\3\14\0\3\0\1\0\7\3\1\0\1\3\1\0\3\3\1\0"+
-    "\26\3\1\0\7\3\1\0\2\3\1\0\5\3\2\0\1\0\1\3"+
-    "\10\0\1\0\3\0\1\0\3\0\22\0\1\3\5\0\12\0\21\0"+
-    "\3\0\1\0\10\3\2\0\2\3\2\0\26\3\1\0\7\3\1\0"+
-    "\2\3\2\0\4\3\2\0\1\0\1\3\6\0\3\0\2\0\2\0"+
-    "\3\0\10\0\2\0\4\0\2\3\1\0\3\3\4\0\12\0\22\0"+
-    "\2\0\1\0\6\3\3\0\3\3\1\0\4\3\3\0\2\3\1\0"+
-    "\1\3\1\0\2\3\3\0\2\3\3\0\3\3\3\0\10\3\1\0"+
-    "\3\3\4\0\5\0\3\0\3\0\1\0\4\0\11\0\1\0\17\0"+
-    "\11\0\21\0\3\0\1\0\10\3\1\0\3\3\1\0\27\3\1\0"+
-    "\12\3\1\0\5\3\4\0\7\0\1\0\3\0\1\0\4\0\7\0"+
-    "\2\0\11\0\2\3\4\0\12\0\22\0\2\0\1\0\10\3\1\0"+
-    "\3\3\1\0\27\3\1\0\12\3\1\0\5\3\4\0\7\0\1\0"+
-    "\3\0\1\0\4\0\7\0\2\0\7\0\1\3\1\0\2\3\4\0"+
-    "\12\0\22\0\2\0\1\0\10\3\1\0\3\3\1\0\27\3\1\0"+
-    "\20\3\4\0\6\0\2\0\3\0\1\0\4\0\11\0\1\0\10\0"+
-    "\2\3\4\0\12\0\221\0\56\3\1\0\1\3\1\0\2\3\7\0"+
-    "\5\0\6\3\1\0\10\0\1\0\12\0\47\0\2\3\1\0\1\3"+
-    "\2\0\2\3\1\0\1\3\2\0\1\3\6\0\4\3\1\0\7\3"+
-    "\1\0\3\3\1\0\1\3\1\0\1\3\2\0\2\3\1\0\2\3"+
-    "\1\0\1\3\1\0\2\3\6\0\1\0\2\0\1\3\2\0\5\3"+
-    "\1\0\1\0\1\0\6\0\2\0\12\0\76\0\2\0\6\0\12\0"+
-    "\13\0\1\0\1\0\1\0\1\0\1\0\4\0\2\0\10\3\1\0"+
-    "\41\3\7\0\24\0\1\0\6\0\4\0\6\0\1\0\1\0\1\0"+
-    "\25\0\3\0\7\0\1\0\1\0\346\0\46\3\12\0\47\3\11\0"+
-    "\1\3\1\0\2\3\1\0\3\3\1\0\1\3\1\0\2\3\1\0"+
-    "\5\3\51\0\1\3\1\0\1\3\1\0\1\3\13\0\1\3\1\0"+
-    "\1\3\1\0\1\3\3\0\2\3\3\0\1\3\5\0\3\3\1\0"+
-    "\1\3\1\0\1\3\1\0\1\3\1\0\1\3\3\0\2\3\3\0"+
-    "\2\3\1\0\1\3\50\0\1\3\11\0\1\3\2\0\1\3\2\0"+
-    "\2\3\7\0\2\3\1\0\1\3\1\0\7\3\50\0\1\3\4\0"+
-    "\1\3\10\0\1\3\u0c06\0\234\3\4\0\132\3\6\0\26\3\2\0"+
-    "\6\3\2\0\46\3\2\0\6\3\2\0\10\3\1\0\1\3\1\0"+
-    "\1\3\1\0\1\3\1\0\37\3\2\0\65\3\1\0\7\3\1\0"+
-    "\1\3\3\0\3\3\1\0\7\3\3\0\4\3\2\0\6\3\4\0"+
-    "\15\3\5\0\3\3\1\0\7\3\323\0\15\0\4\0\1\0\104\0"+
-    "\1\3\3\0\2\3\2\0\1\3\121\0\3\3\u0e82\0\1\0\1\0"+
-    "\1\3\31\0\11\3\6\0\1\0\5\0\13\0\124\3\4\0\2\0"+
-    "\2\0\2\0\2\0\132\3\1\0\3\0\6\0\50\3\u1cd3\0\u51a6\3"+
-    "\u0c5a\0\u2ba4\3\u285c\0";
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
-
-  /** 
-   * Translates DFA states to action switch labels.
-   */
-  private static final int [] ZZ_ACTION = zzUnpackAction();
-
-  private static final String ZZ_ACTION_PACKED_0 =
-    "\1\0\1\1\1\2\4\1";
-
-  private static int [] zzUnpackAction() {
-    int [] result = new int[7];
-    int offset = 0;
-    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAction(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-
-  /** 
-   * Translates a state to a row index in the transition table
-   */
-  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
-
-  private static final String ZZ_ROWMAP_PACKED_0 =
-    "\0\0\0\4\0\10\0\14\0\20\0\24\0\30";
-
-  private static int [] zzUnpackRowMap() {
-    int [] result = new int[7];
-    int offset = 0;
-    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackRowMap(String packed, int offset, int [] result) {
-    int i = 0;  /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int high = packed.charAt(i++) << 16;
-      result[j++] = high | packed.charAt(i++);
-    }
-    return j;
-  }
-
-  /** 
-   * The transition table of the DFA
-   */
-  private static final int ZZ_TRANS [] = {
-    1, 1, -1, 2, -1, -1, -1, -1, 2, 3, 
-    4, 2, 2, 3, 4, 5, -1, 4, 4, 6, 
-    5, 5, 4, 5, 6, 6, -1, 6, 
-  };
-
-  /* error codes */
-  private static final int ZZ_UNKNOWN_ERROR = 0;
-  private static final int ZZ_NO_MATCH = 1;
-  private static final int ZZ_PUSHBACK_2BIG = 2;
-
-  /* error messages for the codes above */
-  private static final String ZZ_ERROR_MSG[] = {
-    "Unkown internal scanner error",
-    "Error: could not match input",
-    "Error: pushback value was too large"
-  };
-
-  /**
-   * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
-   */
-  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
-
-  private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\1\0\1\11\5\1";
-
-  private static int [] zzUnpackAttribute() {
-    int [] result = new int[7];
-    int offset = 0;
-    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAttribute(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-  /** the input device */
-  private java.io.Reader zzReader;
-
-  /** the current state of the DFA */
-  private int zzState;
-
-  /** the current lexical state */
-  private int zzLexicalState = YYINITIAL;
-
-  /** this buffer contains the current text to be matched and is
-      the source of the yytext() string */
-  private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
-
-  /** the textposition at the last accepting state */
-  private int zzMarkedPos;
-
-  /** the textposition at the last state to be included in yytext */
-  private int zzPushbackPos;
-
-  /** the current text position in the buffer */
-  private int zzCurrentPos;
-
-  /** startRead marks the beginning of the yytext() string in the buffer */
-  private int zzStartRead;
-
-  /** endRead marks the last character in the buffer, that has been read
-      from input */
-  private int zzEndRead;
-
-  /** number of newlines encountered up to the start of the matched text */
-  private int yyline;
-
-  /** the number of characters up to the start of the matched text */
-  private int yychar;
-
-  /**
-   * the number of characters from the last newline up to the start of the 
-   * matched text
-   */
-  private int yycolumn;
-
-  /** 
-   * zzAtBOL == true <=> the scanner is currently at the beginning of a line
-   */
-  private boolean zzAtBOL = true;
-
-  /** zzAtEOF == true <=> the scanner is at the EOF */
-  private boolean zzAtEOF;
-
-  /* user code: */
-
-	/**
-	 * Creates a new scanner
-	 */
-	public XML10Names() {
-		this.zzReader = null;
-	}
-
-	public boolean isValidXML10Name(String stringToCheck) {
-		boolean result = false;
-		yyreset(new java.io.StringReader(stringToCheck));
-		try {
-			result = isValidXML10Name();
-		}
-		catch (java.io.IOException e) {
-			// should be impossible with strings, but if occurs, just means
-			// "not"
-			result = false;
-		}
-		return result;
-	}
-
-
-
-  /**
-   * Creates a new scanner
-   * There is also a java.io.InputStream version of this constructor.
-   *
-   * @param   in  the java.io.Reader to read input from.
-   */
-  public XML10Names(java.io.Reader in) {
-    this.zzReader = in;
-  }
-
-  /**
-   * Creates a new scanner.
-   * There is also java.io.Reader version of this constructor.
-   *
-   * @param   in  the java.io.Inputstream to read input from.
-   */
-  public XML10Names(java.io.InputStream in) {
-    this(new java.io.InputStreamReader(in));
-  }
-
-  /** 
-   * Unpacks the compressed character translation table.
-   *
-   * @param packed   the packed character translation table
-   * @return         the unpacked character translation table
-   */
-  private static char [] zzUnpackCMap(String packed) {
-    char [] map = new char[0x10000];
-    int i = 0;  /* index in packed string  */
-    int j = 0;  /* index in unpacked array */
-    while (i < 1226) {
-      int  count = packed.charAt(i++);
-      char value = packed.charAt(i++);
-      do map[j++] = value; while (--count > 0);
-    }
-    return map;
-  }
-
-
-  /**
-   * Refills the input buffer.
-   *
-   * @return      <code>false</code>, iff there was new input.
-   * 
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  private boolean zzRefill() throws java.io.IOException {
-
-    /* first: make room (if you can) */
-    if (zzStartRead > 0) {
-      System.arraycopy(zzBuffer, zzStartRead,
-                       zzBuffer, 0,
-                       zzEndRead-zzStartRead);
-
-      /* translate stored positions */
-      zzEndRead-= zzStartRead;
-      zzCurrentPos-= zzStartRead;
-      zzMarkedPos-= zzStartRead;
-      zzPushbackPos-= zzStartRead;
-      zzStartRead = 0;
-    }
-
-    /* is the buffer big enough? */
-    if (zzCurrentPos >= zzBuffer.length) {
-      /* if not: blow it up */
-      char newBuffer[] = new char[zzCurrentPos*2];
-      System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length);
-      zzBuffer = newBuffer;
-    }
-
-    /* finally: fill the buffer with new input */
-    int numRead = zzReader.read(zzBuffer, zzEndRead,
-                                            zzBuffer.length-zzEndRead);
-
-    if (numRead < 0) {
-      return true;
-    }
-    else {
-      zzEndRead+= numRead;
-      return false;
-    }
-  }
-
-    
-  /**
-   * Closes the input stream.
-   */
-  private final void yyclose() throws java.io.IOException {
-    zzAtEOF = true;            /* indicate end of file */
-    zzEndRead = zzStartRead;  /* invalidate buffer    */
-
-    if (zzReader != null)
-      zzReader.close();
-  }
-
-
-  /**
-   * Resets the scanner to read from a new input stream.
-   * Does not close the old reader.
-   *
-   * All internal variables are reset, the old input stream 
-   * <b>cannot</b> be reused (internal buffer is discarded and lost).
-   * Lexical state is set to <tt>ZZ_INITIAL</tt>.
-   *
-   * @param reader   the new input stream 
-   */
-  private final void yyreset(java.io.Reader reader) {
-    zzReader = reader;
-    zzAtBOL  = true;
-    zzAtEOF  = false;
-    zzEndRead = zzStartRead = 0;
-    zzCurrentPos = zzMarkedPos = zzPushbackPos = 0;
-    yyline = yychar = yycolumn = 0;
-    zzLexicalState = YYINITIAL;
-  }
-
-
-  /**
-   * Returns the current lexical state.
-   */
-  private final int yystate() {
-    return zzLexicalState;
-  }
-
-
-  /**
-   * Enters a new lexical state
-   *
-   * @param newState the new lexical state
-   */
-  private final void yybegin(int newState) {
-    zzLexicalState = newState;
-  }
-
-
-  /**
-   * Returns the text matched by the current regular expression.
-   */
-  private final String yytext() {
-    return new String( zzBuffer, zzStartRead, zzMarkedPos-zzStartRead );
-  }
-
-
-  /**
-   * Returns the character at position <tt>pos</tt> from the 
-   * matched text. 
-   * 
-   * It is equivalent to yytext().charAt(pos), but faster
-   *
-   * @param pos the position of the character to fetch. 
-   *            A value from 0 to yylength()-1.
-   *
-   * @return the character at position pos
-   */
-  private final char yycharat(int pos) {
-    return zzBuffer[zzStartRead+pos];
-  }
-
-
-  /**
-   * Returns the length of the matched text region.
-   */
-  private final int yylength() {
-    return zzMarkedPos-zzStartRead;
-  }
-
-
-  /**
-   * Reports an error that occured while scanning.
-   *
-   * In a wellformed scanner (no or only correct usage of 
-   * yypushback(int) and a match-all fallback rule) this method 
-   * will only be called with things that "Can't Possibly Happen".
-   * If this method is called, something is seriously wrong
-   * (e.g. a JFlex bug producing a faulty scanner etc.).
-   *
-   * Usual syntax/scanner level error handling should be done
-   * in error fallback rules.
-   *
-   * @param   errorCode  the code of the errormessage to display
-   */
-  private void zzScanError(int errorCode) {
-    String message;
-    try {
-      message = ZZ_ERROR_MSG[errorCode];
-    }
-    catch (ArrayIndexOutOfBoundsException e) {
-      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
-    }
-
-    throw new Error(message);
-  } 
-
-
-  /**
-   * Pushes the specified amount of characters back into the input stream.
-   *
-   * They will be read again by then next call of the scanning method
-   *
-   * @param number  the number of characters to be read again.
-   *                This number must not be greater than yylength()!
-   */
-  private void yypushback(int number)  {
-    if ( number > yylength() )
-      zzScanError(ZZ_PUSHBACK_2BIG);
-
-    zzMarkedPos -= number;
-  }
-
-
-  /**
-   * Resumes scanning until the next regular expression is matched,
-   * the end of input is encountered or an I/O-Error occurs.
-   *
-   * @return      the next token
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  private boolean isValidXML10Name() throws java.io.IOException {
-    int zzInput;
-    int zzAction;
-
-    // cached fields:
-    int zzCurrentPosL;
-    int zzMarkedPosL;
-    int zzEndReadL = zzEndRead;
-    char [] zzBufferL = zzBuffer;
-    char [] zzCMapL = ZZ_CMAP;
-
-    int [] zzTransL = ZZ_TRANS;
-    int [] zzRowMapL = ZZ_ROWMAP;
-    int [] zzAttrL = ZZ_ATTRIBUTE;
-
-    while (true) {
-      zzMarkedPosL = zzMarkedPos;
-
-      zzAction = -1;
-
-      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
-  
-      zzState = zzLexicalState;
-
-
-      zzForAction: {
-        while (true) {
-    
-          if (zzCurrentPosL < zzEndReadL)
-            zzInput = zzBufferL[zzCurrentPosL++];
-          else if (zzAtEOF) {
-            zzInput = YYEOF;
-            break zzForAction;
-          }
-          else {
-            // store back cached positions
-            zzCurrentPos  = zzCurrentPosL;
-            zzMarkedPos   = zzMarkedPosL;
-            boolean eof = zzRefill();
-            // get translated positions and possibly new buffer
-            zzCurrentPosL  = zzCurrentPos;
-            zzMarkedPosL   = zzMarkedPos;
-            zzBufferL      = zzBuffer;
-            zzEndReadL     = zzEndRead;
-            if (eof) {
-              zzInput = YYEOF;
-              break zzForAction;
-            }
-            else {
-              zzInput = zzBufferL[zzCurrentPosL++];
-            }
-          }
-          int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];
-          if (zzNext == -1) break zzForAction;
-          zzState = zzNext;
-
-          int zzAttributes = zzAttrL[zzState];
-          if ( (zzAttributes & 1) == 1 ) {
-            zzAction = zzState;
-            zzMarkedPosL = zzCurrentPosL;
-            if ( (zzAttributes & 8) == 8 ) break zzForAction;
-          }
-
-        }
-      }
-
-      // store back cached position
-      zzMarkedPos = zzMarkedPosL;
-
-      switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
-        case 1: 
-          { return false;
-          }
-        case 3: break;
-        case 2: 
-          { return true;
-          }
-        case 4: break;
-        default: 
-          if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
-            zzAtEOF = true;
-              { {return false;} }
-          } 
-          else {
-            zzScanError(ZZ_NO_MATCH);
-          }
-      }
-    }
-  }
-
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLSourceParser.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLSourceParser.java
deleted file mode 100644
index bbcb27d..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLSourceParser.java
+++ /dev/null
@@ -1,608 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser;
-
-
-
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.sse.core.internal.document.DocumentReader;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockTagParser;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockTokenizer;
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-import org.eclipse.wst.sse.core.internal.ltk.parser.StructuredDocumentRegionHandler;
-import org.eclipse.wst.sse.core.internal.ltk.parser.StructuredDocumentRegionParser;
-import org.eclipse.wst.sse.core.internal.ltk.parser.StructuredDocumentRegionParserExtension;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.text.CharSequenceReader;
-import org.eclipse.wst.sse.core.internal.text.IRegionComparible;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-/**
- * Takes input from the HTMLTokenizer and creates a tag list
- */
-
-public class XMLSourceParser implements RegionParser, BlockTagParser, StructuredDocumentRegionParser, IRegionComparible, StructuredDocumentRegionParserExtension {
-	// made public to aid access from inner classes in hierarchy.
-	// TODO: in future, figure out how to solve without exposing data.
-	public CharSequence fCharSequenceSource = null;
-	private IDocument fDocumentInput;
-	protected int fOffset = 0;
-	// DMW: 2/12/03. Removed some state data, since not really needed,
-	// and since it added a lot to overhead (since so many regions are
-	// created.
-	// protected IStructuredDocumentRegion fCurrentNode = null;
-	// protected IStructuredDocumentRegion fNodes = null;
-	// protected List fRegions = null;
-	// protected Object fInput = null;
-	protected String fStringInput = null;
-	protected List fStructuredDocumentRegionHandlers;
-
-	protected BlockTokenizer fTokenizer = null;
-	protected long startTime;
-	protected long stopTime;
-
-	/**
-	 * HTMLSourceParser constructor comment.
-	 */
-	public XMLSourceParser() {
-		super();
-		fStructuredDocumentRegionHandlers = new ArrayList();
-	}
-
-	/**
-	 * This is a simple utility to count nodes. Used only for debug
-	 * statements.
-	 */
-	protected int _countNodes(IStructuredDocumentRegion nodes) {
-		int result = 0;
-		IStructuredDocumentRegion countNode = nodes;
-		while (countNode != null) {
-			result++;
-			countNode = countNode.getNext();
-		}
-		return result;
-	}
-
-	public void addBlockMarker(BlockMarker marker) {
-		getTokenizer().addBlockMarker(marker);
-	}
-
-	public void addStructuredDocumentRegionHandler(StructuredDocumentRegionHandler handler) {
-		if (fStructuredDocumentRegionHandlers == null)
-			fStructuredDocumentRegionHandlers = new ArrayList();
-		fStructuredDocumentRegionHandlers.add(handler);
-	}
-
-	public void beginBlockScan(String newTagName) {
-		getTokenizer().beginBlockTagScan(newTagName);
-	}
-
-	/**
-	 * @return IStructuredDocumentRegion
-	 */
-	protected IStructuredDocumentRegion createStructuredDocumentRegion(String type) {
-		IStructuredDocumentRegion newNode = null;
-		if (type == DOMRegionContext.BLOCK_TEXT)
-			newNode = XMLStructuredRegionFactory.createRegion(XMLStructuredRegionFactory.XML_BLOCK);
-		else
-			newNode = XMLStructuredRegionFactory.createRegion(XMLStructuredRegionFactory.XML);
-		return newNode;
-	}
-
-	protected void fireNodeParsed(IStructuredDocumentRegion fCurrentNode) {
-		if (fCurrentNode != null && fStructuredDocumentRegionHandlers != null) {
-			for (int i = 0; i < fStructuredDocumentRegionHandlers.size(); i++)
-				((StructuredDocumentRegionHandler) fStructuredDocumentRegionHandlers.get(i)).nodeParsed(fCurrentNode);
-		}
-	}
-
-	public BlockMarker getBlockMarker(String tagName) {
-		List markers = getTokenizer().getBlockMarkers();
-		for (int i = 0; i < markers.size(); i++) {
-			BlockMarker marker = (BlockMarker) markers.get(i);
-			if (marker.isCaseSensitive()) {
-				if (marker.getTagName().equals(tagName))
-					return marker;
-			} else {
-				if (marker.getTagName().equalsIgnoreCase(tagName))
-					return marker;
-			}
-		}
-		return null;
-	}
-
-	public List getBlockMarkers() {
-		return getTokenizer().getBlockMarkers();
-	}
-
-	/**
-	 * @return IStructuredDocumentRegion
-	 */
-	public IStructuredDocumentRegion getDocumentRegions() {
-		IStructuredDocumentRegion headnode = null;
-		if (headnode == null) {
-			if (Debug.perfTest) {
-				startTime = System.currentTimeMillis();
-			}
-			headnode = parseNodes();
-			if (Debug.perfTest) {
-				stopTime = System.currentTimeMillis();
-				System.out.println(" -- creating nodes of IStructuredDocument -- "); //$NON-NLS-1$
-				System.out.println(" Time parse and init all regions: " + (stopTime - startTime) + " (msecs)"); //$NON-NLS-2$//$NON-NLS-1$
-				//System.out.println(" for " + fRegions.size() + "
-				// Regions");//$NON-NLS-2$//$NON-NLS-1$
-				System.out.println("      and " + _countNodes(headnode) + " Nodes"); //$NON-NLS-2$//$NON-NLS-1$
-			}
-		}
-		return headnode;
-	}
-
-	protected ITextRegion getNextRegion() {
-		ITextRegion region = null;
-		try {
-			region = getTokenizer().getNextToken();
-			// DMW: 2/12/03 Removed state
-			//		if (region != null) {
-			//			fRegions.add(region);
-			//		}
-			return region;
-		} catch (StackOverflowError e) {
-			Logger.logException(getClass().getName() + ": input could not be parsed correctly at position " + getTokenizer().getOffset(), e); //$NON-NLS-1$
-			throw e;
-		} catch (Exception e) {
-			Logger.logException(getClass().getName() + ": input could not be parsed correctly at position " + getTokenizer().getOffset() + " (" + e.getLocalizedMessage() + ")", e); //$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-		}
-		return null;
-	}
-
-	/**
-	 * Return the full list of known regions. Typically getNodes should be
-	 * used instead of this method.
-	 */
-	public List getRegions() {
-		IStructuredDocumentRegion headNode = null;
-		if (!getTokenizer().isEOF()) {
-			headNode = getDocumentRegions();
-			//		throw new IllegalStateException("parsing has not finished");
-		}
-		// for memory recovery, we assume if someone
-		// requests all regions, we can reset our big
-		// memory consuming objects
-		// but the new "getRegions" method is then more expensive.
-		// I don't think its used much, though.
-		List localRegionsList = getRegions(headNode);
-		primReset();
-		return localRegionsList;
-	}
-
-	/**
-	 * Method getRegions.
-	 * 
-	 * @param headNode
-	 * @return List
-	 */
-	protected List getRegions(IStructuredDocumentRegion headNode) {
-		List allRegions = new ArrayList();
-		IStructuredDocumentRegion currentNode = headNode;
-		while (currentNode != null) {
-			ITextRegionList nodeRegions = currentNode.getRegions();
-			for (int i = 0; i < nodeRegions.size(); i++) {
-				allRegions.add(nodeRegions.get(i));
-			}
-			currentNode = currentNode.getNext();
-		}
-		return allRegions;
-	}
-
-	/**
-	 * 
-	 * @return java.util.List
-	 */
-	public List getStructuredDocumentRegionHandlers() {
-		if (fStructuredDocumentRegionHandlers == null) {
-			fStructuredDocumentRegionHandlers = new ArrayList(0);
-		}
-		return fStructuredDocumentRegionHandlers;
-	}
-
-	/**
-	 * Returns text from the current input. Text is only valid before
-	 * getNodes() has been called and only when a raw String or DocumentReader
-	 * is given as the input.
-	 */
-	public String getText(int offset, int length) {
-		String text = null;
-		if (fCharSequenceSource != null) {
-			int start = fOffset + offset;
-			int end = start + length;
-			text = fCharSequenceSource.subSequence(start, end).toString();
-		} else if (fDocumentInput != null) {
-			try {
-				text = fDocumentInput.get(offset, length);
-			} catch (BadLocationException e) {
-				text = ""; //$NON-NLS-1$
-			}
-		} else {
-			if (fStringInput == null || fStringInput.length() == 0 || offset + length > fStringInput.length() || offset < 0) {
-				text = ""; //$NON-NLS-1$
-			} else {
-				// offset is entirely valid during parsing as the parse
-				//   numbers haven't been adjusted.
-				text = fStringInput.substring(offset, offset + length);
-			}
-		}
-		return text;
-	}
-
-	protected BlockTokenizer getTokenizer() {
-		if (fTokenizer == null) {
-			fTokenizer = new XMLTokenizer();
-		}
-		return fTokenizer;
-	}
-
-
-	public RegionParser newInstance() {
-		XMLSourceParser newInstance = new XMLSourceParser();
-		newInstance.setTokenizer(getTokenizer().newInstance());
-		return newInstance;
-	}
-
-	protected IStructuredDocumentRegion parseNodes() {
-		// regions are initially reported as complete offsets within the
-		// scanned input
-		// they are adjusted here to be indexes from the currentNode's start
-		// offset
-		IStructuredDocumentRegion headNode = null;
-		IStructuredDocumentRegion lastNode = null;
-		ITextRegion region = null;
-		IStructuredDocumentRegion currentNode = null;
-		String type = null;
-
-		while ((region = getNextRegion()) != null) {
-			type = region.getType();
-			// these types (might) demand a IStructuredDocumentRegion for each
-			// of them
-			if (type == DOMRegionContext.BLOCK_TEXT) {
-				if (currentNode != null && currentNode.getLastRegion().getType() == DOMRegionContext.BLOCK_TEXT) {
-					// multiple block texts indicated embedded containers; no
-					// new IStructuredDocumentRegion
-					currentNode.addRegion(region);
-					currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart());
-					region.adjustStart(-currentNode.getStart());
-					// DW 4/16/2003 regions no longer have parents
-					//region.setParent(currentNode);
-				} else {
-					// not continuing a IStructuredDocumentRegion
-					if (currentNode != null) {
-						// ensure that any existing node is at least
-						// terminated
-						if (!currentNode.isEnded()) {
-							currentNode.setLength(region.getStart() - currentNode.getStart());
-							// fCurrentNode.setTextLength(region.getStart() -
-							// fCurrentNode.getStart());
-						}
-						lastNode = currentNode;
-					}
-					try {
-						fireNodeParsed(currentNode);
-					}
-					catch (Exception e) {
-						Logger.log(Logger.ERROR, e.getMessage());
-					}
-					currentNode = createStructuredDocumentRegion(type);
-					if (lastNode != null) {
-						lastNode.setNext(currentNode);
-					}
-					currentNode.setPrevious(lastNode);
-					currentNode.setStart(region.getStart());
-					currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart());
-					currentNode.setEnded(true);
-					region.adjustStart(-currentNode.getStart());
-					currentNode.addRegion(region);
-					// DW 4/16/2003 regions no longer have parents
-					//region.setParent(currentNode);
-				}
-			}
-			// the following contexts OPEN new StructuredDocumentRegions
-			else if ((currentNode != null && currentNode.isEnded()) || (type == DOMRegionContext.XML_CONTENT) || (type == DOMRegionContext.XML_CHAR_REFERENCE) || (type == DOMRegionContext.XML_ENTITY_REFERENCE) || (type == DOMRegionContext.XML_PI_OPEN) || (type == DOMRegionContext.XML_TAG_OPEN) || (type == DOMRegionContext.XML_END_TAG_OPEN) || (type == DOMRegionContext.XML_COMMENT_OPEN) || (type == DOMRegionContext.XML_CDATA_OPEN) || (type == DOMRegionContext.XML_DECLARATION_OPEN)) {
-				if (currentNode != null) {
-					// ensure that any existing node is at least terminated
-					if (!currentNode.isEnded()) {
-						currentNode.setLength(region.getStart() - currentNode.getStart());
-						// fCurrentNode.setTextLength(region.getStart() -
-						// fCurrentNode.getStart());
-					}
-					lastNode = currentNode;
-				}
-				try {
-					fireNodeParsed(currentNode);
-				}
-				catch (Exception e) {
-					Logger.log(Logger.ERROR, e.getMessage());
-				}
-				currentNode = createStructuredDocumentRegion(type);
-				if (lastNode != null) {
-					lastNode.setNext(currentNode);
-				}
-				currentNode.setPrevious(lastNode);
-				currentNode.setStart(region.getStart());
-				currentNode.addRegion(region);
-				currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart());
-				region.adjustStart(-currentNode.getStart());
-				// DW 4/16/2003 regions no longer have parents
-				//region.setParent(currentNode);
-			}
-			// the following contexts neither open nor close
-			// StructuredDocumentRegions; just add to them
-			else if ((type == DOMRegionContext.XML_TAG_NAME) || (type == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) || (type == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) || (type == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) || (type == DOMRegionContext.XML_COMMENT_TEXT) || (type == DOMRegionContext.XML_PI_CONTENT) || (type == DOMRegionContext.XML_DOCTYPE_INTERNAL_SUBSET)) {
-				currentNode.addRegion(region);
-				currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart());
-				region.adjustStart(-currentNode.getStart());
-				// DW 4/16/2003 regions no longer have parents
-				//region.setParent(currentNode);
-			}
-			// the following contexts close off StructuredDocumentRegions
-			// cleanly
-			else if ((type == DOMRegionContext.XML_PI_CLOSE) || (type == DOMRegionContext.XML_TAG_CLOSE) || (type == DOMRegionContext.XML_EMPTY_TAG_CLOSE) || (type == DOMRegionContext.XML_COMMENT_CLOSE) || (type == DOMRegionContext.XML_DECLARATION_CLOSE) || (type == DOMRegionContext.XML_CDATA_CLOSE)) {
-				currentNode.setEnded(true);
-				currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart());
-				currentNode.addRegion(region);
-				region.adjustStart(-currentNode.getStart());
-				// DW 4/16/2003 regions no longer have parents
-				//region.setParent(currentNode);
-			}
-			// this is extremely rare, but valid
-			else if (type == DOMRegionContext.WHITE_SPACE) {
-				ITextRegion lastRegion = currentNode.getLastRegion();
-				// pack the embedded container with this region
-				if (lastRegion instanceof ITextRegionContainer) {
-					ITextRegionContainer container = (ITextRegionContainer) lastRegion;
-					container.getRegions().add(region);
-					// containers must have parent set ...
-					// setting for EACH subregion is redundent, but not sure
-					// where else to do, so will do here for now.
-					container.setParent(currentNode);
-					// DW 4/16/2003 regions no longer have parents
-					//region.setParent(container);
-					region.adjustStart(container.getLength() - region.getStart());
-				}
-				currentNode.getLastRegion().adjustLength(region.getLength());
-				currentNode.adjustLength(region.getLength());
-			} else if (type == DOMRegionContext.UNDEFINED && currentNode != null) {
-				// skip on a very-first region situation as the default
-				// behavior is good enough
-				// combine with previous if also undefined
-				if (currentNode.getLastRegion() != null && currentNode.getLastRegion().getType() == DOMRegionContext.UNDEFINED) {
-					currentNode.getLastRegion().adjustLength(region.getLength());
-					currentNode.adjustLength(region.getLength());
-				}
-				// previous wasn't undefined
-				else {
-					currentNode.addRegion(region);
-					currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart());
-					region.adjustStart(-currentNode.getStart());
-				}
-			} else {
-				// if an unknown type is the first region in the document,
-				// ensure that a node exists
-				if (currentNode == null) {
-					currentNode = createStructuredDocumentRegion(type);
-					currentNode.setStart(region.getStart());
-				}
-				currentNode.addRegion(region);
-				currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart());
-				region.adjustStart(-currentNode.getStart());
-				// DW 4/16/2003 regions no longer have parents
-				//region.setParent(currentNode);
-				if (Debug.debugTokenizer)
-					System.out.println(getClass().getName() + " found region of not specifically handled type " + region.getType() + " @ " + region.getStart() + "[" + region.getLength() + "]"); //$NON-NLS-4$//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-				//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-			}
-
-			// these regions also get their own node, so close them cleanly
-			// NOTE: these regions have new StructuredDocumentRegions created
-			// for them above; it may
-			// be more readable if that is handled here as well, but the
-			// current layout
-			// ensures that they open StructuredDocumentRegions the same way
-			if ((type == DOMRegionContext.XML_CONTENT) || (type == DOMRegionContext.XML_CHAR_REFERENCE) || (type == DOMRegionContext.XML_ENTITY_REFERENCE)) {
-				currentNode.setEnded(true);
-			}
-			if (headNode == null && currentNode != null) {
-				headNode = currentNode;
-			}
-		}
-		if (currentNode != null) {
-			try {
-				fireNodeParsed(currentNode);
-			}
-			catch (Exception e) {
-				Logger.log(Logger.ERROR, e.getMessage());
-			}
-			currentNode.setPrevious(lastNode);
-		}
-		//fStringInput = null;
-		primReset();
-		return headNode;
-	}
-
-	protected void primReset() {
-		//fNodes = null;
-		//fRegions = null;
-		//fInput = null;
-		fStringInput = null;
-		fCharSequenceSource = null;
-		fDocumentInput = null;
-		fOffset = 0;
-		//fCurrentNode = null;
-		// DMW: also reset tokenizer so it doesn't hold on
-		// to large arrays
-		getTokenizer().reset(new char[0]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.core.internal.text.IRegionComparible#regionMatches(int,
-	 *      int, java.lang.String)
-	 */
-	public boolean regionMatches(int offset, int length, String stringToCompare) {
-		// by definition
-		if (stringToCompare == null)
-			return false;
-
-		boolean result = false;
-		if (fCharSequenceSource != null && fCharSequenceSource instanceof IRegionComparible) {
-			result = ((IRegionComparible) fCharSequenceSource).regionMatches(offset, length, stringToCompare);
-		} else {
-			// old fashioned ways
-			String test = null;
-			if (fCharSequenceSource != null) {
-				test = fCharSequenceSource.subSequence(offset, offset + length).toString();
-			} else if (fStringInput != null) {
-				test = fStringInput.substring(offset, offset + length);
-			}
-			result = stringToCompare.equals(test);
-		}
-		return result;
-	}
-
-	public boolean regionMatchesIgnoreCase(int offset, int length, String stringToCompare) {
-		// by definition
-		if (stringToCompare == null)
-			return false;
-
-		boolean result = false;
-		if (fCharSequenceSource != null && fCharSequenceSource instanceof IRegionComparible) {
-			result = ((IRegionComparible) fCharSequenceSource).regionMatchesIgnoreCase(offset, length, stringToCompare);
-		} else {
-			// old fashioned ways
-			String test = null;
-			if (fCharSequenceSource != null) {
-				test = fCharSequenceSource.subSequence(offset, offset + length).toString();
-			} else if (fStringInput != null) {
-				test = fStringInput.substring(offset, offset + length);
-			}
-			result = stringToCompare.equalsIgnoreCase(test);
-		}
-		return result;
-	}
-
-	public void removeBlockMarker(BlockMarker marker) {
-		getTokenizer().removeBlockMarker(marker);
-	}
-
-	public void removeBlockMarker(String tagName) {
-		getTokenizer().removeBlockMarker(tagName);
-	}
-
-	public void removeStructuredDocumentRegionHandler(StructuredDocumentRegionHandler handler) {
-		if (fStructuredDocumentRegionHandlers == null)
-			return;
-		if (fStructuredDocumentRegionHandlers.contains(handler))
-			fStructuredDocumentRegionHandlers.remove(handler);
-	}
-
-	/**
-	 * Resets the input.
-	 */
-	public void reset(java.io.FileInputStream instream) {
-		primReset();
-		//fInput = instream;
-		getTokenizer().reset(instream);
-	}
-
-	/**
-	 * Resets the input.
-	 */
-	public void reset(java.io.Reader reader) {
-		reset(reader, 0);
-	}
-
-	/**
-	 * Resets the input.
-	 */
-	public void reset(java.io.Reader reader, int position) {
-		primReset();
-		fOffset = position;
-		getTokenizer().reset(reader, position);
-		if (reader instanceof DocumentReader) {
-			IDocument doc = ((DocumentReader) reader).getDocument();
-			if (doc instanceof CharSequence) {
-				fCharSequenceSource = (CharSequence) doc;
-			} else {
-				// old fashioned IDocument
-				fDocumentInput = ((DocumentReader) reader).getDocument();
-			}
-
-		} else if (reader instanceof CharSequenceReader) {
-			fCharSequenceSource = ((CharSequenceReader) reader).getOriginalSource();
-		}
-	}
-
-	/**
-	 * Resets the input. Use this version to allow text to be retrieved
-	 * <em>during</em> parsing, such as by the
-	 * StructuredDocumentRegionHandler.
-	 */
-	public void reset(String sourceString) {
-		reset(new StringReader(sourceString));
-		fStringInput = sourceString;
-	}
-
-	/**
-	 * Resets the input. Use this version to allow text to be retrieved
-	 * <em>during</em> parsing, such as by the
-	 * StructuredDocumentRegionHandler.
-	 */
-	public void reset(String sourceString, int position) {
-		StringReader reader = new StringReader(sourceString);
-		reset(reader, position);
-		fStringInput = sourceString;
-	}
-
-	public void resetHandlers() {
-		if (fStructuredDocumentRegionHandlers != null) {
-			int size = fStructuredDocumentRegionHandlers.size();
-			for (int i = 0; i < size; i++)
-				((StructuredDocumentRegionHandler) fStructuredDocumentRegionHandlers.get(i)).resetNodes();
-		}
-	}
-
-	/**
-	 * 
-	 * @param List
-	 */
-	public void setStructuredDocumentRegionHandlers(List newStructuredDocumentRegionHandlers) {
-		fStructuredDocumentRegionHandlers = newStructuredDocumentRegionHandlers;
-	}
-
-	protected void setTokenizer(BlockTokenizer newTokenizer) {
-		// DMW: changed from private to protected, so subclass could use in
-		// creation of 'newInstance'.
-		fTokenizer = newTokenizer;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLStructuredDocumentReParser.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLStructuredDocumentReParser.java
deleted file mode 100644
index b186ef8..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLStructuredDocumentReParser.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredTextReParser;
-import org.eclipse.wst.sse.core.internal.text.StructuredDocumentReParser;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-public class XMLStructuredDocumentReParser extends StructuredDocumentReParser {
-
-	public XMLStructuredDocumentReParser() {
-		super();
-	}
-
-	protected IStructuredDocumentRegion findDirtyEnd(int end) {
-		// Caution: here's one place we have to cast
-		IStructuredDocumentRegion result = fStructuredDocument.getRegionAtCharacterOffset(end);
-		// if not well formed, get one past, if there is something there
-		if ((result != null) && (!result.isEnded())) {
-			if (result.getNext() != null) {
-				result = result.getNext();
-			}
-		}
-		// also, get one past if exactly equal to the end (this was needed
-		// as a simple fix to when a whole exact region is deleted.
-		// there's probably a better way.
-		if ((result != null) && (end == result.getEnd())) {
-			if (result.getNext() != null) {
-				result = result.getNext();
-			}
-		}
-
-		// 12/6/2001 - Since we've changed the parser/scanner to allow a lone
-		// '<' without
-		// always interpretting it as start of a tag name, we need to be a
-		// little fancier, in order
-		// to "skip" over any plain 'ol content between the lone '<' and any
-		// potential meating
-		// regions past plain 'ol content.
-		if (isLoneOpenFollowedByContent(result) && (result.getNext() != null)) {
-			result = result.getNext();
-		}
-
-		if (result != null)
-			fStructuredDocument.setCachedDocumentRegion(result);
-		dirtyEnd = result;
-
-		return dirtyEnd;
-	}
-
-	protected void findDirtyStart(int start) {
-		IStructuredDocumentRegion result = fStructuredDocument.getRegionAtCharacterOffset(start);
-		// heuristic: if the postion is exactly equal to the start, then
-		// go back one more, if it exists. This prevents problems with
-		// insertions
-		// of text that should be merged with the previous node instead of
-		// simply hung
-		// off of it as a separate node (ex.: XML content inserted right
-		// before an open
-		// bracket should become part of the previous content node)
-		if (result != null) {
-			IStructuredDocumentRegion previous = result.getPrevious();
-			if ((previous != null) && ((!(previous.isEnded())) || (start == result.getStart()))) {
-				result = previous;
-			}
-			// If we are now at the end of a "tag dependent" content area (or
-			// JSP area)
-			// then we need to back up all the way to the beginning of that.
-			IStructuredDocumentRegion potential = result;
-			while (isPartOfBlockRegion(potential)) {
-				potential = potential.getPrevious();
-			}
-			if (potential != null) {
-				result = potential;
-				fStructuredDocument.setCachedDocumentRegion(result);
-			}
-		}
-		dirtyStart = result;
-	}
-
-	/**
-	 * The rule is, that is we are content, preceded by lone <, then we need
-	 * to advance one more for dirty end.
-	 */
-	protected boolean isLoneOpenFollowedByContent(IStructuredDocumentRegion flatNode) {
-		boolean result = false;
-		String type = flatNode.getType();
-		if (type == DOMRegionContext.XML_CONTENT) {
-			IStructuredDocumentRegion previous = flatNode.getPrevious();
-			String previousType = null;
-			if (previous != null) {
-				previousType = previous.getType();
-			}
-			if (previousType != null) {
-				result = (previousType == DOMRegionContext.XML_TAG_OPEN);
-			}
-		}
-		return result;
-	}
-
-	protected boolean isPartOfBlockRegion(IStructuredDocumentRegion flatNode) {
-		boolean result = false;
-		String type = flatNode.getType();
-		result = (type == DOMRegionContext.BLOCK_TEXT);
-		return result;
-	}
-
-	public IStructuredTextReParser newInstance() {
-		return new XMLStructuredDocumentReParser();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLStructuredRegionFactory.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLStructuredRegionFactory.java
deleted file mode 100644
index 304c81d..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLStructuredRegionFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.text.XMLStructuredDocumentRegion;
-
-
-/**
- * A simple class to generate instances of StructuredRegions.
- */
-public class XMLStructuredRegionFactory {
-	public final static int JSP_DIRECTIVE = 1003;
-	public final static int XML = 1001;
-	public final static int XML_BLOCK = 1002;
-
-	public static IStructuredDocumentRegion createRegion(int type) {
-		IStructuredDocumentRegion instance = null;
-		switch (type) {
-			case XML :
-				instance = new XMLStructuredDocumentRegion();
-				break;
-			case XML_BLOCK :
-				instance = new BlockStructuredDocumentRegion();
-				break;
-			default :
-				throw new IllegalArgumentException("AbstractRegion::createRegion. Invalid type."); //$NON-NLS-1$
-		}
-		return instance;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLTokenizer.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLTokenizer.java
deleted file mode 100644
index 795fbab..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLTokenizer.java
+++ /dev/null
@@ -1,1881 +0,0 @@
-/* The following code was generated by JFlex 1.2.2 on 1/27/05 4:48 PM */
-
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*nlsXXX*/
-package org.eclipse.wst.xml.core.internal.parser;
-
-import java.io.CharArrayReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockTokenizer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.parser.regions.XMLParserRegionFactory;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-/**
- * This class is a scanner generated by 
- * <a href="http://www.informatik.tu-muenchen.de/~kleing/jflex/">JFlex</a> 1.2.2
- * on 1/27/05 4:48 PM from the specification file
- * <tt>file:/D:/eclipse.wtp/workspace/org.eclipse.wst.sse.core/DevTimeSupport/SedModel/HTMLTokenizer/devel/XMLTokenizer.jflex</tt>
- */
-public class XMLTokenizer implements BlockTokenizer, DOMRegionContext {
-
-  /** this character denotes the end of file */
-  final public static int YYEOF = -1;
-
-  /** lexical states */
-  final public static int ST_XML_DOCTYPE_EXTERNAL_ID = 23;
-  final public static int ST_XML_ELEMENT_DECLARATION_CONTENT = 27;
-  final public static int ST_DHTML_ATTRIBUTE_NAME = 12;
-  final public static int ST_XML_PI_TAG_CLOSE = 11;
-  final public static int ST_XML_DECLARATION_CLOSE = 21;
-  final public static int ST_XML_PI_ATTRIBUTE_VALUE = 10;
-  final public static int ST_DHTML_EQUALS = 13;
-  final public static int ST_XML_TAG_NAME = 16;
-  final public static int ST_XML_ATTRIBUTE_VALUE = 19;
-  final public static int ST_DHTML_ATTRIBUTE_VALUE = 14;
-  final public static int ST_XML_DOCTYPE_ID_SYSTEM = 25;
-  final public static int ST_XML_ATTRIBUTE_NAME = 17;
-  final public static int ST_XML_ELEMENT_DECLARATION = 26;
-  final public static int ST_XML_DOCTYPE_DECLARATION = 22;
-  final public static int ST_XML_ATTLIST_DECLARATION = 28;
-  final public static int ST_XML_COMMENT_END = 4;
-  final public static int ST_CDATA_TEXT = 1;
-  final public static int ST_DHTML_TAG_CLOSE = 15;
-  final public static int ST_XML_COMMENT = 3;
-  final public static int ST_PI_CONTENT = 7;
-  final public static int ST_PI_WS = 6;
-  final public static int ST_CDATA_END = 2;
-  final public static int ST_XML_ATTLIST_DECLARATION_CONTENT = 29;
-  final public static int ST_BLOCK_TAG_SCAN = 30;
-  final public static int ST_XML_PI_EQUALS = 9;
-  final public static int ST_XML_DECLARATION = 20;
-  final public static int YYINITIAL = 0;
-  final public static int ST_XML_DOCTYPE_ID_PUBLIC = 24;
-  final public static int ST_XML_EQUALS = 18;
-  final public static int ST_PI = 5;
-  final public static int ST_XML_PI_ATTRIBUTE_NAME = 8;
-
-  /** 
-   * Translates characters to character classes
-   */
-  final private static String yycmap_packed = 
-    "\11\0\1\5\1\22\2\0\1\14\22\0\1\14\1\21\1\11\1\51"+
-    "\1\16\1\17\1\12\1\13\1\16\1\16\1\16\1\16\1\16\1\7"+
-    "\1\6\1\3\12\15\1\10\1\54\1\1\1\43\1\2\1\4\1\16"+
-    "\1\32\1\55\1\30\1\31\1\35\1\52\1\34\1\34\1\40\1\34"+
-    "\1\34\1\26\1\25\1\42\1\41\1\45\1\34\1\36\1\37\1\33"+
-    "\1\53\2\34\1\23\1\44\1\34\1\27\1\0\1\20\1\0\1\10"+
-    "\1\0\1\47\1\55\1\56\1\50\1\35\1\52\1\34\1\34\1\40"+
-    "\2\34\1\26\1\25\1\42\1\41\1\45\1\34\1\36\1\37\1\46"+
-    "\1\53\1\34\1\34\1\24\1\44\1\34\1\0\1\0\72\0\1\60"+
-    "\10\0\27\57\1\0\37\57\1\0\72\57\2\0\13\57\2\0\10\57"+
-    "\1\0\65\57\1\0\104\57\11\0\44\57\3\0\2\57\4\0\36\57"+
-    "\70\0\131\57\22\0\7\57\16\0\2\60\56\0\106\60\32\0\2\60"+
-    "\44\0\1\57\1\60\3\57\1\0\1\57\1\0\24\57\1\0\54\57"+
-    "\1\0\7\57\3\0\1\57\1\0\1\57\1\0\1\57\1\0\1\57"+
-    "\1\0\22\57\15\0\14\57\1\0\102\57\1\0\14\57\1\0\44\57"+
-    "\1\0\4\60\11\0\65\57\2\0\2\57\2\0\2\57\3\0\34\57"+
-    "\2\0\10\57\2\0\2\57\67\0\46\57\2\0\1\57\7\0\46\57"+
-    "\12\0\21\60\1\0\27\60\1\0\3\60\1\0\1\60\1\0\2\60"+
-    "\1\0\1\60\13\0\33\57\5\0\3\57\56\0\32\57\5\0\1\60"+
-    "\12\57\10\60\15\0\12\60\6\0\1\60\107\57\2\0\5\57\1\0"+
-    "\17\57\1\0\4\57\1\0\1\57\17\60\2\57\2\60\1\0\4\60"+
-    "\2\0\12\60\u0207\0\3\60\1\0\65\57\2\0\1\60\1\57\20\60"+
-    "\3\0\4\60\3\0\12\57\2\60\2\0\12\60\21\0\3\60\1\0"+
-    "\10\57\2\0\2\57\2\0\26\57\1\0\7\57\1\0\1\57\3\0"+
-    "\4\57\2\0\1\60\1\0\7\60\2\0\2\60\2\0\3\60\11\0"+
-    "\1\60\4\0\2\57\1\0\3\57\2\60\2\0\12\60\2\57\20\0"+
-    "\1\60\2\0\6\57\4\0\2\57\2\0\26\57\1\0\7\57\1\0"+
-    "\2\57\1\0\2\57\1\0\2\57\2\0\1\60\1\0\5\60\4\0"+
-    "\2\60\2\0\3\60\13\0\4\57\1\0\1\57\7\0\12\60\2\60"+
-    "\3\57\14\0\3\60\1\0\7\57\1\0\1\57\1\0\3\57\1\0"+
-    "\26\57\1\0\7\57\1\0\2\57\1\0\5\57\2\0\1\60\1\57"+
-    "\10\60\1\0\3\60\1\0\3\60\22\0\1\57\5\0\12\60\21\0"+
-    "\3\60\1\0\10\57\2\0\2\57\2\0\26\57\1\0\7\57\1\0"+
-    "\2\57\2\0\4\57\2\0\1\60\1\57\6\60\3\0\2\60\2\0"+
-    "\3\60\10\0\2\60\4\0\2\57\1\0\3\57\4\0\12\60\22\0"+
-    "\2\60\1\0\6\57\3\0\3\57\1\0\4\57\3\0\2\57\1\0"+
-    "\1\57\1\0\2\57\3\0\2\57\3\0\3\57\3\0\10\57\1\0"+
-    "\3\57\4\0\5\60\3\0\3\60\1\0\4\60\11\0\1\60\17\0"+
-    "\11\60\21\0\3\60\1\0\10\57\1\0\3\57\1\0\27\57\1\0"+
-    "\12\57\1\0\5\57\4\0\7\60\1\0\3\60\1\0\4\60\7\0"+
-    "\2\60\11\0\2\57\4\0\12\60\22\0\2\60\1\0\10\57\1\0"+
-    "\3\57\1\0\27\57\1\0\12\57\1\0\5\57\4\0\7\60\1\0"+
-    "\3\60\1\0\4\60\7\0\2\60\7\0\1\57\1\0\2\57\4\0"+
-    "\12\60\22\0\2\60\1\0\10\57\1\0\3\57\1\0\27\57\1\0"+
-    "\20\57\4\0\6\60\2\0\3\60\1\0\4\60\11\0\1\60\10\0"+
-    "\2\57\4\0\12\60\221\0\56\57\1\0\1\57\1\60\2\57\7\60"+
-    "\5\0\6\57\1\60\10\60\1\0\12\60\47\0\2\57\1\0\1\57"+
-    "\2\0\2\57\1\0\1\57\2\0\1\57\6\0\4\57\1\0\7\57"+
-    "\1\0\3\57\1\0\1\57\1\0\1\57\2\0\2\57\1\0\2\57"+
-    "\1\0\1\57\1\60\2\57\6\60\1\0\2\60\1\57\2\0\5\57"+
-    "\1\0\1\60\1\0\6\60\2\0\12\60\76\0\2\60\6\0\12\60"+
-    "\13\0\1\60\1\0\1\60\1\0\1\60\4\0\2\60\10\57\1\0"+
-    "\41\57\7\0\24\60\1\0\6\60\4\0\6\60\1\0\1\60\1\0"+
-    "\25\60\3\0\7\60\1\0\1\60\346\0\46\57\12\0\47\57\11\0"+
-    "\1\57\1\0\2\57\1\0\3\57\1\0\1\57\1\0\2\57\1\0"+
-    "\5\57\51\0\1\57\1\0\1\57\1\0\1\57\13\0\1\57\1\0"+
-    "\1\57\1\0\1\57\3\0\2\57\3\0\1\57\5\0\3\57\1\0"+
-    "\1\57\1\0\1\57\1\0\1\57\1\0\1\57\3\0\2\57\3\0"+
-    "\2\57\1\0\1\57\50\0\1\57\11\0\1\57\2\0\1\57\2\0"+
-    "\2\57\7\0\2\57\1\0\1\57\1\0\7\57\50\0\1\57\4\0"+
-    "\1\57\10\0\1\57\u0c06\0\234\57\4\0\132\57\6\0\26\57\2\0"+
-    "\6\57\2\0\46\57\2\0\6\57\2\0\10\57\1\0\1\57\1\0"+
-    "\1\57\1\0\1\57\1\0\37\57\2\0\65\57\1\0\7\57\1\0"+
-    "\1\57\3\0\3\57\1\0\7\57\3\0\4\57\2\0\6\57\4\0"+
-    "\15\57\5\0\3\57\1\0\7\57\323\0\15\60\4\0\1\60\104\0"+
-    "\1\57\3\0\2\57\2\0\1\57\121\0\3\57\u0e82\0\1\60\1\0"+
-    "\1\57\31\0\11\57\6\60\1\0\5\60\13\0\124\57\4\0\2\60"+
-    "\2\0\2\60\2\0\132\57\1\0\3\60\6\0\50\57\u1cd3\0\u51a6\57"+
-    "\u0c5a\0\u2ba4\57\134\0\u0800\0\u1ffe\0\2\0";
-
-  /** 
-   * Translates characters to character classes
-   */
-  final private static char [] yycmap = yy_unpack_cmap(yycmap_packed);
-
-  /** 
-   * Translates a state to a row index in the transition table
-   */
-  final private static int yy_rowMap [] = { 
-        0,    49,    98,   147,   196,   245,   294,   343,   392,   441, 
-      490,   539,   588,   637,   686,   735,   784,   833,   882,   931, 
-      980,  1029,  1078,  1127,  1176,  1225,  1274,  1323,  1372,  1421, 
-     1470,  1519,  1568,  1617,  1666,  1715,  1764,  1715,  1764,  1813, 
-     1715,  1715,  1764,  1862,  1911,  1960,  2009,  2058,  2107,  2156, 
-     1715,  1764,  2205,  2254,  2303,  1715,  2352,  2352,  2401,  2450, 
-     2499,  2205,  1715,  2548,  2597,  1715,  2646,  2695,  2744,  2793, 
-     2842,  2891,  1715,  2940,  2989,  3038,  3087,  1715,  3136,  3185, 
-     3234,  3283,  3332,  1715,  3381,  3430,  3479,  3528,  3577,  3626, 
-     3675,  3724,  3724,  3773,  3822,  3871,  3920,  3920,  3969,  4018, 
-     4067,  4116,  4116,  4165,  4214,  4263,  4312,  1715,  4361,  4361, 
-     4410,  4459,  4508,  4557,  1715,  1715,  1764,  1715,  1715,  4606, 
-     4655,  4704,  4753,  4802,  4851,  4900,  4949,  1715,  4998,  5047, 
-     1715,  1715,  2352,  5096,  2450,  1715,  5145,  2499,  2548,  2646, 
-     2695,  5194,  2744,  1715,  5243,  2793,  1715,  3136,  5292,  3234, 
-     1715,  5341,  3283,  4606,  5390,  5439,  5488,  3528,  1715,  5537, 
-     5586,  3724,  5635,  3773,  1715,  5684,  5733,  5782,  5782,  5831, 
-     5880,  3871,  3724,  3920,  5929,  3969,  1715,  5978,  4018,  4067, 
-     3920,  4116,  6027,  4165,  1715,  6076,  6125,  6174,  6174,  6223, 
-     6272,  6321,  4361,  6370,  4410,  1715,  6419,  6468,  6517,  6517, 
-     6566,  6615,  6664,  6713,  6762,  6811,  6860,  1715,  6909,  6958, 
-     1715,  1715,  1715,  2009,  7007,  7056,  7105,  7154,  7203,  7252, 
-     5684,  7301,  7301,  6076,  7350,  7350,  7399,  6419,  7448,  7448, 
-     7497,  1715,  7546,  7595,  1715,  7644,  7693,  7742,  7791,  7840, 
-     7889,  7938,  5831,  6223,  7987,  6566,  8036,  8085,  8134,  8183, 
-     8232,  8281,  8330,  8379,  8428,  8477,  8526,  8575,  8624,  8673, 
-     8722,  1715,  1715,  8771,  8820,  8869,  8918,  1715,  1715,  1715, 
-     8967,  9016,  9065,  9114,  9163,  1715,  4263,  4508
-  };
-
-  /** 
-   * The packed transition table of the DFA
-   */
-  final private static String yy_packed = 
-    "\1\40\1\41\10\40\1\42\4\40\1\43\41\40\1\44"+
-    "\1\45\57\44\1\46\1\47\16\46\1\50\1\46\1\51"+
-    "\36\46\1\52\1\53\57\52\1\46\1\47\5\46\1\54"+
-    "\12\46\1\51\37\46\1\47\2\46\1\55\1\56\2\46"+
-    "\1\57\3\46\1\56\5\46\1\56\2\60\2\57\1\46"+
-    "\10\57\1\61\2\57\1\46\5\57\1\46\2\57\1\46"+
-    "\3\57\2\46\1\47\2\46\1\55\1\62\6\46\1\62"+
-    "\5\46\1\62\36\46\1\63\1\64\2\63\1\65\15\63"+
-    "\1\51\36\63\1\46\1\47\2\46\1\66\1\56\2\46"+
-    "\1\67\3\46\1\56\5\46\1\56\4\67\1\46\13\67"+
-    "\1\46\5\67\1\46\2\67\1\46\3\67\2\46\1\47"+
-    "\2\46\1\66\1\56\2\46\1\67\3\46\1\56\5\46"+
-    "\1\56\4\67\1\46\13\67\1\70\5\67\1\46\2\67"+
-    "\1\46\3\67\1\46\1\71\1\47\1\46\1\72\1\73"+
-    "\1\56\3\71\1\74\1\71\1\75\1\56\5\71\1\56"+
-    "\36\71\1\46\1\47\2\46\1\76\15\46\1\51\37\46"+
-    "\1\47\1\77\1\100\1\46\1\56\2\46\1\101\3\46"+
-    "\1\56\5\46\1\56\4\101\1\46\13\101\1\46\5\101"+
-    "\1\46\2\101\1\46\3\101\2\46\1\47\1\77\1\100"+
-    "\1\46\1\56\2\46\1\101\3\46\1\56\5\46\1\56"+
-    "\4\101\1\46\13\101\1\102\5\101\1\46\2\101\1\46"+
-    "\3\101\1\46\1\103\1\47\1\77\1\104\1\103\1\56"+
-    "\3\103\1\105\1\103\1\106\1\56\5\103\1\56\36\103"+
-    "\1\46\1\47\3\46\1\56\6\46\1\56\5\46\1\56"+
-    "\36\46\1\107\1\110\1\111\1\112\4\107\1\113\12\107"+
-    "\4\114\1\107\13\114\1\107\5\114\1\107\2\114\1\107"+
-    "\3\114\1\107\1\46\1\110\1\111\1\112\1\46\1\56"+
-    "\2\46\1\115\3\46\1\56\5\46\1\56\4\115\1\46"+
-    "\13\115\1\46\5\115\1\46\2\115\1\46\3\115\2\46"+
-    "\1\110\1\111\1\112\1\46\1\56\2\46\1\115\3\46"+
-    "\1\56\5\46\1\56\4\115\1\46\13\115\1\116\5\115"+
-    "\1\46\2\115\1\46\3\115\1\46\1\117\1\110\1\111"+
-    "\1\120\1\117\1\56\3\117\1\121\1\117\1\122\1\56"+
-    "\5\117\1\56\36\117\1\46\1\123\1\124\2\46\1\56"+
-    "\6\46\1\56\5\46\1\56\6\46\1\125\1\126\2\46"+
-    "\1\127\11\46\1\126\1\125\11\46\1\47\1\124\2\46"+
-    "\1\56\6\46\1\56\5\46\1\56\4\46\1\130\32\46"+
-    "\1\47\1\124\2\46\1\56\2\46\1\131\3\46\1\56"+
-    "\5\46\1\56\4\131\1\130\13\131\1\46\5\131\1\46"+
-    "\2\131\1\46\3\131\2\46\1\47\1\124\2\46\1\56"+
-    "\6\46\1\56\5\46\1\56\4\46\1\130\7\46\1\132"+
-    "\5\46\1\133\13\46\1\134\1\47\1\124\1\135\1\134"+
-    "\1\56\3\134\1\136\1\134\1\137\1\56\5\134\1\56"+
-    "\4\134\1\140\31\134\1\141\1\47\1\124\1\142\1\141"+
-    "\1\56\3\141\1\143\1\141\1\144\1\56\5\141\1\56"+
-    "\4\141\1\145\31\141\1\146\1\47\1\124\1\147\1\146"+
-    "\1\56\3\146\1\150\1\146\1\151\1\56\5\146\1\56"+
-    "\36\146\1\152\1\153\1\154\56\152\1\155\1\47\1\124"+
-    "\1\156\1\155\1\56\3\155\1\157\1\155\1\160\1\56"+
-    "\5\155\1\56\36\155\1\161\1\162\1\163\56\161\1\164"+
-    "\1\165\57\164\1\40\1\0\10\40\1\0\4\40\1\0"+
-    "\41\40\3\0\1\166\1\167\14\0\1\170\44\0\1\171"+
-    "\2\0\1\172\3\0\1\171\5\0\1\171\4\172\1\0"+
-    "\13\172\1\0\5\172\1\173\2\172\1\0\3\172\6\0"+
-    "\1\171\2\0\1\174\3\0\1\171\5\0\1\171\4\174"+
-    "\1\0\13\174\1\0\5\174\1\0\2\174\1\0\3\174"+
-    "\103\0\1\175\57\0\1\176\47\0\1\177\53\0\1\200"+
-    "\63\0\1\56\6\0\1\56\5\0\1\56\44\0\3\57"+
-    "\4\0\1\57\5\0\4\57\1\0\13\57\1\0\5\57"+
-    "\1\0\2\57\1\0\4\57\6\0\3\57\4\0\1\57"+
-    "\5\0\2\57\1\201\1\57\1\0\13\57\1\0\5\57"+
-    "\1\0\2\57\1\0\4\57\6\0\3\57\4\0\1\57"+
-    "\5\0\2\57\1\202\1\57\1\0\13\57\1\0\5\57"+
-    "\1\0\2\57\1\0\4\57\5\0\1\62\6\0\1\62"+
-    "\5\0\1\62\40\0\1\203\60\0\1\204\64\0\3\67"+
-    "\4\0\1\67\5\0\4\67\1\0\13\67\1\0\5\67"+
-    "\1\0\2\67\1\0\4\67\1\71\2\0\1\205\1\71"+
-    "\1\0\3\71\1\0\1\71\2\0\5\71\1\0\37\71"+
-    "\1\0\1\204\1\205\1\71\1\0\3\71\1\0\1\71"+
-    "\2\0\5\71\1\0\36\71\1\74\1\0\1\206\1\207"+
-    "\1\74\1\206\3\74\1\210\1\74\2\206\5\74\1\206"+
-    "\36\74\1\75\1\0\1\211\1\212\1\75\1\211\3\75"+
-    "\1\211\1\75\1\210\1\211\5\75\1\211\36\75\2\0"+
-    "\1\77\1\213\63\0\3\101\4\0\1\101\5\0\4\101"+
-    "\1\0\13\101\1\0\5\101\1\0\2\101\1\0\4\101"+
-    "\1\103\2\0\1\214\1\103\1\0\3\103\1\0\1\103"+
-    "\2\0\5\103\1\0\37\103\1\0\1\77\1\215\1\103"+
-    "\1\0\3\103\1\0\1\103\2\0\5\103\1\0\36\103"+
-    "\1\105\1\0\1\216\1\217\1\105\1\216\3\105\1\220"+
-    "\1\105\2\216\5\105\1\216\36\105\1\106\1\0\1\221"+
-    "\1\222\1\106\1\221\3\106\1\221\1\106\1\220\1\221"+
-    "\5\106\1\221\36\106\1\107\3\0\17\107\4\0\1\107"+
-    "\13\0\1\107\5\0\1\107\2\0\1\107\3\0\1\107"+
-    "\3\0\1\166\15\0\1\170\41\0\1\223\56\0\1\107"+
-    "\3\0\2\107\3\113\4\107\1\113\5\107\4\114\1\107"+
-    "\13\114\1\107\5\114\1\107\2\114\1\107\3\114\1\113"+
-    "\6\0\3\114\4\0\1\114\5\0\4\114\1\0\13\114"+
-    "\1\0\5\114\1\0\2\114\1\0\4\114\6\0\3\115"+
-    "\4\0\1\115\5\0\4\115\1\0\13\115\1\0\5\115"+
-    "\1\0\2\115\1\0\4\115\1\117\2\0\1\224\1\117"+
-    "\1\0\3\117\1\0\1\117\2\0\5\117\1\0\37\117"+
-    "\1\0\1\223\1\224\1\117\1\0\3\117\1\0\1\117"+
-    "\2\0\5\117\1\0\36\117\1\121\1\0\1\225\1\226"+
-    "\1\121\1\225\3\121\1\227\1\121\2\225\5\121\1\225"+
-    "\36\121\1\122\1\0\1\230\1\231\1\122\1\230\3\122"+
-    "\1\230\1\122\1\227\1\230\5\122\1\230\36\122\3\0"+
-    "\1\166\15\0\1\232\100\0\1\233\52\0\1\234\12\0"+
-    "\1\234\40\0\1\235\32\0\20\236\1\237\40\236\6\0"+
-    "\3\131\4\0\1\131\5\0\4\131\1\0\13\131\1\0"+
-    "\5\131\1\0\2\131\1\0\4\131\44\0\1\240\67\0"+
-    "\1\241\5\0\1\134\2\0\1\242\1\134\1\0\3\134"+
-    "\1\0\1\134\2\0\5\134\1\0\36\134\1\136\1\0"+
-    "\1\243\1\244\1\136\1\243\3\136\1\245\1\136\2\243"+
-    "\5\136\1\243\36\136\1\246\1\0\1\247\1\250\1\251"+
-    "\1\247\3\251\1\247\1\246\1\252\1\253\3\251\1\246"+
-    "\1\251\1\253\4\251\1\246\27\251\2\246\1\140\2\236"+
-    "\1\254\1\140\1\236\3\140\1\236\1\140\2\236\3\140"+
-    "\1\255\1\140\1\236\36\140\1\141\2\0\1\256\1\141"+
-    "\1\0\3\141\1\0\1\141\2\0\5\141\1\0\36\141"+
-    "\1\143\2\257\1\260\1\143\1\257\3\143\1\261\1\143"+
-    "\2\257\5\143\1\257\36\143\1\144\2\262\1\263\1\144"+
-    "\1\262\3\144\1\262\1\144\1\261\1\262\5\144\1\262"+
-    "\36\144\1\145\2\236\1\264\1\145\1\236\3\145\1\236"+
-    "\1\145\2\236\3\145\1\265\1\145\1\236\36\145\1\146"+
-    "\2\0\1\266\1\146\1\0\3\146\1\0\1\146\2\0"+
-    "\5\146\1\0\36\146\1\150\1\0\1\267\1\270\1\150"+
-    "\1\267\3\150\1\271\1\150\2\267\5\150\1\267\36\150"+
-    "\1\272\1\0\1\273\1\274\1\275\1\273\3\275\1\273"+
-    "\1\272\1\276\1\277\3\275\1\272\1\275\1\277\4\275"+
-    "\1\272\27\275\2\272\2\152\1\0\60\152\1\0\16\152"+
-    "\1\300\37\152\1\155\2\0\1\301\1\155\1\0\3\155"+
-    "\1\0\1\155\2\0\5\155\1\0\36\155\1\157\1\0"+
-    "\1\302\1\303\1\157\1\302\3\157\1\304\1\157\2\302"+
-    "\5\157\1\302\36\157\1\305\1\0\1\306\1\307\1\310"+
-    "\1\306\3\310\1\306\1\305\1\311\1\312\3\310\1\305"+
-    "\1\310\1\312\4\310\1\305\27\310\2\305\2\161\1\0"+
-    "\60\161\1\0\16\161\1\313\37\161\7\0\1\314\17\0"+
-    "\1\315\36\0\1\171\2\0\1\40\3\0\1\171\5\0"+
-    "\1\171\4\40\1\0\13\40\1\0\5\40\1\0\2\40"+
-    "\1\0\3\40\1\0\1\316\1\0\3\316\1\317\3\172"+
-    "\1\316\1\0\1\316\1\317\1\172\1\316\1\0\2\316"+
-    "\1\317\4\172\1\316\13\172\1\316\5\172\1\316\2\172"+
-    "\1\320\4\172\15\0\1\321\6\0\1\322\34\0\1\316"+
-    "\1\0\3\316\1\317\3\174\1\316\1\0\1\316\1\317"+
-    "\1\174\1\316\1\0\2\316\1\317\4\174\1\316\13\174"+
-    "\1\316\5\174\1\316\2\174\1\323\4\174\27\0\1\315"+
-    "\33\0\1\324\60\0\1\325\64\0\3\57\4\0\1\57"+
-    "\5\0\3\57\1\326\1\0\13\57\1\0\5\57\1\0"+
-    "\2\57\1\0\4\57\6\0\3\57\4\0\1\57\5\0"+
-    "\4\57\1\0\13\57\1\0\1\57\1\327\3\57\1\0"+
-    "\2\57\1\0\4\57\1\206\1\0\7\206\1\210\47\206"+
-    "\1\211\1\0\11\211\1\210\45\211\1\216\1\0\7\216"+
-    "\1\220\47\216\1\221\1\0\11\221\1\220\45\221\1\225"+
-    "\1\0\7\225\1\227\47\225\1\230\1\0\11\230\1\227"+
-    "\45\230\30\0\1\330\25\0\1\330\35\0\1\331\12\0"+
-    "\1\331\47\0\1\332\62\0\1\333\76\0\1\334\3\0"+
-    "\1\243\1\0\7\243\1\245\47\243\1\246\1\0\1\247"+
-    "\1\335\1\246\1\247\3\246\1\247\1\246\1\245\1\247"+
-    "\5\246\1\247\36\246\1\247\1\0\11\247\1\245\45\247"+
-    "\1\246\1\0\1\247\1\335\1\246\1\247\3\246\1\247"+
-    "\1\246\1\336\1\247\5\246\1\247\36\246\13\0\1\337"+
-    "\45\0\1\247\1\0\11\247\1\336\45\247\11\257\1\261"+
-    "\47\257\13\262\1\261\45\262\1\267\1\0\7\267\1\271"+
-    "\47\267\1\272\1\0\1\273\1\340\1\272\1\273\3\272"+
-    "\1\273\1\272\1\271\1\273\5\272\1\273\36\272\1\273"+
-    "\1\0\11\273\1\271\45\273\1\272\1\0\1\273\1\340"+
-    "\1\272\1\273\3\272\1\273\1\272\1\341\1\273\5\272"+
-    "\1\273\36\272\13\0\1\342\45\0\1\273\1\0\11\273"+
-    "\1\341\45\273\2\152\1\0\24\152\1\343\31\152\1\302"+
-    "\1\0\7\302\1\304\47\302\1\305\1\0\1\306\1\344"+
-    "\1\305\1\306\3\305\1\306\1\305\1\304\1\306\5\305"+
-    "\1\306\36\305\1\306\1\0\11\306\1\304\45\306\1\305"+
-    "\1\0\1\306\1\344\1\305\1\306\3\305\1\306\1\305"+
-    "\1\345\1\306\5\305\1\306\36\305\13\0\1\346\45\0"+
-    "\1\306\1\0\11\306\1\345\45\306\2\161\1\0\24\161"+
-    "\1\347\31\161\7\0\1\350\101\0\1\351\30\0\1\316"+
-    "\1\0\10\316\1\0\4\316\1\0\34\316\1\0\5\316"+
-    "\1\0\3\316\1\317\4\316\1\0\1\316\1\317\2\316"+
-    "\1\0\2\316\1\317\31\316\1\352\4\316\15\0\1\321"+
-    "\36\0\1\353\21\0\1\354\12\0\3\354\2\0\1\354"+
-    "\11\0\2\354\1\0\1\354\2\0\2\354\10\0\3\57"+
-    "\4\0\1\57\5\0\4\57\1\0\11\57\1\355\1\57"+
-    "\1\0\5\57\1\0\2\57\1\0\4\57\33\0\1\356"+
-    "\12\0\1\356\40\0\1\357\57\0\1\360\66\0\1\361"+
-    "\12\0\1\361\40\0\1\362\35\0\2\363\1\0\3\363"+
-    "\2\0\1\252\4\363\1\0\6\363\1\0\27\363\5\0"+
-    "\2\364\1\0\3\364\2\0\1\276\4\364\1\0\6\364"+
-    "\1\0\27\364\2\0\2\152\1\0\25\152\1\365\30\152"+
-    "\3\0\2\366\1\0\3\366\2\0\1\311\4\366\1\0"+
-    "\6\366\1\0\27\366\2\0\2\161\1\0\25\161\1\367"+
-    "\30\161\31\0\1\370\103\0\1\352\21\0\1\354\12\0"+
-    "\3\354\2\0\1\354\11\0\2\354\1\0\1\354\1\0"+
-    "\1\353\2\354\10\0\3\57\4\0\1\57\5\0\4\57"+
-    "\1\0\6\57\1\371\4\57\1\0\5\57\1\0\2\57"+
-    "\1\0\4\57\44\0\1\372\54\0\1\373\55\0\1\374"+
-    "\60\0\1\375\63\0\1\376\20\0\2\152\1\0\26\152"+
-    "\1\377\27\152\2\161\1\0\26\161\1\u0100\27\161\32\0"+
-    "\1\u0101\34\0\3\57\4\0\1\57\5\0\4\57\1\0"+
-    "\3\57\1\u0102\7\57\1\0\2\57\1\u0102\2\57\1\0"+
-    "\2\57\1\0\4\57\45\0\1\u0103\52\0\1\u0104\63\0"+
-    "\1\u0105\43\0\1\u0106\63\0\1\u0107\25\0\1\u0107\2\0"+
-    "\2\152\1\0\27\152\1\u0108\26\152\2\161\1\0\27\161"+
-    "\1\u0109\26\161\33\0\1\u010a\32\0\1\u010b\3\57\3\0"+
-    "\1\u010b\1\57\4\0\1\u010b\4\57\1\0\13\57\1\0"+
-    "\5\57\1\0\2\57\1\0\4\57\35\0\1\u010c\56\0"+
-    "\1\u010d\12\0\1\u010d\45\0\1\u010e\12\0\1\u010e\12\0"+
-    "\2\152\1\0\30\152\1\u010f\25\152\2\161\1\0\30\161"+
-    "\1\u0110\25\161\32\0\1\u0111\33\0\1\u010b\6\0\1\u010b"+
-    "\5\0\1\u010b\36\0\2\152\1\0\27\152\1\u0112\26\152"+
-    "\2\161\1\0\27\161\1\u0113\26\161\27\0\1\u0114\31\0"+
-    "\2\152\1\0\24\152\1\u0115\31\152\2\161\1\0\24\161"+
-    "\1\u0116\31\161";
-
-  /** 
-   * The transition table of the DFA
-   */
-  final private static int yytrans [] = yy_unpack(yy_packed);
-
-
-  /* error codes */
-  final private static int YY_UNKNOWN_ERROR = 0;
-  // final private static int YY_ILLEGAL_STATE = 1;
-  final private static int YY_NO_MATCH = 2;
-  final private static int YY_PUSHBACK_2BIG = 3;
-
-  /* error messages for the codes above */
-  final private static String YY_ERROR_MSG[] = {
-    "Unkown internal scanner error",		//$NON-NLS-1$
-    "Internal error: unknown state",		//$NON-NLS-1$
-    "Error: could not match input",		//$NON-NLS-1$
-    "Error: pushback value was too large"	//$NON-NLS-1$
-  };
-
-  /**
-   * YY_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
-   */
-  private final static byte YY_ATTRIBUTE[] = {
-     1,  0,  0,  0,  0,  1,  0,  0,  1,  1,  1,  0,  1,  1,  1,  1, 
-     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  1, 
-     1,  1,  1,  9,  1,  9,  1,  1,  9,  9,  1,  1,  1,  1,  1,  1, 
-     1,  1,  9,  1,  1,  1,  1,  9,  1,  1,  1,  1,  1,  1,  9,  1, 
-     1,  9,  1,  1,  1,  1,  1,  1,  9,  1,  1,  1,  1,  9,  1,  1, 
-     1,  1,  1,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 
-     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  9,  1,  1,  1,  1, 
-     1,  1,  9,  9,  1,  9,  9,  1,  0,  1,  0,  1,  0,  0,  0,  9, 
-     1,  1,  9,  9,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  9, 
-     0,  0,  9,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  9,  0, 
-     0,  0,  0,  0,  9,  1,  0,  0,  1,  1,  0,  0,  1,  0,  0,  0, 
-     9,  0,  0,  0,  1,  0,  0,  0,  9,  1,  0,  0,  1,  1,  0,  1, 
-     0,  0,  0,  9,  1,  0,  0,  1,  1,  0,  1,  0,  0,  1,  1,  9, 
-     0,  0,  9,  9,  9,  1,  1,  0,  0,  0,  0,  0,  0,  1,  0,  0, 
-     1,  0,  1,  0,  1,  0,  1,  9,  0,  1,  9,  0,  1,  0,  0,  0, 
-     0,  0,  0,  0,  1,  0,  1,  0,  1,  0,  0,  0,  0,  0,  1,  1, 
-     0,  1,  0,  0,  0,  9,  9,  1,  1,  0,  1,  9,  9,  9,  1,  1, 
-     0,  1,  1,  9,  1,  1
-  };
-
-  /** the input device */
-  private java.io.Reader yy_reader;
-
-  /** the current state of the DFA */
-  private int yy_state;
-
-  /** the current lexical state */
-  private int yy_lexical_state = YYINITIAL;
-
-  /** this buffer contains the current text to be matched and is
-      the source of the yytext() string */
-  private char yy_buffer[] = new char[16384];
-
-  /** the textposition at the last accepting state */
-  private int yy_markedPos;
-
-  /** the textposition at the last state to be included in yytext */
-  private int yy_pushbackPos;
-
-  /** the current text position in the buffer */
-  private int yy_currentPos;
-
-  /** startRead marks the beginning of the yytext() string in the buffer */
-  private int yy_startRead;
-
-  /** endRead marks the last character in the buffer, that has been read
-      from input */
-  private int yy_endRead;
-
-  /** number of newlines encountered up to the start of the matched text */
-  private int yyline;
-
-  /** the number of characters up to the start of the matched text */
-  private int yychar;
-
-  /**
-   * the number of characters from the last newline up to the start of the 
-   * matched text
-   */
-  // private int yycolumn; 
-
-  /** 
-   * yy_atBOL == true <=> the scanner is currently at the beginning of a line
-   */
-  // private boolean yy_atBOL;
-
-  /** yy_atEOF == true <=> the scanner has returned a value for EOF */
-  private boolean yy_atEOF;
-
-  /** denotes if the user-EOF-code has already been executed */
-  private boolean yy_eof_done;
-
-  /* user code: */
-	private int fTokenCount = 0;
- 
-	// required holders for white-space compacting
-	private boolean fShouldLoadBuffered = false;
-	private String fBufferedContext = null;
-	private int fBufferedStart = 1;
-	private int fBufferedLength = 0;
-	private String f_context = null;
-
-	// state stack for handling embedded regions
-	private IntStack fStateStack = new IntStack();
-
-	private String context = null;
-	private int start = 0;
-	private int textLength = 0;
-	private int length = 0;
-
-	// offset for tracking position specific block tags
-	private int fOffset = 0;
-	
-	// the name of the current tag being opened
-	private String fCurrentTagName = null;
-
-	// the list of tag name BlockMarkers
-	private List fBlockMarkers = new ArrayList();
-
-	// required to not seek text blocks on an end tag
-	private boolean fIsBlockingEnabled = false;
-	private boolean fIsCaseSensitiveBlocking = true;
-
-	private XMLParserRegionFactory fRegionFactory = new XMLParserRegionFactory();
-/**
- * user method 
- */
-public final void addBlockMarker(BlockMarker marker) {
-	if(containsTagName(marker.getTagName()))
-		return;
-	fBlockMarkers.add(marker);
-}
-/**
- * user method 
- */
-public final void removeBlockMarker(BlockMarker marker) {
-	fBlockMarkers.remove(marker);
-}
-/**
- * user method 
- */
-public final void removeBlockMarker(String tagname) {
-	if (fBlockMarkers != null) {
-		Iterator blocks = fBlockMarkers.iterator();
-		while (blocks.hasNext()) {
-			if (((BlockMarker) blocks.next()).getTagName().equals(tagname))
-				blocks.remove();
-		}
-	}
-}
-/* user method */
-public final boolean isCaseSensitiveBlocking() {
-	return fIsCaseSensitiveBlocking;
-}
-/* user method */
-public final void setCaseSensitiveBlocking(boolean newValue) {
-	fIsCaseSensitiveBlocking = newValue;
-}
-/* user method */
-public boolean getBlockMarkerCaseSensitivity() {
-        return getBlockMarkerCaseSensitivity(fCurrentTagName);
-}
-/* user method */
-public boolean getBlockMarkerCaseSensitivity(String name) {
-	Iterator iterator = fBlockMarkers.iterator();
-	while(iterator.hasNext()) {
-		BlockMarker marker = (BlockMarker)iterator.next();
-		boolean casesensitive = marker.isCaseSensitive();
-		if(casesensitive && marker.getTagName().equals(name))
-			return casesensitive;
-		else if(!casesensitive && marker.getTagName().equalsIgnoreCase(name))
-			return casesensitive;
-	}
-	return true;
-}
-/* user method */
-public String getBlockMarkerContext() {
-	return getBlockMarkerContext(fCurrentTagName);
-}
-/* user method */
-public String getBlockMarkerContext(String name) {
-	Iterator iterator = fBlockMarkers.iterator();
-	while(iterator.hasNext()) {
-		BlockMarker marker = (BlockMarker)iterator.next();
-		if(marker.getTagName().equals(name))
-			return marker.getContext();
-	}
-	return BLOCK_TEXT;
-}
-/* user method */
-public List getBlockMarkers() {
-	return fBlockMarkers;
-}
-/* user method */
-public final int getOffset() {
-	return fOffset + yychar;
-}
-private final boolean isBlockMarker() {
-	return isBlockMarker(fCurrentTagName);
-}
-private final boolean isBlockMarker(String tagName) {
-	if (!fIsBlockingEnabled)
-		return false;
-	return containsTagName(tagName);
-}
-/**
- * user method
- */
-public final void beginBlockTagScan(String newTagName) {
-	beginBlockMarkerScan(newTagName, BLOCK_TEXT);
-}
-/**
- * user method
- *
- * Special tokenizer setup.  Allows tokenization to be initiated at the
- * start of a text block within a "newTagName" tag.
- *
- * Example: 
- *	Tokenizer toker = new Tokenizer();
- *	toker.setCaseSensitiveBlocking(false);
- *	toker.reset(new java.io.StringReader("afiuhqwkejhtasihgalkwhtq</scripter></scr></script>asgdasga"));
- *	toker.beginBlockMarkerScan("script", BLOCK_TEXT);
- *	toker.getRegions(); 
- *
- * Returns:
- *	BLOCK_TEXT: 0-40
- *	XML_END_TAG_OPEN: 41-42
- *	XML_TAG_NAME: 43-48
- *	XML_TAG_CLOSE: 49-49
- *	XML_CONTENT: 50-57
- *
- */
-public final void beginBlockMarkerScan(String newTagName, String blockcontext) {
-	yybegin(ST_BLOCK_TAG_SCAN);
-	fCurrentTagName = newTagName;
-}
-/**
- * Method doScan.
- * 
- * Returns a context region for all of the text from the current position upto the end of input or
- * to right *before* the first occurence of searchString
- * 
- * @param searchString - target string to search for ex.: "-->", "</tagname"
- * @param requireTailSeparator - whether the target must be immediately followed by whitespace or '>'
- * @param context - the context of the scanned region if non-zero length
- * @param exitState - the state to go to if the region was of non-zero length
- * @param abortState - the state to go to if the searchString was found immediately
- * @return String - the context found: the desired context on a non-zero length match, the abortContext on immediate success
- * @throws IOException
- */
-private final String doScan(String searchString, boolean requireTailSeparator, String searchContext, int exitState, int immediateFallbackState) throws IOException {
-	boolean stillSearching = true;
-	// Disable further block (probably)
-	fIsBlockingEnabled = false;
-	int searchStringLength = searchString.length();
-	int n = 0;
-	char lastCheckChar;
-	int i;
-	boolean same = false;
-	while (stillSearching) {
-		n = 0;
-		// Ensure that enough data from the input exists to compare against the search String.
-		n = yy_advance();
-		while(n != YYEOF && yy_currentPos < searchStringLength)
-			n = yy_advance();
-		// If the input was too short or we've exhausted the input, stop immediately.
-		if (n == YYEOF) {
-			stillSearching = false;
-		}
-		else {
-			same = true;
-			// Ensure that we've not encountered a complete block (<%%>) that was *shorter* than the closeTagString and
-			// thus found twice at current-targetLength [since the first scan would have come out this far anyway].
-			// Check the characters in the target versus the last targetLength characters read from the buffer
-			// and see if it matches
-			
-			// safety check for array accesses (yy_currentPos is the *last* character we can check against)
-			if(yy_currentPos >= searchStringLength && yy_currentPos <= yy_buffer.length) {
-				for(i = 0; i < searchStringLength; i++) {
-					if(same && fIsCaseSensitiveBlocking)
-						same = yy_buffer[i + yy_currentPos - searchStringLength] == searchString.charAt(i);
-					else if(same && !fIsCaseSensitiveBlocking)
-						same = Character.toLowerCase(yy_buffer[i + yy_currentPos - searchStringLength]) == Character.toLowerCase(searchString.charAt(i));
-				}
-			}
-			// safety check failed; no match is possible right now
-			else {
-				same = false;
-			}
-			if (same && requireTailSeparator && yy_currentPos < yy_buffer.length) {
-				// Additional check for close tags to ensure that targetString="</script" doesn't match
-				// "</scriptS"
-				lastCheckChar = yy_buffer[yy_currentPos];
-				// Succeed on "</script>" and "</script "
-				if(lastCheckChar == '>' || Character.isWhitespace(lastCheckChar))
-					stillSearching = false;
-			}
-			else {
-				stillSearching = !same || (yy_currentPos < yy_startRead + searchStringLength);
-			}
-		}
-	}
-	if (n != YYEOF || same) {
-		// We've stopped short of the end or definitely found a match
-		yy_markedPos = yy_currentPos - searchStringLength;
-		yy_currentPos = yy_markedPos + 1;
-		// If the searchString occurs at the very beginning of what would have
-		// been a Block, resume scanning normally immediately
-		if (yy_markedPos == yy_startRead) {
-			yybegin(immediateFallbackState);
-			return primGetNextToken();
-		}
-	}
-	else {
-		// We ran through the rest of the input
-		yy_markedPos = yy_currentPos;
-		yy_currentPos++;
-	}
-	yybegin(exitState);
-	// If the ending occurs at the very beginning of what would have
-	// been a Block, resume scanning normally immediately
-	if(yy_markedPos == yy_startRead)
-		return primGetNextToken();
-	return searchContext;
-}
-/**
- * user method
- *
- * A generic lookahead-like operation
- */
-private final String doBlockScan(String target, String targetContext, int immediateFallbackState) throws IOException {
-	return doScan(target, false, targetContext, immediateFallbackState, immediateFallbackState);
-}
-/**
- * user method 
- * does a lookahead for the current tag name
- */
-private final String doBlockTagScan() throws IOException {
-        fIsCaseSensitiveBlocking = getBlockMarkerCaseSensitivity();
-	return doScan("</" + fCurrentTagName, true, getBlockMarkerContext(fCurrentTagName), YYINITIAL, YYINITIAL);
-}
-/**
- * user method
- *
- * Converts the raw context String returned by the primGetNextToken()
- * method into a full ITextRegion by pulling in values for the
- * current offset within the scanning text.
- *
- * Returns null when EOF is encountered and attaches intermittently
- * discovered whitespace onto the end of useful regions.
- *
- * Note that this algorithm caches the token following the one being returned
- * so that whitespace can be collapsed.
- */
-public final ITextRegion getNextToken() throws IOException {
-	// load the starting non-whitespace token (assume that it is so)
-	if (fShouldLoadBuffered) {
-		context = fBufferedContext;
-		start = fBufferedStart;
-		textLength = length = fBufferedLength;
-		fShouldLoadBuffered = false;
-	}
-	else {
-		context = primGetNextToken();
-		if (context == XML_TAG_NAME) {
-			if(containsTagName(yy_buffer, yy_startRead, yy_markedPos-yy_startRead))
-				fCurrentTagName = yytext();
-			else
-				fCurrentTagName = null;
-		}
-		else if (context == XML_TAG_OPEN) {
-			fIsBlockingEnabled = true;
-		}
-		else if (context == XML_END_TAG_OPEN) {
-			fIsBlockingEnabled = false;
-		}
-		start = yychar;
-		textLength = length = yylength();
-		if (yy_atEOF) {
-			fTokenCount++;
-			return null;
-		}
-	}
-	// store the next token
-	f_context = primGetNextToken();
-	if (f_context == XML_TAG_NAME) {
-		if(containsTagName(yy_buffer, yy_startRead, yy_markedPos-yy_startRead))
-			fCurrentTagName = yytext();
-		else
-			fCurrentTagName = null;
-	}
-	else if (f_context == XML_TAG_OPEN) {
-		fIsBlockingEnabled = true;
-	}
-	else if (f_context == XML_END_TAG_OPEN) {
-		fIsBlockingEnabled = false;
-	}
-	fBufferedContext = f_context;
-	fBufferedStart = yychar;
-	fBufferedLength = yylength();
-	fShouldLoadBuffered = true;
-	if (fBufferedContext == WHITE_SPACE) {
-		fShouldLoadBuffered = false;
-		length += fBufferedLength;
-	}
-	if (context == null) {
-		// EOF
-		if (Debug.debugTokenizer) {
-			System.out.println(getClass().getName() + " discovered " + fTokenCount + " tokens."); //$NON-NLS-2$//$NON-NLS-1$
-		}
-		return null;
-	}
-	fTokenCount++;
-	return fRegionFactory.createToken(context, start, textLength, length, null, fCurrentTagName);
-}
-/* user method */
-public XMLTokenizer(){
-	super();
-}
-/* user method */
-public XMLTokenizer(char[] charArray){
-		this(new CharArrayReader(charArray));
-}
-/* user method */
-public void reset(char[] charArray) {
-	reset(new CharArrayReader(charArray), 0);
-}
-/* user method */
-public void reset(char[] charArray, int newOffset) {
-	reset(new CharArrayReader(charArray), newOffset);
-}
-/* user method */
-public void reset(java.io.InputStream in) {
-	reset(new java.io.InputStreamReader(in), 0);
-}
-/* user method */
-public void reset(java.io.InputStream in, int newOffset) {
-	reset(new java.io.InputStreamReader(in), newOffset);
-}
-/* user method */
-public void reset(java.io.Reader in) {
-	reset(in, 0);
-}
-/**
- * user method *
- *
- * Reset internal counters and vars to "newly created" values, in the hopes
- * that resetting a pre-existing tokenizer is faster than creating a new one.
- *
- * This method contains code blocks that were essentially duplicated from the
- * <em>generated</em> output of this specification before this method was
- * added.  Those code blocks were under the above copyright.
- */
-public void reset(java.io.Reader in, int newOffset) {
-	if (Debug.debugTokenizer) {
-		System.out.println("resetting tokenizer");//$NON-NLS-1$
-	}
-	fOffset = newOffset;
-
-	/* the input device */
-	yy_reader = in;
-
-	/* the current state of the DFA */
-	yy_state = 0;
-
-	/* the current lexical state */
-	yy_lexical_state = YYINITIAL;
-
-	/* this buffer contains the current text to be matched and is
-	the source of the yytext() string */
-	java.util.Arrays.fill(yy_buffer, (char)0);
-
-	/* the textposition at the last accepting state */
-	yy_markedPos = 0;
-
-	/* the textposition at the last state to be included in yytext */
-	yy_pushbackPos = 0;
-
-	/* the current text position in the buffer */
-	yy_currentPos = 0;
-
-	/* startRead marks the beginning of the yytext() string in the buffer */
-	yy_startRead = 0;
-
-	/** 
-	 * endRead marks the last character in the buffer, that has been read
-	 * from input 
-	 */
-	yy_endRead = 0;
-
-	/* number of newlines encountered up to the start of the matched text */
-	yyline = 0;
-
-	/* the number of characters up to the start of the matched text */
-	yychar = 0;
-
-	/* yy_atEOF == true <=> the scanner has returned a value for EOF */
-	yy_atEOF = false;
-
-	/* denotes if the user-EOF-code has already been executed */
-	yy_eof_done = false;
-
-
-	/* user vars: */
-	fTokenCount = 0;
- 
-	fShouldLoadBuffered = false;
-	fBufferedContext = null;
-	fBufferedStart = 1;
-	fBufferedLength = 0;
-	fStateStack = new IntStack();
-
-	context = null;
-	start = 0;
-	textLength = 0;
-	length = 0;
-}
-
-	/**
-	 * user method
-	 *
-	 */
-	public BlockTokenizer newInstance() {
-		XMLTokenizer newInstance = new XMLTokenizer();
-		// global tagmarkers can be shared; they have no state and 
-		// are never destroyed (e.g. 'release')
-		for(int i = 0; i < fBlockMarkers.size(); i++) {
-			BlockMarker blockMarker = (BlockMarker) fBlockMarkers.get(i);
-			if(blockMarker.isGlobal())
-				newInstance.addBlockMarker(blockMarker);
-		}
-		return newInstance;
-	}
-/* user method */
-private final String scanXMLCommentText() throws IOException {
-	// Scan for '-->' and return the text up to that point as
-	//   XML_COMMENT_TEXT unless the string occurs IMMEDIATELY, in which
-	//  case change to the ST_XML_COMMENT_END state and return the next
-	//  context as usual.
-	return doScan("-->", false, XML_COMMENT_TEXT, ST_XML_COMMENT_END, ST_XML_COMMENT_END);
-}
-
-
-  /**
-   * Creates a new scanner
-   * There is also a java.io.InputStream version of this constructor.
-   *
-   * @param   in  the java.io.Reader to read input from.
-   */
-  public XMLTokenizer(java.io.Reader in) {
-    this.yy_reader = in;
-  }
-
-  /**
-   * Creates a new scanner.
-   * There is also java.io.Reader version of this constructor.
-   *
-   * @param   in  the java.io.Inputstream to read input from.
-   */
-  public XMLTokenizer(java.io.InputStream in) {
-    this(new java.io.InputStreamReader(in));
-  }
-
-  /** 
-   * Unpacks the compressed DFA transition table.
-   *
-   * @param packed   the packed transition table
-   * @return         the unpacked transition table
-   */
-  private static int [] yy_unpack(String packed) {
-    int [] trans = new int[9212];
-    int i = 0;  /* index in packed string  */
-    int j = 0;  /* index in unpacked array */
-    while (i < 3220) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      value--;
-      do trans[j++] = value; while (--count > 0);
-    }
-    return trans;
-  }
-
-  /** 
-   * Unpacks the compressed character translation table.
-   *
-   * @param packed   the packed character translation table
-   * @return         the unpacked character translation table
-   */
-  private static char [] yy_unpack_cmap(String packed) {
-    char [] map = new char[0x10000];
-    int i = 0;  /* index in packed string  */
-    int j = 0;  /* index in unpacked array */
-    while (i < 1372) {
-      int  count = packed.charAt(i++);
-      char value = packed.charAt(i++);
-      do map[j++] = value; while (--count > 0);
-    }
-    return map;
-  }
-
-
-  /**
-   * Gets the next input character.
-   *
-   * @return      the next character of the input stream, EOF if the
-   *              end of the stream is reached.
-   * @exception   IOException  if any I/O-Error occurs
-   */
-  private int yy_advance() throws java.io.IOException {
-
-    /* standard case */
-    if (yy_currentPos < yy_endRead) return yy_buffer[yy_currentPos++];
-
-    /* if the eof is reached, we don't need to work hard */ 
-    if (yy_atEOF) return YYEOF;
-
-    /* otherwise: need to refill the buffer */
-
-    /* first: make room (if you can) */
-    if (yy_startRead > 0) {
-      System.arraycopy(yy_buffer, yy_startRead, 
-                       yy_buffer, 0, 
-                       yy_endRead-yy_startRead);
-
-      /* translate stored positions */
-      yy_endRead-= yy_startRead;
-      yy_currentPos-= yy_startRead;
-      yy_markedPos-= yy_startRead;
-      yy_pushbackPos-= yy_startRead;
-      yy_startRead = 0;
-    }
-
-    /* is the buffer big enough? */
-    if (yy_currentPos >= yy_buffer.length) {
-      /* if not: blow it up */
-      char newBuffer[] = new char[yy_currentPos*2];
-      System.arraycopy(yy_buffer, 0, newBuffer, 0, yy_buffer.length);
-      yy_buffer = newBuffer;
-    }
-
-    /* finally: fill the buffer with new input */
-    int numRead = yy_reader.read(yy_buffer, yy_endRead, 
-                                            yy_buffer.length-yy_endRead);
-
-    if ( numRead == -1 ) return YYEOF;
-
-    yy_endRead+= numRead;
-
-    return yy_buffer[yy_currentPos++];
-  }
-
-    
-  /**
-   * Closes the input stream.
-   */
-  final public void yyclose() throws java.io.IOException {
-    yy_atEOF = true;            /* indicate end of file */
-    yy_endRead = yy_startRead;  /* invalidate buffer    */
-    yy_reader.close();
-  }
-
-
-  /**
-   * Returns the current lexical state.
-   */
-  final public int yystate() {
-    return yy_lexical_state;
-  }
-
-  /**
-   * Enters a new lexical state
-   *
-   * @param newState the new lexical state
-   */
-  final public void yybegin(int newState) {
-    yy_lexical_state = newState;
-  }
-
-
-  /**
-   * Returns the text matched by the current regular expression.
-   */
-  final public String yytext() {
-    return new String( yy_buffer, yy_startRead, yy_markedPos-yy_startRead );
-  }
-
-  /**
-   * Returns the length of the matched text region.
-   */
-  final public int yylength() {
-    return yy_markedPos-yy_startRead;
-  }
-
-
-  /**
-   * Reports an error that occured while scanning - from the SED JFlex skeleton
-   *
-   * @param   errorCode  the code of the errormessage to display
-   */
-  private void yy_ScanError(int errorCode) {
-    try {
-      Logger.log(Logger.ERROR, YY_ERROR_MSG[errorCode]);
-    }
-    catch (ArrayIndexOutOfBoundsException e) {
-      Logger.log(Logger.ERROR, YY_ERROR_MSG[YY_UNKNOWN_ERROR]);
-    }
-    // DO NOT EXIT the VM on an error
-    // System.exit(1);
-  } 
-
-
-  /**
-   * Pushes the specified amount of characters back into the input stream.
-   *
-   * They will be read again by then next call of the scanning method
-   *
-   * @param number  the number of characters to be read again.
-   *                This number must not be greater than yylength()!
-   */
-  void yypushback(int number) {
-    if ( number > yylength() )
-      yy_ScanError(YY_PUSHBACK_2BIG);
-
-    yy_markedPos -= number;
-  }
-
-	/**
-	 * user method - skeleton.sed
-	 */
-	protected final boolean containsTagName(char[] markerTagName, int offset, int tagnameLength) {
-		for(int j = 0; j < fBlockMarkers.size(); j++) {
-			BlockMarker marker = (BlockMarker)fBlockMarkers.get(j);
-			if(marker.getTagName().length() == tagnameLength) {
-				boolean matchesSoFar = true;
-				for(int i = 0; i < tagnameLength && matchesSoFar; i++) {
-					if(marker.isCaseSensitive()) {
-						if(marker.getTagName().charAt(i) != markerTagName[i + offset])
-							matchesSoFar = false;
-					}
-					else {
-						if(Character.toLowerCase(marker.getTagName().charAt(i)) != Character.toLowerCase(markerTagName[i + offset]))
-							matchesSoFar = false;
-					}
-				}
-				if(matchesSoFar)
-					return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * user method - skeleton.sed
-	 *
-	 * Return ALL of the regions scannable within the remaining text
-	 * Note: for verification use
-	 */
-	public final List getRegions() {
-		List tokens = new ArrayList();
-		ITextRegion region = null;
-		try {
-			region = getNextToken();
-			while(region != null) {
-				if (region != null) {
-					tokens.add(region);
-				}
-				region = getNextToken();
-			}
-		}
-		catch (StackOverflowError e) {
-			Logger.logException(getClass().getName()+": input could not be tokenized correctly at position " + getOffset(), e);//$NON-NLS-1$
-			throw e;
-		}
-		catch (Exception e) {
-			// Since this is convenience method and NOT the recommended 
-			// way of getting tokens, many errors are simply hidden
-			Logger.logException("Exception not handled retrieving regions: " + e.getLocalizedMessage(), e);//$NON-NLS-1$
-		}
-		return tokens;
-	}
-	/**
-	 * user method - skeleton.sed
-	 */
-	private final void dump(String s) {
-		if (Debug.debugTokenizer) {
-			System.out.println(s + " (" + yychar + "-" + //$NON-NLS-2$//$NON-NLS-1$
-				(yylength() + yychar) + "):\'" +//$NON-NLS-1$
-					StringUtils.escape(yytext()) + "\'");//$NON-NLS-1$
-		}
-	}
-	/* user method  - skeleton.sed */
-	public final boolean isEOF() {
-		return yy_atEOF;
-	}
-/* user method - skeleton.sed */
-protected final boolean containsTagName(String markerTagName) {
-	Iterator blocks = fBlockMarkers.iterator();
-	while(blocks.hasNext()) {
-		BlockMarker marker = (BlockMarker)blocks.next();
-		if(marker.isCaseSensitive()) {
-			if(marker.getTagName().equals(markerTagName))
-				return true;
-		}
-		else {
-			if(marker.getTagName().equalsIgnoreCase(markerTagName))
-				return true;
-		}
-	}
-	return false;
-}
-
-  /**
-   * Contains user EOF-code, which will be executed exactly once,
-   * when the end of file is reached
-   */
-  private void yy_do_eof() {
-    if (!yy_eof_done) {
-      yy_eof_done = true;
-    // do nothing, this is the downstream parser's job
-
-    }
-  }
-
-
-  /**
-   * Resumes scanning until the next regular expression is matched,
-   * the end of input is encountered or an I/O-Error occurs.
-   *
-   * @return      the next token
-   * @exception   IOException  if any I/O-Error occurs
-   */
-  public String primGetNextToken() throws java.io.IOException {
-    int yy_input;
-    int yy_action;
-
-
-    while (true) {
-
-      yychar+= yylength();
-
-      boolean yy_counted = false;
-      for (yy_currentPos = yy_startRead; yy_currentPos < yy_markedPos;
-                                                      yy_currentPos++) {
-        switch (yy_buffer[yy_currentPos]) {
-        case '\r':
-          yyline++;
-          yy_counted = true;
-          break;
-        case '\n':
-          if (yy_counted)
-            yy_counted = false;
-          else {
-            yyline++;
-          }
-          break;
-        default:
-          yy_counted = false;
-        }
-      }
-
-      if (yy_counted) {
-        if ( yy_advance() == '\n' ) yyline--;
-        if ( !yy_atEOF ) yy_currentPos--;
-      }
-
-      yy_action = -1;
-
-      yy_currentPos = yy_startRead = yy_markedPos;
-
-      yy_state = yy_lexical_state;
-
-
-      yy_forAction: {
-        while (true) {
-    
-          yy_input = yy_advance();
-
-          if ( yy_input == YYEOF ) break yy_forAction;
-
-          int yy_next = yytrans[ yy_rowMap[yy_state] + yycmap[yy_input] ];
-          if (yy_next == -1) break yy_forAction;
-          yy_state = yy_next;
-
-          int yy_attributes = YY_ATTRIBUTE[yy_state];
-          if ( (yy_attributes & 1) > 0 ) {
-            yy_action = yy_state; 
-            yy_markedPos = yy_currentPos; 
-            if ( (yy_attributes & 8) > 0 ) break yy_forAction;
-          }
-
-        }
-      }
-
-
-      switch (yy_action) {    
-
-        case 275: 
-        case 276: 
-        case 277: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("\nCDATA start");//$NON-NLS-1$
-	fStateStack.push(yystate());
-	yybegin(ST_CDATA_TEXT);
-	return XML_CDATA_OPEN;
- }
-        case 279: break;
-        case 269: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("element");//$NON-NLS-1$
-	yybegin(ST_XML_ELEMENT_DECLARATION);
-	return XML_ELEMENT_DECLARATION;
- }
-        case 280: break;
-        case 268: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("attlist");//$NON-NLS-1$
-	yybegin(ST_XML_ATTLIST_DECLARATION);
-	return XML_ATTLIST_DECLARATION;
- }
-        case 281: break;
-        case 267: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("doctype");//$NON-NLS-1$
-	yybegin(ST_XML_DOCTYPE_DECLARATION);
-	return XML_DOCTYPE_DECLARATION;
- }
-        case 282: break;
-        case 262: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("doctype external id");//$NON-NLS-1$
-	yybegin(ST_XML_DOCTYPE_ID_PUBLIC);
-	return XML_DOCTYPE_EXTERNAL_ID_PUBLIC;
- }
-        case 283: break;
-        case 261: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("doctype external id");//$NON-NLS-1$
-	yybegin(ST_XML_DOCTYPE_ID_SYSTEM);
-	return XML_DOCTYPE_EXTERNAL_ID_SYSTEM;
- }
-        case 284: break;
-        case 257: 
-        case 266: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("DHTML processing instruction target");//$NON-NLS-1$
-        yybegin(ST_DHTML_ATTRIBUTE_NAME);
-        return XML_TAG_NAME;
- }
-        case 285: break;
-        case 234: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("\nCharRef");//$NON-NLS-1$
-	return XML_CHAR_REFERENCE;
- }
-        case 286: break;
-        case 231: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("\ncomment start");//$NON-NLS-1$
-	yybegin(ST_XML_COMMENT);
-	return XML_COMMENT_OPEN;
- }
-        case 287: break;
-        case 213: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("XML processing instruction target");//$NON-NLS-1$
-        yybegin(ST_XML_PI_ATTRIBUTE_NAME);
-        return XML_TAG_NAME;
- }
-        case 288: break;
-        case 212: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("comment end");//$NON-NLS-1$
-	yybegin(YYINITIAL);
-	return XML_COMMENT_CLOSE;
- }
-        case 289: break;
-        case 211: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("CDATA end");//$NON-NLS-1$
-	yybegin(fStateStack.pop());
-	return XML_CDATA_CLOSE;
- }
-        case 290: break;
-        case 210: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("\nPEReference");//$NON-NLS-1$
-	return XML_PE_REFERENCE;
- }
-        case 291: break;
-        case 207: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("\nEntityRef");//$NON-NLS-1$
-	return XML_ENTITY_REFERENCE;
- }
-        case 292: break;
-        case 158: 
-        case 172: 
-        case 180: 
-          { 
-	return XML_DOCTYPE_INTERNAL_SUBSET;
- }
-        case 293: break;
-        case 146: 
-          { 
-        yybegin(YYINITIAL);
-	if(Debug.debugTokenizer)
-		dump("empty tag close");//$NON-NLS-1$
-        return XML_EMPTY_TAG_CLOSE;
- }
-        case 294: break;
-        case 131: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("XML processing instruction end");//$NON-NLS-1$
-        yybegin(YYINITIAL);
-        return XML_PI_CLOSE;
- }
-        case 295: break;
-        case 130: 
-          { 
-		// ended with nothing inside
-        yybegin(YYINITIAL);
-        return XML_PI_CLOSE;
- }
-        case 296: break;
-        case 127: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("processing instruction end");//$NON-NLS-1$
-        yybegin(YYINITIAL);
-        return XML_PI_CLOSE;
- }
-        case 297: break;
-        case 119: 
-          { 
-	fStateStack.push(yystate());
-	if(Debug.debugTokenizer)
-		dump("\ndeclaration start");//$NON-NLS-1$
-        yybegin(ST_XML_DECLARATION);
-	return XML_DECLARATION_OPEN;
- }
-        case 298: break;
-        case 118: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("\nprocessing instruction start");//$NON-NLS-1$
-	yybegin(ST_PI);
-        return XML_PI_OPEN;
- }
-        case 299: break;
-        case 62: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("DHTML processing instruction end");//$NON-NLS-1$
-        yybegin(YYINITIAL);
-        return XML_PI_CLOSE;
- }
-        case 300: break;
-        case 56: 
-        case 58: 
-        case 59: 
-        case 60: 
-        case 135: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("XML processing instruction attribute value");//$NON-NLS-1$
-        yybegin(ST_XML_PI_ATTRIBUTE_NAME);
-        return XML_TAG_ATTRIBUTE_VALUE;
- }
-        case 301: break;
-        case 55: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("XML processing instruction '='");//$NON-NLS-1$
-        yybegin(ST_XML_PI_ATTRIBUTE_VALUE);
-        return XML_TAG_ATTRIBUTE_EQUALS;
- }
-        case 302: break;
-        case 54: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("XML processing instruction attribute name");//$NON-NLS-1$
-        yybegin(ST_XML_PI_EQUALS);
-        return XML_TAG_ATTRIBUTE_NAME;
- }
-        case 303: break;
-        case 50: 
-        case 51: 
-        case 52: 
-          { 
-	// block scan until close is found
-	return doScan("?>", false, XML_PI_CONTENT, ST_XML_PI_TAG_CLOSE, ST_XML_PI_TAG_CLOSE);
- }
-        case 304: break;
-        case 49: 
-          { 
-        yybegin(ST_PI_CONTENT);
-        return WHITE_SPACE;
- }
-        case 305: break;
-        case 46: 
-        case 47: 
-        case 48: 
-        case 128: 
-        case 129: 
-        case 214: 
-        case 236: 
-        case 248: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("processing instruction target");//$NON-NLS-1$
-        yybegin(ST_PI_WS);
-        return XML_TAG_NAME;
- }
-        case 306: break;
-        case 41: 
-        case 42: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("comment content");//$NON-NLS-1$
-	return scanXMLCommentText();
- }
-        case 307: break;
-        case 40: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("LINE FEED");//$NON-NLS-1$
-	return WHITE_SPACE;
- }
-        case 308: break;
-        case 0: 
-        case 31: 
-        case 121: 
-        case 123: 
-        case 205: 
-        case 206: 
-        case 233: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("\nXML content");//$NON-NLS-1$
-	return XML_CONTENT;
- }
-        case 309: break;
-        case 5: 
-        case 8: 
-        case 9: 
-        case 10: 
-        case 12: 
-        case 13: 
-        case 14: 
-        case 15: 
-        case 17: 
-        case 18: 
-        case 19: 
-        case 20: 
-        case 21: 
-        case 22: 
-        case 23: 
-        case 24: 
-        case 25: 
-        case 26: 
-        case 28: 
-        case 45: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("white space");//$NON-NLS-1$
-        return WHITE_SPACE;
- }
-        case 310: break;
-        case 16: 
-        case 70: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("inappropriate tag name");//$NON-NLS-1$
-	yybegin(YYINITIAL);
-        return XML_CONTENT;
- }
-        case 311: break;
-        case 27: 
-        case 105: 
-        case 106: 
-        case 191: 
-        case 226: 
-        case 244: 
-        case 254: 
-        case 263: 
-        case 270: 
-        case 273: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("elementdecl contentspec");//$NON-NLS-1$
-	return XML_ELEMENT_DECL_CONTENT;
- }
-        case 312: break;
-        case 29: 
-        case 112: 
-        case 113: 
-        case 202: 
-        case 230: 
-        case 246: 
-        case 255: 
-        case 264: 
-        case 271: 
-        case 274: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("attlist contentspec");//$NON-NLS-1$
-	return XML_ATTLIST_DECL_CONTENT;
- }
-        case 313: break;
-        case 32: 
-        case 71: 
-        case 82: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("\nstart tag open");//$NON-NLS-1$
-        yybegin(ST_XML_TAG_NAME);
-        return XML_TAG_OPEN;
- }
-        case 314: break;
-        case 33: 
-        case 34: 
-        case 37: 
-        case 38: 
-        case 39: 
-        case 43: 
-        case 44: 
-        case 53: 
-        case 57: 
-        case 61: 
-        case 63: 
-        case 67: 
-        case 73: 
-        case 79: 
-        case 84: 
-        case 85: 
-        case 86: 
-        case 87: 
-        case 89: 
-        case 90: 
-        case 92: 
-        case 97: 
-        case 102: 
-        case 109: 
-          { 
-	if (Debug.debugTokenizer)
-		System.out.println("!!!unexpected!!!: \"" + yytext() + "\":" + //$NON-NLS-2$//$NON-NLS-1$
-			yychar + "-" + (yychar + yylength()));//$NON-NLS-1$
-	return UNDEFINED;
- }
-        case 315: break;
-        case 35: 
-        case 36: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("CDATA text");//$NON-NLS-1$
-	String blockContext = doBlockScan("]]>", XML_CDATA_TEXT, ST_CDATA_END);//$NON-NLS-1$
-	if(blockContext == XML_CDATA_TEXT)
-		yybegin(ST_CDATA_END);
-	return blockContext;
- }
-        case 316: break;
-        case 64: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("DHTML processing instruction attribute name");//$NON-NLS-1$
-        yybegin(ST_DHTML_EQUALS);
-        return XML_TAG_ATTRIBUTE_NAME;
- }
-        case 317: break;
-        case 65: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("DHTML processing instruction '='");//$NON-NLS-1$
-        yybegin(ST_DHTML_ATTRIBUTE_VALUE);
-        return XML_TAG_ATTRIBUTE_EQUALS;
- }
-        case 318: break;
-        case 66: 
-        case 68: 
-        case 69: 
-        case 143: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("DHTML processing instruction attribute value");//$NON-NLS-1$
-        yybegin(ST_DHTML_ATTRIBUTE_NAME);
-        return XML_TAG_ATTRIBUTE_VALUE;
- }
-        case 319: break;
-        case 72: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("tag close");//$NON-NLS-1$
-	if(isBlockMarker()) {
-        	yybegin(ST_BLOCK_TAG_SCAN);
-	}
-	else
-        	yybegin(YYINITIAL);
-        return XML_TAG_CLOSE;
- }
-        case 320: break;
-        case 74: 
-        case 75: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("tag name");//$NON-NLS-1$
-        yybegin(ST_XML_ATTRIBUTE_NAME);
-        return XML_TAG_NAME;
- }
-        case 321: break;
-        case 76: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("attr name");//$NON-NLS-1$
-        yybegin(ST_XML_EQUALS);
-        return XML_TAG_ATTRIBUTE_NAME;
- }
-        case 322: break;
-        case 77: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("equals");//$NON-NLS-1$
-        yybegin(ST_XML_ATTRIBUTE_VALUE);
-        return XML_TAG_ATTRIBUTE_EQUALS;
- }
-        case 323: break;
-        case 78: 
-        case 80: 
-        case 81: 
-        case 150: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("attr value");//$NON-NLS-1$
-        yybegin(ST_XML_ATTRIBUTE_NAME);
-        return XML_TAG_ATTRIBUTE_VALUE;
- }
-        case 324: break;
-        case 83: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("declaration end");//$NON-NLS-1$
-	if (Debug.debugTokenizer) {
-		if(fStateStack.peek()!=YYINITIAL)
-			System.out.println("end embedded region");//$NON-NLS-1$
-	}
-	yybegin(fStateStack.pop());
-	return XML_DECLARATION_CLOSE;
- }
-        case 325: break;
-        case 88: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("doctype type");//$NON-NLS-1$
-	yybegin(ST_XML_DOCTYPE_EXTERNAL_ID);
-	return XML_DOCTYPE_NAME;
- }
-        case 326: break;
-        case 91: 
-        case 93: 
-        case 94: 
-        case 95: 
-        case 164: 
-        case 165: 
-        case 168: 
-        case 169: 
-        case 221: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("doctype public reference");//$NON-NLS-1$
-	yybegin(ST_XML_DOCTYPE_ID_SYSTEM);
-	return XML_DOCTYPE_EXTERNAL_ID_PUBREF;
- }
-        case 327: break;
-        case 96: 
-        case 98: 
-        case 99: 
-        case 100: 
-        case 176: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("doctype system reference");//$NON-NLS-1$
-	yybegin(ST_XML_DECLARATION_CLOSE);
-	return XML_DOCTYPE_EXTERNAL_ID_SYSREF;
- }
-        case 328: break;
-        case 101: 
-        case 103: 
-        case 104: 
-        case 184: 
-        case 185: 
-        case 188: 
-        case 189: 
-        case 224: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("elementdecl name");//$NON-NLS-1$
-	yybegin(ST_XML_ELEMENT_DECLARATION_CONTENT);
-	return XML_ELEMENT_DECL_NAME;
- }
-        case 329: break;
-        case 107: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("elementdecl close");//$NON-NLS-1$
-	if (Debug.debugTokenizer) {
-		if(fStateStack.peek()!=YYINITIAL)
-			System.out.println("end embedded region");//$NON-NLS-1$
-	}
-	yybegin(fStateStack.pop());
-	return XML_DECLARATION_CLOSE;
- }
-        case 330: break;
-        case 108: 
-        case 110: 
-        case 111: 
-        case 195: 
-        case 196: 
-        case 199: 
-        case 200: 
-        case 228: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("attlist name");//$NON-NLS-1$
-	yybegin(ST_XML_ATTLIST_DECLARATION_CONTENT);
-	return XML_ATTLIST_DECL_NAME;
- }
-        case 331: break;
-        case 114: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("attlist close");//$NON-NLS-1$
-	if (Debug.debugTokenizer) {
-		if(fStateStack.peek()!=YYINITIAL)
-			System.out.println("end embedded region");//$NON-NLS-1$
-	}
-	yybegin(fStateStack.pop());
-	return XML_DECLARATION_CLOSE;
- }
-        case 332: break;
-        case 117: 
-          { 
-	if(Debug.debugTokenizer)
-		dump("\nend tag open");//$NON-NLS-1$
-        yybegin(ST_XML_TAG_NAME);
-        return XML_END_TAG_OPEN;
- }
-        case 333: break;
-        case 115: 
-        case 116: 
-          { 
-		return doBlockTagScan();
-	 }
-        case 334: break;
-        default: 
-          if (yy_input == YYEOF && yy_startRead == yy_currentPos) {
-            yy_atEOF = true;
-            yy_do_eof();
-              return null;
-          } 
-          else {
-            yy_ScanError(YY_NO_MATCH);
-          }
-      }
-    }
-  }    
-
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeEqualsRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeEqualsRegion.java
deleted file mode 100644
index cb0f3c9..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeEqualsRegion.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser.regions;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-
-public class AttributeEqualsRegion implements ITextRegion {
-	static private final byte fTextLength = 1;
-	static private final String fType = DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS;
-	private short fLength;
-	private int fStart;
-
-
-	public AttributeEqualsRegion() {
-		super();
-	}
-
-	public AttributeEqualsRegion(int start, int textLength, int length) {
-		this();
-		fStart = start;
-		fLength = (short) length;
-	}
-
-
-	public void adjustLength(int i) {
-		fLength += i;
-
-	}
-
-	public void adjustStart(int i) {
-		fStart += i;
-
-	}
-
-	public void adjustTextLength(int i) {
-		// not supported
-
-	}
-
-	public void equatePositions(ITextRegion region) {
-		fStart = region.getStart();
-		fLength = (short) region.getLength();
-	}
-
-	public int getEnd() {
-		return fStart + fLength;
-	}
-
-	public int getLength() {
-		return fLength;
-	}
-
-	public int getStart() {
-		return fStart;
-	}
-
-	public int getTextEnd() {
-		return fStart + fTextLength;
-	}
-
-	public int getTextLength() {
-		return fTextLength;
-	}
-
-	public String getType() {
-		return fType;
-	}
-
-	public String toString() {
-		return RegionToStringUtil.toString(this);
-	}
-
-	public StructuredDocumentEvent updateRegion(Object requester, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		// can never be updated
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeNameRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeNameRegion.java
deleted file mode 100644
index 5ae7dea..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeNameRegion.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser.regions;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.Utilities;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-public class AttributeNameRegion implements ITextRegion {
-	// specify correct type
-	static private final String fType = DOMRegionContext.XML_TAG_ATTRIBUTE_NAME;
-	private int fLength;
-	private int fStart;
-	private int fTextLength;
-
-	public AttributeNameRegion() {
-		super();
-	}
-
-	public AttributeNameRegion(int start, int textLength, int length) {
-		this();
-		fStart = start;
-		fTextLength = textLength;
-		fLength = length;
-	}
-
-	public void adjustLength(int i) {
-		fLength += i;
-
-	}
-
-	public void adjustStart(int i) {
-		fStart += i;
-
-	}
-
-	public void adjustTextLength(int i) {
-		fTextLength += 1;
-
-	}
-
-	public void equatePositions(ITextRegion region) {
-		fStart = region.getStart();
-		fLength = region.getLength();
-		fTextLength = region.getTextLength();
-	}
-
-	public int getEnd() {
-		return fStart + fLength;
-	}
-
-	public int getLength() {
-		return fLength;
-	}
-
-	public int getStart() {
-		return fStart;
-	}
-
-	public int getTextEnd() {
-		return fStart + fTextLength;
-	}
-
-	public int getTextLength() {
-		return fTextLength;
-	}
-
-	public String getType() {
-		return fType;
-	}
-
-	public String toString() {
-		return RegionToStringUtil.toString(this);
-	}
-
-	public StructuredDocumentEvent updateRegion(Object requester, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		RegionChangedEvent result = null;
-		// if the region is an easy type (e.g. attribute value),
-		// and the requested changes are all
-		// alphanumeric, then make the change here locally.
-		// (This can obviously be made more sophisticated as the need arises,
-		// but should
-		// always follow this pattern.)
-		if (Debug.debugStructuredDocument) {
-			System.out.println("\t\tContextRegion::updateModel"); //$NON-NLS-1$
-			System.out.println("\t\t\tregion type is " + fType); //$NON-NLS-1$
-		}
-		boolean canHandle = false;
-		// note: we'll always handle deletes from these
-		// regions ... if its already that region,
-		// deleting something from it won't change its
-		// type. (remember, the calling program needs
-		// to insure we are not called, if not all contained
-		// on one region.
-		if ((changes == null) || (changes.length() == 0)) {
-			// delete case
-			// We can not do the quick delete, if
-			// if all the text in a region is to be deleted.
-			// Or, if the delete starts in the white space region.
-			// In these cases, a reparse is needed.
-			// Minor note, we use textEnd-start since it always
-			// less than or equal to end-start. This might
-			// cause us to miss a few cases we could have handled,
-			// but will prevent us from trying to handle funning cases
-			// involving whitespace.
-			if ((fStart >= getTextEnd()) || (Math.abs(lengthToReplace) >= getTextEnd() - getStart())) {
-				canHandle = false;
-			} else {
-				canHandle = true;
-			}
-		} else {
-			if ((RegionUpdateRule.canHandleAsWhiteSpace(this, parent, changes, requestStart, lengthToReplace)) || RegionUpdateRule.canHandleAsLetterOrDigit(this, parent, changes, requestStart, lengthToReplace)) {
-				canHandle = true;
-			} else {
-				canHandle = false;
-			}
-
-		}
-		if (canHandle) {
-			// at this point, we still have the old region. We won't create a
-			// new instance, we'll just update the one we have, by changing
-			// its end postion,
-			// The parent flatnode, upon return, has responsibility
-			// for updating sibling regions.
-			// and in turn, the structuredDocument itself has responsibility
-			// for
-			// updating the text store and down stream flatnodes.
-			if (Debug.debugStructuredDocument) {
-				System.out.println("change handled by region"); //$NON-NLS-1$
-			}
-			int lengthDifference = Utilities.calculateLengthDifference(changes, lengthToReplace);
-			// Note: we adjust both end and text end, because for any change
-			// that is in only the trailing whitespace region, we should not
-			// do a quick change,
-			// so 'canHandle' should have been false for those case.
-			// TO_DO_FUTURE: cache value of canHandleAsWhiteSpace from above
-			// If we are handling as whitespace, there is no need to increase
-			// the text length, only
-			// the total length is changing.
-			if (!RegionUpdateRule.canHandleAsWhiteSpace(this, parent, changes, requestStart, lengthToReplace)) {
-				fTextLength += lengthDifference;
-			}
-			fLength += lengthDifference;
-			result = new RegionChangedEvent(parent.getParentDocument(), requester, parent, this, changes, requestStart, lengthToReplace);
-		}
-
-		return result;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeValueRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeValueRegion.java
deleted file mode 100644
index 0a7b3a5..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeValueRegion.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser.regions;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.Utilities;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-public class AttributeValueRegion implements ITextRegion {
-	// specify correct type
-	static private final String fType = DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE;
-	private int fLength;
-	private int fStart;
-	private int fTextLength;
-
-	public AttributeValueRegion() {
-		super();
-	}
-
-	public AttributeValueRegion(int start, int textLength, int length) {
-		this();
-		fStart = start;
-		fTextLength = textLength;
-		fLength = length;
-	}
-
-	public void adjustLength(int i) {
-		fLength += i;
-	}
-
-	public void adjustStart(int i) {
-		fStart += i;
-	}
-
-	public void adjustTextLength(int i) {
-		fTextLength += 1;
-	}
-
-	public void equatePositions(ITextRegion region) {
-		fStart = region.getStart();
-		fLength = region.getLength();
-		fTextLength = region.getTextLength();
-	}
-
-	public int getEnd() {
-		return fStart + fLength;
-	}
-
-	public int getLength() {
-		return fLength;
-	}
-
-	public int getStart() {
-		return fStart;
-	}
-
-	public int getTextEnd() {
-		return fStart + fTextLength;
-	}
-
-	public int getTextLength() {
-		return fTextLength;
-	}
-
-	public String getType() {
-		return fType;
-	}
-
-	public String toString() {
-		return RegionToStringUtil.toString(this);
-	}
-
-	public StructuredDocumentEvent updateRegion(Object requester, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		RegionChangedEvent result = null;
-		// if the region is an easy type (e.g. attribute value),
-		// and the requested changes are all
-		// alphanumeric, then make the change here locally.
-		// (This can obviously be made more sophisticated as the need arises,
-		// but should
-		// always follow this pattern.)
-		if (Debug.debugStructuredDocument) {
-			System.out.println("\t\tContextRegion::updateModel"); //$NON-NLS-1$
-			System.out.println("\t\t\tregion type is " + fType); //$NON-NLS-1$
-		}
-		boolean canHandle = false;
-		// note: we'll always handle deletes from these
-		// regions ... if its already that region,
-		// deleting something from it won't change its
-		// type. (remember, the calling program needs
-		// to insure we are not called, if not all contained
-		// on one region.
-		if ((changes == null) || (changes.length() == 0)) {
-			// delete case
-			// We can not do the quick delete, if
-			// if all the text in a region is to be deleted.
-			// Or, if the delete starts in the white space region.
-			// In these cases, a reparse is needed.
-			// Minor note, we use textEnd-start since it always
-			// less than or equal to end-start. This might
-			// cause us to miss a few cases we could have handled,
-			// but will prevent us from trying to handle funning cases
-			// involving whitespace.
-			if ((fStart >= getTextEnd()) || (Math.abs(lengthToReplace) >= getTextEnd() - getStart())) {
-				canHandle = false;
-			} else {
-				canHandle = true;
-			}
-		} else {
-			if ((RegionUpdateRule.canHandleAsWhiteSpace(this, parent, changes, requestStart, lengthToReplace)) || RegionUpdateRule.canHandleAsLetterOrDigit(this, parent, changes, requestStart, lengthToReplace)) {
-				canHandle = true;
-			} else {
-				canHandle = false;
-			}
-		}
-		if (canHandle) {
-			// at this point, we still have the old region. We won't create a
-			// new instance, we'll just update the one we have, by changing
-			// its end postion,
-			// The parent flatnode, upon return, has responsibility
-			// for updating sibling regions.
-			// and in turn, the structuredDocument itself has responsibility
-			// for
-			// updating the text store and down stream flatnodes.
-			if (Debug.debugStructuredDocument) {
-				System.out.println("change handled by region"); //$NON-NLS-1$
-			}
-			int lengthDifference = Utilities.calculateLengthDifference(changes, lengthToReplace);
-			// Note: we adjust both end and text end, because for any change
-			// that is in only the trailing whitespace region, we should not
-			// do a quick change,
-			// so 'canHandle' should have been false for those case.
-			// TO_DO_FUTURE: cache value of canHandleAsWhiteSpace from above
-			// If we are handling as whitespace, there is no need to increase
-			// the text length, only
-			// the total length is changing.
-			if (!RegionUpdateRule.canHandleAsWhiteSpace(this, parent, changes, requestStart, lengthToReplace)) {
-				fTextLength += lengthDifference;
-			}
-			// update length (and end) after above check for white space,
-			// since
-			// it looks to determine if at end of region.
-			fLength += lengthDifference;
-			result = new RegionChangedEvent(parent.getParentDocument(), requester, parent, this, changes, requestStart, lengthToReplace);
-		}
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/GenericTemplateRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/GenericTemplateRegion.java
deleted file mode 100644
index 407898d..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/GenericTemplateRegion.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser.regions;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-/**
- * 
- * This class is not intended to be used, its just present to server as a
- * generic starting point for adding new specific region types.
- */
-
-public class GenericTemplateRegion implements ITextRegion {
-	// specify correct type
-	static private final String fType = DOMRegionContext.UNDEFINED;
-	private int fLength;
-	private int fStart;
-	private int fTextLength;
-
-
-	public GenericTemplateRegion() {
-		super();
-	}
-
-	public GenericTemplateRegion(int start, int textLength, int length) {
-		this();
-		fStart = start;
-		fTextLength = textLength;
-		fLength = length;
-	}
-
-	public void adjustLength(int i) {
-		fLength += i;
-
-	}
-
-	public void adjustStart(int i) {
-		fStart += i;
-
-	}
-
-
-	public void adjustTextLength(int i) {
-		fTextLength += 1;
-
-	}
-
-	public void equatePositions(ITextRegion region) {
-		fStart = region.getStart();
-		fLength = region.getLength();
-		fTextLength = region.getTextLength();
-	}
-
-	public int getEnd() {
-		return fStart + fLength;
-	}
-
-	public int getLength() {
-		return fLength;
-	}
-
-	public int getStart() {
-		return fStart;
-	}
-
-	public int getTextEnd() {
-		return fStart + fTextLength;
-	}
-
-	public int getTextLength() {
-		return fTextLength;
-	}
-
-	public String getType() {
-		return fType;
-	}
-
-	public String toString() {
-		return RegionToStringUtil.toString(this);
-	}
-
-	public StructuredDocumentEvent updateRegion(Object requester, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		// can never be updated
-		return null;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/RegionToStringUtil.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/RegionToStringUtil.java
deleted file mode 100644
index 34778bb..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/RegionToStringUtil.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser.regions;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-
-public class RegionToStringUtil {
-	static public String toString(ITextRegion region) {
-		String className = region.getClass().getName();
-		String shortClassName = className.substring(className.lastIndexOf(".") + 1); //$NON-NLS-1$
-		String result = shortClassName + "--> " + region.getType() + ": " + region.getStart() + "-" + region.getTextEnd() + (region.getTextEnd() != region.getEnd() ? ("/" + region.getEnd()) : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-		// NOTE: if the document held by any region has been updated and the
-		// region offsets have not
-		// yet been updated, the output from this method invalid.
-		return result;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/RegionUpdateRule.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/RegionUpdateRule.java
deleted file mode 100644
index 3258301..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/RegionUpdateRule.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser.regions;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.Utilities;
-
-
-/**
- * 
- * This is a utility class to centralize 'region' update. Note: care must be
- * taken that is is not used for StructuredDocumentRegions, or container
- * regions, its only for "token regions"
- *  
- */
-public class RegionUpdateRule {
-
-	static public boolean allLetterOrDigit(String changes) {
-		boolean result = true;
-		for (int i = 0; i < changes.length(); i++) {
-			// TO_DO_FUTURE: check that a Java Letter or Digit is
-			// the same thing as an XML letter or digit
-			if (!(Character.isLetterOrDigit(changes.charAt(i)))) {
-				result = false;
-				break;
-			}
-		}
-		return result;
-	}
-
-	static public boolean allWhiteSpace(String changes) {
-		boolean result = true;
-		for (int i = 0; i < changes.length(); i++) {
-			if (!Character.isWhitespace(changes.charAt(i))) {
-				result = false;
-				break;
-			}
-		}
-		return result;
-	}
-
-	static public boolean canHandleAsLetterOrDigit(ITextRegion region, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		if (parent == null)
-			return canHandleAsLetterOrDigit(region, changes, requestStart, lengthToReplace);
-		boolean result = false;
-		// Make sure we are in a non-white space area
-		if ((requestStart <= (parent.getTextEndOffset(region))) && (allLetterOrDigit(changes))) {
-			result = true;
-		}
-		return result;
-	}
-
-	static public boolean canHandleAsLetterOrDigit(ITextRegion region, String changes, int requestStart, int lengthToReplace) {
-		boolean result = false;
-		// Make sure we are in a non-white space area
-		if ((requestStart <= (region.getTextEnd())) && (allLetterOrDigit(changes))) {
-			result = true;
-		}
-		return result;
-	}
-
-	static public boolean canHandleAsWhiteSpace(ITextRegion region, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		// we don't explect a null parent, but just in case!
-		// (in which case, we must be dealing with regions that are
-		// structuredDocumentRegions).
-		if (parent == null)
-			return canHandleAsWhiteSpace(region, changes, requestStart, lengthToReplace);
-		boolean result = false;
-		// if we are in the "white space" area of a region, then
-		// we don't want to handle, a reparse is needed.
-		// the white space region is consider anywhere that would
-		// leave whitespace between this character and the text part.
-		// and of course, we can insert whitespace in whitespace region
-		//
-		// if there is no whitespace in this region, no need to look further
-		if (region.getEnd() > region.getTextEnd()) {
-			// no need to add one to end of text, as we used to, since we
-			// change definition of length to equate to offset plus one.
-			if (requestStart > parent.getTextEndOffset(region)) {
-				// ok, we are in the whitespace region, so we can't handle,
-				// unless
-				// we are just inserting whitespace.
-				if (allWhiteSpace(changes)) {
-					result = true;
-				} else {
-					result = false;
-				}
-			}
-		}
-		return result;
-	}
-
-	static public boolean canHandleAsWhiteSpace(ITextRegion region, String changes, int requestStart, int lengthToReplace) {
-		boolean result = false;
-		// if we are in the "white space" area of a region, then
-		// we don't want to handle, a reparse is needed.
-		// the white space region is consider anywhere that would
-		// leave whitespace between this character and the text part.
-		// and of course, we can insert whitespace in whitespace region
-		//
-		// if there is no whitespace in this region, no need to look further
-		if (region.getEnd() > region.getTextEnd()) {
-			// no need to add one to end of text, as we used to, since we
-			// change definition of length to equate to offset plus one.
-			if (requestStart > region.getTextEnd()) {
-				// ok, we are in the whitespace region, so we can't handle,
-				// unless
-				// we are just inserting whitespace.
-				if (allWhiteSpace(changes)) {
-					result = true;
-				} else {
-					result = false;
-				}
-			}
-		}
-		return result;
-	}
-
-	// need an adjust text length API before this can be used
-	static public StructuredDocumentEvent updateModel(ITextRegion region, Object requester, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		RegionChangedEvent result = null;
-		// if the region is an easy type (e.g. attribute value),
-		// and the requested changes are all
-		// alphanumeric, then make the change here locally.
-		// (This can obviously be made more sophisticated as the need arises,
-		// but should
-		// always follow this pattern.)
-		if (Debug.debugStructuredDocument) {
-			System.out.println("\t\tContextRegion::updateModel"); //$NON-NLS-1$
-			System.out.println("\t\t\tregion type is " + region.getType()); //$NON-NLS-1$
-		}
-		boolean canHandle = false;
-		// note: we'll always handle deletes from these
-		// regions ... if its already that region,
-		// deleting something from it won't change its
-		// type. (remember, the calling program needs
-		// to insure we are not called, if not all contained
-		// on one region.
-		if ((changes == null) || (changes.length() == 0)) {
-			// delete case
-			// We can not do the quick delete, if
-			// if all the text in a region is to be deleted.
-			// Or, if the delete starts in the white space region.
-			// In these cases, a reparse is needed.
-			// Minor note, we use textEnd-start since it always
-			// less than or equal to end-start. This might
-			// cause us to miss a few cases we could have handled,
-			// but will prevent us from trying to handle funning cases
-			// involving whitespace.
-			if ((region.getStart() >= region.getTextEnd()) || (Math.abs(lengthToReplace) >= region.getTextEnd() - region.getStart())) {
-				canHandle = false;
-			} else {
-				canHandle = true;
-			}
-		} else {
-			if ((RegionUpdateRule.canHandleAsWhiteSpace(region, parent, changes, requestStart, lengthToReplace)) || RegionUpdateRule.canHandleAsLetterOrDigit(region, parent, changes, requestStart, lengthToReplace)) {
-				canHandle = true;
-			} else {
-				canHandle = false;
-			}
-		}
-		if (canHandle) {
-			// at this point, we still have the old region. We won't create a
-			// new instance, we'll just update the one we have, by changing
-			// its end postion,
-			// The parent flatnode, upon return, has responsibility
-			// for updating sibling regions.
-			// and in turn, the structuredDocument itself has responsibility
-			// for
-			// updating the text store and down stream flatnodes.
-			if (Debug.debugStructuredDocument) {
-				System.out.println("change handled by region"); //$NON-NLS-1$
-			}
-			int lengthDifference = Utilities.calculateLengthDifference(changes, lengthToReplace);
-			// Note: we adjust both end and text end, because for any change
-			// that is in only the trailing whitespace region, we should not
-			// do a quick change,
-			// so 'canHandle' should have been false for those case.
-			region.adjustLength(lengthDifference);
-			// TO_DO_FUTURE: cache value of canHandleAsWhiteSpace from above
-			// If we are handling as whitespace, there is no need to increase
-			// the text length, only
-			// the total length is changing.
-			if (!RegionUpdateRule.canHandleAsWhiteSpace(region, parent, changes, region.getStart(), lengthToReplace)) {
-				//				region.adjustTextLength(lengthDifference);
-			}
-			result = new RegionChangedEvent(parent.getParentDocument(), requester, parent, region, changes, requestStart, lengthToReplace);
-		}
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagCloseRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagCloseRegion.java
deleted file mode 100644
index a40933c..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagCloseRegion.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser.regions;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-public class TagCloseRegion implements ITextRegion {
-	static private final byte fLength = 1;
-	static private final byte fTextLength = 1;
-	static private final String fType = DOMRegionContext.XML_TAG_CLOSE;
-	private int fStart;
-
-
-	public TagCloseRegion() {
-		super();
-	}
-
-	public TagCloseRegion(int start) {
-		this();
-		fStart = start;
-	}
-
-	public void adjustLength(int i) {
-		throw new SourceEditingRuntimeException("invalid for this region type"); //$NON-NLS-1$
-
-	}
-
-	public void adjustStart(int i) {
-		fStart += i;
-
-	}
-
-	public void adjustTextLength(int i) {
-		// not supported
-
-	}
-
-	public void equatePositions(ITextRegion region) {
-		fStart = region.getStart();
-	}
-
-	public int getEnd() {
-		return fStart + fLength;
-	}
-
-	public int getLength() {
-		return fLength;
-	}
-
-	public int getStart() {
-		return fStart;
-	}
-
-	public int getTextEnd() {
-		return fStart + fTextLength;
-	}
-
-	public int getTextLength() {
-		return fTextLength;
-	}
-
-	public String getType() {
-		return fType;
-	}
-
-	public String toString() {
-		return RegionToStringUtil.toString(this);
-	}
-
-	public StructuredDocumentEvent updateRegion(Object requester, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		// can never be updated
-		return null;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagNameRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagNameRegion.java
deleted file mode 100644
index 8fd618f..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagNameRegion.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser.regions;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-public class TagNameRegion implements ITextRegion {
-	static private final String fType = DOMRegionContext.XML_TAG_NAME;
-	private short fLength;
-	private int fStart;
-	private short fTextLength;
-
-
-	public TagNameRegion() {
-		super();
-	}
-
-	public TagNameRegion(int start, int textLength, int length) {
-		this();
-		fStart = start;
-		fTextLength = (short) textLength;
-		fLength = (short) length;
-	}
-
-	public void adjustLength(int i) {
-		fLength += i;
-
-	}
-
-	public void adjustStart(int i) {
-		fStart += i;
-
-	}
-
-
-	public void adjustTextLength(int i) {
-		fTextLength += i;
-	}
-
-	public void equatePositions(ITextRegion region) {
-		fStart = region.getStart();
-		fLength = (short) region.getLength();
-		fTextLength = (short) region.getTextLength();
-	}
-
-	public int getEnd() {
-		return fStart + fLength;
-	}
-
-	public int getLength() {
-		return fLength;
-	}
-
-	public int getStart() {
-		return fStart;
-	}
-
-	public int getTextEnd() {
-		return fStart + fTextLength;
-	}
-
-	public int getTextLength() {
-		return fTextLength;
-	}
-
-	public String getType() {
-		return fType;
-	}
-
-	public String toString() {
-		return RegionToStringUtil.toString(this);
-	}
-
-	public StructuredDocumentEvent updateRegion(Object requester, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		// can never be updated
-		return null;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagOpenRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagOpenRegion.java
deleted file mode 100644
index d9904e7..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagOpenRegion.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser.regions;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-public class TagOpenRegion implements ITextRegion {
-	static private final String fType = DOMRegionContext.XML_TAG_OPEN;
-	private int fLength;
-	private int fStart;
-	private int fTextLength;
-
-
-	public TagOpenRegion() {
-		super();
-	}
-
-	public TagOpenRegion(int start, int textLength, int length) {
-		this();
-		fStart = start;
-		fTextLength = textLength;
-		fLength = length;
-	}
-
-	public void adjustLength(int i) {
-		fLength += i;
-
-	}
-
-	public void adjustStart(int i) {
-		fStart += i;
-
-	}
-
-
-	public void adjustTextLength(int i) {
-		fTextLength += 1;
-
-	}
-
-	public void equatePositions(ITextRegion region) {
-		fStart = region.getStart();
-		fLength = region.getLength();
-		fTextLength = region.getTextLength();
-	}
-
-	public int getEnd() {
-		return fStart + fLength;
-	}
-
-	public int getLength() {
-		return fLength;
-	}
-
-	public int getStart() {
-		return fStart;
-	}
-
-	public int getTextEnd() {
-		return fStart + fTextLength;
-	}
-
-	public int getTextLength() {
-		return fTextLength;
-	}
-
-	public String getType() {
-		return fType;
-	}
-
-	public String toString() {
-		return RegionToStringUtil.toString(this);
-	}
-
-	public StructuredDocumentEvent updateRegion(Object requester, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		// can never be updated
-		return null;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/WhiteSpaceOnlyRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/WhiteSpaceOnlyRegion.java
deleted file mode 100644
index b699d60..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/WhiteSpaceOnlyRegion.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser.regions;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.Utilities;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-public class WhiteSpaceOnlyRegion implements ITextRegion {
-	static private final byte fTextLength = 0;
-
-	static private final String fType = DOMRegionContext.WHITE_SPACE;
-	protected int fLength;
-	protected int fStart;
-
-	public WhiteSpaceOnlyRegion(int start, int length) {
-		super();
-		fStart = start;
-		fLength = length;
-	}
-
-	public void adjust(int i) {
-		fStart += i;
-	}
-
-	public void adjustLength(int i) {
-		fLength += i;
-	}
-
-	public void adjustStart(int i) {
-		fStart += i;
-	}
-
-
-	public void adjustTextLength(int i) {
-		// not supported
-
-	}
-
-	public boolean contains(int position) {
-
-		return fStart <= position && position < fStart + fLength;
-	}
-
-	public void equatePositions(ITextRegion region) {
-		fStart = region.getStart();
-		fLength = region.getLength();
-	}
-
-	public int getEnd() {
-		return fStart + fLength;
-	}
-
-	public int getLength() {
-		return fLength;
-	}
-
-	public int getStart() {
-		return fStart;
-	}
-
-	public int getTextEnd() {
-		return fStart + fTextLength;
-	}
-
-	public int getTextLength() {
-		return fTextLength;
-	}
-
-	public String getType() {
-		return fType;
-	}
-
-	public void setLength(int i) {
-		fLength = i;
-	}
-
-	public void setStart(int i) {
-		fStart = i;
-	}
-
-	public void setTextLength(short i) {
-		throw new SourceEditingRuntimeException("invalid call"); //$NON-NLS-1$
-	}
-
-	public void setType(String string) {
-		throw new SourceEditingRuntimeException("invalid call"); //$NON-NLS-1$
-	}
-
-	public String toString() {
-		return RegionToStringUtil.toString(this);
-	}
-
-	/**
-	 * For this ITextRegion type, the start must in terms of what the region
-	 * expects ... that is, its not document offset, but start relative to
-	 * what ever contains it.
-	 */
-	public StructuredDocumentEvent updateRegion(Object requester, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		// if the region is an easy type (e.g. attribute value),
-		// and the requested changes are all
-		// alphanumeric, then make the change here locally.
-		// (This can obviously be made more sophisticated as the need arises,
-		// but should
-		// always follow this pattern.)
-		if (Debug.debugStructuredDocument) {
-			System.out.println("\t\tContextRegion::updateModel"); //$NON-NLS-1$
-			System.out.println("\t\t\tregion type is " + fType); //$NON-NLS-1$
-		}
-		boolean canHandle = false;
-		// note: we'll always handle deletes from these
-		// regions ... if its already that region,
-		// deleting something from it won't change its
-		// type. (remember, the calling program needs
-		// to insure we are not called, if not all contained
-		// on one region.
-		if ((changes == null) || (changes.length() == 0)) {
-			// delete case
-			// We can not do the quick delete, if
-			// if all the text in a region is to be deleted.
-			// Or, if the delete starts in the white space region.
-			// In these cases, a reparse is needed.
-			// Minor note, we use textEnd-start since it always
-			// less than or equal to end-start. This might
-			// cause us to miss a few cases we could have handled,
-			// but will prevent us from trying to handle funning cases
-			// involving whitespace.
-			if ((fStart >= getTextEnd()) || (Math.abs(lengthToReplace) >= getTextEnd() - getStart())) {
-				canHandle = false;
-			} else {
-				canHandle = true;
-			}
-		} else {
-			if (RegionUpdateRule.canHandleAsWhiteSpace(this, parent, changes, requestStart, lengthToReplace)) {
-				canHandle = true;
-			} else {
-				canHandle = false;
-			}
-
-		}
-		RegionChangedEvent result = null;
-
-		if (canHandle) {
-			// at this point, we still have the old region. We won't create a
-			// new instance, we'll just update the one we have, by changing
-			// its end postion,
-			// The parent flatnode, upon return, has responsibility
-			// for updating sibling regions.
-			// and in turn, the structuredDocument itself has responsibility
-			// for
-			// updating the text store and down stream flatnodes.
-			if (Debug.debugStructuredDocument) {
-				System.out.println("change handled by region"); //$NON-NLS-1$
-			}
-			int lengthDifference = Utilities.calculateLengthDifference(changes, lengthToReplace);
-			// Note: we adjust both end and text end, because for any change
-			// that is in only the trailing whitespace region, we should not
-			// do a quick change,
-			// so 'canHandle' should have been false for those case.
-			fLength += lengthDifference;
-
-			result = new RegionChangedEvent(parent.getParentDocument(), requester, parent, this, changes, requestStart, lengthToReplace);
-		}
-
-		return result;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLCDataTextRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLCDataTextRegion.java
deleted file mode 100644
index 35faebb..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLCDataTextRegion.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser.regions;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.Utilities;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-public class XMLCDataTextRegion implements ITextRegion {
-	static private final String fType = DOMRegionContext.XML_CDATA_TEXT;
-	private int fLength;
-	private int fStart;
-	private int fTextLength;
-
-
-	public XMLCDataTextRegion() {
-		super();
-	}
-
-	public XMLCDataTextRegion(int start, int textLength, int length) {
-		this();
-		fStart = start;
-		fTextLength = textLength;
-		fLength = length;
-	}
-
-	public void adjustLength(int i) {
-		fLength += i;
-
-	}
-
-	public void adjustStart(int i) {
-		fStart += i;
-
-	}
-
-
-	public void adjustTextLength(int i) {
-		fTextLength += i;
-
-	}
-
-	public void equatePositions(ITextRegion region) {
-		fStart = region.getStart();
-		fLength = region.getLength();
-		fTextLength = region.getTextLength();
-	}
-
-	public int getEnd() {
-		return fStart + fLength;
-	}
-
-	public int getLength() {
-		// TODO: shouldn't cdata be like XML Content ... length and text
-		// length
-		// always be the same, regardless of whitespace?
-		return fLength;
-	}
-
-	public int getStart() {
-		return fStart;
-	}
-
-	public int getTextEnd() {
-		return fStart + fTextLength;
-	}
-
-	public int getTextLength() {
-		return fTextLength;
-	}
-
-	public String getType() {
-		return fType;
-	}
-
-	public String toString() {
-		return RegionToStringUtil.toString(this);
-	}
-
-
-	public StructuredDocumentEvent updateRegion(Object requester, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		// TODO: this is a pretty lame method, since XML CData region can have
-		// a much
-		// better rule for region update, but this is what previous
-		// (unfactored)
-		// version had, so I'll carry it over, of now.
-		RegionChangedEvent result = null;
-		// if the region is an easy type (e.g. attribute value),
-		// and the requested changes are all
-		// alphanumeric, then make the change here locally.
-		// (This can obviously be made more sophisticated as the need arises,
-		// but should
-		// always follow this pattern.)
-		if (Debug.debugStructuredDocument) {
-			System.out.println("\t\tContextRegion::updateModel"); //$NON-NLS-1$
-			System.out.println("\t\t\tregion type is " + fType); //$NON-NLS-1$
-		}
-		boolean canHandle = false;
-		// note: we'll always handle deletes from these
-		// regions ... if its already that region,
-		// deleting something from it won't change its
-		// type. (remember, the calling program needs
-		// to insure we are not called, if not all contained
-		// on one region.
-		if ((changes == null) || (changes.length() == 0)) {
-			// delete case
-			// We can not do the quick delete, if
-			// if all the text in a region is to be deleted.
-			// Or, if the delete starts in the white space region.
-			// In these cases, a reparse is needed.
-			// Minor note, we use textEnd-start since it always
-			// less than or equal to end-start. This might
-			// cause us to miss a few cases we could have handled,
-			// but will prevent us from trying to handle funning cases
-			// involving whitespace.
-			if ((fStart >= getTextEnd()) || (Math.abs(lengthToReplace) >= getTextEnd() - getStart())) {
-				canHandle = false;
-			} else {
-				canHandle = true;
-			}
-		} else {
-			if ((RegionUpdateRule.canHandleAsWhiteSpace(this, parent, changes, requestStart, lengthToReplace)) || RegionUpdateRule.canHandleAsLetterOrDigit(this, parent, changes, requestStart, lengthToReplace)) {
-				canHandle = true;
-			} else {
-				canHandle = false;
-			}
-
-		}
-		if (canHandle) {
-			// at this point, we still have the old region. We won't create a
-			// new instance, we'll just update the one we have, by changing
-			// its end postion,
-			// The parent flatnode, upon return, has responsibility
-			// for updating sibling regions.
-			// and in turn, the structuredDocument itself has responsibility
-			// for
-			// updating the text store and down stream flatnodes.
-			if (Debug.debugStructuredDocument) {
-				System.out.println("change handled by region"); //$NON-NLS-1$
-			}
-			int lengthDifference = Utilities.calculateLengthDifference(changes, lengthToReplace);
-			// Note: we adjust both end and text end, because for any change
-			// that is in only the trailing whitespace region, we should not
-			// do a quick change,
-			// so 'canHandle' should have been false for those case.
-			// TO_DO_FUTURE: cache value of canHandleAsWhiteSpace from above
-			// If we are handling as whitespace, there is no need to increase
-			// the text length, only
-			// the total length is changing.
-			if (!RegionUpdateRule.canHandleAsWhiteSpace(this, parent, changes, requestStart, lengthToReplace)) {
-				fTextLength += lengthDifference;
-			}
-			fLength += lengthDifference;
-			result = new RegionChangedEvent(parent.getParentDocument(), requester, parent, this, changes, requestStart, lengthToReplace);
-		}
-
-		return result;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLContentRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLContentRegion.java
deleted file mode 100644
index 6ccb570..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLContentRegion.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser.regions;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.Utilities;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-
-public class XMLContentRegion implements ITextRegion {
-	static private final String fType = DOMRegionContext.XML_CONTENT;
-	// length and textLength are always the same for content region
-	//private int fTextLength;
-	private int fLength;
-	private int fStart;
-
-
-	public XMLContentRegion() {
-		super();
-	}
-
-	public XMLContentRegion(int start, int length) {
-		this();
-		fStart = start;
-		fLength = length;
-	}
-
-
-	public void adjustLength(int i) {
-		fLength += i;
-
-	}
-
-	public void adjustStart(int i) {
-		fStart += i;
-
-	}
-
-
-	public void adjustTextLength(int i) {
-		// not supported
-
-	}
-
-	public void equatePositions(ITextRegion region) {
-		fStart = region.getStart();
-		fLength = region.getLength();
-	}
-
-	public int getEnd() {
-		return fStart + fLength;
-	}
-
-	public int getLength() {
-		return fLength;
-	}
-
-	public int getStart() {
-		return fStart;
-	}
-
-	public int getTextEnd() {
-		return fStart + fLength;
-	}
-
-	public int getTextLength() {
-		return fLength;
-	}
-
-	public String getType() {
-		return fType;
-	}
-
-	public String toString() {
-		return RegionToStringUtil.toString(this);
-	}
-
-
-	public StructuredDocumentEvent updateRegion(Object requester, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		// TODO: this is a pretty lame method, since XML Content can have a
-		// much
-		// better rule for region update, but this is what previous
-		// (unfactored)
-		// version had, so I'll carry it over, of now.
-		RegionChangedEvent result = null;
-		// if the region is an easy type (e.g. attribute value),
-		// and the requested changes are all
-		// alphanumeric, then make the change here locally.
-		// (This can obviously be made more sophisticated as the need arises,
-		// but should
-		// always follow this pattern.)
-		if (Debug.debugStructuredDocument) {
-			System.out.println("\t\tContextRegion::updateModel"); //$NON-NLS-1$
-			System.out.println("\t\t\tregion type is " + fType); //$NON-NLS-1$
-		}
-		boolean canHandle = false;
-		// note: we'll always handle deletes from these
-		// regions ... if its already that region,
-		// deleting something from it won't change its
-		// type. (remember, the calling program needs
-		// to insure we are not called, if not all contained
-		// on one region.
-		if ((changes == null) || (changes.length() == 0)) {
-			// delete case
-			// We can not do the quick delete, if
-			// if all the text in a region is to be deleted.
-			// Or, if the delete starts in the white space region.
-			// In these cases, a reparse is needed.
-			// Minor note, we use textEnd-start since it always
-			// less than or equal to end-start. This might
-			// cause us to miss a few cases we could have handled,
-			// but will prevent us from trying to handle funning cases
-			// involving whitespace.
-			if ((fStart >= getTextEnd()) || (Math.abs(lengthToReplace) >= getTextEnd() - getStart())) {
-				canHandle = false;
-			} else {
-				canHandle = true;
-			}
-		} else {
-			if ((RegionUpdateRule.canHandleAsWhiteSpace(this, parent, changes, requestStart, lengthToReplace)) || RegionUpdateRule.canHandleAsLetterOrDigit(this, parent, changes, requestStart, lengthToReplace)) {
-				canHandle = true;
-			} else {
-				canHandle = false;
-			}
-
-		}
-		if (canHandle) {
-			// at this point, we still have the old region. We won't create a
-			// new instance, we'll just update the one we have, by changing
-			// its end postion,
-			// The parent flatnode, upon return, has responsibility
-			// for updating sibling regions.
-			// and in turn, the structuredDocument itself has responsibility
-			// for
-			// updating the text store and down stream flatnodes.
-			if (Debug.debugStructuredDocument) {
-				System.out.println("change handled by region"); //$NON-NLS-1$
-			}
-			int lengthDifference = Utilities.calculateLengthDifference(changes, lengthToReplace);
-			// Note: we adjust both end and text end, because for any change
-			// that is in only the trailing whitespace region, we should not
-			// do a quick change,
-			// so 'canHandle' should have been false for those case.
-			fLength += lengthDifference;
-			// TO_DO_FUTURE: cache value of canHandleAsWhiteSpace from above
-			// If we are handling as whitespace, there is no need to increase
-			// the text length, only
-			// the total length is changing.
-			// don't need for content region
-			//			if (!RegionUpdateRule.canHandleAsWhiteSpace(this, changes,
-			// fStart, lengthToReplace)) {
-			//				fTextLength += lengthDifference;
-			//			}
-			result = new RegionChangedEvent(parent.getParentDocument(), requester, parent, this, changes, requestStart, lengthToReplace);
-		}
-
-		return result;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLHeadParserFactory.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLHeadParserFactory.java
deleted file mode 100644
index 03a9951..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLHeadParserFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser.regions;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-public class XMLHeadParserFactory {
-	public ITextRegion createToken(String context, int start, int textLength, int length, String text) {
-		ITextRegion newRegion = null;
-		//		if (context == XMLRegionContext.XML_CDATA_TEXT) {
-		newRegion = new XMLHeadParserRegion(context, start, textLength, length, text);
-		//		}
-		return newRegion;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLHeadParserRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLHeadParserRegion.java
deleted file mode 100644
index 9bceeaa..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLHeadParserRegion.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser.regions;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-/**
- * 
- * This class is not intended to be used, its just present to server as a
- * generic starting point for adding new specific region types.
- */
-
-public class XMLHeadParserRegion implements ITextRegion {
-	private int fLength;
-	private int fStart;
-	private String fText;
-	private int fTextLength;
-	// specify correct type
-	private String fType = DOMRegionContext.UNDEFINED;
-
-	public XMLHeadParserRegion() {
-		super();
-	}
-
-	public XMLHeadParserRegion(String context, int start, int textLength, int length, String text) {
-		this();
-		fType = context;
-		fStart = start;
-		fTextLength = textLength;
-		fLength = length;
-		fText = text;
-	}
-
-	public void adjustLength(int i) {
-		fLength += i;
-
-	}
-
-	public void adjustStart(int i) {
-		fStart += i;
-
-	}
-
-
-	public void adjustTextLength(int i) {
-		fTextLength += 1;
-
-	}
-
-	public void equatePositions(ITextRegion region) {
-		fStart = region.getStart();
-		fLength = region.getLength();
-		fTextLength = region.getTextLength();
-	}
-
-	public int getEnd() {
-		return fStart + fLength;
-	}
-
-	public int getLength() {
-		return fLength;
-	}
-
-	public int getStart() {
-		return fStart;
-	}
-
-	public String getText() {
-		return fText;
-	}
-
-	public int getTextEnd() {
-		return fStart + fTextLength;
-	}
-
-	public int getTextLength() {
-		return fTextLength;
-	}
-
-	public String getType() {
-		return fType;
-	}
-
-	public String toString() {
-		return RegionToStringUtil.toString(this);
-	}
-
-	public StructuredDocumentEvent updateRegion(Object requester, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		// can never be updated
-		return null;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLParserRegionFactory.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLParserRegionFactory.java
deleted file mode 100644
index 583d642..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLParserRegionFactory.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.parser.regions;
-
-
-
-import org.eclipse.wst.sse.core.internal.parser.ContextRegion;
-import org.eclipse.wst.sse.core.internal.parser.ForeignRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-/**
- * 
- * This region factory is very specific to the parser output, and the specific
- * implementation classes for various regions.
- */
-
-public class XMLParserRegionFactory {
-
-	public XMLParserRegionFactory() {
-		super();
-	}
-
-	public ITextRegion createToken(ITextRegionContainer parent, String context, int start, int textLength, int length) {
-		return this.createToken(parent, context, start, textLength, length, null, null);
-	}
-
-	public ITextRegion createToken(ITextRegionContainer parent, String context, int start, int textLength, int length, String lang, String surroundingTag) {
-		ITextRegion newRegion = createToken(context, start, textLength, length);
-		// DW, 4/16/2003 token regions no longer have parents
-		// newRegion.setParent(parent);
-		return newRegion;
-	}
-
-	public ITextRegion createToken(String context, int start, int textLength, int length) {
-		return this.createToken(context, start, textLength, length, null, null);
-	}
-
-	public ITextRegion createToken(String context, int start, int textLength, int length, String lang, String surroundingTag) {
-		ITextRegion newRegion = null;
-		if (context == DOMRegionContext.XML_CDATA_TEXT) {
-			newRegion = new XMLCDataTextRegion(start, textLength, length);
-		}
-		else if (context == DOMRegionContext.XML_CONTENT) {
-			newRegion = new XMLContentRegion(start, length);
-		}
-		else if (context == DOMRegionContext.XML_TAG_NAME) {
-			newRegion = new TagNameRegion(start, textLength, length);
-		}
-		else if (context == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-			newRegion = new AttributeNameRegion(start, textLength, length);
-		}
-		else if (context == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) {
-			newRegion = new AttributeEqualsRegion(start, textLength, length);
-		}
-		else if (context == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-			newRegion = new AttributeValueRegion(start, textLength, length);
-		}
-		else if (context == DOMRegionContext.XML_TAG_OPEN) {
-			newRegion = new TagOpenRegion(start, textLength, length);
-		}
-		else if (context == DOMRegionContext.XML_TAG_CLOSE) {
-			newRegion = new TagCloseRegion(start);
-		}
-		else if (context == DOMRegionContext.WHITE_SPACE) {
-			newRegion = new WhiteSpaceOnlyRegion(start, length);
-		}
-		else
-		// removed this condition during transition, and implemented in
-		// subclass
-		// if (context == XMLJSPRegionContexts.JSP_CONTENT) {
-		// newRegion = new JSPCodeRegion(context, start, textLength, length);
-		// } else
-		if (context == DOMRegionContext.BLOCK_TEXT) {
-			newRegion = new ForeignRegion(context, start, textLength, length);
-			((ForeignRegion) newRegion).setSurroundingTag(surroundingTag);
-		}
-		else {
-			newRegion = new ContextRegion(context, start, textLength, length);
-		}
-		return newRegion;
-	}
-
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/preferences/XMLCorePreferenceInitializer.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/preferences/XMLCorePreferenceInitializer.java
deleted file mode 100644
index 7211076..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/preferences/XMLCorePreferenceInitializer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-
-/**
- * Sets default values for XML Core preferences
- */
-public class XMLCorePreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IEclipsePreferences node = new DefaultScope().getNode(XMLCorePlugin.getDefault().getBundle().getSymbolicName());
-		
-		// formatting preferences
-		node.putInt(XMLCorePreferenceNames.LINE_WIDTH, 72);
-		node.putBoolean(XMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES, false);
-		node.put(XMLCorePreferenceNames.INDENTATION_CHAR, XMLCorePreferenceNames.TAB);
-		node.putInt(XMLCorePreferenceNames.INDENTATION_SIZE, 1);
-		node.putBoolean(XMLCorePreferenceNames.SPLIT_MULTI_ATTRS, false);
-		
-		// cleanup preferences
-		node.putBoolean(XMLCorePreferenceNames.COMPRESS_EMPTY_ELEMENT_TAGS, true);
-		node.putBoolean(XMLCorePreferenceNames.INSERT_REQUIRED_ATTRS, true);
-		node.putBoolean(XMLCorePreferenceNames.INSERT_MISSING_TAGS, true);
-		node.putBoolean(XMLCorePreferenceNames.QUOTE_ATTR_VALUES, true);
-		node.putBoolean(XMLCorePreferenceNames.FORMAT_SOURCE, true);
-		node.putBoolean(XMLCorePreferenceNames.CONVERT_EOL_CODES, false);
-
-		node.put(CommonEncodingPreferenceNames.INPUT_CODESET, ""); //$NON-NLS-1$
-		node.put(CommonEncodingPreferenceNames.OUTPUT_CODESET, "UTF-8");//$NON-NLS-1$
-		node.put(CommonEncodingPreferenceNames.END_OF_LINE_CODE, ""); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/preferences/XMLCorePreferenceNames.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/preferences/XMLCorePreferenceNames.java
deleted file mode 100644
index 74d0f7f..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/preferences/XMLCorePreferenceNames.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.internal.preferences;
-
-/**
- * Common preference keys used by XML core
- * 
- * @plannedfor 1.0
- */
-public class XMLCorePreferenceNames {
-	private XMLCorePreferenceNames() {
-		// empty private constructor so users cannot instantiate class
-	}
-	
-	/**
-	 * The maximum width of a line before a line split is needed.
-	 * <p>
-	 * Value is of type <code>Integer</code>.
-	 * </p>
-	 */
-	public static final String LINE_WIDTH = "lineWidth";//$NON-NLS-1$
-	
-	/**
-	 * Indicates if all blanks lines should be cleared during formatting.
-	 * Blank lines will be kept when false.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String CLEAR_ALL_BLANK_LINES = "clearAllBlankLines";//$NON-NLS-1$
-
-	/**
-	 * The number of #INDENTATION_CHAR for 1 indentation.
-	 * <p>
-	 * Value is of type <code>Integer</code>.
-	 * </p>
-	 */
-	public static final String INDENTATION_SIZE = "indentationSize";//$NON-NLS-1$
-
-	/**
-	 * The character used for indentation.
-	 * <p>
-	 * Value is of type <code>String</code>.<br />
-	 * Possible values: {TAB, SPACE}
-	 * </p>
-	 */
-	public static final String INDENTATION_CHAR = "indentationChar";//$NON-NLS-1$
-
-	/**
-	 * Possible value for the preference #INDENTATION_CHAR. Indicates to use
-	 * tab character when formatting.
-	 * 
-	 * @see #SPACE
-	 * @see #INDENTATION_CHAR
-	 */
-	public static final String TAB = "tab"; //$NON-NLS-1$
-
-	/**
-	 * Possible value for the preference #INDENTATION_CHAR. Indicates to use
-	 * space character when formatting.
-	 * 
-	 * @see #TAB
-	 * @see #INDENTATION_CHAR
-	 */
-	public static final String SPACE = "space"; //$NON-NLS-1$
-
-	/**
-	 * Indicates if tags with multiple attributes should be formatted
-	 * (splitting each attr on a new line).
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String SPLIT_MULTI_ATTRS = "splitMultiAttrs";//$NON-NLS-1$
-	
-	/**
-	 * Indicates whether or not cleanup processor should format source.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String FORMAT_SOURCE = "formatSource";//$NON-NLS-1$
-
-	/**
-	 * Indicates whether or not empty elements should be compressed during
-	 * cleanup.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String COMPRESS_EMPTY_ELEMENT_TAGS = "compressEmptyElementTags";//$NON-NLS-1$
-
-	/**
-	 * Indicates whether or not to insert required attributes during cleanup.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String INSERT_REQUIRED_ATTRS = "insertRequiredAttrs";//$NON-NLS-1$
-
-	/**
-	 * Indicates whether or not to insert missing tags during cleanup.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String INSERT_MISSING_TAGS = "insertMissingTags";//$NON-NLS-1$
-
-	/**
-	 * Indicates whether or not to quote all attribute values during cleanup.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String QUOTE_ATTR_VALUES = "quoteAttrValues";//$NON-NLS-1$
-
-	/**
-	 * Indicates whether or not to convert all line delimiters during cleanup.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String CONVERT_EOL_CODES = "convertEOLCodes";//$NON-NLS-1$
-
-	/**
-	 * Indicates the line delimiter to use during cleanup if converting line
-	 * delimiters.
-	 * <p>
-	 * Value is of type <code>String</code>.<br />
-	 * Possible values: {CR, CRLF, LF, NO_TRANSLATION} 
-	 * </p> 
-	 * 
-	 */
-	public static final String CLEANUP_EOL_CODE = "cleanupEOLCode";//$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/propagate/PropagatingAdapterFactoryImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/propagate/PropagatingAdapterFactoryImpl.java
deleted file mode 100644
index 895fe24..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/propagate/PropagatingAdapterFactoryImpl.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.propagate;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.sse.core.internal.PropagatingAdapter;
-import org.eclipse.wst.sse.core.internal.PropagatingAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-
-/**
- * The PropagatingAdapterFactory is part of the "adapt on create" mechanism. A
- * PropagatingAdapter, once added to a node, will cause proagating adapters to
- * be created for all child nodes. A side effect of creating a
- * PropagatingAdapter for a node is that is is also creates adapters for and
- * adapts the Node for all other registered 'create on adapt' Adapters. This
- * other adapters are registered by registering their factories via plugin
- * extension point.
- */
-public class PropagatingAdapterFactoryImpl extends AbstractAdapterFactory implements PropagatingAdapterFactory {
-
-	private PropagatingAdapter adapterInstance;
-	protected List contributedFactories = null;
-
-	/**
-	 * PropagatingAdapterFactory constructor comment.
-	 */
-	public PropagatingAdapterFactoryImpl() {
-		this(PropagatingAdapter.class, true);
-	}
-
-	protected PropagatingAdapterFactoryImpl(Object adapterKey, boolean registerAdapters) { //,
-		// Object
-		// modelType)
-		// {
-		super(adapterKey, registerAdapters);
-	}
-
-	public void addContributedFactories(INodeAdapterFactory factory) {
-		if (contributedFactories != null) {
-			contributedFactories.add(factory);
-		}
-
-	}
-
-	public INodeAdapterFactory copy() {
-		PropagatingAdapterFactory clonedInstance = new PropagatingAdapterFactoryImpl(this.adapterKey, this.shouldRegisterAdapter);
-		// clone this adapters specific list of adapter factories too
-		if (contributedFactories != null) {
-			Iterator iterator = contributedFactories.iterator();
-			clonedInstance.setContributedFactories(new ArrayList());
-			while (iterator.hasNext()) {
-				INodeAdapterFactory existingFactory = (INodeAdapterFactory) iterator.next();
-				clonedInstance.addContributedFactories(existingFactory.copy());
-			}
-		}
-		return clonedInstance;
-	}
-
-	/**
-	 * createAdapter method comment.
-	 */
-	protected INodeAdapter createAdapter(INodeNotifier target) {
-		// every notifier get's one of these
-		// (and the same instance of it)
-		return getAdapterInstance();
-	}
-
-	/**
-	 * Gets the adapterInstance.
-	 * 
-	 * @return Returns a PropagatingAdapter
-	 */
-	protected PropagatingAdapter getAdapterInstance() {
-		if (adapterInstance == null) {
-			adapterInstance = new PropagatingAdapterImpl();
-			if (contributedFactories != null) {
-				for (int i = 0; i < contributedFactories.size(); i++)
-					adapterInstance.addAdaptOnCreateFactory((PropagatingAdapterFactory) contributedFactories.get(i));
-			}
-		}
-		return adapterInstance;
-	}
-
-	public void release() {
-		// give the adapter instance a chance to release its factories
-		getAdapterInstance().release();
-
-	}
-
-	public void setContributedFactories(ArrayList list) {
-		contributedFactories = list;
-
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/propagate/PropagatingAdapterImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/propagate/PropagatingAdapterImpl.java
deleted file mode 100644
index 1a679fb..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/propagate/PropagatingAdapterImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.propagate;
-
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.sse.core.internal.PropagatingAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class PropagatingAdapterImpl implements PropagatingAdapter {
-
-	public static final Class PropagatingAdapterClass = PropagatingAdapter.class;
-	// because so many of these are created in huge file,
-	// Jeffrey Liu suggested these be done lazily, since not all
-	// models and not all nodes actually have a list of factories.
-	private List adaptOnCreateFactories = null;
-
-	/**
-	 * AbstractPropagatingAdapterImpl constructor comment.
-	 */
-	public PropagatingAdapterImpl() {
-		super();
-	}
-
-	protected void adaptOnCreate(IDOMNode node) {
-		// give each of the factories a chance to adapt the node, if it
-		// chooses to
-		if (adaptOnCreateFactories != null) {
-			Iterator iterator = adaptOnCreateFactories.iterator();
-			while (iterator.hasNext()) {
-				INodeAdapterFactory factory = (INodeAdapterFactory) iterator.next();
-				factory.adapt(node);
-			}
-		}
-
-	}
-
-	/**
-	 * This mechanism can be made "easier to use" later.
-	 */
-	public void addAdaptOnCreateFactory(INodeAdapterFactory factory) {
-		//adaptOnCreateFactories.add(factory);
-		getAdaptOnCreateFactories().add(factory);
-	}
-
-	/**
-	 * Gets the adaptOnCreateFactories.
-	 * 
-	 * @return Returns a List
-	 */
-	public List getAdaptOnCreateFactories() {
-		if (adaptOnCreateFactories == null)
-			adaptOnCreateFactories = new ArrayList();
-		return adaptOnCreateFactories;
-	}
-
-	//	protected void unadaptOnRemove(INodeNotifier node) {
-	//		// give each of the factories a chance to process remove event
-	//		// This is a bit out of the normal adapter pattern, but I couldn't
-	//		// think of a better way to "remove" pageDirectiveWatchers, if and
-	//		// when the page directive was 'removed' (edited).
-	//		//
-	//		Iterator iterator = adaptOnCreateFactories.iterator();
-	//		while (iterator.hasNext()) {
-	//			IAdapterFactory factory = (IAdapterFactory) iterator.next();
-	//			if (factory instanceof PropagatingAdapterFactory) {
-	//				((PropagatingAdapterFactory)factory).unadapt(node);
-	//			}
-	//		}
-	//
-	//	}
-
-	/**
-	 * @see PropagatingAdapter#initializeForFactory(INodeAdapterFactory,
-	 *      INodeNotifier)
-	 */
-	public void initializeForFactory(INodeAdapterFactory factory, INodeNotifier node) {
-		// we're DOM specific implimentation
-		if (node instanceof IDOMNode) {
-			IDOMNode xmlNode = (IDOMNode) node;
-			propagateTo(xmlNode);
-		}
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type allows it
-	 * to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return type.equals(PropagatingAdapterClass);
-	}
-
-	protected boolean isInteresting(Object newValue) {
-		return (newValue != null && (newValue instanceof Element || newValue instanceof Document || newValue instanceof DocumentType));
-	}
-
-	/**
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		// DMW, 2002.8.10. I changed this so we only propagate to Elements ...
-		// not attributes too!
-		// I'm assuming this will help performance and memory, but don't know
-		// if anyone was depending on
-		// this being proagate to attributes.
-		if (eventType == INodeNotifier.ADD && isInteresting(newValue)) {
-			propagateTo((IDOMNode) newValue);
-		}
-		//	else if (eventType == INodeNotifier.CONTENT_CHANGED) {
-		//		notifier.getAdapterFor(PropagatingAdapterClass);
-		//	}
-		//	else if (eventType == INodeNotifier.CHANGE) {
-		//	}
-		//		else if (eventType == INodeNotifier.REMOVE &&
-		// isInteresting(oldValue)) {
-		//			unadaptOnRemove((XMLNode)oldValue);
-		//		}
-		//	else if (eventType == INodeNotifier.STRUCTURE_CHANGED) {
-		//	}
-	}
-
-	protected void propagateTo(IDOMNode node) {
-		// get adapter to ensure its created
-		node.getAdapterFor(PropagatingAdapterClass);
-		adaptOnCreate(node);
-		propagateToChildren(node);
-	}
-
-	protected void propagateToChildren(IDOMNode parent) {
-		for (Node child = parent.getFirstChild(); child != null; child = child.getNextSibling()) {
-			propagateTo((IDOMNode) child);
-		}
-	}
-
-	/**
-	 * @see PropagatingAdapter#release()
-	 */
-	public void release() {
-		if (adaptOnCreateFactories != null) {
-			Iterator iterator = adaptOnCreateFactories.iterator();
-			while (iterator.hasNext()) {
-				INodeAdapterFactory factory = (INodeAdapterFactory) iterator.next();
-				factory.release();
-			}
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/IXMLCharEntity.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/IXMLCharEntity.java
deleted file mode 100644
index 711716c..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/IXMLCharEntity.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional;
-
-
-
-/**
- * XML Namespace constants
- * 
- * @plannedfor 1.0
- */
-public interface IXMLCharEntity {
-	static final String AMP_NAME = "amp";//$NON-NLS-1$
-	static final String AMP_REF = "&amp;";//$NON-NLS-1$
-	static final String AMP_VALUE = "&";//$NON-NLS-1$
-	static final String APOS_NAME = "apos";//$NON-NLS-1$
-	static final String APOS_REF = "&apos;";//$NON-NLS-1$
-	static final String APOS_VALUE = "'";//$NON-NLS-1$
-	static final String GT_NAME = "gt";//$NON-NLS-1$
-	static final String GT_REF = "&gt;";//$NON-NLS-1$
-	static final String GT_VALUE = ">";//$NON-NLS-1$
-
-	static final String LT_NAME = "lt";//$NON-NLS-1$
-	static final String LT_REF = "&lt;";//$NON-NLS-1$
-	static final String LT_VALUE = "<";//$NON-NLS-1$
-	static final String QUOT_NAME = "quot";//$NON-NLS-1$
-	static final String QUOT_REF = "&quot;";//$NON-NLS-1$
-	static final String QUOT_VALUE = "\"";//$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/IXMLNamespace.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/IXMLNamespace.java
deleted file mode 100644
index 3c77349..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/IXMLNamespace.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional;
-
-
-
-/**
- * XML Namespace constants
- * 
- * @plannedfor 1.0
- */
-public interface IXMLNamespace {
-
-	static final String XMLNS = "xmlns";//$NON-NLS-1$
-	static final String XMLNS_PREFIX = "xmlns:";//$NON-NLS-1$
-	static final String XMLNS_URI = "http://www.w3.org/2000/xmlns/";//$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/IXMLPreferenceNames.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/IXMLPreferenceNames.java
deleted file mode 100644
index 2740e0f..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/IXMLPreferenceNames.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional;
-
-/**
- * Keys to use for preference settings.
- * 
- * @plannedfor 1.0
- */
-
-public interface IXMLPreferenceNames {
-	String CLEANUP_ATTR_NAME_CASE = "cleanupAttrNameCase";//$NON-NLS-1$
-	String CLEANUP_EOL_CODE = "cleanupEOLCode";//$NON-NLS-1$
-	// cleanup preference names
-	String CLEANUP_TAG_NAME_CASE = "cleanupTagNameCase";//$NON-NLS-1$
-	String CONVERT_EOL_CODES = "convertEOLCodes";//$NON-NLS-1$
-	String FORMAT_SOURCE = "formatSource";//$NON-NLS-1$
-	String INSERT_MISSING_TAGS = "insertMissingTags";//$NON-NLS-1$
-
-	// others
-	String LAST_ACTIVE_PAGE = "lastActivePage";//$NON-NLS-1$
-	String QUOTE_ATTR_VALUES = "quoteAttrValues";//$NON-NLS-1$
-
-	/*
-	 * not used for now // highlighting types String COMMENT_BORDER =
-	 * "commentBorder";//$NON-NLS-1$ String COMMENT_TEXT =
-	 * "commentText";//$NON-NLS-1$ String CDATA_BORDER =
-	 * "cdataBorder";//$NON-NLS-1$ String CDATA_TEXT =
-	 * "cdataText";//$NON-NLS-1$ String PI_BORDER = "piBorder";//$NON-NLS-1$
-	 * String PI_CONTENT = "piContent";//$NON-NLS-1$ String TAG_BORDER =
-	 * "tagBorder";//$NON-NLS-1$ String TAG_NAME = "tagName";//$NON-NLS-1$
-	 * String TAG_ATTRIBUTE_NAME = "tagAttributeName";//$NON-NLS-1$ String
-	 * TAG_ATTRIBUTE_VALUE = "tagAttributeValue";//$NON-NLS-1$ String
-	 * DECL_BORDER = "declBoder";//$NON-NLS-1$ String DOCTYPE_NAME =
-	 * "doctypeName";//$NON-NLS-1$ String DOCTYPE_EXTERNAL_ID =
-	 * "doctypeExternalId";//$NON-NLS-1$ String DOCTYPE_EXTERNAL_ID_PUBREF =
-	 * "doctypeExternalPubref";//$NON-NLS-1$ String DOCTYPE_EXTERNAL_ID_SYSREF =
-	 * "doctypeExtrenalSysref";//$NON-NLS-1$ String XML_CONTENT =
-	 * "xmlContent";//$NON-NLS-1$ // highlighting preferences String COMMA =
-	 * ",";//$NON-NLS-1$ String COLOR = "color";//$NON-NLS-1$ String NAME =
-	 * "name";//$NON-NLS-1$ String FOREGROUND = "foreground";//$NON-NLS-1$
-	 * String BACKGROUND = "background";//$NON-NLS-1$ String BOLD =
-	 * "bold";//$NON-NLS-1$ String ITALIC = "italic";//$NON-NLS-1$
-	 */
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/NameValidator.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/NameValidator.java
deleted file mode 100644
index 1f53cfb..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/NameValidator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional;
-
-import java.io.Reader;
-
-import org.eclipse.wst.xml.core.internal.parser.XML10Names;
-
-/**
- * This class provides consistent way to pre-check if a string is a valid XML
- * name, before, for example, trying to actually create an Element with it.
- * Attempting to create an Element with an invalid name will throw the appropriate
- * DOM Exception, but often clients want to check the validiting of a name
- * such as based on some user input, long in advance of actually making 
- * the DOM call. And, natually, want to give the user feedback in a more 
- * timely fashion.
- * 
- * @plannedfor 1.0
- */
-public final class NameValidator {
-
-	private static XML10Names xml10charChecker = null;
-
-	/**
-	 * Returns true if <code>name</code> is valid XML name according to XML
-	 * 1.0 rules, false otherwise.
-	 * 
-	 * @param name
-	 *            name is the string to test
-	 * @return true if valid name according to XML 1.0 rules, false otherwise.
-	 */
-	public synchronized static final boolean isValid(String name) {
-
-		if (xml10charChecker == null) {
-			xml10charChecker = inititailizeXML10Names();
-		}
-		return xml10charChecker.isValidXML10Name(name);
-	}
-
-	private static XML10Names inititailizeXML10Names() {
-		return new XML10Names((Reader) null);
-	}
-
-	/**
-	 * Not intenteded to be instantiated.
-	 */
-	private NameValidator() {
-		super();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/CMDocType.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/CMDocType.java
deleted file mode 100644
index d47f940..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/CMDocType.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.contentmodel;
-
-
-public interface CMDocType {
-	public final static String CHTML_DOC_TYPE = "CHTML";//$NON-NLS-1$
-	public final static String HTML_DOC_TYPE = "HTML";//$NON-NLS-1$
-	public final static String JSP11_DOC_TYPE = "JSP11";//$NON-NLS-1$
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/CMDocumentTracker.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/CMDocumentTracker.java
deleted file mode 100644
index 63e9b1a..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/CMDocumentTracker.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.contentmodel;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-
-
-/**
- * Position dependent CMDocument tracker. A tracker matches a
- * IStructuredDocumentRegion with a CMDocument that it enables allowing for
- * position-dependent content models
- */
-public interface CMDocumentTracker {
-
-	CMDocument getDocument();
-
-	IStructuredDocumentRegion getStructuredDocumentRegion();
-}
-
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/CMNodeWrapper.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/CMNodeWrapper.java
deleted file mode 100644
index 1c905c1..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/CMNodeWrapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.contentmodel;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-public interface CMNodeWrapper extends CMNode {
-	CMNode getOriginNode();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/ContentModelAdapter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/ContentModelAdapter.java
deleted file mode 100644
index 2184758..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/ContentModelAdapter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.contentmodel;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * ContentModelAdapter interface
- */
-public interface ContentModelAdapter extends org.eclipse.wst.sse.core.internal.provisional.INodeAdapter {
-
-	/**
-	 * getCMDocument method
-	 * 
-	 * @return CMDocument
-	 * @param notifer
-	 * 
-	 * Returns CMDocument associated to the adapting node. For exampl : HTML
-	 * CMDocument is associated to HTML Document node, DTD CMDocument is
-	 * associated to DocumentType node, DTD/Schema CMDocument is associated to
-	 * Element node (sometime with namespace), and taglib CMDocument is
-	 * associated to taglib directive Element node.
-	 * 
-	 * INodeNotifier is passed for stateless (singleton) INodeAdapter
-	 * implementation.
-	 */
-	CMDocument getCMDocument(org.eclipse.wst.sse.core.internal.provisional.INodeNotifier notifier);
-
-	/**
-	 * getDeclaration method
-	 * 
-	 * @return CMNode
-	 * @param notifer
-	 * 
-	 * Returns ElementDefinition or AttributeDefinition for the adapting node.
-	 * 
-	 * INodeNotifier is passed for stateless (singleton) INodeAdapter
-	 * implementation.
-	 */
-	CMNode getDeclaration(org.eclipse.wst.sse.core.internal.provisional.INodeNotifier notifier);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/NullContentModel.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/NullContentModel.java
deleted file mode 100644
index 51e77fb..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/NullContentModel.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.contentmodel;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-
-/**
- * This class can be used to intialize specific variables that need a content
- * model, until the true content model is available. This prevents having to
- * do lots of null checks.
- */
-public class NullContentModel implements CMDocument {
-
-	private static class NullCMNamedNodeMap implements CMNamedNodeMap {
-		public int getLength() {
-			return 0;
-		}
-
-		public CMNode getNamedItem(String name) {
-			return null;
-		}
-
-		public CMNode item(int index) {
-			return null;
-		}
-
-		public Iterator iterator() {
-			return new NullIterator();
-		}
-
-	}
-
-	private static class NullIterator implements Iterator {
-		public NullIterator() {
-		}
-
-		public boolean hasNext() {
-			return false;
-		}
-
-		public Object next() {
-			throw new NoSuchElementException();
-		}
-
-		public void remove() {
-			throw new UnsupportedOperationException("can not remove regions via iterator"); //$NON-NLS-1$
-
-		}
-
-	}
-
-	public NullContentModel() {
-		super();
-	}
-
-	public CMNamedNodeMap getElements() {
-		return new NullCMNamedNodeMap();
-	}
-
-	public CMNamedNodeMap getEntities() {
-		return new NullCMNamedNodeMap();
-	}
-
-	public CMNamespace getNamespace() {
-		return null;
-	}
-
-	public String getNodeName() {
-		return null;
-	}
-
-	public int getNodeType() {
-		return 0;
-	}
-
-	public Object getProperty(String propertyName) {
-		return null;
-	}
-
-	public boolean supports(String propertyName) {
-		return false;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contenttype/ContentTypeIdForXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contenttype/ContentTypeIdForXML.java
deleted file mode 100644
index 67c3a90..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contenttype/ContentTypeIdForXML.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.internal.provisional.contenttype;
-
-/**
- * This class, with its few field, is a convience to provide compile-time
- * safety when refering to a contentType ID. The value of the contenttype id
- * field must match what is specified in plugin.xml file.
- * 
- * @plannedfor 1.0
- */
-final public class ContentTypeIdForXML {
-	/**
-	 * This content type is actually supplied by base Eclipse. Its given here
-	 * just as documentation for WTP based clients. Typically, clients should
-	 * use the values/constants supplied by base Eclipse.
-	 */
-	public final static String ContentTypeID_XML = getConstantString2();
-	/**
-	 * This value is public only for testing and special infrastructure. The
-	 * constant nor is value should not be referenced by clients.
-	 * 
-	 * The value of the contenttype id field must match what is specified in
-	 * plugin.xml file. Note: this value is intentially set with default
-	 * protected method so it will not be inlined.
-	 */
-	public final static String ContentTypeID_SSEXML = getConstantString();
-
-	/**
-	 * Don't allow instantiation.
-	 */
-	private ContentTypeIdForXML() {
-		super();
-	}
-
-	static String getConstantString() {
-		return "org.eclipse.wst.xml.core.xmlsource"; //$NON-NLS-1$
-	}
-
-	static String getConstantString2() {
-		return "org.eclipse.core.runtime.xml"; //$NON-NLS-1$
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMAttr.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMAttr.java
deleted file mode 100644
index aa798f5..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMAttr.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.w3c.dom.Attr;
-
-
-/**
- * This interface provides extensions to corresponding DOM interface to enable
- * functions for source editing and incremental parsing.
- * 
- * @plannedfor 1.0
- * 
- */
-public interface IDOMAttr extends IDOMNode, Attr {
-
-	/**
-	 * Get's the region in attribute representing the '=' sign. May or may not
-	 * have whitespace surrounding it.
-	 * 
-	 * @deprecated - 
-	 * ISSUE: need to change/remove to avoid exposing 'ITextRegion'
-	 * change to offset pattern, as others.
-	 * 
-	 * @return ITextRegion - the region representing the equals sign, or null
-	 *         if their is no equals sign.
-	 */
-	ITextRegion getEqualRegion();
-
-	/**
-	 * Gets the source location of the end of the attribute name, including
-	 * whitespace.
-	 * 
-	 * @return int - the source location of the end of the attribute name,
-	 *         including whitespace.
-	 */
-	int getNameRegionEndOffset();
-
-	/**
-	 * Gets the source location of the start of the attribute name.
-	 * 
-	 * @return int - the source location of the start of the attribute name.
-	 */
-	int getNameRegionStartOffset();
-
-
-	/**
-	 * Gets the text associated with the attribute name.
-	 * 
-	 * @return String - the text associated with the attribute name.
-	 */
-	String getNameRegionText();
-
-	/**
-	 * Gets the source location of the end of the attribute name, excluding
-	 * whitespace.
-	 * 
-	 * @return int - returns the source location of the end of the attribute
-	 *         name, excluding whitespace.
-	 */
-	int getNameRegionTextEndOffset();
-
-	/**
-	 * Gets the source location of the start of the attribute value.
-	 * 
-	 * @return int - returns the source location of the start of the attribute
-	 *         value.
-	 * 
-	 * ISSUE: need to better spec interaction with quote marks
-	 */
-	int getValueRegionStartOffset();
-
-	/**
-	 * Gets the text associated with the attribute value.
-	 * 
-	 * @return String - returns the text associated with the attribute value.
-	 */
-	String getValueRegionText();
-
-	/**
-	 * Check if Attr has a nested value (such as a JSP expression).
-	 * 
-	 * @return true if contains a nested value, false otherwise.
-	 */
-	boolean hasNestedValue();
-
-	/**
-	 * Check if Attr has only name but not equal sign nor value.
-	 * 
-	 * @return true if has only name but not equal sign nor value.
-	 */
-	boolean hasNameOnly();
-
-	/**
-	 * Returns true if attribute is defined globally for document. Returns
-	 * false if attribute is preceeded by a prefix (whether valid name space
-	 * or not). Returns true if its owning element is a global element.
-	 * 
-	 * @return true if attribute is defined globally for document. Returns
-	 *         false if attribute is preceeded by a prefix (whether valid name
-	 *         space or not). Returns true if its owning element is a global
-	 *         element.
-	 */
-	boolean isGlobalAttr();
-
-	/**
-	 * Returns true if is xml attr
-	 * 
-	 * ISSUE: need to figure out how to specify this one in a meaningful way.
-	 * 
-	 * @return boolean - returns true if is xml attr
-	 */
-	boolean isXMLAttr();
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMDocument.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMDocument.java
deleted file mode 100644
index 33c97c3..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMDocument.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.ranges.DocumentRange;
-import org.w3c.dom.traversal.DocumentTraversal;
-
-/**
- * This interface enables creation of DOCTYPE declaration and some DOM Level 2
- * interfaces. May be referenced but not implemented by clients.
- * 
- * @plannedfor 1.0
- */
-public interface IDOMDocument extends IDOMNode, Document, DocumentRange, DocumentTraversal {
-
-	/**
-	 * create comment element. tagName must be registered as comment element
-	 * name in plugin.xml
-	 * 
-	 * @param tagName
-	 *            the element name
-	 * @param isJSPTag
-	 *            true if the element is JSP style comment (&lt;%-- ...
-	 *            --%&gt;)
-	 * @return Element element instance
-	 * @throws DOMException
-	 *             thrown if the element name is registered as comment element
-	 */
-	Element createCommentElement(String tagName, boolean isJSPTag) throws DOMException;
-
-	/**
-	 * Creates a DocumentType node
-	 * 
-	 * ISSUE: I believe this 'name' is the one specific in doctype extension,
-	 * need to verify.
-	 * 
-	 * @param name -
-	 *            name of the doctype
-	 * @return DocumentType - returns a document type node.
-	 */
-	DocumentType createDoctype(String name);
-
-	/**
-	 * Returns the DocumentType ID. Unlike the standard DOM approach of
-	 * "getDocumentType().getPublicId()", this method returns the id even if
-	 * implicit.
-	 * 
-	 * @return the DocumentType ID
-	 */
-	String getDocumentTypeId();
-
-	/**
-	 * NOT API ... needs to be removed/changed
-	 * 
-	 * ISSUE: need to specify
-	 * 
-	 * @deprecated
-	 * 
-	 * @return true if is JSPDocument
-	 * 
-	 */
-	boolean isJSPDocument();
-
-	/**
-	 * NOT API ... needs to be removed/changed
-	 * 
-	 * ISSUE: need to specify
-	 * 
-	 * @deprecated
-	 * 
-	 */
-	boolean isJSPType();
-
-	/**
-	 * NOT API ... may removed/changed
-	 * 
-	 * ISSUE: need to specify -- currently used to denote an HTML DOM document
-	 * is XHTML
-	 * 
-	 * 
-	 */
-	boolean isXMLType();
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMDocumentType.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMDocumentType.java
deleted file mode 100644
index 3afee60..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMDocumentType.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.DocumentType;
-
-/**
- * This interface enables setting of Public and System ID for DOCTYPE
- * declaration.
- * 
- * @plannedfor 1.0
- */
-public interface IDOMDocumentType extends IDOMNode, DocumentType {
-
-
-	/**
-	 * Sets document type's public id, as source.
-	 * 
-	 * @param String -
-	 *            the publicId
-	 */
-	void setPublicId(String publicId);
-
-	/**
-	 * Sets docment type's system id, as source.
-	 * 
-	 * @param String -
-	 *            the systemId
-	 */
-	void setSystemId(String systemId);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMElement.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMElement.java
deleted file mode 100644
index c1a6feb..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMElement.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-
-/**
- * This interface provides extensions to corresponding DOM interface to enable
- * functions for source editing and incremental parsing.
- * 
- * @plannedfor 1.0
- * 
- */
-public interface IDOMElement extends IDOMNode, Element {
-
-	/**
-	 * Retuns the start offset of the end tag.
-	 * 
-	 * ISSUE: need to sort out need for this
-	 * 
-	 * @return int - the start offset of the end tag.
-	 */
-	int getEndStartOffset();
-
-	/**
-	 * Returns the end offset of the
-	 * 
-	 * ISSUE: need to sort out need for this
-	 * 
-	 * @return int - the end offset of the start tag.
-	 */
-	int getStartEndOffset();
-
-	/**
-	 * Returns true if has an end tag.
-	 * 
-	 * In our source-oriented DOM, sometimes Elements are "ended", even
-	 * without an explicit end tag in the source.
-	 * 
-	 * @return true if has an end tag.
-	 */
-	boolean hasEndTag();
-
-	/**
-	 * returns true if has a start tag.
-	 * 
-	 * In our source-oriented DOM, a lone end tag will cause a node to be
-	 * created in the tree, unlike well-formed-only DOMs.
-	 * 
-	 * @return true if has a start tag.
-	 */
-	boolean hasStartTag();
-
-	/**
-	 * returns true if this element is a comment element
-	 * 
-	 * @return true if this element is a comment element
-	 */
-	boolean isCommentTag();
-
-	/**
-	 * isEmptyTag method
-	 * 
-	 * @return boolean - true if is empty tag, false otherwise
-	 */
-	boolean isEmptyTag();
-
-	/**
-	 * Returns true if floating end tag.
-	 * 
-	 * @return true if floating end tag.
-	 */
-	boolean isEndTag();
-
-	/**
-	 * Returns true for "global tag" (basically, without prefix)
-	 * 
-	 * @return true for "global tag" (basically, without prefix)
-	 */
-	boolean isGlobalTag();
-
-	/**
-	 * Returns true for no start and the end tags in source.
-	 * 
-	 * Provided for some very special cases when, for example, and HTML tag is
-	 * assumed in an HTML document that does not have a literal HTML tag.
-	 * 
-	 * ISSUE: check with clients to see if still needed
-	 * 
-	 * @return true or no start and the end tags in source.
-	 */
-	boolean isImplicitTag();
-
-	/**
-	 * isJSPTag method
-	 * 
-	 * @return boolean
-	 * 
-	 * ISSUE: change to isContainerLanguageTag(String type);
-	 */
-	boolean isJSPTag();
-
-	/**
-	 * Returns true if start tag is closed.
-	 * 
-	 * @return true if start tag is closed.
-	 */
-	boolean isStartTagClosed();
-
-	/**
-	 * returns true if is xml tag
-	 * 
-	 * ISSUE: need to spec this better.
-	 * 
-	 * @return true if is xml tag
-	 */
-	boolean isXMLTag();
-
-	/**
-	 * NOT CLIENT API
-	 * 
-	 * notifyEndTagChanged
-	 * 
-	 */
-	void notifyEndTagChanged();
-
-	/**
-	 * NOT CLIENT API
-	 * 
-	 * notifyStartTagChanged
-	 * 
-	 */
-	void notifyStartTagChanged();
-
-	/**
-	 * NOT CLIENT API
-	 * 
-	 * Signify that this tag is a comment
-	 * 
-	 * For use only by parsers.
-	 * 
-	 */
-	void setCommentTag(boolean isCommentTag);
-
-	/**
-	 * NOT CLIENT API
-	 * 
-	 * Signify that this tag is an empty tag
-	 * 
-	 * For use only by parsers
-	 */
-	void setEmptyTag(boolean isEmptyTag);
-
-	/**
-	 * NOT CLIENT API
-	 * 
-	 * Signify that this tag is a JSP tag
-	 * 
-	 * For use only by parsers
-	 * 
-	 * ISSUE: I have had one non-parsing client who has had to use this ...
-	 * need to check
-	 * 
-	 */
-	void setJSPTag(boolean isJSPTag);
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public void setIdAttribute(String name, boolean isId);
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId);
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation for DOM 3.
-	 */
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException;
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMEntity.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMEntity.java
deleted file mode 100644
index 68ffb44..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMEntity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.internal.provisional.document;
-
-import org.w3c.dom.Entity;
-
-public interface IDOMEntity extends Entity {
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation of DOM 3.
-	 */
-	public String getInputEncoding();
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation of DOM 3.
-	 */
-	public String getXmlEncoding();
-
-	/**
-	 * NOT IMPLEMENTED. Is defined here in preparation of DOM 3.
-	 */
-	public String getXmlVersion();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMImplementation.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMImplementation.java
deleted file mode 100644
index 2c16d40..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMImplementation.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.internal.provisional.document;
-
-public interface IDOMImplementation {
-
-	/**
-	 * NOT IMPLEMENTED. This is defined here in preparation of DOM 3.
-	 * 
-	 * This method returns a specialized object which implements the
-	 * specialized APIs of the specified feature and version, as specified in .
-	 * The specialized object may also be obtained by using binding-specific
-	 * casting methods but is not necessarily expected to, as discussed in .
-	 * This method also allow the implementation to provide specialized
-	 * objects which do not support the <code>DOMImplementation</code>
-	 * interface.
-	 * 
-	 * @param feature
-	 *            The name of the feature requested. Note that any plus sign
-	 *            "+" prepended to the name of the feature will be ignored
-	 *            since it is not significant in the context of this method.
-	 * @param version
-	 *            This is the version number of the feature to test.
-	 * @return Returns an object which implements the specialized APIs of the
-	 *         specified feature and version, if any, or <code>null</code>
-	 *         if there is no object which implements interfaces associated
-	 *         with that feature. If the <code>DOMObject</code> returned by
-	 *         this method implements the <code>DOMImplementation</code>
-	 *         interface, it must delegate to the primary core
-	 *         <code>DOMImplementation</code> and not return results
-	 *         inconsistent with the primary core
-	 *         <code>DOMImplementation</code> such as
-	 *         <code>hasFeature</code>, <code>getFeature</code>, etc.
-	 * @see DOM Level 3
-	 */
-	public Object getFeature(String feature, String version);
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMModel.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMModel.java
deleted file mode 100644
index f0af9da..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMModel.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.document;
-
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.document.XMLModelNotifier;
-
-/**
- * Provides means to get the XMLModel form of IStrucutredModel. Not to be
- * implemented or extended by clients.
- * 
- * @plannedfor 1.0
- */
-public interface IDOMModel extends IStructuredModel {
-
-	/**
-	 * Returns the DOM Document.
-	 * 
-	 * @return the DOM Document.
-	 */
-	IDOMDocument getDocument();
-
-	/**
-	 * 
-	 * Returns an source generator appropriate for this model.
-	 * 
-	 * @return the source generator
-	 */
-	ISourceGenerator getGenerator();
-
-	/**
-	 * NOT CLIENT API
-	 * 
-	 * Returns an XMLModelNotifier. Clients should not use.
-	 * 
-	 * ISSUE: should be "internalized".
-	 * 
-	 */
-	XMLModelNotifier getModelNotifier();
-
-	/**
-	 * NOT CLIENT API
-	 *
-	 * Sets the model notifier Clients should not use.
-	 * 
-	 * ISSUE: need to review with legacy clients.
-	 */
-	void setModelNotifier(XMLModelNotifier notifier);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMNode.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMNode.java
deleted file mode 100644
index c73891c..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMNode.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.document;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Node;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-
-/**
- * This interface describes the extended functionality of our source-oriented
- * DOM. First, our nodes extend the w3c Node interface, IndexedRegion, and
- * INodeNotifier. Plus, has the extra methods called out here.
- * 
- * ISSUE: the 'read-only' API should be broken out in their own interface
- * 
- * @plannedfor 1.0
- * 
- */
-public interface IDOMNode extends IndexedRegion, INodeNotifier, Node {
-
-	/**
-	 * Gets the last structured document region of this node.
-	 * 
-	 * ISSUE: need to resolve getEnd/getLast confusion.
-	 * 
-	 * @return IStructuredDocumentRegion - returns the last structured
-	 *         document region associated with
-	 */
-	IStructuredDocumentRegion getEndStructuredDocumentRegion();
-
-	/**
-	 * Gets the first structured document region of this node.
-	 * 
-	 * ISSUE: need to resolve getFirst/getStart confusion
-	 * 
-	 * @return the first structured document region of this node.
-	 */
-	IStructuredDocumentRegion getFirstStructuredDocumentRegion();
-
-	/**
-	 * Gets the last structured document region of this node.
-	 * 
-	 * ISSUE: need to resolve getEnd/getLast confusion.
-	 * 
-	 * @return IStructuredDocumentRegion - returns the last structured
-	 *         document region associated with
-	 */
-	IStructuredDocumentRegion getLastStructuredDocumentRegion();
-
-	/**
-	 * Returns the model associated with this node. Returns null if not part
-	 * of an active model.
-	 * 
-	 * @return IDOMModel - returns the IDOMModel this node is part of.
-	 */
-	IDOMModel getModel();
-
-	/**
-	 * Get's the region representing the name of this node
-	 * 
-	 * ISSUE: only implemented/used at attribute and DTDNodes -- should move.
-	 * 
-	 * @return ITextRegion - returns the ITextRegion associated with this
-	 *         Node.
-	 * 
-	 * @deprecated
-	 */
-	ITextRegion getNameRegion();
-
-	/**
-	 * Returns the literal source representing this node in source document.
-	 * 
-	 * ISSUE: need to fix implementation to match.
-	 * 
-	 * @return the literal source representing this node in source document.
-	 */
-	String getSource();
-
-	/**
-	 * Gets the first structured document region of this node.
-	 * 
-	 * ISSUE: need to resolve getFirst/getStart confusion
-	 * 
-	 * @return the first structured document region of this node.
-	 */
-	IStructuredDocumentRegion getStartStructuredDocumentRegion();
-
-	/**
-	 * Returns the structured document that underlies this node's model.
-	 * 
-	 * Returns null if this node is not actively part of a source document. In
-	 * contrast, in the pure DOM world, "owning document" is not null even
-	 * after a node is deleted from the DOM.
-	 * 
-	 * ISSUE: we need to fix our implementation to match this spec.
-	 * 
-	 * @return the structured document.
-	 */
-	IStructuredDocument getStructuredDocument();
-
-	/**
-	 * Get's the region representing the value of this node if only one
-	 * ITextRegion, null otherwise.
-	 * 
-	 * ISSUE: only implemented/used at attribute level, move "down".
-	 * 
-	 * @return ITextRegion - returns the ITextRegion associated with this
-	 *         Node.
-	 * 
-	 * @deprecated
-	 */
-	ITextRegion getValueRegion();
-
-	/**
-	 * Returns a string representing the source of this node, but with
-	 * character enties converted (e.g. &lt; is converted to '<').
-	 * 
-	 * ISSUE: need to better spec extent of this conversion, we may not know
-	 * all character entities.
-	 * 
-	 * ISSUE: need to fix implementation to match spec.
-	 * 
-	 * @return String - get's the source of this Node.
-	 */
-	String getValueSource();
-
-	/**
-	 * Used to know read-only state of children.
-	 * 
-	 * @return boolean Whether children of the element can be appended or
-	 *         removed.
-	 */
-	boolean isChildEditable();
-
-	/**
-	 * Returns true if tag is closed in source.
-	 * 
-	 * In our source orient DOM we sometimes end a Node without it being
-	 * explicitly closed in source.
-	 * 
-	 * @return boolean - true if node is closed
-	 */
-	boolean isClosed();
-
-	/**
-	 * Returns true if this node can contain children.
-	 * 
-	 * @return boolean - true if this node can contain children.
-	 */
-	boolean isContainer();
-
-	/**
-	 * Used to know read-only state of data.
-	 * 
-	 */
-	boolean isDataEditable();
-
-	/**
-	 * Set's readonly state of children
-	 * 
-	 */
-	void setChildEditable(boolean editable);
-
-	/**
-	 * Set's readonly state of data
-	 * 
-	 */
-	void setDataEditable(boolean editable);
-
-	/**
-	 * Sets readonly state of data
-	 * 
-	 * faster approach to set read-only state.
-	 */
-	void setEditable(boolean editable, boolean deep);
-
-	/**
-	 * Sets the specified raw source to the Text node. Throws
-	 * InvalidCharacterException when the specified raw source includes
-	 * invalid characters, such as, ' <', '>' and '&'. Valid character
-	 * entities, such as, "&amp;lt;", are accepted.
-	 */
-	void setSource(String source) throws InvalidCharacterException;
-
-	/**
-	 * Sets the specified raw source to the Text or Attr node's value. When
-	 * the specified raw source includes invalid characters, such as, ' <',
-	 * '>' and '&', converts them. Valid character entities, such as,
-	 * "&amp;lt;", are accepted.
-	 */
-	void setValueSource(String source);
-	
-	
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public short compareDocumentPosition(Node other) throws DOMException;
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public String getBaseURI();
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public Object getFeature(String feature, String version);
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public String getTextContent() throws DOMException;
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public Object getUserData(String key);
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public boolean isDefaultNamespace(String namespaceURI);
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public boolean isEqualNode(Node arg);
-	
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public boolean isSameNode(Node other);
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public String lookupNamespaceURI(String prefix);
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public String lookupPrefix(String namespaceURI);
-	
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public void setTextContent(String textContent) throws DOMException;
-	
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public Object setUserData(String key, Object data, UserDataHandler handler);
-	
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public TypeInfo getSchemaTypeInfo();
-	
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public boolean isId();
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMText.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMText.java
deleted file mode 100644
index 3c88c76..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMText.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.document;
-
-
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Text;
-
-/**
- * This interface provides extensions to corresponding DOM interface to enable
- * functions for source editing and incremental parsing.
- * 
- * @plannedfor 1.0
- * 
- */
-public interface IDOMText extends IDOMNode, Text {
-
-	/**
-	 * NOT API - can be eliminated or moved to ltk level
-	 * 
-	 * Appends the content of the text node
-	 * 
-	 * @param text -
-	 *            the Text to append.
-	 */
-	void appendText(Text text);
-
-	/**
-	 * NOT API - can be eliminated or moved to ltk level
-	 * 
-	 * Returns true if is not valid.
-	 */
-	boolean isInvalid();
-
-	/**
-	 * Returns true if is entirely white space.
-	 * 
-	 * This is intened to be better performing that all clients getting the
-	 * source, and checking themselves.
-	 * 
-	 * ISSUE: need to clarify if implementation is pure to "white space" as
-	 * per DOM spec? Here is the DOM spec:
-	 * 
-	 * Returns whether this text node contains <a
-	 * href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204#infoitem.character'>
-	 * element content whitespace</a>, often abusively called "ignorable
-	 * whitespace". The text node is determined to contain whitespace in
-	 * element content during the load of the document or if validation occurs
-	 * while using <code>Document.normalizeDocument()</code>.
-	 * 
-	 * @see DOM Level 3
-	 * 
-	 * @return true if is entirely white space.
-	 */
-
-	public boolean isElementContentWhitespace();
-
-	/**
-	 * NOT YET IMPLEMTENTED but exists here interface in preparation for DOM3
-	 * 
-	 * Returns all text of <code>Text</code> nodes logically-adjacent text
-	 * nodes to this node, concatenated in document order. <br>
-	 * For instance, in the example below <code>wholeText</code> on the
-	 * <code>Text</code> node that contains "bar" returns "barfoo", while on
-	 * the <code>Text</code> node that contains "foo" it returns "barfoo".
-	 * 
-	 * @see DOM Level 3
-	 * 
-	 */
-	public String getWholeText();
-
-	/**
-	 * NOT YET IMPLEMTENTED but exists here interface in preparation for DOM3
-	 * 
-	 * Replaces the text of the current node and all logically-adjacent text
-	 * nodes with the specified text. All logically-adjacent text nodes are
-	 * removed including the current node unless it was the recipient of the
-	 * replacement text. <br>
-	 * This method returns the node which received the replacement text. The
-	 * returned node is:
-	 * <ul>
-	 * <li><code>null</code>, when the replacement text is the empty
-	 * string; </li>
-	 * <li>the current node, except when the current node is read-only; </li>
-	 * <li> a new <code>Text</code> node of the same type (
-	 * <code>Text</code> or <code>CDATASection</code>) as the current
-	 * node inserted at the location of the replacement. </li>
-	 * </ul>
-	 * <br>
-	 * For instance, in the above example calling
-	 * <code>replaceWholeText</code> on the <code>Text</code> node that
-	 * contains "bar" with "yo" in argument results in the following: <br>
-	 * Where the nodes to be removed are read-only descendants of an
-	 * <code>EntityReference</code>, the <code>EntityReference</code>
-	 * must be removed instead of the read-only nodes. If any
-	 * <code>EntityReference</code> to be removed has descendants that are
-	 * not <code>EntityReference</code>, <code>Text</code>, or
-	 * <code>CDATASection</code> nodes, the <code>replaceWholeText</code>
-	 * method must fail before performing any modification of the document,
-	 * raising a <code>DOMException</code> with the code
-	 * <code>NO_MODIFICATION_ALLOWED_ERR</code>. <br>
-	 * For instance, in the example below calling
-	 * <code>replaceWholeText</code> on the <code>Text</code> node that
-	 * contains "bar" fails, because the <code>EntityReference</code> node
-	 * "ent" contains an <code>Element</code> node which cannot be removed.
-	 * 
-	 * @param content
-	 *            The content of the replacing <code>Text</code> node.
-	 * @return The <code>Text</code> node created with the specified
-	 *         content.
-	 * @exception DOMException
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if one of the
-	 *                <code>Text</code> nodes being replaced is readonly.
-	 * @see DOM Level 3
-	 */
-	public Text replaceWholeText(String content) throws DOMException;
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/ISourceGenerator.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/ISourceGenerator.java
deleted file mode 100644
index e6576cf..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/ISourceGenerator.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.document;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Comment;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.EntityReference;
-import org.w3c.dom.Node;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-/**
- * 
- * ISourceGenerator allows DOM models to generate source appropriate for their
- * parameter, relative to the model that provides the source generator.
- * 
- */
-
-public interface ISourceGenerator {
-
-	/**
-	 * Generate attribute name.
-	 * 
-	 * @param attr -
-	 *            the Attr
-	 * @return String - the string generated
-	 */
-	String generateAttrName(Attr attr);
-
-	/**
-	 * generateAttrValue
-	 * 
-	 * @param attr -
-	 *            the Attr
-	 * @return String - the string generated
-	 */
-	String generateAttrValue(Attr attr);
-
-	/**
-	 * generateAttrValue
-	 * 
-	 * @param attr -
-	 *            the Attr
-	 * @param char -
-	 *            the type of quote desired (' or ").
-	 * @return String - the string generated
-	 */
-	String generateAttrValue(Attr attr, char quote);
-
-	/**
-	 * generateAttrValue
-	 * 
-	 * @param value
-	 *            the String value
-	 * @param char -
-	 *            the type of quote desired (' or ").
-	 * @return String - the string generated
-	 */
-	String generateAttrValue(String value, char quote);
-
-	/**
-	 * generateCDATASection method
-	 * 
-	 * @param comment
-	 *            CDATASection
-	 * @return String - the string generated
-	 */
-	String generateCDATASection(CDATASection cdata);
-
-	/**
-	 * generateChild method
-	 * 
-	 * @return String
-	 * @param Node
-	 * @return String - the string generated
-	 */
-	String generateChild(Node parentNode);
-
-	/**
-	 * generateCloseTag
-	 * 
-	 * @param node -
-	 *            the Node
-	 * @return String - the string generated
-	 */
-	String generateCloseTag(Node node);
-
-	/**
-	 * generateComment method
-	 * 
-	 * @param comment
-	 *            org.w3c.dom.Comment
-	 * @return String - the string generated
-	 */
-	String generateComment(Comment comment);
-
-	/**
-	 * generateDoctype method
-	 * 
-	 * @param docType
-	 *            DocumentType
-	 * @return String - the string generated
-	 */
-	String generateDoctype(DocumentType docType);
-
-	/**
-	 * generateElement method
-	 * 
-	 * @param element -
-	 *            Element
-	 * @return String - the string generated
-	 */
-	String generateElement(Element element);
-
-	/**
-	 * generateEndTag method
-	 * 
-	 * @param element -
-	 *            Element
-	 * @return String - the string generated
-	 */
-	String generateEndTag(Element element);
-
-	/**
-	 * generateEntityRef method
-	 * 
-	 * @param entityRef
-	 *            EntityReference
-	 * @return String - the string generated
-	 */
-	String generateEntityRef(EntityReference entityRef);
-
-	/**
-	 * generatePI method
-	 * 
-	 * @param pi -
-	 *            ProcessingInstruction
-	 * @return String - the string generated
-	 */
-	String generatePI(ProcessingInstruction pi);
-
-	/**
-	 * generateSource method
-	 * 
-	 * @param node -
-	 *            the Node
-	 * @return String - the string generated
-	 */
-	String generateSource(Node node);
-
-	/**
-	 * generateStartTag method
-	 * 
-	 * @param element
-	 *            Element
-	 * @return String - the string generated
-	 */
-	String generateStartTag(Element element);
-
-	/**
-	 * Generate tag name.
-	 * 
-	 * @param element -
-	 *            element
-	 * @return String - the string generated
-	 */
-	String generateTagName(Element element);
-
-	/**
-	 * generateText method
-	 * 
-	 * @param text -
-	 *            the Text
-	 * @return String - the string generated
-	 */
-	String generateText(Text text);
-
-	/**
-	 * generate text data
-	 * 
-	 * @param text -
-	 *            the Text
-	 * @param data -
-	 *            the data
-	 * @return String - the string generated
-	 */
-	String generateTextData(Text text, String data);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/CommentNodeFormatter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/CommentNodeFormatter.java
deleted file mode 100644
index da0e1de..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/CommentNodeFormatter.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.format;
-
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatContraints;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Node;
-
-
-public class CommentNodeFormatter extends NodeFormatter {
-
-	protected String adjustIndentations(String aString, String lineIndent, String singleIndent) {
-		String result = new String();
-
-		int indexOfLineDelimiter = StringUtils.indexOfLineDelimiter(aString);
-		result = aString.substring(0, indexOfLineDelimiter);
-		while (indexOfLineDelimiter != -1) {
-			// Before find the next LineDelimiter, we have to figure out the
-			// size of the current LineDelimiter
-			// so we can figure out how many bytes to skip before finding the
-			// next LineDelimiter.
-			// Otherwise, we may treat the LF in CRLF as the next
-			// LineDelimiter.
-			int lineDelimiterSize = 1;
-			if (aString.length() >= indexOfLineDelimiter + 2 && aString.substring(indexOfLineDelimiter, indexOfLineDelimiter + 1).compareTo(CR) == 0 && aString.substring(indexOfLineDelimiter + 1, indexOfLineDelimiter + 2).compareTo(LF) == 0)
-				lineDelimiterSize = 2;
-
-			int indexOfNextLineDelimiter = StringUtils.indexOfLineDelimiter(aString, indexOfLineDelimiter + lineDelimiterSize);
-			int indexOfNonblank = StringUtils.indexOfNonblank(aString, indexOfLineDelimiter);
-
-			if (indexOfNonblank != -1) {
-				if (indexOfNextLineDelimiter == -1) {
-					// last line; copy till the end
-					result += lineIndent + singleIndent + aString.substring(indexOfNonblank);
-				} else if (indexOfNextLineDelimiter != -1 && indexOfNextLineDelimiter < indexOfNonblank) {
-					// blank line; just add a indent
-					result += lineIndent + singleIndent;
-				} else {
-					// copy all text between indexOfNonblank and
-					// indexOfNextLineDelimiter
-					result += lineIndent + singleIndent + aString.substring(indexOfNonblank, indexOfNextLineDelimiter);
-				}
-
-				indexOfLineDelimiter = indexOfNextLineDelimiter;
-			} else {
-				if (indexOfNextLineDelimiter == -1) {
-					result += lineIndent;
-				} else {
-					// blank line; just add a indent
-					result += lineIndent + singleIndent;
-				}
-
-				indexOfLineDelimiter = indexOfNextLineDelimiter;
-			}
-		}
-
-		return result;
-	}
-
-	protected void formatNode(IDOMNode node, IStructuredFormatContraints formatContraints) {
-		if (node != null) {
-			// lineDelimiterFound means multi line comment
-			String nodeValue = node.getNodeValue();
-			boolean lineDelimiterFoundInComment = StringUtils.containsLineDelimiter(nodeValue);
-
-			if (lineDelimiterFoundInComment) {
-				// format indentation before node
-				formatIndentationBeforeNode(node, formatContraints);
-
-				// adjust indentations in multi line comment
-				String lineDelimiter = node.getModel().getStructuredDocument().getLineDelimiter();
-				String lineIndent = formatContraints.getCurrentIndent();
-				String singleIndent = getFormatPreferences().getIndent();
-				String newNodevalue = adjustIndentations(nodeValue, lineDelimiter + lineIndent, singleIndent);
-				if (nodeValue.compareTo(newNodevalue) != 0)
-					node.setNodeValue(newNodevalue);
-			}
-
-			if (!nodeHasSiblings(node) || (node.getPreviousSibling() != null && node.getPreviousSibling().getNodeType() == Node.TEXT_NODE && !StringUtils.containsLineDelimiter(node.getPreviousSibling().getNodeValue()) && node.getNextSibling() == null)) {
-				// single child
-				// or inline comment after text
-				// do nothing
-			} else
-				// format indentation after node
-				formatIndentationAfterNode(node, formatContraints);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/DocumentNodeFormatter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/DocumentNodeFormatter.java
deleted file mode 100644
index aee80a1..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/DocumentNodeFormatter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.format;
-
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatContraints;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-
-public class DocumentNodeFormatter extends NodeFormatter {
-	protected void formatChildren(IDOMNode node, IStructuredFormatContraints formatContraints) {
-		String singleIndent = getFormatPreferences().getIndent();
-		String lineIndent = formatContraints.getCurrentIndent();
-
-		if (node != null && (fProgressMonitor == null || !fProgressMonitor.isCanceled())) {
-			// normalize node first to combine adjacent text nodes
-			node.normalize();
-
-			IDOMNode nextChild = (IDOMNode) node.getFirstChild();
-			while (nextChild != null) {
-				IDOMNode eachChildNode = nextChild;
-				nextChild = (IDOMNode) eachChildNode.getNextSibling();
-				IStructuredFormatter formatter = getFormatter(eachChildNode);
-				IStructuredFormatContraints childFormatContraints = formatter.getFormatContraints();
-				String childIndent = lineIndent + singleIndent;
-				childFormatContraints.setCurrentIndent(childIndent);
-				childFormatContraints.setClearAllBlankLines(formatContraints.getClearAllBlankLines());
-
-				// format each child
-				formatter.format(eachChildNode, childFormatContraints);
-
-				if (nextChild != null && nextChild.getParentNode() == null)
-					// nextNode is deleted during format
-					nextChild = (IDOMNode) eachChildNode.getNextSibling();
-			}
-		}
-	}
-
-	protected void formatNode(IDOMNode node, IStructuredFormatContraints formatContraints) {
-		if (node != null)
-			formatChildren(node, formatContraints);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/ElementNodeFormatter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/ElementNodeFormatter.java
deleted file mode 100644
index a144cb5..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/ElementNodeFormatter.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.format;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatContraints;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.document.AttrImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.document.ISourceGenerator;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-
-public class ElementNodeFormatter extends DocumentNodeFormatter {
-	static protected final char DOUBLE_QUOTE = '"';//$NON-NLS-1$
-	static protected final String DOUBLE_QUOTES = "\"\"";//$NON-NLS-1$
-	static protected final char EQUAL_CHAR = '='; // equal sign$NON-NLS-1$
-	static protected final String PRESERVE = "preserve";//$NON-NLS-1$
-	static protected final String PRESERVE_QUOTED = "\"preserve\"";//$NON-NLS-1$
-	static protected final char SINGLE_QUOTE = '\'';//$NON-NLS-1$
-	static protected final String XML_SPACE = "xml:space";//$NON-NLS-1$
-
-	protected void formatEndTag(IDOMNode node, IStructuredFormatContraints formatContraints) {
-		if (!isEndTagMissing(node)) {
-			// end tag exists
-
-			IStructuredDocument structuredDocument = node.getModel().getStructuredDocument();
-			String lineDelimiter = structuredDocument.getLineDelimiter();
-			String nodeIndentation = getNodeIndent(node);
-			IDOMNode lastChild = (IDOMNode) node.getLastChild();
-			if (lastChild != null && lastChild.getNodeType() != Node.TEXT_NODE) {
-				if (isEndTagMissing(lastChild)) {
-					// find deepest child
-					IDOMNode deepestChild = (IDOMNode) lastChild.getLastChild();
-					while (deepestChild != null && deepestChild.getLastChild() != null && isEndTagMissing(deepestChild)) {
-						lastChild = deepestChild;
-						deepestChild = (IDOMNode) deepestChild.getLastChild();
-					}
-
-					if (deepestChild != null) {
-						if (deepestChild.getNodeType() == Node.TEXT_NODE) {
-							// Special indentation handling if lastChild's end
-							// tag is missing and deepestChild is a text node.
-							String nodeText = deepestChild.getNodeValue();
-
-							if (!nodeText.endsWith(lineDelimiter + nodeIndentation)) {
-								nodeText = StringUtils.appendIfNotEndWith(nodeText, lineDelimiter);
-								nodeText = StringUtils.appendIfNotEndWith(nodeText, nodeIndentation);
-							}
-
-							replaceNodeValue(deepestChild, nodeText);
-						} else
-							insertAfterNode(lastChild, lineDelimiter + nodeIndentation);
-					}
-				} else
-					// indent end tag
-					insertAfterNode(lastChild, lineDelimiter + nodeIndentation);
-			} else if (lastChild == null && firstStructuredDocumentRegionContainsLineDelimiters(node)) {
-				// indent end tag
-				replace(structuredDocument, node.getFirstStructuredDocumentRegion().getEndOffset(), 0, lineDelimiter + nodeIndentation);
-			}
-
-			// format end tag name
-			IStructuredDocumentRegion endTagStructuredDocumentRegion = node.getLastStructuredDocumentRegion();
-			if (endTagStructuredDocumentRegion.getRegions().size() >= 3) {
-				ITextRegion endTagNameRegion = endTagStructuredDocumentRegion.getRegions().get(1);
-				removeRegionSpaces(node, endTagStructuredDocumentRegion, endTagNameRegion);
-			}
-		}
-	}
-
-	protected void formatNode(IDOMNode node, IStructuredFormatContraints formatContraints) {
-		if (node != null) {
-			// format indentation before node
-			formatIndentationBeforeNode(node, formatContraints);
-
-			// format start tag
-			IDOMNode newNode = node;
-			int startTagStartOffset = node.getStartOffset();
-			IDOMModel structuredModel = node.getModel();
-
-			formatStartTag(node, formatContraints);
-			// save new node
-			newNode = (IDOMNode) structuredModel.getIndexedRegion(startTagStartOffset);
-
-			IStructuredDocumentRegion flatNode = newNode.getFirstStructuredDocumentRegion();
-			if (flatNode != null) {
-				ITextRegionList regions = flatNode.getRegions();
-				ITextRegion lastRegion = regions.get(regions.size() - 1);
-				// format children and end tag if not empty start tag
-				if (lastRegion.getType() != DOMRegionContext.XML_EMPTY_TAG_CLOSE) {
-					// format children
-					formatChildren(newNode, formatContraints);
-
-					// save new node
-					newNode = (IDOMNode) structuredModel.getIndexedRegion(startTagStartOffset);
-
-					// format end tag
-					formatEndTag(newNode, formatContraints);
-				}
-			}
-
-			// format indentation after node
-			formatIndentationAfterNode(newNode, formatContraints);
-		}
-	}
-
-	/**
-	 * This method formats the start tag name, and formats the attributes if
-	 * available.
-	 */
-	protected void formatStartTag(IDOMNode node, IStructuredFormatContraints formatContraints) {
-		String singleIndent = getFormatPreferences().getIndent();
-		String lineIndent = formatContraints.getCurrentIndent();
-		String attrIndent = lineIndent + singleIndent;
-		boolean splitMultiAttrs = ((IStructuredFormatPreferencesXML) fFormatPreferences).getSplitMultiAttrs();
-		IStructuredDocumentRegion flatNode = node.getFirstStructuredDocumentRegion();
-		NamedNodeMap attributes = node.getAttributes();
-
-		// Note: attributes should not be null even if the node has no
-		// attributes. However, attributes.getLength() will be 0. But, check
-		// for null just in case.
-		if (attributes != null) {
-			// compute current available line width
-			int currentAvailableLineWidth = 0;
-			try {
-				// 1 is for "<"
-				int nodeNameOffset = node.getStartOffset() + 1 + node.getNodeName().length();
-				int lineOffset = node.getStructuredDocument().getLineInformationOfOffset(nodeNameOffset).getOffset();
-				String text = node.getStructuredDocument().get(lineOffset, nodeNameOffset - lineOffset);
-				int usedWidth = getIndentationLength(text);
-				currentAvailableLineWidth = getFormatPreferences().getLineWidth() - usedWidth;
-			} catch (BadLocationException exception) {
-				throw new SourceEditingRuntimeException(exception);
-			}
-
-			StringBuffer stringBuffer = new StringBuffer();
-			String lineDelimiter = node.getModel().getStructuredDocument().getLineDelimiter();
-			int attrLength = attributes.getLength();
-			int lastUndefinedRegionOffset = 0;
-			for (int i = 0; i < attrLength; i++) {
-				AttrImpl attr = (AttrImpl) attributes.item(i);
-				ITextRegion nameRegion = attr.getNameRegion();
-				ITextRegion equalRegion = attr.getEqualRegion();
-				ITextRegion valueRegion = attr.getValueRegion();
-
-				// append undefined regions
-				String undefinedRegion = getUndefinedRegions(node, lastUndefinedRegionOffset, attr.getStartOffset() - lastUndefinedRegionOffset);
-				stringBuffer.append(undefinedRegion);
-				lastUndefinedRegionOffset = attr.getStartOffset();
-
-				// check for xml:space attribute
-				if (flatNode.getText(nameRegion).compareTo(XML_SPACE) == 0) {
-					if (valueRegion == null) {
-						ModelQueryAdapter adapter = (ModelQueryAdapter) ((IDOMDocument) node.getOwnerDocument()).getAdapterFor(ModelQueryAdapter.class);
-						CMElementDeclaration elementDeclaration = (CMElementDeclaration) adapter.getModelQuery().getCMNode(node);
-						if (elementDeclaration == null)
-							// CMElementDeclaration not found, default to
-							// PRESERVE
-							formatContraints.setClearAllBlankLines(false);
-						else {
-							CMAttributeDeclaration attributeDeclaration = (CMAttributeDeclaration) elementDeclaration.getAttributes().getNamedItem(XML_SPACE);
-							if (attributeDeclaration == null)
-								// CMAttributeDeclaration not found, default
-								// to PRESERVE
-								formatContraints.setClearAllBlankLines(false);
-							else {
-								String defaultValue = attributeDeclaration.getAttrType().getImpliedValue();
-
-								if (defaultValue.compareTo(PRESERVE) == 0)
-									formatContraints.setClearAllBlankLines(false);
-								else
-									formatContraints.setClearAllBlankLines(getFormatPreferences().getClearAllBlankLines());
-							}
-						}
-					} else {
-						ISourceGenerator generator = node.getModel().getGenerator();
-						String newAttrValue = generator.generateAttrValue(attr);
-
-						// There is a problem in
-						// StructuredDocumentRegionUtil.getAttrValue(ITextRegion)
-						// when the region is instanceof ContextRegion.
-						// Workaround for now.
-						if (flatNode.getText(valueRegion).length() == 1) {
-							char firstChar = flatNode.getText(valueRegion).charAt(0);
-							if ((firstChar == DOUBLE_QUOTE) || (firstChar == SINGLE_QUOTE))
-								newAttrValue = DOUBLE_QUOTES;
-						}
-
-						if (newAttrValue.compareTo(PRESERVE_QUOTED) == 0)
-							formatContraints.setClearAllBlankLines(false);
-						else
-							formatContraints.setClearAllBlankLines(getFormatPreferences().getClearAllBlankLines());
-					}
-				}
-
-				if (splitMultiAttrs && attrLength > 1) {
-					stringBuffer.append(lineDelimiter + attrIndent);
-					stringBuffer.append(flatNode.getText(nameRegion));
-					if (valueRegion != null) {
-						// append undefined regions
-						undefinedRegion = getUndefinedRegions(node, lastUndefinedRegionOffset, flatNode.getStartOffset(equalRegion) - lastUndefinedRegionOffset);
-						stringBuffer.append(undefinedRegion);
-						lastUndefinedRegionOffset = flatNode.getStartOffset(equalRegion);
-
-						stringBuffer.append(EQUAL_CHAR);
-
-						// append undefined regions
-						undefinedRegion = getUndefinedRegions(node, lastUndefinedRegionOffset, flatNode.getStartOffset(valueRegion) - lastUndefinedRegionOffset);
-						stringBuffer.append(undefinedRegion);
-						lastUndefinedRegionOffset = flatNode.getStartOffset(valueRegion);
-
-						// Note: trim() should not be needed for
-						// valueRegion.getText(). Just a workaround for a
-						// problem found in valueRegion for now.
-						stringBuffer.append(flatNode.getText(valueRegion).trim());
-					}
-				} else {
-					if (valueRegion != null) {
-						int textLength = 1 + flatNode.getText(nameRegion).length() + 1 + flatNode.getText(valueRegion).length();
-						if (i == attrLength - 1) {
-							if (flatNode != null) {
-								ITextRegionList regions = flatNode.getRegions();
-								ITextRegion lastRegion = regions.get(regions.size() - 1);
-								if (lastRegion.getType() != DOMRegionContext.XML_EMPTY_TAG_CLOSE)
-									// 3 is for " />"
-									textLength += 3;
-								else
-									// 1 is for ">"
-									textLength++;
-							}
-						}
-
-						if (currentAvailableLineWidth >= textLength) {
-							stringBuffer.append(SPACE_CHAR);
-							currentAvailableLineWidth--;
-						} else {
-							stringBuffer.append(lineDelimiter + attrIndent);
-							currentAvailableLineWidth = getFormatPreferences().getLineWidth() - attrIndent.length();
-						}
-
-						stringBuffer.append(flatNode.getText(nameRegion));
-
-						// append undefined regions
-						undefinedRegion = getUndefinedRegions(node, lastUndefinedRegionOffset, flatNode.getStartOffset(equalRegion) - lastUndefinedRegionOffset);
-						stringBuffer.append(undefinedRegion);
-						lastUndefinedRegionOffset = flatNode.getStartOffset(equalRegion);
-
-						stringBuffer.append(EQUAL_CHAR);
-
-						// append undefined regions
-						undefinedRegion = getUndefinedRegions(node, lastUndefinedRegionOffset, flatNode.getStartOffset(valueRegion) - lastUndefinedRegionOffset);
-						stringBuffer.append(undefinedRegion);
-						lastUndefinedRegionOffset = flatNode.getStartOffset(valueRegion);
-
-						// Note: trim() should not be needed for
-						// valueRegion.getText(). Just a workaround for a
-						// problem found in valueRegion for now.
-						stringBuffer.append(flatNode.getText(valueRegion).trim());
-
-						currentAvailableLineWidth -= flatNode.getText(nameRegion).length();
-						currentAvailableLineWidth--;
-						currentAvailableLineWidth -= flatNode.getText(valueRegion).trim().length();
-					} else {
-						if (currentAvailableLineWidth >= 1 + flatNode.getText(nameRegion).length()) {
-							stringBuffer.append(SPACE_CHAR);
-							currentAvailableLineWidth--;
-						} else {
-							stringBuffer.append(lineDelimiter + attrIndent);
-							currentAvailableLineWidth = getFormatPreferences().getLineWidth() - attrIndent.length();
-						}
-
-						stringBuffer.append(flatNode.getText(nameRegion));
-
-						currentAvailableLineWidth -= flatNode.getText(nameRegion).length();
-					}
-				}
-			}
-
-			// append undefined regions
-			String undefinedRegion = getUndefinedRegions(node, lastUndefinedRegionOffset, node.getEndOffset() - lastUndefinedRegionOffset);
-			stringBuffer.append(undefinedRegion);
-
-			IDOMModel structuredModel = node.getModel();
-			IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-			// 1 is for "<"
-			int offset = node.getStartOffset() + 1 + node.getNodeName().length();
-			// 1 is for "<"
-			int length = node.getFirstStructuredDocumentRegion().getTextLength() - 1 - node.getNodeName().length();
-
-			if (flatNode != null) {
-				ITextRegionList regions = flatNode.getRegions();
-				ITextRegion firstRegion = regions.get(0);
-				ITextRegion lastRegion = regions.get(regions.size() - 1);
-
-				if (firstRegion.getType() == DOMRegionContext.XML_END_TAG_OPEN)
-					// skip formatting for end tags in this format: </tagName>
-					return;
-				else {
-					if (lastRegion.getType() == DOMRegionContext.XML_TAG_CLOSE || lastRegion.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE)
-						length = length - lastRegion.getLength();
-
-					if (lastRegion.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE)
-						// leave space before XML_EMPTY_TAG_CLOSE: <tagName />
-						stringBuffer.append(SPACE_CHAR);
-				}
-			}
-
-			replace(structuredDocument, offset, length, stringBuffer.toString());
-		}
-	}
-
-	protected String getUndefinedRegions(IDOMNode node, int startOffset, int length) {
-		String result = new String();
-
-		IStructuredDocumentRegion flatNode = node.getFirstStructuredDocumentRegion();
-		ITextRegionList regions = flatNode.getRegions();
-		for (int i = 0; i < regions.size(); i++) {
-			ITextRegion region = regions.get(i);
-			String regionType = region.getType();
-			int regionStartOffset = flatNode.getStartOffset(region);
-
-			if (regionType.compareTo(DOMRegionContext.UNDEFINED) == 0 && regionStartOffset >= startOffset && regionStartOffset < startOffset + length)
-				result = result + flatNode.getFullText(region);
-		}
-
-		if (result.length() > 0)
-			return SPACE + result.trim();
-		else
-			return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/FormatProcessorXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/FormatProcessorXML.java
deleted file mode 100644
index 61be949..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/FormatProcessorXML.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.format;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.sse.core.internal.format.AbstractStructuredFormatProcessor;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.document.CDATASectionImpl;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.w3c.dom.Node;
-
-public class FormatProcessorXML extends AbstractStructuredFormatProcessor {
-	protected IStructuredFormatPreferences fFormatPreferences = null;
-
-	protected String getFileExtension() {
-		return "xml"; //$NON-NLS-1$
-	}
-
-	public IStructuredFormatPreferences getFormatPreferences() {
-		if (fFormatPreferences == null) {
-			fFormatPreferences = new StructuredFormatPreferencesXML();
-
-			Preferences preferences = getModelPreferences();
-			if (preferences != null) {
-				fFormatPreferences.setLineWidth(preferences.getInt(XMLCorePreferenceNames.LINE_WIDTH));
-				((IStructuredFormatPreferencesXML) fFormatPreferences).setSplitMultiAttrs(preferences.getBoolean(XMLCorePreferenceNames.SPLIT_MULTI_ATTRS));
-				fFormatPreferences.setClearAllBlankLines(preferences.getBoolean(XMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES));
-
-				char indentChar = ' ';
-				String indentCharPref = preferences.getString(XMLCorePreferenceNames.INDENTATION_CHAR);
-				if (XMLCorePreferenceNames.TAB.equals(indentCharPref)) {
-					indentChar = '\t';
-				}
-				int indentationWidth = preferences.getInt(XMLCorePreferenceNames.INDENTATION_SIZE);
-
-				StringBuffer indent = new StringBuffer();
-				for (int i = 0; i < indentationWidth; i++) {
-					indent.append(indentChar);
-				}
-				fFormatPreferences.setIndent(indent.toString());
-			}
-		}
-
-		return fFormatPreferences;
-	}
-
-	protected IStructuredFormatter getFormatter(Node node) {
-		// 262135 - NPE during format of empty document
-		if (node == null)
-			return null;
-
-		short nodeType = node.getNodeType();
-		IStructuredFormatter formatter = null;
-		switch (nodeType) {
-			case Node.ELEMENT_NODE : {
-				formatter = new ElementNodeFormatter();
-				break;
-			}
-			case Node.TEXT_NODE : {
-				if (node instanceof CDATASectionImpl)
-					formatter = new NodeFormatter();
-				else
-					formatter = new TextNodeFormatter();
-				break;
-			}
-			case Node.COMMENT_NODE : {
-				formatter = new CommentNodeFormatter();
-				break;
-			}
-			case Node.PROCESSING_INSTRUCTION_NODE : {
-				formatter = new NodeFormatter();
-				break;
-			}
-			case Node.DOCUMENT_NODE : {
-				formatter = new DocumentNodeFormatter();
-				break;
-			}
-			default : {
-				formatter = new NodeFormatter();
-			}
-		}
-
-		// init fomatter
-		formatter.setFormatPreferences(getFormatPreferences());
-		formatter.setProgressMonitor(fProgressMonitor);
-
-		return formatter;
-	}
-
-	protected Preferences getModelPreferences() {
-		return XMLCorePlugin.getDefault().getPluginPreferences();
-	}
-
-	protected void refreshFormatPreferences() {
-		fFormatPreferences = null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/IStructuredFormatPreferencesXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/IStructuredFormatPreferencesXML.java
deleted file mode 100644
index 5af2338..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/IStructuredFormatPreferencesXML.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.format;
-
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-
-public interface IStructuredFormatPreferencesXML extends IStructuredFormatPreferences {
-	boolean getSplitMultiAttrs();
-
-	void setSplitMultiAttrs(boolean splitMultiAttrs);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/NodeFormatter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/NodeFormatter.java
deleted file mode 100644
index f6e439f..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/NodeFormatter.java
+++ /dev/null
@@ -1,796 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.format;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatContraints;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter;
-import org.eclipse.wst.sse.core.internal.format.StructuredFormatContraints;
-import org.eclipse.wst.sse.core.internal.parser.ContextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.document.CDATASectionImpl;
-import org.eclipse.wst.xml.core.internal.document.CharacterDataImpl;
-import org.eclipse.wst.xml.core.internal.document.CommentImpl;
-import org.eclipse.wst.xml.core.internal.parser.regions.TagNameRegion;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Node;
-
-public class NodeFormatter implements IStructuredFormatter {
-	static protected final String CR = "\r"; //$NON-NLS-1$
-	static protected final String CRLF = "\r\n"; //$NON-NLS-1$
-	static protected final String DELIMITERS = " \t\n\r\f"; //$NON-NLS-1$
-	static protected final String EMPTY_STRING = ""; //$NON-NLS-1$
-	static protected final String FF = "\f"; //$NON-NLS-1$
-	static protected final String LF = "\n"; //$NON-NLS-1$
-	static protected final String SPACE = " "; //$NON-NLS-1$
-	static protected final char SPACE_CHAR = ' '; //$NON-NLS-1$
-	static protected final String TAB = "\t"; //$NON-NLS-1$
-	static protected final char TAB_CHAR = '\t'; //$NON-NLS-1$
-	protected IStructuredFormatContraints fFormatContraints = null;
-	protected IStructuredFormatPreferences fFormatPreferences = null;
-	protected IProgressMonitor fProgressMonitor = null;
-
-	protected String compressSpaces(String string, IStructuredFormatContraints formatContraints) {
-		/*
-		 * Note that the StructuredTextEditor supports mixed new line
-		 * characters (CR, LF, CRLF) in one file. We have to handle that when
-		 * we try to preserve blank lines.
-		 */
-		String[] stringArray = null;
-		boolean clearAllBlankLines = formatContraints.getClearAllBlankLines();
-
-		if (clearAllBlankLines)
-			stringArray = StringUtils.asArray(string);
-		else
-			stringArray = StringUtils.asArray(string, DELIMITERS, true);
-
-		StringBuffer compressedString = new StringBuffer();
-		if (stringArray.length > 0) {
-			boolean cr = false, lf = false, cr2 = false, nonSpace = true;
-
-			if (stringArray[0].compareTo(CR) == 0)
-				cr = true;
-			else if (stringArray[0].compareTo(LF) == 0)
-				lf = true;
-			else if ((stringArray[0].compareTo(SPACE) != 0) && (stringArray[0].compareTo(TAB) != 0) && (stringArray[0].compareTo(FF) != 0)) {
-				compressedString.append(stringArray[0]);
-				nonSpace = true;
-			}
-
-			for (int i = 1; i < stringArray.length; i++) {
-				if (stringArray[i].compareTo(CR) == 0) {
-					if (cr && lf) {
-						if (nonSpace) {
-							compressedString.append(CR + LF);
-							nonSpace = false;
-						}
-						compressedString.append(stringArray[i]);
-						cr2 = true;
-					} else if (cr) {
-						if (nonSpace) {
-							compressedString.append(CR);
-							nonSpace = false;
-						}
-						compressedString.append(stringArray[i]);
-						cr2 = true;
-					} else
-						cr = true;
-				} else if (stringArray[i].compareTo(LF) == 0) {
-					if (cr && lf && cr2) {
-						compressedString.append(stringArray[i]);
-					} else if (lf) {
-						if (nonSpace) {
-							compressedString.append(LF);
-							nonSpace = false;
-						}
-						compressedString.append(stringArray[i]);
-					} else
-						lf = true;
-				} else if ((stringArray[i].compareTo(SPACE) != 0) && (stringArray[i].compareTo(TAB) != 0) && (stringArray[i].compareTo(FF) != 0)) {
-					if (compressedString.length() > 0)
-						compressedString.append(SPACE);
-					compressedString.append(stringArray[i]);
-
-					cr = false;
-					lf = false;
-					cr2 = false;
-					nonSpace = true;
-				}
-			}
-		}
-
-		return compressedString.toString();
-	}
-
-	protected boolean firstStructuredDocumentRegionContainsLineDelimiters(IDOMNode node) {
-		boolean result = false;
-
-		if (node != null) {
-			IStructuredDocumentRegion firstStructuredDocumentRegion = node.getFirstStructuredDocumentRegion();
-			if (firstStructuredDocumentRegion != null && firstStructuredDocumentRegion.getText() != null) {
-				String firstStructuredDocumentRegionText = firstStructuredDocumentRegion.getText();
-				result = StringUtils.containsLineDelimiter(firstStructuredDocumentRegionText);
-			}
-		}
-
-		return result;
-	}
-
-	public void format(Node node) {
-		IStructuredFormatContraints formatContraints = getFormatContraints();
-
-		format(node, formatContraints);
-	}
-
-	public void format(Node node, IStructuredFormatContraints formatContraints) {
-		if (formatContraints.getFormatWithSiblingIndent())
-			formatContraints.setCurrentIndent(getSiblingIndent(node));
-
-		if (node instanceof IDOMNode)
-			formatNode((IDOMNode) node, formatContraints);
-	}
-
-	protected void formatIndentationAfterNode(IDOMNode node, IStructuredFormatContraints formatContraints) {
-		if (node != null) {
-			IDOMNode nextSibling = (IDOMNode) node.getNextSibling();
-			IStructuredDocument doc = node.getModel().getStructuredDocument();
-			int line = doc.getLineOfOffset(node.getEndOffset());
-			String lineDelimiter = doc.getLineDelimiter();
-			try {
-				lineDelimiter = doc.getLineDelimiter(line);
-				if (lineDelimiter == null)
-					lineDelimiter = ""; //$NON-NLS-1$
-			} catch (BadLocationException exception) {
-				throw new SourceEditingRuntimeException(exception);
-			}
-
-			if (node.getParentNode() != null) {
-				if (node.getParentNode().getNodeType() == Node.DOCUMENT_NODE)
-					if (nextSibling != null)
-						if (nextSibling.getNodeType() == Node.TEXT_NODE)
-							getFormatter(nextSibling).format(nextSibling, formatContraints);
-						else if (nextSibling.getNodeType() == Node.COMMENT_NODE) {
-							// do nothing
-						} else {
-							String lineIndent = formatContraints.getCurrentIndent();
-							insertAfterNode(node, lineDelimiter + lineIndent);
-						}
-					else {
-					}
-
-				else if (nextSibling != null)
-					if (nextSibling.getNodeType() == Node.TEXT_NODE)
-						getFormatter(nextSibling).format(nextSibling, formatContraints);
-					else if (nextSibling.getNodeType() == Node.COMMENT_NODE) {
-						// do nothing
-					} else {
-						String lineIndent = formatContraints.getCurrentIndent();
-						insertAfterNode(node, lineDelimiter + lineIndent);
-					}
-				else {
-					IDOMNode indentNode = getParentIndentNode(node);
-					String lineIndent = getNodeIndent(indentNode);
-					IDOMNode lastChild = getDeepestChildNode(node);
-					boolean clearAllBlankLines = formatContraints.getClearAllBlankLines();
-
-					if (lastChild != null) {
-						if ((lastChild.getNodeType() == Node.TEXT_NODE) && (lastChild.getNodeValue().endsWith(lineDelimiter + lineIndent))) {
-							// this text node already ends with the requested
-							// indentation
-						}
-
-						else if ((lastChild.getNodeType() == Node.TEXT_NODE) && (lastChild.getNodeValue() != null && lastChild.getNodeValue().endsWith(lineDelimiter)))
-							if (clearAllBlankLines) {
-								replaceNodeValue(lastChild, lineDelimiter + lineIndent);
-							} else {
-								// append indentation
-								insertAfterNode(lastChild, lineIndent);
-							}
-						else if (lastChild.getNodeType() == Node.TEXT_NODE)
-							if (lastChild.getNodeValue().length() == 0) {
-								// replace
-								replaceNodeValue(lastChild, lineDelimiter + lineIndent);
-							} else {
-								// append indentation
-								insertAfterNode(lastChild, lineDelimiter + lineIndent);
-							}
-						else {
-							// append indentation
-							insertAfterNode(lastChild, lineDelimiter + lineIndent);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	protected void formatIndentationBeforeNode(IDOMNode node, IStructuredFormatContraints formatContraints) {
-		if (node != null) {
-			IDOMNode previousSibling = (IDOMNode) node.getPreviousSibling();
-			IStructuredDocument doc = node.getModel().getStructuredDocument();
-			int line = doc.getLineOfOffset(node.getStartOffset());
-			String lineDelimiter = doc.getLineDelimiter();
-			try {
-				if (line > 0) {
-					lineDelimiter = doc.getLineDelimiter(line - 1);
-					if (lineDelimiter == null)
-						lineDelimiter = ""; //$NON-NLS-1$
-				}
-			} catch (BadLocationException exception) {
-				throw new SourceEditingRuntimeException(exception);
-			}
-			String lineIndent = formatContraints.getCurrentIndent();
-
-			if (node.getParentNode() != null) {
-				if (node.getParentNode().getNodeType() == Node.DOCUMENT_NODE) {
-					if (previousSibling != null)
-						if (previousSibling.getNodeType() == Node.TEXT_NODE)
-							getFormatter(previousSibling).format(previousSibling, formatContraints);
-						else {
-							insertBeforeNode(node, lineDelimiter + lineIndent);
-						}
-				} else {
-					if (previousSibling == null || previousSibling.getNodeType() != Node.TEXT_NODE) {
-						// 261968 - formatting tag without closing bracket:
-						// <t1><t1
-						// 265673 - Null ptr in formatIndentationBeforeNode
-						int prevEndNodeOffset = -1;
-						int prevEndRegionOffset = -1;
-						if (previousSibling != null) {
-							prevEndNodeOffset = previousSibling.getEndOffset();
-							IStructuredDocumentRegion endRegion = previousSibling.getEndStructuredDocumentRegion();
-							if (endRegion != null) {
-								prevEndRegionOffset = endRegion.getTextEndOffset();
-							}
-						}
-						if ((previousSibling == null) || (prevEndNodeOffset != -1 && prevEndNodeOffset == prevEndRegionOffset)) {
-							insertBeforeNode(node, lineDelimiter + lineIndent);
-						}
-
-					} else {
-						if (previousSibling.getNodeValue().length() == 0) {
-							// replace
-							replaceNodeValue(previousSibling, lineDelimiter + lineIndent);
-						} else {
-							// append indentation
-							if (!previousSibling.getNodeValue().endsWith(lineDelimiter + lineIndent)) {
-								if (previousSibling.getNodeValue().endsWith(lineDelimiter)) {
-									insertAfterNode(previousSibling, lineIndent);
-								} else
-									getFormatter(previousSibling).format(previousSibling, formatContraints);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	protected void formatNode(IDOMNode node, IStructuredFormatContraints formatContraints) {
-		if (node != null && (fProgressMonitor == null || !fProgressMonitor.isCanceled())) {
-			// format indentation before node
-			formatIndentationBeforeNode(node, formatContraints);
-
-			// format indentation after node
-			formatIndentationAfterNode(node, formatContraints);
-		}
-	}
-
-	/**
-	 * This method will compute the correct indentation after this node
-	 * depending on the indentations of its sibling nodes and parent node. Not
-	 * needed anymore?
-	 */
-	protected void formatTrailingText(IDOMNode node, IStructuredFormatContraints formatContraints) {
-		String lineDelimiter = node.getModel().getStructuredDocument().getLineDelimiter();
-		String lineIndent = formatContraints.getCurrentIndent();
-		String parentLineIndent = getNodeIndent(node.getParentNode());
-		boolean clearAllBlankLines = formatContraints.getClearAllBlankLines();
-
-		if ((node != null) && (node.getNodeType() != Node.DOCUMENT_NODE)) {
-			IDOMNode nextSibling = (IDOMNode) node.getNextSibling();
-			if ((nextSibling != null) && (nextSibling.getNodeType() == Node.TEXT_NODE)) {
-				String nextSiblingText = nextSibling.getNodeValue();
-				if (nextSibling.getNextSibling() == null)
-					if ((nextSibling.getParentNode().getNodeType() == Node.DOCUMENT_NODE) && (nextSiblingText.trim().length() == 0))
-						// delete spaces at the end of the document
-						replaceNodeValue(nextSibling, EMPTY_STRING);
-					else
-						// replace the text node with parent indentation
-						replaceNodeValue(nextSibling, lineDelimiter + parentLineIndent);
-				else
-					// replace the text node with indentation
-					replaceNodeValue(nextSibling, lineDelimiter + lineIndent);
-			} else {
-				if (nextSibling == null) {
-					lineIndent = parentLineIndent;
-
-					if (node.getParentNode().getNodeType() != Node.DOCUMENT_NODE)
-						if ((node.getNodeType() == Node.TEXT_NODE) && (node.getNodeValue().endsWith(lineDelimiter + lineIndent))) {
-							// this text node already ends with the requested
-							// indentation
-						}
-
-						else if ((node.getNodeType() == Node.TEXT_NODE) && (node.getNodeValue().endsWith(lineDelimiter)))
-							if (clearAllBlankLines)
-								replaceNodeValue(node, lineDelimiter + lineIndent);
-							else
-								// append indentation
-								insertAfterNode(node, lineIndent);
-						else if (node.getNodeType() == Node.TEXT_NODE)
-							if (node.getNodeValue().length() == 0)
-								// replace
-								replaceNodeValue(node, lineDelimiter + lineIndent);
-							else
-							// append indentation
-							if (!node.getNodeValue().endsWith(lineDelimiter + lineIndent))
-								if (node.getNodeValue().endsWith(lineDelimiter))
-									insertAfterNode(node, lineIndent);
-								else
-									insertAfterNode(node, lineDelimiter + lineIndent);
-							else
-								replaceNodeValue(node, lineDelimiter + lineIndent);
-				} else {
-					if ((node.getNodeType() == Node.TEXT_NODE) && (node.getNodeValue().endsWith(lineDelimiter + lineIndent))) {
-						// this text node already ends with the requested
-						// indentation
-					}
-
-					else if ((node.getNodeType() == Node.TEXT_NODE) && (node.getNodeValue().endsWith(lineDelimiter)))
-						if (clearAllBlankLines)
-							replaceNodeValue(node, lineDelimiter + lineIndent);
-						else
-							// append indentation
-							insertAfterNode(node, lineIndent);
-					else if (node.getNodeType() == Node.TEXT_NODE)
-						if (node.getNodeValue().length() == 0)
-							// replace
-							replaceNodeValue(node, lineDelimiter + lineIndent);
-						else
-							// append indentation
-							insertAfterNode(node, lineDelimiter + lineIndent);
-					else
-						// append indentation
-						insertAfterNode(node, lineDelimiter + lineIndent);
-				}
-			}
-		}
-	}
-
-	protected String getCompressedNodeText(IDOMNode node, IStructuredFormatContraints formatContraints) {
-		return compressSpaces(getNodeText(node), formatContraints);
-	}
-
-	protected IDOMNode getDeepestChildNode(IDOMNode node) {
-		IDOMNode result = null;
-		IDOMNode lastChild = (IDOMNode) node.getLastChild();
-
-		if (lastChild == null)
-			result = node;
-		else {
-			result = getDeepestChildNode(lastChild);
-
-			if ((result.getNodeType() == Node.TEXT_NODE || result.getNodeType() == Node.COMMENT_NODE) && !isEndTagMissing(node))
-				result = node;
-		}
-
-		return result;
-	}
-
-	public IStructuredFormatContraints getFormatContraints() {
-		if (fFormatContraints == null) {
-			fFormatContraints = new StructuredFormatContraints();
-
-			fFormatContraints.setClearAllBlankLines(getFormatPreferences().getClearAllBlankLines());
-		}
-
-		return fFormatContraints;
-	}
-
-	public IStructuredFormatPreferences getFormatPreferences() {
-		if (fFormatPreferences == null) {
-			fFormatPreferences = new StructuredFormatPreferencesXML();
-
-			Preferences preferences = getModelPreferences();
-			if (preferences != null) {
-				fFormatPreferences.setLineWidth(preferences.getInt(XMLCorePreferenceNames.LINE_WIDTH));
-				((IStructuredFormatPreferencesXML) fFormatPreferences).setSplitMultiAttrs(preferences.getBoolean(XMLCorePreferenceNames.SPLIT_MULTI_ATTRS));
-				fFormatPreferences.setClearAllBlankLines(preferences.getBoolean(XMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES));
-
-				char indentChar = ' ';
-				String indentCharPref = preferences.getString(XMLCorePreferenceNames.INDENTATION_CHAR);
-				if (XMLCorePreferenceNames.TAB.equals(indentCharPref)) {
-					indentChar = '\t';
-				}
-				int indentationWidth = preferences.getInt(XMLCorePreferenceNames.INDENTATION_SIZE);
-
-				StringBuffer indent = new StringBuffer();
-				for (int i = 0; i < indentationWidth; i++) {
-					indent.append(indentChar);
-				}
-				fFormatPreferences.setIndent(indent.toString());
-			}
-		}
-
-		return fFormatPreferences;
-	}
-
-	protected IStructuredFormatter getFormatter(IDOMNode node) {
-		// 262135 - NPE during format of empty document
-		if (node == null)
-			return null;
-
-		short nodeType = ((Node) node).getNodeType();
-		IStructuredFormatter formatter = null;
-		switch (nodeType) {
-			case Node.ELEMENT_NODE : {
-				formatter = new ElementNodeFormatter();
-				break;
-			}
-			case Node.TEXT_NODE : {
-				if (node instanceof CDATASectionImpl)
-					formatter = new NodeFormatter();
-				else
-					formatter = new TextNodeFormatter();
-				break;
-			}
-			case Node.COMMENT_NODE : {
-				formatter = new CommentNodeFormatter();
-				break;
-			}
-			case Node.PROCESSING_INSTRUCTION_NODE : {
-				formatter = new NodeFormatter();
-				break;
-			}
-			case Node.DOCUMENT_NODE : {
-				formatter = new DocumentNodeFormatter();
-				break;
-			}
-			default : {
-				formatter = new NodeFormatter();
-			}
-		}
-
-		// init fomatter
-		formatter.setFormatPreferences(getFormatPreferences());
-		formatter.setProgressMonitor(fProgressMonitor);
-
-		return formatter;
-	}
-
-	protected int getIndentationLength(String indent) {
-		// TODO Kit : The calculation of IndentationLength is not correct
-		// here.
-		// nodeIndentation may contain tabs. Multiply by 4 temporarily to get
-		// approx. width.
-		// Need to re-work.
-
-		int indentationLength = 0;
-
-		for (int i = 0; i < indent.length(); i++) {
-			if (indent.substring(i, i + 1).compareTo(TAB) == 0)
-				indentationLength += 4;
-			else
-				indentationLength++;
-		}
-
-		return indentationLength;
-	}
-
-	protected Preferences getModelPreferences() {
-		return XMLCorePlugin.getDefault().getPluginPreferences();
-	}
-
-	/**
-	 * This method will find the indentation for this node. It will search
-	 * backwards starting from the beginning of the node until a character
-	 * other than a space or a tab is found. If this node is null or it's a
-	 * document node or it's a first level node (node's parent is a document
-	 * node) the default empty string will be returned as the indentation.
-	 */
-	protected String getNodeIndent(Node node) {
-		String result = EMPTY_STRING;
-
-		if ((node != null) && (node.getNodeType() != Node.DOCUMENT_NODE) && (node.getParentNode() != null) && (node.getParentNode().getNodeType() != Node.DOCUMENT_NODE)) {
-			IDOMNode siblingTextNode = (IDOMNode) node.getPreviousSibling();
-			if ((siblingTextNode != null) && (siblingTextNode.getNodeType() == Node.TEXT_NODE)) {
-				// find the indentation
-				String siblingText = siblingTextNode.getNodeValue();
-				int siblingTextLength = siblingText.length();
-				if ((siblingText != null) && (siblingTextLength > 0) && ((siblingText.charAt(siblingTextLength - 1) == SPACE_CHAR) || (siblingText.charAt(siblingTextLength - 1) == TAB_CHAR))) {
-					int searchIndex = siblingTextLength - 1;
-					while ((searchIndex >= 0) && ((siblingText.charAt(searchIndex) == SPACE_CHAR) || (siblingText.charAt(searchIndex) == TAB_CHAR)))
-						searchIndex--;
-
-					if (searchIndex < siblingTextLength)
-						result = siblingText.substring(searchIndex + 1, siblingTextLength);
-				}
-			}
-		}
-
-		return result;
-	}
-
-	protected String getNodeName(IDOMNode node) {
-		return node.getNodeName();
-	}
-
-	protected String getNodeText(IDOMNode node) {
-		String text = null;
-
-		if ((node instanceof CharacterDataImpl) && !(node instanceof CommentImpl) && !(node instanceof CDATASectionImpl) && !isJSPTag(node))
-			text = ((CharacterDataImpl) node).getSource();
-		else
-			text = node.getFirstStructuredDocumentRegion().getText();
-
-		return text;
-	}
-
-	protected IDOMNode getParentIndentNode(IDOMNode node) {
-		IDOMNode result = null;
-		IDOMNode parentNode = (IDOMNode) node.getParentNode();
-
-		if (parentNode.getNodeType() == Node.DOCUMENT_NODE)
-			result = parentNode;
-		else {
-			ITextRegion region = parentNode.getLastStructuredDocumentRegion().getFirstRegion();
-			if (region.getType() == DOMRegionContext.XML_END_TAG_OPEN)
-				result = parentNode;
-			else
-				result = getParentIndentNode(parentNode);
-		}
-
-		return result;
-	}
-
-	/**
-	 * This method will find the indentation for a node sibling to this node.
-	 * It will try to find a sibling node before this node first. If there is
-	 * no sibling node before this node, it will try to find a sibling node
-	 * after this node. If still not found, we will check if this node is
-	 * already indented from its parent. If yes, this node's indentation will
-	 * be used. Otherwise, the parent node's indentation plus one indentation
-	 * will be used. If this node is null or it's a document node or it's a
-	 * first level node (node's parent is a document node) the default empty
-	 * string will be returned as the indentation.
-	 */
-	protected String getSiblingIndent(Node node) {
-		String result = EMPTY_STRING;
-
-		if ((node != null) && (node.getNodeType() != Node.DOCUMENT_NODE) && (node.getParentNode() != null) && (node.getParentNode().getNodeType() != Node.DOCUMENT_NODE)) {
-			// find the text node before the previous non-text sibling
-			// if that's not found, we will try the text node before the next
-			// non-text sibling
-			IDOMNode sibling = (IDOMNode) node.getPreviousSibling();
-			while ((sibling != null) && (sibling.getNodeType() == Node.TEXT_NODE || sibling.getNodeType() == Node.COMMENT_NODE)) {
-				if (sibling.getNodeType() == Node.COMMENT_NODE && sibling.getPreviousSibling() != null && sibling.getPreviousSibling().getNodeType() == Node.TEXT_NODE && StringUtils.containsLineDelimiter(sibling.getPreviousSibling().getNodeValue()))
-					break;
-				sibling = (IDOMNode) sibling.getPreviousSibling();
-			}
-			if (sibling == null) {
-				sibling = (IDOMNode) node.getNextSibling();
-				while ((sibling != null) && (sibling.getNodeType() == Node.TEXT_NODE))
-					sibling = (IDOMNode) sibling.getNextSibling();
-			}
-			String singleIndent = getFormatPreferences().getIndent();
-			String parentLineIndent = getNodeIndent(node.getParentNode());
-
-			if (sibling != null) {
-				String siblingIndent = getNodeIndent(sibling);
-				if (siblingIndent.length() > 0)
-					result = siblingIndent;
-				else {
-					String nodeIndent = getNodeIndent(node);
-					if (nodeIndent.length() > parentLineIndent.length())
-						// this node is indented from its parent, its
-						// indentation will be used
-						result = nodeIndent;
-					else
-						result = parentLineIndent + singleIndent;
-				}
-			} else {
-				String nodeIndent = getNodeIndent(node);
-				if (nodeIndent.length() > parentLineIndent.length())
-					// this node is indented from its parent, its indentation
-					// will be used
-					result = nodeIndent;
-				else
-					result = parentLineIndent + singleIndent;
-			}
-		}
-
-		return result;
-	}
-
-	protected void insertAfterNode(IDOMNode node, String string) {
-		IDOMModel structuredModel = node.getModel();
-		IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-
-		int offset = node.getEndOffset();
-		int length = 0;
-
-		// 261968 - formatting tag without closing bracket: <t1><t1
-		if (node.getEndStructuredDocumentRegion() != null) {
-			offset = node.getEndStructuredDocumentRegion().getTextEndOffset();
-			length = node.getEndOffset() - offset;
-		}
-		replace(structuredDocument, offset, length, string);
-	}
-
-	protected void insertBeforeNode(IDOMNode node, String string) {
-		IDOMModel structuredModel = node.getModel();
-		IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-
-		replace(structuredDocument, node.getStartOffset(), 0, string);
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type allows it
-	 * to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return type.equals(IStructuredFormatter.class);
-	}
-
-	protected boolean isEndTagMissing(IDOMNode node) {
-		boolean result = false;
-
-		if ((node != null) && (node.getNodeType() != Node.DOCUMENT_NODE) && !isJSPTag(node)) {
-			IStructuredDocumentRegion startTagStructuredDocumentRegion = node.getFirstStructuredDocumentRegion();
-			IStructuredDocumentRegion endTagStructuredDocumentRegion = node.getLastStructuredDocumentRegion();
-
-			ITextRegion startTagNameRegion = null;
-			if (startTagStructuredDocumentRegion.getRegions().size() > 1)
-				startTagNameRegion = startTagStructuredDocumentRegion.getRegions().get(1);
-			ITextRegion endTagNameRegion = null;
-			if (endTagStructuredDocumentRegion.getRegions().size() > 1)
-				endTagNameRegion = endTagStructuredDocumentRegion.getRegions().get(1);
-
-			ITextRegionList startTagRegions = startTagStructuredDocumentRegion.getRegions();
-			if (startTagNameRegion == endTagNameRegion && startTagNameRegion != null && (startTagRegions.get(0)).getType() != DOMRegionContext.XML_END_TAG_OPEN && (startTagRegions.get(startTagRegions.size() - 1).getType()) != DOMRegionContext.XML_EMPTY_TAG_CLOSE)
-				// end tag missing
-				result = true;
-		}
-
-		return result;
-	}
-
-	protected boolean nodeHasSiblings(IDOMNode node) {
-		return (node.getPreviousSibling() != null) || (node.getNextSibling() != null);
-	}
-
-	/**
-	 * Node changed. No format should be performed automatically.
-	 */
-	public void notifyChanged(org.eclipse.wst.sse.core.internal.provisional.INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-	}
-
-	protected void removeRegionSpaces(IDOMNode node, IStructuredDocumentRegion flatNode, ITextRegion region) {
-		if ((region != null) && (region instanceof ContextRegion || region instanceof TagNameRegion) && (flatNode.getEndOffset(region) > flatNode.getTextEndOffset(region))) {
-			IDOMModel structuredModel = node.getModel();
-			IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-
-			replace(structuredDocument, flatNode.getTextEndOffset(region), flatNode.getEndOffset(region) - flatNode.getTextEndOffset(region), EMPTY_STRING);
-		}
-	}
-
-	/**
-	 * This method will replace the string at offset and length with a new
-	 * string. If the string to be replaced is the same as the new string, the
-	 * string will not be replaced.
-	 */
-	protected void replace(IStructuredDocument structuredDocument, int offset, int length, String string) {
-		try {
-			String structuredDocumentString = structuredDocument.get(offset, length);
-			if (structuredDocumentString.compareTo(string) != 0)
-				structuredDocument.replaceText(structuredDocument, offset, length, string);
-		} catch (BadLocationException exception) {
-			throw new SourceEditingRuntimeException(exception);
-		}
-	}
-
-	/**
-	 * This method will replace the node value with a new string. If the node
-	 * value to be replaced is the same as the new string, the node value will
-	 * not be replaced.
-	 */
-	protected void replaceNodeValue(IDOMNode node, String string) {
-		IDOMModel structuredModel = node.getModel();
-		IStructuredDocument structuredDocument = structuredModel.getStructuredDocument();
-		int offset = node.getStartOffset();
-		int length = node.getEndOffset() - node.getStartOffset();
-
-		try {
-			String structuredDocumentString = structuredDocument.get(offset, length);
-			if (structuredDocumentString.compareTo(string) != 0)
-				replace(structuredDocument, offset, length, string);
-		} catch (BadLocationException exception) {
-			throw new SourceEditingRuntimeException(exception);
-		}
-	}
-
-	public void setFormatPreferences(IStructuredFormatPreferences formatPreferences) {
-		fFormatPreferences = formatPreferences;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.core.format.IStructuredFormatter#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void setProgressMonitor(IProgressMonitor monitor) {
-		fProgressMonitor = monitor;
-	}
-
-	/**
-	 * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-	 * way for expedency. Should be evolved in future to depend on "nestedContext".
-	 */
-	private boolean isJSPTag(Node node) {
-	
-		final String JSP_CLOSE = "JSP_CLOSE"; //$NON-NLS-1$
-		// final String JSP_COMMENT_CLOSE = "JSP_COMMENT_CLOSE"; //$NON-NLS-1$
-	
-		// final String JSP_COMMENT_OPEN = "JSP_COMMENT_OPEN"; //$NON-NLS-1$
-		// final String JSP_COMMENT_TEXT = "JSP_COMMENT_TEXT"; //$NON-NLS-1$
-	
-		final String JSP_CONTENT = "JSP_CONTENT"; //$NON-NLS-1$
-		final String JSP_DECLARATION_OPEN = "JSP_DECLARATION_OPEN"; //$NON-NLS-1$
-		final String JSP_DIRECTIVE_CLOSE = "JSP_DIRECTIVE_CLOSE"; //$NON-NLS-1$
-		final String JSP_DIRECTIVE_NAME = "JSP_DIRECTIVE_NAME"; //$NON-NLS-1$
-	
-		final String JSP_DIRECTIVE_OPEN = "JSP_DIRECTIVE_OPEN"; //$NON-NLS-1$
-		final String JSP_EXPRESSION_OPEN = "JSP_EXPRESSION_OPEN"; //$NON-NLS-1$
-	
-		// final String JSP_ROOT_TAG_NAME = "JSP_ROOT_TAG_NAME"; //$NON-NLS-1$
-	
-		final String JSP_SCRIPTLET_OPEN = "JSP_SCRIPTLET_OPEN"; //$NON-NLS-1$
-	
-		boolean result = false;
-	
-		if (node instanceof IDOMNode) {
-			IStructuredDocumentRegion flatNode = ((IDOMNode) node).getFirstStructuredDocumentRegion();
-			// in some cases, the nodes exists, but hasn't been associated
-			// with
-			// a flatnode yet (the screen updates can be initiated on a
-			// different thread,
-			// so the request for a flatnode can come in before the node is
-			// fully formed.
-			// if the flatnode is null, we'll just allow the defaults to
-			// apply.
-			if (flatNode != null) {
-				String flatNodeType = flatNode.getType();
-				// should not be null, but just to be sure
-				if (flatNodeType != null) {
-					if ((flatNodeType.equals(JSP_CONTENT)) || (flatNodeType.equals(JSP_EXPRESSION_OPEN)) || (flatNodeType.equals(JSP_SCRIPTLET_OPEN)) || (flatNodeType.equals(JSP_DECLARATION_OPEN)) || (flatNodeType.equals(JSP_DIRECTIVE_CLOSE)) || (flatNodeType.equals(JSP_DIRECTIVE_NAME)) || (flatNodeType.equals(JSP_DIRECTIVE_OPEN)) || (flatNodeType.equals(JSP_CLOSE))) {
-						result = true;
-					}
-				}
-			}
-		}
-	
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/StructuredFormatPreferencesXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/StructuredFormatPreferencesXML.java
deleted file mode 100644
index 084c689..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/StructuredFormatPreferencesXML.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.format;
-
-import org.eclipse.wst.sse.core.internal.format.StructuredFormatPreferences;
-
-public class StructuredFormatPreferencesXML extends StructuredFormatPreferences implements IStructuredFormatPreferencesXML {
-	private boolean fSplitMultiAttrs;
-
-	public boolean getSplitMultiAttrs() {
-		return fSplitMultiAttrs;
-	}
-
-	public void setSplitMultiAttrs(boolean splitMultiAttrs) {
-		fSplitMultiAttrs = splitMultiAttrs;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/TextNodeFormatter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/TextNodeFormatter.java
deleted file mode 100644
index 4998505..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/TextNodeFormatter.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.provisional.format;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatContraints;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Node;
-
-
-public class TextNodeFormatter extends NodeFormatter {
-	protected void formatNode(IDOMNode node, IStructuredFormatContraints formatContraints) {
-		if (node != null) {
-			IStructuredDocument doc = node.getModel().getStructuredDocument();
-			int line = doc.getLineOfOffset(node.getStartOffset());
-			String lineDelimiter = doc.getLineDelimiter();
-			try {
-				lineDelimiter = doc.getLineDelimiter(line);
-				if (lineDelimiter == null)
-					lineDelimiter = ""; //$NON-NLS-1$
-			} catch (BadLocationException exception) {
-				throw new SourceEditingRuntimeException(exception);
-			}
-			int lineWidth = getFormatPreferences().getLineWidth();
-			IDOMNode parentNode = (IDOMNode) node.getParentNode();
-			String nodeIndentation = formatContraints.getCurrentIndent();
-
-			// compute current available line width
-			int currentAvailableLineWidth = 0;
-			try {
-				int nodeNameOffset = node.getStartOffset();
-				int lineOffset = node.getStructuredDocument().getLineInformationOfOffset(nodeNameOffset).getOffset();
-				String text = node.getStructuredDocument().get(lineOffset, nodeNameOffset - lineOffset);
-				int usedWidth = getIndentationLength(text);
-				currentAvailableLineWidth = getFormatPreferences().getLineWidth() - usedWidth;
-			} catch (BadLocationException exception) {
-				throw new SourceEditingRuntimeException(exception);
-			}
-
-			String compressedText = getCompressedNodeText(node, formatContraints);
-
-			if (((compressedText.length() <= (currentAvailableLineWidth - node.getParentNode().getNodeName().length() - 3) && !StringUtils.containsLineDelimiter(compressedText)) && (!nodeHasSiblings(node) || (!StringUtils.containsLineDelimiter(node.getNodeValue()) && node.getNextSibling() != null && node.getNextSibling().getNodeType() == Node.COMMENT_NODE && !StringUtils.containsLineDelimiter(node.getNextSibling().getNodeValue()))) && !firstStructuredDocumentRegionContainsLineDelimiters((IDOMNode) node.getParentNode())) || node.getStartStructuredDocumentRegion().getStartOffset() == 0) {
-				// enough space
-				// and text has no line delimiters
-				// and (node has no siblings or followed by inline comment)
-				// and
-				// parentFirstStructuredDocumentRegionContainsLineDelimiters
-
-				if (isEndTagMissing(parentNode)) {
-					parentNode = (IDOMNode) parentNode.getParentNode();
-					while (isEndTagMissing(parentNode))
-						parentNode = (IDOMNode) parentNode.getParentNode();
-
-					// add parent's indentation to end
-					nodeIndentation = getNodeIndent(parentNode);
-
-					if (!compressedText.endsWith(lineDelimiter + nodeIndentation)) {
-						compressedText = StringUtils.appendIfNotEndWith(compressedText, lineDelimiter);
-						compressedText = StringUtils.appendIfNotEndWith(compressedText, nodeIndentation);
-					}
-				}
-
-				if ((parentNode != null) && (parentNode.getNodeType() == Node.DOCUMENT_NODE) && (node.getNodeValue().length() > 0) && (node.getNodeValue().trim().length() == 0) && ((node.getPreviousSibling() == null) || (node.getNextSibling() == null)))
-					// delete spaces at the beginning or end of the document
-					compressedText = EMPTY_STRING;
-
-				replaceNodeValue(node, compressedText);
-			} else {
-				// not enough space, need to reflow text
-
-				currentAvailableLineWidth = lineWidth - getIndentationLength(nodeIndentation);
-				List vector = reflowText(compressedText, currentAvailableLineWidth);
-				int vectorSize = vector.size();
-				String reflowedText = new String();
-
-				for (int i = 0; i < vectorSize; i++) {
-					if (((String) vector.get(i)).trim().length() > 0)
-						reflowedText = reflowedText + lineDelimiter + nodeIndentation + (String) vector.get(i);
-					else
-						reflowedText = reflowedText + lineDelimiter;
-				}
-
-				if (node.getNextSibling() == null) {
-					if (isEndTagMissing(parentNode)) {
-						// don't add indentation to end if parent end tag is
-						// missing
-					}
-
-					else {
-						// add parent's indentation to end
-						nodeIndentation = getNodeIndent(parentNode);
-
-						if (!reflowedText.endsWith(lineDelimiter + nodeIndentation)) {
-							reflowedText = StringUtils.appendIfNotEndWith(reflowedText, lineDelimiter);
-							reflowedText = StringUtils.appendIfNotEndWith(reflowedText, nodeIndentation);
-						}
-					}
-				} else {
-					if (!reflowedText.endsWith(lineDelimiter + nodeIndentation)) {
-						// not already ended with the expected indentation
-
-						if (node.getNextSibling().getNodeType() == Node.COMMENT_NODE) {
-							// add indentation to end if
-							// currentTextEndsWithLineDelimiter
-							// or followed by multiLineComment
-
-							String nodeText = getNodeText(node);
-							int indexOfLastLineDelimiter = StringUtils.indexOfLastLineDelimiter(nodeText);
-							boolean currentTextEndsWithLineDelimiter = indexOfLastLineDelimiter != -1;
-							if (currentTextEndsWithLineDelimiter) {
-								// no more non blank character after the last
-								// line delimiter
-								currentTextEndsWithLineDelimiter = StringUtils.indexOfNonblank(nodeText, indexOfLastLineDelimiter) == -1;
-							}
-
-							String nodeValue = node.getNextSibling().getNodeValue();
-							boolean multiLineComment = StringUtils.containsLineDelimiter(nodeValue);
-
-							if (currentTextEndsWithLineDelimiter || multiLineComment) {
-								reflowedText = StringUtils.appendIfNotEndWith(reflowedText, lineDelimiter);
-								reflowedText = StringUtils.appendIfNotEndWith(reflowedText, nodeIndentation);
-							}
-						} else {
-							// not a comment, just add add indentation to end
-							reflowedText = StringUtils.appendIfNotEndWith(reflowedText, lineDelimiter);
-							reflowedText = StringUtils.appendIfNotEndWith(reflowedText, nodeIndentation);
-						}
-					}
-				}
-
-				replaceNodeValue(node, reflowedText);
-			}
-
-		}
-	}
-
-	protected Vector reflowText(String text, int availableWidth) {
-		String[] stringArray = null;
-		boolean clearAllBlankLines = getFormatPreferences().getClearAllBlankLines();
-
-		if (clearAllBlankLines)
-			stringArray = StringUtils.asArray(text);
-		else
-			stringArray = StringUtils.asArray(text, DELIMITERS, true);
-
-		Vector output = new Vector();
-		if ((stringArray != null) && (stringArray.length > 0)) {
-			StringBuffer buffer = new StringBuffer();
-			if (stringArray[0].compareTo(CR) != 0)
-				buffer.append(stringArray[0]);
-			int bufferLength = stringArray[0].toString().length();
-			boolean cr = stringArray[0].compareTo(CR) == 0;
-
-			for (int i = 1; i < stringArray.length; i++) {
-				String eachString = stringArray[i];
-				if ((eachString.compareTo(SPACE) != 0) && (eachString.compareTo(TAB) != 0) && (eachString.compareTo(FF) != 0)) {
-					if ((bufferLength + 1 + eachString.length() > availableWidth) || (eachString.compareTo(CR) == 0) || (eachString.compareTo(LF) == 0)) {
-						if ((eachString.compareTo(LF) == 0) && cr) {
-							// do nothing
-						} else {
-							output.add(buffer.toString());
-							buffer = new StringBuffer();
-							bufferLength = 0;
-						}
-						cr = eachString.compareTo(CR) == 0;
-					} else if (buffer.toString().trim().length() > 0) {
-						buffer.append(SPACE);
-						bufferLength++;
-					}
-					if ((eachString.compareTo(CR) != 0) && (eachString.compareTo(LF) != 0)) {
-						buffer.append(eachString);
-						bufferLength = bufferLength + eachString.length();
-					}
-				}
-			}
-			output.add(buffer.toString());
-		} else
-			output.add(text);
-
-		return output;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/text/IXMLPartitions.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/text/IXMLPartitions.java
deleted file mode 100644
index 7391845..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/text/IXMLPartitions.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.wst.xml.core.internal.provisional.text;
-
-
-
-/**
- * This interface is not intended to be implemented.
- * It defines the partition types for XML.
- * Clients should reference the partition type Strings defined here directly.
- * 
- * @plannedfor 1.0
- */
-public interface IXMLPartitions {
-	
-	String XML_DEFAULT = "org.eclipse.wst.xml.XML_DEFAULT"; //$NON-NLS-1$
-	String XML_CDATA = "org.eclipse.wst.xml.XML_CDATA"; //$NON-NLS-1$
-	String XML_PI = "org.eclipse.wst.xml.XML_PI"; //$NON-NLS-1$
-	String XML_DECLARATION = "org.eclipse.wst.xml.XML_DECL"; //$NON-NLS-1$
-	String XML_COMMENT = "org.eclipse.wst.xml.XML_COMMENT"; //$NON-NLS-1$
-	
-	/*
-	 * This value is used as a prefix to any unknown processing instructions
-	 * we find. The processor target name is converted to uppercase and
-	 * appended to the prefix to create a unique partition type.
-	 */
-	String PROCESSING_INSTRUCTION_PREFIX = "org.eclipse.wst.xml.PROCESSING_INSTRUCTION:"; //$NON-NLS-1$
-
-	/**
-	 * Should match
-	 * org.eclipse.wst.sse.core.dtd.partitioning.StructuredTextPartitionerForDTD.ST_DTD_SUBSET
-	 */
-	String DTD_SUBSET = "org.eclipse.wst.xml.dtd.internal_subset"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/regions/DOMRegionContext.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/regions/DOMRegionContext.java
deleted file mode 100644
index e379894..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/regions/DOMRegionContext.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.regions;
-
-public interface DOMRegionContext {
-
-	public static final String BLOCK_TEXT = "BLOCK_TEXT"; //$NON-NLS-1$
-
-	public static final String UNDEFINED = "UNDEFINED"; //$NON-NLS-1$
-
-	public static final String WHITE_SPACE = "WHITE_SPACE"; //$NON-NLS-1$
-	public static final String XML_ATTLIST_DECL_CLOSE = "XML_ATTLIST_DECL_CLOSE"; //$NON-NLS-1$
-	public static final String XML_ATTLIST_DECL_CONTENT = "XML_ATTLIST_DECL_CONTENT"; //$NON-NLS-1$
-	public static final String XML_ATTLIST_DECL_NAME = "XML_ATTLIST_DECL_NAME"; //$NON-NLS-1$
-
-	public static final String XML_ATTLIST_DECLARATION = "XML_ATTLIST_DECLARATION"; //$NON-NLS-1$
-	public static final String XML_CDATA_CLOSE = "XML_CDATA_CLOSE"; //$NON-NLS-1$
-	public static final String XML_CDATA_OPEN = "XML_CDATA_OPEN"; //$NON-NLS-1$
-	public static final String XML_CDATA_TEXT = "XML_CDATA_TEXT"; //$NON-NLS-1$
-	public static final String XML_CHAR_REFERENCE = "XML_CHAR_REFERENCE"; //$NON-NLS-1$
-	public static final String XML_COMMENT_CLOSE = "XML_COMMENT_CLOSE"; //$NON-NLS-1$
-
-	public static final String XML_COMMENT_OPEN = "XML_COMMENT_OPEN"; //$NON-NLS-1$
-	public static final String XML_COMMENT_TEXT = "XML_COMMENT_TEXT"; //$NON-NLS-1$
-
-	public static final String XML_CONTENT = "XML_CONTENT"; //$NON-NLS-1$
-	public static final String XML_DECLARATION_CLOSE = "XML_DECLARATION_CLOSE"; //$NON-NLS-1$
-
-	public static final String XML_DECLARATION_OPEN = "XML_DECLARATION_OPEN"; //$NON-NLS-1$
-
-	public static final String XML_DOCTYPE_DECLARATION = "XML_DOCTYPE_DECLARATION"; //$NON-NLS-1$
-	public static final String XML_DOCTYPE_DECLARATION_CLOSE = "XML_DOCTYPE_DECLARATION_CLOSE"; //$NON-NLS-1$
-	public static final String XML_DOCTYPE_EXTERNAL_ID_PUBLIC = "XML_DOCTYPE_EXTERNAL_ID_PUBLIC"; //$NON-NLS-1$
-	public static final String XML_DOCTYPE_EXTERNAL_ID_PUBREF = "XML_DOCTYPE_EXTERNAL_ID_PUBREF"; //$NON-NLS-1$
-	public static final String XML_DOCTYPE_EXTERNAL_ID_SYSREF = "XML_DOCTYPE_EXTERNAL_ID_SYSREF"; //$NON-NLS-1$
-	public static final String XML_DOCTYPE_EXTERNAL_ID_SYSTEM = "XML_DOCTYPE_EXTERNAL_ID_SYSTEM"; //$NON-NLS-1$
-	public static final String XML_DOCTYPE_INTERNAL_SUBSET = "XML_DOCTYPE_INTERNAL_SUBSET"; //$NON-NLS-1$
-	public static final String XML_DOCTYPE_NAME = "XML_DOCTYPE_NAME"; //$NON-NLS-1$
-	public static final String XML_ELEMENT_DECL_CLOSE = "XML_ELEMENT_DECL_CLOSE"; //$NON-NLS-1$
-	public static final String XML_ELEMENT_DECL_CONTENT = "XML_ELEMENT_DECL_CONTENT"; //$NON-NLS-1$
-	public static final String XML_ELEMENT_DECL_NAME = "XML_ELEMENT_DECL_NAME"; //$NON-NLS-1$
-
-	public static final String XML_ELEMENT_DECLARATION = "XML_ELEMENT_DECLARATION"; //$NON-NLS-1$
-	public static final String XML_EMPTY_TAG_CLOSE = "XML_EMPTY_TAG_CLOSE"; //$NON-NLS-1$
-	public static final String XML_END_TAG_OPEN = "XML_END_TAG_OPEN"; //$NON-NLS-1$
-	public static final String XML_ENTITY_REFERENCE = "XML_ENTITY_REFERENCE"; //$NON-NLS-1$
-
-	public static final String XML_PE_REFERENCE = "XML_PE_REFERENCE"; //$NON-NLS-1$
-	public static final String XML_PI_CLOSE = "XML_PI_CLOSE"; //$NON-NLS-1$
-	public static final String XML_PI_CONTENT = "XML_PI_CONTENT"; //$NON-NLS-1$
-	public static final String XML_PI_OPEN = "XML_PI_OPEN"; //$NON-NLS-1$
-	public static final String XML_TAG_ATTRIBUTE_EQUALS = "XML_TAG_ATTRIBUTE_EQUALS"; //$NON-NLS-1$
-	public static final String XML_TAG_ATTRIBUTE_NAME = "XML_TAG_ATTRIBUTE_NAME"; //$NON-NLS-1$
-	public static final String XML_TAG_ATTRIBUTE_VALUE = "XML_TAG_ATTRIBUTE_VALUE"; //$NON-NLS-1$
-	public static final String XML_TAG_CLOSE = "XML_TAG_CLOSE"; //$NON-NLS-1$
-	public static final String XML_TAG_NAME = "XML_TAG_NAME"; //$NON-NLS-1$
-
-	public static final String XML_TAG_OPEN = "XML_TAG_OPEN"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/ModelQueryAdapter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/ModelQueryAdapter.java
deleted file mode 100644
index fc5465c..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/ModelQueryAdapter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.ssemodelquery;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-
-public interface ModelQueryAdapter extends INodeAdapter {
-
-	public CMDocumentCache getCMDocumentCache();
-
-	public URIResolver getIdResolver();
-
-	public ModelQuery getModelQuery();
-
-	void release();
-
-	void setIdResolver(URIResolver newIdResolver);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/ModelQueryAdapterImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/ModelQueryAdapterImpl.java
deleted file mode 100644
index 26b00e6..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/ModelQueryAdapterImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.ssemodelquery;
-
-
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-
-
-public class ModelQueryAdapterImpl implements ModelQueryAdapter {
-	protected CMDocumentCache cmDocumentCache;
-	protected URIResolver idResolver;
-
-	protected ModelQuery modelQuery;
-
-	public ModelQueryAdapterImpl(CMDocumentCache cmDocumentCache, ModelQuery modelQuery, URIResolver idResolver) {
-		this.cmDocumentCache = cmDocumentCache;
-		this.modelQuery = modelQuery;
-		this.idResolver = idResolver;
-	}
-
-	public CMDocumentCache getCMDocumentCache() {
-		return cmDocumentCache;
-	}
-
-	public URIResolver getIdResolver() {
-		return idResolver;
-	}
-
-	public ModelQuery getModelQuery() {
-		return modelQuery;
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type allows it
-	 * to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return type.equals(ModelQueryAdapter.class);
-	}
-
-	/**
-	 */
-
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-	}
-
-	/**
-	 * @see ModelQueryAdapter#release()
-	 */
-	public void release() {
-	}
-
-	/**
-	 * @see ModelQueryAdapter#setIdResolver(URIResolver)
-	 */
-
-	public void setIdResolver(URIResolver newIdResolver) {
-		idResolver = newIdResolver;
-		if (modelQuery instanceof MovableModelQuery)
-			((MovableModelQuery) modelQuery).setIdResolver(newIdResolver);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/MovableModelQuery.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/MovableModelQuery.java
deleted file mode 100644
index 7557efc..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/MovableModelQuery.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.ssemodelquery;
-
-
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-
-public interface MovableModelQuery extends ModelQuery {
-
-	void setIdResolver(URIResolver newURIResolver);
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/tasks/XMLFileTaskScanner.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/tasks/XMLFileTaskScanner.java
deleted file mode 100644
index 4a10d61..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/tasks/XMLFileTaskScanner.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.tasks;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.tasks.StructuredFileTaskScanner;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-public class XMLFileTaskScanner extends StructuredFileTaskScanner {
-	public XMLFileTaskScanner() {
-		super();
-	}
-
-	protected boolean isCommentRegion(IStructuredDocumentRegion region, ITextRegion textRegion) {
-		return textRegion.getType().equals(DOMRegionContext.XML_COMMENT_TEXT);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/text/XMLStructuredDocumentRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/text/XMLStructuredDocumentRegion.java
deleted file mode 100644
index c5cc404..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/text/XMLStructuredDocumentRegion.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.text;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-public class XMLStructuredDocumentRegion extends BasicStructuredDocumentRegion implements IStructuredDocumentRegion {
-
-	public XMLStructuredDocumentRegion() {
-		super();
-	}
-
-	public String getType() {
-		String result = super.getType();
-		// normally, we want the second region as the flatnode type ... since
-		// the
-		// first one is usually just "open tag".
-		if ((result != DOMRegionContext.XML_PI_OPEN) && (getRegions().size() > 1)) {
-			result = getRegions().get(1).getType();
-		}
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/text/rules/StructuredTextPartitionerForXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/text/rules/StructuredTextPartitionerForXML.java
deleted file mode 100644
index bd8a9b8..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/text/rules/StructuredTextPartitionerForXML.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.text.rules;
-
-import java.util.Locale;
-
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.wst.sse.core.internal.parser.ForeignRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredTextPartitioner;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.text.rules.StructuredTextPartitioner;
-import org.eclipse.wst.xml.core.internal.provisional.text.IXMLPartitions;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-public class StructuredTextPartitionerForXML extends StructuredTextPartitioner implements IStructuredTextPartitioner {
-
-	private final static String[] configuredContentTypes = new String[]{IXMLPartitions.XML_DEFAULT, IXMLPartitions.XML_CDATA, IXMLPartitions.XML_PI, IXMLPartitions.XML_DECLARATION, IXMLPartitions.XML_COMMENT, IXMLPartitions.DTD_SUBSET};
-
-	public StructuredTextPartitionerForXML() {
-		super();
-	}
-
-	protected void setInternalPartition(int offset, int length, String type) {
-		super.setInternalPartition(offset, length, type);
-	}
-
-	protected void initLegalContentTypes() {
-		fSupportedTypes = configuredContentTypes;
-	}
-
-	public String getPartitionType(ITextRegion region, int offset) {
-		String result = null;
-		if (region.getType() == DOMRegionContext.XML_COMMENT_TEXT)
-			result = IXMLPartitions.XML_COMMENT;
-		else if (region.getType() == DOMRegionContext.XML_CDATA_TEXT)
-			result = IXMLPartitions.XML_CDATA;
-		else if (region.getType() == DOMRegionContext.XML_PI_CONTENT) {
-			/**
-			 * Grammatically, it's impossible to get a PI_CONTENT region
-			 * without a preceding XML_TAG_NAME region. Relying on this,
-			 * extract the target processor name and create a partition type
-			 * dynamically.
-			 */
-			IStructuredDocumentRegion docRegion = fStructuredDocument.getRegionAtCharacterOffset(offset);
-			ITextRegion name = docRegion.getRegionAtCharacterOffset(docRegion.getStartOffset() + region.getStart() - 1);
-			result = IXMLPartitions.PROCESSING_INSTRUCTION_PREFIX + docRegion.getText(name).toUpperCase(Locale.ENGLISH);
-		}
-		else if (region.getType() == DOMRegionContext.XML_PI_OPEN)
-			result = IXMLPartitions.XML_PI;
-		else if (region.getType() == DOMRegionContext.XML_DOCTYPE_DECLARATION)
-			result = IXMLPartitions.XML_DECLARATION;
-		else if (region.getType() == DOMRegionContext.XML_DOCTYPE_INTERNAL_SUBSET)
-			result = IXMLPartitions.DTD_SUBSET;
-		else
-			result = super.getPartitionType(region, offset);
-		return result;
-	}
-
-	protected String getPartitionType(ForeignRegion region, int offset) {
-		// temp added just to dis-ambiguate call from subclass
-		return super.getPartitionType(region, offset);
-	}
-
-	public String getPartitionTypeBetween(IStructuredDocumentRegion previousNode, IStructuredDocumentRegion nextNode) {
-		return super.getPartitionTypeBetween(previousNode, nextNode);
-	}
-
-	public String getDefaultPartitionType() {
-		return IXMLPartitions.XML_DEFAULT;
-	}
-
-	public IDocumentPartitioner newInstance() {
-		StructuredTextPartitionerForXML instance = new StructuredTextPartitionerForXML();
-		return instance;
-	}
-
-	/**
-	 * @return
-	 */
-	public static String[] getConfiguredContentTypes() {
-		return configuredContentTypes;
-	}
-
-	protected String getPartitionFromBlockedText(ITextRegion region, int offset, String result) {
-		// was moved to subclass for quick transition
-		String newResult = result;
-		// nsd_TODO: David and I need to discuss, design, and implement this
-		// for all block tags and comments
-		// and make sure is part of "extensible" design of block tags
-		if (region.getType() == DOMRegionContext.BLOCK_TEXT) {
-			// for code safety, we'll always check instanceof, but I think
-			// always true.
-			if (region instanceof ForeignRegion) {
-				// super is used below so won't be ambiguous
-				newResult = getPartitionType((ForeignRegion) region, offset);
-			}
-			else if (region instanceof ForeignRegion) {
-				newResult = getPartitionType((ForeignRegion) region, offset);
-			}
-			else {
-				newResult = getUnknown();
-			}
-		}
-		return newResult;
-	}
-
-	protected boolean doParserSpecificCheck(int offset, boolean partitionFound, IStructuredDocumentRegion sdRegion, IStructuredDocumentRegion previousStructuredDocumentRegion, ITextRegion next, ITextRegion previousStart) {
-		// this was moved down to subclass of StructuredTextPartioner
-		// for quick fix to transition problems. Heirarchy needs lots of
-		// cleanup.
-		if (previousStart != null && previousStart.getType() == DOMRegionContext.XML_TAG_OPEN && next.getType() == DOMRegionContext.XML_END_TAG_OPEN) {
-			ITextRegion previousName = previousStructuredDocumentRegion.getRegionAtCharacterOffset(previousStructuredDocumentRegion.getEndOffset(previousStart));
-			ITextRegion nextName = sdRegion.getRegionAtCharacterOffset(sdRegion.getEndOffset(next));
-			if (previousName != null && nextName != null && previousName.getType() == DOMRegionContext.XML_TAG_NAME && nextName.getType() == DOMRegionContext.XML_TAG_NAME) {
-				setInternalPartition(offset, 0, getPartitionTypeBetween(previousStructuredDocumentRegion, sdRegion));
-				partitionFound = true;
-			}
-		}
-		return partitionFound;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/validate/AbstractPropagatingValidator.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/validate/AbstractPropagatingValidator.java
deleted file mode 100644
index adef45a..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/validate/AbstractPropagatingValidator.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validate;
-
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.validate.ValidationAdapter;
-import org.w3c.dom.Node;
-
-
-public abstract class AbstractPropagatingValidator extends ValidationComponent {
-
-	/**
-	 * Constructor for AbstractPropagatingValidator.
-	 */
-	public AbstractPropagatingValidator() {
-		super();
-	}
-
-	protected abstract ValidationComponent getPropagatee();
-
-	protected abstract ValidationAdapter getValidator();
-
-
-	public void validate(IndexedRegion node) {
-		if (node == null)
-			return;
-		getValidator().validate(node);
-
-
-		Propagator.propagateToChildElements(getPropagatee(), (Node) node);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/validate/Propagator.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/validate/Propagator.java
deleted file mode 100644
index e58d1a6..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/validate/Propagator.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validate;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.validate.ValidationAdapter;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class Propagator {
-
-	public static void propagateToChildElements(ValidationComponent validator, Node parent) {
-		if (parent == null)
-			return;
-		Class clazz = validator.getClass();
-
-		NodeList children = parent.getChildNodes();
-		for (int i = 0; i < children.getLength(); i++) {
-			Node child = children.item(i);
-			if (child == null || child.getNodeType() != Node.ELEMENT_NODE)
-				continue;
-
-			INodeNotifier notifier = (INodeNotifier) child;
-			ValidationAdapter va = (ValidationAdapter) notifier.getExistingAdapter(clazz);
-			if (va == null) {
-				notifier.addAdapter(validator);
-				va = validator;
-			}
-			va.validate((IndexedRegion) child);
-		}
-	}
-
-	/**
-	 * Propagator is just a placeholder of utilities. Don't instantiate.
-	 */
-	private Propagator() {
-		super();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/validate/ValidationComponent.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/validate/ValidationComponent.java
deleted file mode 100644
index 7210fe5..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/validate/ValidationComponent.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validate;
-
-
-
-import org.eclipse.wst.sse.core.internal.validate.ValidationAdapter;
-import org.eclipse.wst.sse.core.internal.validate.ValidationReporter;
-
-public abstract class ValidationComponent implements ValidationAdapter {
-
-	protected ValidationReporter reporter = null;
-
-	/**
-	 * ValidationComponent constructor comment.
-	 */
-	public ValidationComponent() {
-		super();
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type allows it
-	 * to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return (type == ValidationAdapter.class);
-	}
-
-	/**
-	 */
-	public void notifyChanged(org.eclipse.wst.sse.core.internal.provisional.INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		// This method will be implemented in the V2.
-	}
-
-	/**
-	 */
-	public void setReporter(ValidationReporter reporter) {
-		this.reporter = reporter;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/COPYRIGHT.html b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/COPYRIGHT.html
deleted file mode 100644
index 1d48a66..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/COPYRIGHT.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>W3C IPR SOFTWARE NOTICE</title>
-<style type="text/css">
-<!--
-html, body { background: #fff; color: #000; } /* body for Windows IE3 */
--->
-</style>
-</head>
-<body>
-<h1>W3C SOFTWARE NOTICE AND LICENSE</h1>
-<h3>Copyright &copy; 2004 <a href="http://www.w3.org/">World Wide Web
-Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts
-Institute of Technology</a>, <a href="http://www.ercim.org/">European
-Research Consortium for Informatics and Mathematics</a>, <a
-	href="http://www.keio.ac.jp/">Keio University</a>). All Rights
-Reserved.</h3>
-<p>The DOM bindings are published under the W3C Software Copyright
-Notice and License. The software license requires "Notice of any changes
-or modifications to the W3C files, including the date changes were
-made." Consequently, modified versions of the DOM bindings must document
-that they do not conform to the W3C standard; in the case of the IDL
-definitions, the pragma prefix can no longer be 'w3c.org'; in the case
-of the Java language binding, the package names can no longer be in the
-'org.w3c' package.</p>
-<p><b>Note:</b> The original version of the W3C Software Copyright
-Notice and License could be found at <a
-	href='http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231'>http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</a>
-</p>
-<p>This work (and included software, documentation such as READMEs, or
-other related items) is being provided by the copyright holders under
-the following license. By obtaining, using and/or copying this work, you
-(the licensee) agree that you have read, understood, and will comply
-with the following terms and conditions.</p>
-
-<p>Permission to copy, modify, and distribute this software and its
-documentation, with or without modification,&nbsp;for any purpose and
-without fee or royalty is hereby granted, provided that you include the
-following on ALL copies of the software and documentation or portions
-thereof, including modifications:</p>
-<ol>
-	<li>The full text of this NOTICE in a location viewable to users of the
-	redistributed or derivative work.</li>
-
-	<li>Any pre-existing intellectual property disclaimers, notices, or
-	terms and conditions. If none exist, the <a
-		href="http://www.w3.org/Consortium/Legal/2002/copyright-software-short-notice-20021231.html">W3C
-	Software Short Notice</a> should be included (hypertext is preferred,
-	text is permitted) within the body of any redistributed or derivative
-	code.</li>
-
-	<li>Notice of any changes or modifications to the files, including the
-	date changes were made. (We recommend you provide URIs to the location
-	from which the code is derived.)</li>
-</ol>
-
-<p>THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
-HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
-DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
-TRADEMARKS OR OTHER RIGHTS.</p>
-
-<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
-SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE
-OR DOCUMENTATION.</p>
-
-<p>The name and trademarks of copyright holders may NOT be used in
-advertising or publicity pertaining to the software without specific,
-written prior permission. Title to copyright in this software and any
-associated documentation will at all times remain with copyright
-holders.</p>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/DOMConfiguration.java b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/DOMConfiguration.java
deleted file mode 100644
index 7cce160..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/DOMConfiguration.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
- * Copyright (c) 2004 World Wide Web Consortium,
- *
- * (Massachusetts Institute of Technology, European Research Consortium for
- * Informatics and Mathematics, Keio University). All Rights Reserved. This
- * work is distributed under the W3C(r) Software License [1] in the hope that
- * it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
- */
-
-package org.w3c.dom;
-
-/**
- *  The <code>DOMConfiguration</code> interface represents the configuration 
- * of a document and maintains a table of recognized parameters. Using the 
- * configuration, it is possible to change 
- * <code>Document.normalizeDocument()</code> behavior, such as replacing the 
- * <code>CDATASection</code> nodes with <code>Text</code> nodes or 
- * specifying the type of the schema that must be used when the validation 
- * of the <code>Document</code> is requested. <code>DOMConfiguration</code> 
- * objects are also used in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>DOM Level 3 Load and Save</a>]
- *  in the <code>DOMParser</code> and <code>DOMSerializer</code> interfaces. 
- * <p> The parameter names used by the <code>DOMConfiguration</code> object 
- * are defined throughout the DOM Level 3 specifications. Names are 
- * case-insensitive. To avoid possible conflicts, as a convention, names 
- * referring to parameters defined outside the DOM specification should be 
- * made unique. Because parameters are exposed as properties in the , names 
- * are recommended to follow the section 5.16 Identifiers of [Unicode] with the addition of the character '-' (HYPHEN-MINUS) but it is not 
- * enforced by the DOM implementation. DOM Level 3 Core Implementations are 
- * required to recognize all parameters defined in this specification. Some 
- * parameter values may also be required to be supported by the 
- * implementation. Refer to the definition of the parameter to know if a 
- * value must be supported or not. 
- * <p ><b>Note:</b>  Parameters are similar to features and properties used in 
- * SAX2 [<a href='http://www.saxproject.org/'>SAX</a>]. 
- * <p> The following list of parameters defined in the DOM: 
- * <dl>
- * <dt>
- * <code>"canonical-form"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[<em>optional</em>] Canonicalize the document according to the rules specified in [<a href='http://www.w3.org/TR/2001/REC-xml-c14n-20010315'>Canonical XML</a>], 
- * such as removing the <code>DocumentType</code> node (if any) from the 
- * tree, or removing superfluous namespace declarations from each element. 
- * Note that this is limited to what can be represented in the DOM; in 
- * particular, there is no way to specify the order of the attributes in the 
- * DOM. In addition,  Setting this parameter to <code>true</code> will also 
- * set the state of the parameters listed below. Later changes to the state 
- * of one of those parameters will revert "canonical-form" back to 
- * <code>false</code>. Parameters set to <code>false</code>: "entities", "
- * normalize-characters", "cdata-sections". Parameters set to 
- * <code>true</code>: "namespaces", "namespace-declarations", "well-formed", 
- * "element-content-whitespace". Other parameters are not changed unless 
- * explicitly specified in the description of the parameters.</dd>
- * <dt>
- * <code>false</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>)Do not canonicalize the document.</dd>
- * </dl></dd>
- * <dt><code>"cdata-sections"</code></dt>
- * <dd>
- * <dl>
- * <dt>
- * <code>true</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>)Keep <code>CDATASection</code> nodes in the document.</dd>
- * <dt><code>false</code></dt>
- * <dd>[<em>required</em>]Transform <code>CDATASection</code> nodes in the document into 
- * <code>Text</code> nodes. The new <code>Text</code> node is then combined 
- * with any adjacent <code>Text</code> node.</dd>
- * </dl></dd>
- * <dt>
- * <code>"check-character-normalization"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[<em>optional</em>] Check if the characters in the document are <a href='http://www.w3.org/TR/2004/REC-xml11-20040204/#dt-fullnorm'>fully 
- * normalized</a>, as defined in appendix B of [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]. When a 
- * sequence of characters is encountered that fails normalization checking, 
- * an error with the <code>DOMError.type</code> equals to 
- * "check-character-normalization-failure" is issued. </dd>
- * <dt><code>false</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>)Do not check if characters are normalized.</dd>
- * </dl></dd>
- * <dt><code>"comments"</code></dt>
- * <dd>
- * <dl>
- * <dt>
- * <code>true</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>)Keep <code>Comment</code> nodes in the document.</dd>
- * <dt><code>false</code></dt>
- * <dd>[<em>required</em>]Discard <code>Comment</code> nodes in the document.</dd>
- * </dl></dd>
- * <dt>
- * <code>"datatype-normalization"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[<em>optional</em>] Expose schema normalized values in the tree, such as <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#key-nv'>XML 
- * Schema normalized values</a> in the case of XML Schema. Since this parameter requires to have schema 
- * information, the "validate" parameter will also be set to 
- * <code>true</code>. Having this parameter activated when "validate" is 
- * <code>false</code> has no effect and no schema-normalization will happen. 
- * <p ><b>Note:</b>  Since the document contains the result of the XML 1.0 
- * processing, this parameter does not apply to attribute value 
- * normalization as defined in section 3.3.3 of [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] and is only 
- * meant for schema languages other than Document Type Definition (DTD). </dd>
- * <dt>
- * <code>false</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>) Do not perform schema normalization on the tree. </dd>
- * </dl></dd>
- * <dt>
- * <code>"element-content-whitespace"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>)Keep all whitespaces in the document.</dd>
- * <dt><code>false</code></dt>
- * <dd>[<em>optional</em>] Discard all <code>Text</code> nodes that contain whitespaces in element 
- * content, as described in <a href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204#infoitem.character'>
- * [element content whitespace]</a>. The implementation is expected to use the attribute 
- * <code>Text.isElementContentWhitespace</code> to determine if a 
- * <code>Text</code> node should be discarded or not.</dd>
- * </dl></dd>
- * <dt><code>"entities"</code></dt>
- * <dd>
- * <dl>
- * <dt>
- * <code>true</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>)Keep <code>EntityReference</code> nodes in the document.</dd>
- * <dt>
- * <code>false</code></dt>
- * <dd>[<em>required</em>] Remove all <code>EntityReference</code> nodes from the document, 
- * putting the entity expansions directly in their place. <code>Text</code> 
- * nodes are normalized, as defined in <code>Node.normalize</code>. Only <a href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204/#infoitem.rse'>
- * unexpanded entity references</a> are kept in the document. </dd>
- * </dl>
- * <p ><b>Note:</b>  This parameter does not affect <code>Entity</code> nodes. </dd>
- * <dt>
- * <code>"error-handler"</code></dt>
- * <dd>[<em>required</em>] Contains a <code>DOMErrorHandler</code> object. If an error is 
- * encountered in the document, the implementation will call back the 
- * <code>DOMErrorHandler</code> registered using this parameter. The 
- * implementation may provide a default <code>DOMErrorHandler</code> object. 
- *  When called, <code>DOMError.relatedData</code> will contain the closest 
- * node to where the error occurred. If the implementation is unable to 
- * determine the node where the error occurs, 
- * <code>DOMError.relatedData</code> will contain the <code>Document</code> 
- * node. Mutations to the document from within an error handler will result 
- * in implementation dependent behavior. </dd>
- * <dt><code>"infoset"</code></dt>
- * <dd>
- * <dl>
- * <dt>
- * <code>true</code></dt>
- * <dd>[<em>required</em>]Keep in the document the information defined in the XML Information Set [<a href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204/'>XML Information Set</a>]
- * .This forces the following parameters to <code>false</code>: "
- * validate-if-schema", "entities", "datatype-normalization", "cdata-sections
- * ".This forces the following parameters to <code>true</code>: "
- * namespace-declarations", "well-formed", "element-content-whitespace", "
- * comments", "namespaces".Other parameters are not changed unless 
- * explicitly specified in the description of the parameters. Note that 
- * querying this parameter with <code>getParameter</code> returns 
- * <code>true</code> only if the individual parameters specified above are 
- * appropriately set.</dd>
- * <dt><code>false</code></dt>
- * <dd>Setting <code>infoset</code> to 
- * <code>false</code> has no effect.</dd>
- * </dl></dd>
- * <dt><code>"namespaces"</code></dt>
- * <dd>
- * <dl>
- * <dt>
- * <code>true</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>) Perform the namespace processing as defined in . </dd>
- * <dt><code>false</code></dt>
- * <dd>[<em>optional</em>] Do not perform the namespace processing. </dd>
- * </dl></dd>
- * <dt>
- * <code>"namespace-declarations"</code></dt>
- * <dd> This parameter has no effect if the 
- * parameter "namespaces" is set to <code>false</code>. 
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>) Include namespace declaration attributes, specified or defaulted from 
- * the schema, in the document. See also the sections "Declaring Namespaces" 
- * in [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- *  and [<a href='http://www.w3.org/TR/2004/REC-xml-names11-20040204/'>XML Namespaces 1.1</a>]
- * .</dd>
- * <dt><code>false</code></dt>
- * <dd>[<em>required</em>]Discard all namespace declaration attributes. The namespace prefixes (
- * <code>Node.prefix</code>) are retained even if this parameter is set to 
- * <code>false</code>.</dd>
- * </dl></dd>
- * <dt><code>"normalize-characters"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[<em>optional</em>] <a href='http://www.w3.org/TR/2004/REC-xml11-20040204/#dt-fullnorm'>Fully 
- * normalized</a> the characters in the document as defined in appendix B of [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]. </dd>
- * <dt>
- * <code>false</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>)Do not perform character normalization.</dd>
- * </dl></dd>
- * <dt><code>"schema-location"</code></dt>
- * <dd>[<em>optional</em>] Represent a <code>DOMString</code> object containing a list of URIs, 
- * separated by whitespaces (characters matching the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-S'>nonterminal 
- * production S</a> defined in section 2.3 [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]), that 
- * represents the schemas against which validation should occur, i.e. the 
- * current schema. The types of schemas referenced in this list must match 
- * the type specified with <code>schema-type</code>, otherwise the behavior 
- * of an implementation is undefined.  The schemas specified using this 
- * property take precedence to the schema information specified in the 
- * document itself. For namespace aware schema, if a schema specified using 
- * this property and a schema specified in the document instance (i.e. using 
- * the <code>schemaLocation</code> attribute) in a schema document (i.e. 
- * using schema <code>import</code> mechanisms) share the same 
- * <code>targetNamespace</code>, the schema specified by the user using this 
- * property will be used. If two schemas specified using this property share 
- * the same <code>targetNamespace</code> or have no namespace, the behavior 
- * is implementation dependent.  If no location has been provided, this 
- * parameter is <code>null</code>. 
- * <p ><b>Note:</b>  The <code>"schema-location"</code> parameter is ignored 
- * unless the "schema-type" parameter value is set. It is strongly 
- * recommended that <code>Document.documentURI</code> will be set so that an 
- * implementation can successfully resolve any external entities referenced. </dd>
- * <dt>
- * <code>"schema-type"</code></dt>
- * <dd>[<em>optional</em>] Represent a <code>DOMString</code> object containing an absolute URI 
- * and representing the type of the schema language used to validate a 
- * document against. Note that no lexical checking is done on the absolute 
- * URI.  If this parameter is not set, a default value may be provided by 
- * the implementation, based on the schema languages supported and on the 
- * schema language used at load time. If no value is provided, this 
- * parameter is <code>null</code>. 
- * <p ><b>Note:</b>  For XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
- * , applications must use the value 
- * <code>"http://www.w3.org/2001/XMLSchema"</code>. For XML DTD [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], 
- * applications must use the value 
- * <code>"http://www.w3.org/TR/REC-xml"</code>. Other schema languages are 
- * outside the scope of the W3C and therefore should recommend an absolute 
- * URI in order to use this method. </dd>
- * <dt><code>"split-cdata-sections"</code></dt>
- * <dd>
- * <dl>
- * <dt>
- * <code>true</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>)Split CDATA sections containing the CDATA section termination marker 
- * ']]&gt;'. When a CDATA section is split a warning is issued with a 
- * <code>DOMError.type</code> equals to 
- * <code>"cdata-sections-splitted"</code> and 
- * <code>DOMError.relatedData</code> equals to the first 
- * <code>CDATASection</code> node in document order resulting from the split.</dd>
- * <dt>
- * <code>false</code></dt>
- * <dd>[<em>required</em>]Signal an error if a <code>CDATASection</code> contains an 
- * unrepresentable character.</dd>
- * </dl></dd>
- * <dt><code>"validate"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[<em>optional</em>] Require the validation against a schema (i.e. XML schema, DTD, any 
- * other type or representation of schema) of the document as it is being 
- * normalized as defined by [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. If 
- * validation errors are found, or no schema was found, the error handler is 
- * notified. Schema-normalized values will not be exposed according to the 
- * schema in used unless the parameter "datatype-normalization" is 
- * <code>true</code>.  This parameter will reevaluate: 
- * <ul>
- * <li> Attribute nodes with 
- * <code>Attr.specified</code> equals to <code>false</code>, as specified in 
- * the description of the <code>Attr</code> interface; 
- * </li>
- * <li> The value of the 
- * attribute <code>Text.isElementContentWhitespace</code> for all 
- * <code>Text</code> nodes; 
- * </li>
- * <li> The value of the attribute 
- * <code>Attr.isId</code> for all <code>Attr</code> nodes; 
- * </li>
- * <li> The attributes 
- * <code>Element.schemaTypeInfo</code> and <code>Attr.schemaTypeInfo</code>. 
- * </li>
- * </ul>
- * <p ><b>Note:</b>  "validate-if-schema" and "validate" are mutually 
- * exclusive, setting one of them to <code>true</code> will set the other 
- * one to <code>false</code>. Applications should also consider setting the 
- * parameter "well-formed" to <code>true</code>, which is the default for 
- * that option, when validating the document. </dd>
- * <dt><code>false</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>) Do not accomplish schema processing, including the internal subset 
- * processing. Default attribute values information are kept. Note that 
- * validation might still happen if "validate-if-schema" is <code>true</code>
- * . </dd>
- * </dl></dd>
- * <dt><code>"validate-if-schema"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[<em>optional</em>]Enable validation only if a declaration for the document element can be 
- * found in a schema (independently of where it is found, i.e. XML schema, 
- * DTD, or any other type or representation of schema). If validation is 
- * enabled, this parameter has the same behavior as the parameter "validate" 
- * set to <code>true</code>. 
- * <p ><b>Note:</b>  "validate-if-schema" and "validate" are mutually 
- * exclusive, setting one of them to <code>true</code> will set the other 
- * one to <code>false</code>. </dd>
- * <dt><code>false</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>) No schema processing should be performed if the document has a schema, 
- * including internal subset processing. Default attribute values 
- * information are kept. Note that validation must still happen if "validate
- * " is <code>true</code>. </dd>
- * </dl></dd>
- * <dt><code>"well-formed"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>) Check if all nodes are XML well formed according to the XML version in 
- * use in <code>Document.xmlVersion</code>: 
- * <ul>
- * <li> check if the attribute 
- * <code>Node.nodeName</code> contains invalid characters according to its 
- * node type and generate a <code>DOMError</code> of type 
- * <code>"wf-invalid-character-in-node-name"</code>, with a 
- * <code>DOMError.SEVERITY_ERROR</code> severity, if necessary; 
- * </li>
- * <li> check if 
- * the text content inside <code>Attr</code>, <code>Element</code>, 
- * <code>Comment</code>, <code>Text</code>, <code>CDATASection</code> nodes 
- * for invalid characters and generate a <code>DOMError</code> of type 
- * <code>"wf-invalid-character"</code>, with a 
- * <code>DOMError.SEVERITY_ERROR</code> severity, if necessary; 
- * </li>
- * <li> check if 
- * the data inside <code>ProcessingInstruction</code> nodes for invalid 
- * characters and generate a <code>DOMError</code> of type 
- * <code>"wf-invalid-character"</code>, with a 
- * <code>DOMError.SEVERITY_ERROR</code> severity, if necessary; 
- * </li>
- * </ul></dd>
- * <dt>
- * <code>false</code></dt>
- * <dd>[<em>optional</em>] Do not check for XML well-formedness. </dd>
- * </dl></dd>
- * </dl>
- * <p> The resolution of the system identifiers associated with entities is 
- * done using <code>Document.documentURI</code>. However, when the feature 
- * "LS" defined in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>DOM Level 3 Load and Save</a>]
- *  is supported by the DOM implementation, the parameter 
- * "resource-resolver" can also be used on <code>DOMConfiguration</code> 
- * objects attached to <code>Document</code> nodes. If this parameter is 
- * set, <code>Document.normalizeDocument()</code> will invoke the resource 
- * resolver instead of using <code>Document.documentURI</code>. 
- * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
- * @since DOM Level 3
- */
-public interface DOMConfiguration {
-    /**
-     * Set the value of a parameter.
-     * @param name The name of the parameter to set.
-     * @param value  The new value or <code>null</code> if the user wishes to 
-     *   unset the parameter. While the type of the value parameter is 
-     *   defined as <code>DOMUserData</code>, the object type must match the 
-     *   type defined by the definition of the parameter. For example, if 
-     *   the parameter is "error-handler", the value must be of type 
-     *   <code>DOMErrorHandler</code>. 
-     * @exception DOMException
-     *    NOT_FOUND_ERR: Raised when the parameter name is not recognized. 
-     *   <br> NOT_SUPPORTED_ERR: Raised when the parameter name is recognized 
-     *   but the requested value cannot be set. 
-     *   <br> TYPE_MISMATCH_ERR: Raised if the value type for this parameter 
-     *   name is incompatible with the expected value type. 
-     */
-    public void setParameter(String name, 
-                             Object value)
-                             throws DOMException;
-
-    /**
-     *  Return the value of a parameter if known. 
-     * @param name  The name of the parameter. 
-     * @return  The current object associated with the specified parameter or 
-     *   <code>null</code> if no object has been associated or if the 
-     *   parameter is not supported. 
-     * @exception DOMException
-     *    NOT_FOUND_ERR: Raised when the parameter name is not recognized. 
-     */
-    public Object getParameter(String name)
-                               throws DOMException;
-
-    /**
-     * Check if setting a parameter to a specific value is supported.
-     * @param name The name of the parameter to check.
-     * @param value  An object. if <code>null</code>, the returned value is 
-     *   <code>true</code>. 
-     * @return  <code>true</code> if the parameter could be successfully set 
-     *   to the specified value, or <code>false</code> if the parameter is 
-     *   not recognized or the requested value is not supported. This does 
-     *   not change the current value of the parameter itself. 
-     */
-    public boolean canSetParameter(String name, 
-                                   Object value);
-
-    /**
-     *  The list of the parameters supported by this 
-     * <code>DOMConfiguration</code> object and for which at least one value 
-     * can be set by the application. Note that this list can also contain 
-     * parameter names defined outside this specification. 
-     */
-    public DOMStringList getParameterNames();
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/DOMStringList.java b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/DOMStringList.java
deleted file mode 100644
index e6c348a..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/DOMStringList.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2004 World Wide Web Consortium,
- *
- * (Massachusetts Institute of Technology, European Research Consortium for
- * Informatics and Mathematics, Keio University). All Rights Reserved. This
- * work is distributed under the W3C(r) Software License [1] in the hope that
- * it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
- */
-
-package org.w3c.dom;
-
-/**
- *  The <code>DOMStringList</code> interface provides the abstraction of an 
- * ordered collection of <code>DOMString</code> values, without defining or 
- * constraining how this collection is implemented. The items in the 
- * <code>DOMStringList</code> are accessible via an integral index, starting 
- * from 0. 
- * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
- * @since DOM Level 3
- */
-public interface DOMStringList {
-    /**
-     *  Returns the <code>index</code>th item in the collection. If 
-     * <code>index</code> is greater than or equal to the number of 
-     * <code>DOMString</code>s in the list, this returns <code>null</code>. 
-     * @param index Index into the collection.
-     * @return  The <code>DOMString</code> at the <code>index</code>th 
-     *   position in the <code>DOMStringList</code>, or <code>null</code> if 
-     *   that is not a valid index. 
-     */
-    public String item(int index);
-
-    /**
-     * The number of <code>DOMString</code>s in the list. The range of valid 
-     * child node indices is 0 to <code>length-1</code> inclusive.
-     */
-    public int getLength();
-
-    /**
-     *  Test if a string is part of this <code>DOMStringList</code>. 
-     * @param str  The string to look for. 
-     * @return  <code>true</code> if the string has been found, 
-     *   <code>false</code> otherwise. 
-     */
-    public boolean contains(String str);
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/TypeInfo.java b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/TypeInfo.java
deleted file mode 100644
index 054f990..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/TypeInfo.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (c) 2004 World Wide Web Consortium,
- *
- * (Massachusetts Institute of Technology, European Research Consortium for
- * Informatics and Mathematics, Keio University). All Rights Reserved. This
- * work is distributed under the W3C(r) Software License [1] in the hope that
- * it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
- */
-
-package org.w3c.dom;
-
-/**
- *  The <code>TypeInfo</code> interface represents a type referenced from 
- * <code>Element</code> or <code>Attr</code> nodes, specified in the schemas 
- * associated with the document. The type is a pair of a namespace URI and 
- * name properties, and depends on the document's schema. 
- * <p> If the document's schema is an XML DTD [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], the values 
- * are computed as follows: 
- * <ul>
- * <li> If this type is referenced from an 
- * <code>Attr</code> node, <code>typeNamespace</code> is 
- * <code>"http://www.w3.org/TR/REC-xml"</code> and <code>typeName</code> 
- * represents the <b>[attribute type]</b> property in the [<a href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204/'>XML Information Set</a>]
- * . If there is no declaration for the attribute, <code>typeNamespace</code>
- *  and <code>typeName</code> are <code>null</code>. 
- * </li>
- * <li> If this type is 
- * referenced from an <code>Element</code> node, <code>typeNamespace</code> 
- * and <code>typeName</code> are <code>null</code>. 
- * </li>
- * </ul>
- * <p> If the document's schema is an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
- * , the values are computed as follows using the post-schema-validation 
- * infoset contributions (also called PSVI contributions): 
- * <ul>
- * <li> If the <b>[validity]</b> property exists AND is <em>"invalid"</em> or <em>"notKnown"</em>: the {target namespace} and {name} properties of the declared type if 
- * available, otherwise <code>null</code>. 
- * <p ><b>Note:</b>  At the time of writing, the XML Schema specification does 
- * not require exposing the declared type. Thus, DOM implementations might 
- * choose not to provide type information if validity is not valid. 
- * </li>
- * <li> If the <b>[validity]</b> property exists and is <em>"valid"</em>: 
- * <ol>
- * <li> If <b>[member type definition]</b> exists: 
- * <ol>
- * <li>If {name} is not absent, then expose {name} and {target 
- * namespace} properties of the <b>[member type definition]</b> property;
- * </li>
- * <li>Otherwise, expose the namespace and local name of the 
- * corresponding anonymous type name.
- * </li>
- * </ol>
- * </li>
- * <li> If the <b>[type definition]</b> property exists: 
- * <ol>
- * <li>If {name} is not absent, then expose {name} and {target 
- * namespace} properties of the <b>[type definition]</b> property;
- * </li>
- * <li>Otherwise, expose the namespace and local name of the 
- * corresponding anonymous type name.
- * </li>
- * </ol> 
- * </li>
- * <li> If the <b>[member type definition anonymous]</b> exists: 
- * <ol>
- * <li>If it is false, then expose <b>[member type definition name]</b> and <b>[member type definition namespace]</b> properties;
- * </li>
- * <li>Otherwise, expose the namespace and local name of the 
- * corresponding anonymous type name.
- * </li>
- * </ol> 
- * </li>
- * <li> If the <b>[type definition anonymous]</b> exists: 
- * <ol>
- * <li>If it is false, then expose <b>[type definition name]</b> and <b>[type definition namespace]</b> properties;
- * </li>
- * <li>Otherwise, expose the namespace and local name of the 
- * corresponding anonymous type name.
- * </li>
- * </ol> 
- * </li>
- * </ol>
- * </li>
- * </ul>
- * <p ><b>Note:</b>  Other schema languages are outside the scope of the W3C 
- * and therefore should define how to represent their type systems using 
- * <code>TypeInfo</code>. 
- * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
- * @since DOM Level 3
- */
-public interface TypeInfo {
-    /**
-     *  The name of a type declared for the associated element or attribute, 
-     * or <code>null</code> if unknown. 
-     */
-    public String getTypeName();
-
-    /**
-     *  The namespace of the type declared for the associated element or 
-     * attribute or <code>null</code> if the element does not have 
-     * declaration or if no namespace information is available. 
-     */
-    public String getTypeNamespace();
-
-    // DerivationMethods
-    /**
-     *  If the document's schema is an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
-     * , this constant represents the derivation by <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#key-typeRestriction'>
-     * restriction</a> if complex types are involved, or a <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#element-restriction'>
-     * restriction</a> if simple types are involved. 
-     * <br>  The reference type definition is derived by restriction from the 
-     * other type definition if the other type definition is the same as the 
-     * reference type definition, or if the other type definition can be 
-     * reached recursively following the {base type definition} property 
-     * from the reference type definition, and all the <em>derivation methods</em> involved are restriction. 
-     */
-    public static final int DERIVATION_RESTRICTION    = 0x00000001;
-    /**
-     *  If the document's schema is an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
-     * , this constant represents the derivation by <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#key-typeExtension'>
-     * extension</a>. 
-     * <br>  The reference type definition is derived by extension from the 
-     * other type definition if the other type definition can be reached 
-     * recursively following the {base type definition} property from the 
-     * reference type definition, and at least one of the <em>derivation methods</em> involved is an extension. 
-     */
-    public static final int DERIVATION_EXTENSION      = 0x00000002;
-    /**
-     *  If the document's schema is an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
-     * , this constant represents the <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#element-union'>
-     * union</a> if simple types are involved. 
-     * <br> The reference type definition is derived by union from the other 
-     * type definition if there exists two type definitions T1 and T2 such 
-     * as the reference type definition is derived from T1 by 
-     * <code>DERIVATION_RESTRICTION</code> or 
-     * <code>DERIVATION_EXTENSION</code>, T2 is derived from the other type 
-     * definition by <code>DERIVATION_RESTRICTION</code>, T1 has {variety} <em>union</em>, and one of the {member type definitions} is T2. Note that T1 could be 
-     * the same as the reference type definition, and T2 could be the same 
-     * as the other type definition. 
-     */
-    public static final int DERIVATION_UNION          = 0x00000004;
-    /**
-     *  If the document's schema is an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
-     * , this constant represents the <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#element-list'>list</a>. 
-     * <br> The reference type definition is derived by list from the other 
-     * type definition if there exists two type definitions T1 and T2 such 
-     * as the reference type definition is derived from T1 by 
-     * <code>DERIVATION_RESTRICTION</code> or 
-     * <code>DERIVATION_EXTENSION</code>, T2 is derived from the other type 
-     * definition by <code>DERIVATION_RESTRICTION</code>, T1 has {variety} <em>list</em>, and T2 is the {item type definition}. Note that T1 could be the same as 
-     * the reference type definition, and T2 could be the same as the other 
-     * type definition. 
-     */
-    public static final int DERIVATION_LIST           = 0x00000008;
-
-    /**
-     *  This method returns if there is a derivation between the reference 
-     * type definition, i.e. the <code>TypeInfo</code> on which the method 
-     * is being called, and the other type definition, i.e. the one passed 
-     * as parameters. 
-     * @param typeNamespaceArg  the namespace of the other type definition. 
-     * @param typeNameArg  the name of the other type definition. 
-     * @param derivationMethod  the type of derivation and conditions applied 
-     *   between two types, as described in the list of constants provided 
-     *   in this interface. 
-     * @return  If the document's schema is a DTD or no schema is associated 
-     *   with the document, this method will always return <code>false</code>
-     *   .  If the document's schema is an XML Schema, the method will 
-     *   <code>true</code> if the reference type definition is derived from 
-     *   the other type definition according to the derivation parameter. If 
-     *   the value of the parameter is <code>0</code> (no bit is set to 
-     *   <code>1</code> for the <code>derivationMethod</code> parameter), 
-     *   the method will return <code>true</code> if the other type 
-     *   definition can be reached by recursing any combination of {base 
-     *   type definition}, {item type definition}, or {member type 
-     *   definitions} from the reference type definition. 
-     */
-    public boolean isDerivedFrom(String typeNamespaceArg, 
-                                 String typeNameArg, 
-                                 int derivationMethod);
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/UserDataHandler.java b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/UserDataHandler.java
deleted file mode 100644
index a16ea73..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/UserDataHandler.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2004 World Wide Web Consortium,
- *
- * (Massachusetts Institute of Technology, European Research Consortium for
- * Informatics and Mathematics, Keio University). All Rights Reserved. This
- * work is distributed under the W3C(r) Software License [1] in the hope that
- * it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
- */
-
-package org.w3c.dom;
-
-/**
- * When associating an object to a key on a node using 
- * <code>Node.setUserData()</code> the application can provide a handler 
- * that gets called when the node the object is associated to is being 
- * cloned, imported, or renamed. This can be used by the application to 
- * implement various behaviors regarding the data it associates to the DOM 
- * nodes. This interface defines that handler. 
- * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
- * @since DOM Level 3
- */
-public interface UserDataHandler {
-    // OperationType
-    /**
-     * The node is cloned, using <code>Node.cloneNode()</code>.
-     */
-    public static final short NODE_CLONED               = 1;
-    /**
-     * The node is imported, using <code>Document.importNode()</code>.
-     */
-    public static final short NODE_IMPORTED             = 2;
-    /**
-     * The node is deleted.
-     * <p ><b>Note:</b> This may not be supported or may not be reliable in 
-     * certain environments, such as Java, where the implementation has no 
-     * real control over when objects are actually deleted.
-     */
-    public static final short NODE_DELETED              = 3;
-    /**
-     * The node is renamed, using <code>Document.renameNode()</code>.
-     */
-    public static final short NODE_RENAMED              = 4;
-    /**
-     * The node is adopted, using <code>Document.adoptNode()</code>.
-     */
-    public static final short NODE_ADOPTED              = 5;
-
-    /**
-     * This method is called whenever the node for which this handler is 
-     * registered is imported or cloned.
-     * <br> DOM applications must not raise exceptions in a 
-     * <code>UserDataHandler</code>. The effect of throwing exceptions from 
-     * the handler is DOM implementation dependent. 
-     * @param operation Specifies the type of operation that is being 
-     *   performed on the node.
-     * @param key Specifies the key for which this handler is being called. 
-     * @param data Specifies the data for which this handler is being called. 
-     * @param src Specifies the node being cloned, adopted, imported, or 
-     *   renamed. This is <code>null</code> when the node is being deleted.
-     * @param dst Specifies the node newly created if any, or 
-     *   <code>null</code>.
-     */
-    public void handle(short operation, 
-                       String key, 
-                       Object data, 
-                       Node src, 
-                       Node dst);
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/package.html b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/package.html
deleted file mode 100644
index cbc3338..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/package.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html>
-This package contains unmodified sources provided by 
- http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/java-binding.zip
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/ranges/COPYRIGHT.html b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/ranges/COPYRIGHT.html
deleted file mode 100644
index 26049b7..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/ranges/COPYRIGHT.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                      "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>W3C IPR SOFTWARE NOTICE</title>
-  </head>
-  <body bgcolor="#FFFFFF" text="#000000">
-    <h1>
-      W3C IPR SOFTWARE NOTICE
-    </h1>
-    <h3>
-      Copyright &copy; 2000 <loc href="http://www.w3.org/">World Wide Web
-      Consortium</loc>, (<loc href="http://www.lcs.mit.edu/">Massachusetts
-      Institute of Technology</loc>, <loc href="http://www.inria.fr/">Institut
-      National de Recherche en Informatique et en Automatique</loc>, <loc
-      href="http://www.keio.ac.jp/">Keio University</loc>). All Rights
-      Reserved.
-    </h3>
-    <p>
-      The DOM bindings are published under the W3C Software Copyright Notice
-      and License. The software license requires "Notice of any changes or
-      modifications to the W3C files, including the date changes were made."
-      Consequently, modified versions of the DOM bindings must document that
-      they do not conform to the W3C standard; in the case of the IDL binding,
-      the pragma prefix can no longer be 'w3c.org'; in the case of the Java
-      binding, the package names can no longer be in the 'org.w3c' package.
-    </p>
-    <p>
-      <b>Note:</b> The original version of the W3C Software Copyright Notice
-      and License could be found at <a
-      href='http://www.w3.org/Consortium/Legal/copyright-software-19980720'>http://www.w3.org/Consortium/Legal/copyright-software-19980720</a>
-    </p>
-    <h3>
-      Copyright &copy; 1994-2000 <a href="http://www.w3.org/">World Wide Web
-      Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts
-      Institute of Technology</a>, <a href="http://www.inria.fr/">Institut
-      National de Recherche en Informatique et en Automatique</a>, <a
-      href="http://www.keio.ac.jp/">Keio University</a>). All Rights
-      Reserved. http://www.w3.org/Consortium/Legal/
-    </h3>
-    <p>
-      This W3C work (including software, documents, or other related items) is
-      being provided by the copyright holders under the following license. By
-      obtaining, using and/or copying this work, you (the licensee) agree that
-      you have read, understood, and will comply with the following terms and
-      conditions:
-    </p>
-    <p>
-      Permission to use, copy, and modify this software and its documentation,
-      with or without modification,&nbsp; for any purpose and without fee or
-      royalty is hereby granted, provided that you include the following on ALL
-      copies of the software and documentation or portions thereof, including
-      modifications, that you make:
-    </p>
-    <ol>
-      <li>
-	The full text of this NOTICE in a location viewable to users of the
-	redistributed or derivative work.
-      </li>
-      <li>
-	Any pre-existing intellectual property disclaimers, notices, or terms
-	and conditions. If none exist, a short notice of the following form
-	(hypertext is preferred, text is permitted) should be used within the
-	body of any redistributed or derivative code: "Copyright &copy;
-	[$date-of-software] <a href="http://www.w3.org/">World Wide Web
-	Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts
-	Institute of Technology</a>, <a href="http://www.inria.fr/">Institut
-	National de Recherche en Informatique et en Automatique</a>, <a
-	href="http://www.keio.ac.jp/">Keio University</a>).  All Rights
-	Reserved. http://www.w3.org/Consortium/Legal/"
-      </li>
-      <li>
-	Notice of any changes or modifications to the W3C files, including the
-	date changes were made. (We recommend you provide URIs to the location
-	from which the code is derived.)
-      </li>
-    </ol>
-    <p>
-      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
-      HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
-      INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
-      FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
-      DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
-      TRADEMARKS OR OTHER RIGHTS.
-    </p>
-    <p>
-      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-      CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
-      DOCUMENTATION.
-    </p>
-    <p>
-      The name and trademarks of copyright holders may NOT be used in
-      advertising or publicity pertaining to the software without specific,
-      written prior permission. Title to copyright in this software and any
-      associated documentation will at all times remain with copyright
-      holders.
-    </p>
-  </body>
-</html>
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/ranges/DocumentRange.java b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/ranges/DocumentRange.java
deleted file mode 100644
index b72a1c1..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/ranges/DocumentRange.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
- */
-
-package org.w3c.dom.ranges;
-
-/**
- * <p>
- * See also the <a
- * href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document
- * Object Model (DOM) Level 2 Traversal and Range Specification</a>.
- * 
- * @since DOM Level 2
- */
-public interface DocumentRange {
-	/**
-	 * This interface can be obtained from the object implementing the
-	 * <code>Document</code> interface using binding-specific casting
-	 * methods.
-	 * 
-	 * @return The initial state of the Range returned from this method is
-	 *         such that both of its boundary-points are positioned at the
-	 *         beginning of the corresponding Document, before any content.
-	 *         The Range returned can only be used to select content
-	 *         associated with this Document, or with DocumentFragments and
-	 *         Attrs for which this Document is the <code>ownerDocument</code>.
-	 */
-	public Range createRange();
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/ranges/Range.java b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/ranges/Range.java
deleted file mode 100644
index 170fc60..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/ranges/Range.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
- */
-
-package org.w3c.dom.ranges;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.DOMException;
-
-/**
- * <p>
- * See also the <a
- * href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document
- * Object Model (DOM) Level 2 Traversal and Range Specification</a>.
- * 
- * @since DOM Level 2
- */
-public interface Range {
-	/**
-	 * Node within which the Range begins
-	 * 
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public Node getStartContainer() throws DOMException;
-
-	/**
-	 * Offset within the starting node of the Range.
-	 * 
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public int getStartOffset() throws DOMException;
-
-	/**
-	 * Node within which the Range ends
-	 * 
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public Node getEndContainer() throws DOMException;
-
-	/**
-	 * Offset within the ending node of the Range.
-	 * 
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public int getEndOffset() throws DOMException;
-
-	/**
-	 * TRUE if the Range is collapsed
-	 * 
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public boolean getCollapsed() throws DOMException;
-
-	/**
-	 * The deepest common ancestor container of the Range's two
-	 * boundary-points.
-	 * 
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public Node getCommonAncestorContainer() throws DOMException;
-
-	/**
-	 * Sets the attributes describing the start of the Range.
-	 * 
-	 * @param refNodeThe
-	 *            <code>refNode</code> value. This parameter must be
-	 *            different from <code>null</code>.
-	 * @param offsetThe
-	 *            <code>startOffset</code> value.
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if <code>refNode</code>
-	 *                or an ancestor of <code>refNode</code> is an Entity,
-	 *                Notation, or DocumentType node.
-	 * @exception DOMException
-	 *                INDEX_SIZE_ERR: Raised if <code>offset</code> is
-	 *                negative or greater than the number of child units in
-	 *                <code>refNode</code>. Child units are 16-bit units if
-	 *                <code>refNode</code> is a type of CharacterData node
-	 *                (e.g., a Text or Comment node) or a
-	 *                ProcessingInstruction node. Child units are Nodes in all
-	 *                other cases. <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void setStart(Node refNode, int offset) throws RangeException, DOMException;
-
-	/**
-	 * Sets the attributes describing the end of a Range.
-	 * 
-	 * @param refNodeThe
-	 *            <code>refNode</code> value. This parameter must be
-	 *            different from <code>null</code>.
-	 * @param offsetThe
-	 *            <code>endOffset</code> value.
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if <code>refNode</code>
-	 *                or an ancestor of <code>refNode</code> is an Entity,
-	 *                Notation, or DocumentType node.
-	 * @exception DOMException
-	 *                INDEX_SIZE_ERR: Raised if <code>offset</code> is
-	 *                negative or greater than the number of child units in
-	 *                <code>refNode</code>. Child units are 16-bit units if
-	 *                <code>refNode</code> is a type of CharacterData node
-	 *                (e.g., a Text or Comment node) or a
-	 *                ProcessingInstruction node. Child units are Nodes in all
-	 *                other cases. <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void setEnd(Node refNode, int offset) throws RangeException, DOMException;
-
-	/**
-	 * Sets the start position to be before a node
-	 * 
-	 * @param refNodeRange
-	 *            starts before <code>refNode</code>
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if the root container of
-	 *                <code>refNode</code> is not an Attr, Document, or
-	 *                DocumentFragment node or if <code>refNode</code> is a
-	 *                Document, DocumentFragment, Attr, Entity, or Notation
-	 *                node.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void setStartBefore(Node refNode) throws RangeException, DOMException;
-
-	/**
-	 * Sets the start position to be after a node
-	 * 
-	 * @param refNodeRange
-	 *            starts after <code>refNode</code>
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if the root container of
-	 *                <code>refNode</code> is not an Attr, Document, or
-	 *                DocumentFragment node or if <code>refNode</code> is a
-	 *                Document, DocumentFragment, Attr, Entity, or Notation
-	 *                node.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void setStartAfter(Node refNode) throws RangeException, DOMException;
-
-	/**
-	 * Sets the end position to be before a node.
-	 * 
-	 * @param refNodeRange
-	 *            ends before <code>refNode</code>
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if the root container of
-	 *                <code>refNode</code> is not an Attr, Document, or
-	 *                DocumentFragment node or if <code>refNode</code> is a
-	 *                Document, DocumentFragment, Attr, Entity, or Notation
-	 *                node.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void setEndBefore(Node refNode) throws RangeException, DOMException;
-
-	/**
-	 * Sets the end of a Range to be after a node
-	 * 
-	 * @param refNodeRange
-	 *            ends after <code>refNode</code>.
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if the root container of
-	 *                <code>refNode</code> is not an Attr, Document or
-	 *                DocumentFragment node or if <code>refNode</code> is a
-	 *                Document, DocumentFragment, Attr, Entity, or Notation
-	 *                node.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void setEndAfter(Node refNode) throws RangeException, DOMException;
-
-	/**
-	 * Collapse a Range onto one of its boundary-points
-	 * 
-	 * @param toStartIf
-	 *            TRUE, collapses the Range onto its start; if FALSE,
-	 *            collapses it onto its end.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void collapse(boolean toStart) throws DOMException;
-
-	/**
-	 * Select a node and its contents
-	 * 
-	 * @param refNodeThe
-	 *            node to select.
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if an ancestor of
-	 *                <code>refNode</code> is an Entity, Notation or
-	 *                DocumentType node or if <code>refNode</code> is a
-	 *                Document, DocumentFragment, Attr, Entity, or Notation
-	 *                node.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void selectNode(Node refNode) throws RangeException, DOMException;
-
-	/**
-	 * Select the contents within a node
-	 * 
-	 * @param refNodeNode
-	 *            to select from
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if <code>refNode</code>
-	 *                or an ancestor of <code>refNode</code> is an Entity,
-	 *                Notation or DocumentType node.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void selectNodeContents(Node refNode) throws RangeException, DOMException;
-
-	// CompareHow
-	/**
-	 * Compare start boundary-point of <code>sourceRange</code> to start
-	 * boundary-point of Range on which <code>compareBoundaryPoints</code>
-	 * is invoked.
-	 */
-	public static final short START_TO_START = 0;
-	/**
-	 * Compare start boundary-point of <code>sourceRange</code> to end
-	 * boundary-point of Range on which <code>compareBoundaryPoints</code>
-	 * is invoked.
-	 */
-	public static final short START_TO_END = 1;
-	/**
-	 * Compare end boundary-point of <code>sourceRange</code> to end
-	 * boundary-point of Range on which <code>compareBoundaryPoints</code>
-	 * is invoked.
-	 */
-	public static final short END_TO_END = 2;
-	/**
-	 * Compare end boundary-point of <code>sourceRange</code> to start
-	 * boundary-point of Range on which <code>compareBoundaryPoints</code>
-	 * is invoked.
-	 */
-	public static final short END_TO_START = 3;
-
-	/**
-	 * Compare the boundary-points of two Ranges in a document.
-	 * 
-	 * @param howA
-	 *            code representing the type of comparison, as defined above.
-	 * @param sourceRangeThe
-	 *            <code>Range</code> on which this current
-	 *            <code>Range</code> is compared to.
-	 * @return -1, 0 or 1 depending on whether the corresponding
-	 *         boundary-point of the Range is respectively before, equal to,
-	 *         or after the corresponding boundary-point of
-	 *         <code>sourceRange</code>.
-	 * @exception DOMException
-	 *                WRONG_DOCUMENT_ERR: Raised if the two Ranges are not in
-	 *                the same Document or DocumentFragment. <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public short compareBoundaryPoints(short how, Range sourceRange) throws DOMException;
-
-	/**
-	 * Removes the contents of a Range from the containing document or
-	 * document fragment without returning a reference to the removed content.
-	 * 
-	 * @exception DOMException
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if any portion of
-	 *                the content of the Range is read-only or any of the
-	 *                nodes that contain any of the content of the Range are
-	 *                read-only. <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void deleteContents() throws DOMException;
-
-	/**
-	 * Moves the contents of a Range from the containing document or document
-	 * fragment to a new DocumentFragment.
-	 * 
-	 * @return A DocumentFragment containing the extracted contents.
-	 * @exception DOMException
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if any portion of
-	 *                the content of the Range is read-only or any of the
-	 *                nodes which contain any of the content of the Range are
-	 *                read-only. <br>
-	 *                HIERARCHY_REQUEST_ERR: Raised if a DocumentType node
-	 *                would be extracted into the new DocumentFragment. <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public DocumentFragment extractContents() throws DOMException;
-
-	/**
-	 * Duplicates the contents of a Range
-	 * 
-	 * @return A DocumentFragment that contains content equivalent to this
-	 *         Range.
-	 * @exception DOMException
-	 *                HIERARCHY_REQUEST_ERR: Raised if a DocumentType node
-	 *                would be extracted into the new DocumentFragment. <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public DocumentFragment cloneContents() throws DOMException;
-
-	/**
-	 * Inserts a node into the Document or DocumentFragment at the start of
-	 * the Range. If the container is a Text node, this will be split at the
-	 * start of the Range (as if the Text node's splitText method was
-	 * performed at the insertion point) and the insertion will occur between
-	 * the two resulting Text nodes. Adjacent Text nodes will not be
-	 * automatically merged. If the node to be inserted is a DocumentFragment
-	 * node, the children will be inserted rather than the DocumentFragment
-	 * node itself.
-	 * 
-	 * @param newNodeThe
-	 *            node to insert at the start of the Range
-	 * @exception DOMException
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if an ancestor
-	 *                container of the start of the Range is read-only. <br>
-	 *                WRONG_DOCUMENT_ERR: Raised if <code>newNode</code> and
-	 *                the container of the start of the Range were not created
-	 *                from the same document. <br>
-	 *                HIERARCHY_REQUEST_ERR: Raised if the container of the
-	 *                start of the Range is of a type that does not allow
-	 *                children of the type of <code>newNode</code> or if
-	 *                <code>newNode</code> is an ancestor of the container.
-	 *                <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 * @exception RangeException
-	 *                INVALID_NODE_TYPE_ERR: Raised if <code>newNode</code>
-	 *                is an Attr, Entity, Notation, or Document node.
-	 */
-	public void insertNode(Node newNode) throws DOMException, RangeException;
-
-	/**
-	 * Reparents the contents of the Range to the given node and inserts the
-	 * node at the position of the start of the Range.
-	 * 
-	 * @param newParentThe
-	 *            node to surround the contents with.
-	 * @exception DOMException
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if an ancestor
-	 *                container of either boundary-point of the Range is
-	 *                read-only. <br>
-	 *                WRONG_DOCUMENT_ERR: Raised if <code> newParent</code>
-	 *                and the container of the start of the Range were not
-	 *                created from the same document. <br>
-	 *                HIERARCHY_REQUEST_ERR: Raised if the container of the
-	 *                start of the Range is of a type that does not allow
-	 *                children of the type of <code>newParent</code> or if
-	 *                <code>newParent</code> is an ancestor of the container
-	 *                or if <code>node</code> would end up with a child node
-	 *                of a type not allowed by the type of <code>node</code>.
-	 *                <br>
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 * @exception RangeException
-	 *                BAD_BOUNDARYPOINTS_ERR: Raised if the Range partially
-	 *                selects a non-text node. <br>
-	 *                INVALID_NODE_TYPE_ERR: Raised if <code> node</code> is
-	 *                an Attr, Entity, DocumentType, Notation, Document, or
-	 *                DocumentFragment node.
-	 */
-	public void surroundContents(Node newParent) throws DOMException, RangeException;
-
-	/**
-	 * Produces a new Range whose boundary-points are equal to the
-	 * boundary-points of the Range.
-	 * 
-	 * @return The duplicated Range.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public Range cloneRange() throws DOMException;
-
-	/**
-	 * Returns the contents of a Range as a string. This string contains only
-	 * the data characters, not any markup.
-	 * 
-	 * @return The contents of the Range.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public String toString() throws DOMException;
-
-	/**
-	 * Called to indicate that the Range is no longer in use and that the
-	 * implementation may relinquish any resources associated with this Range.
-	 * Subsequent calls to any methods or attribute getters on this Range will
-	 * result in a <code>DOMException</code> being thrown with an error code
-	 * of <code>INVALID_STATE_ERR</code>.
-	 * 
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if <code>detach()</code> has
-	 *                already been invoked on this object.
-	 */
-	public void detach() throws DOMException;
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/ranges/RangeException.java b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/ranges/RangeException.java
deleted file mode 100644
index 325acbd..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/ranges/RangeException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
- */
-
-package org.w3c.dom.ranges;
-
-/**
- * Range operations may throw a <code>RangeException</code> as specified in
- * their method descriptions.
- * <p>
- * See also the <a
- * href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document
- * Object Model (DOM) Level 2 Traversal and Range Specification</a>.
- * 
- * @since DOM Level 2
- */
-public class RangeException extends RuntimeException {
-	public RangeException(short code, String message) {
-		super(message);
-		this.code = code;
-	}
-
-	public short code;
-	// RangeExceptionCode
-	/**
-	 * If the boundary-points of a Range do not meet specific requirements.
-	 */
-	public static final short BAD_BOUNDARYPOINTS_ERR = 1;
-	/**
-	 * If the container of an boundary-point of a Range is being set to either
-	 * a node of an invalid type or a node with an ancestor of an invalid
-	 * type.
-	 */
-	public static final short INVALID_NODE_TYPE_ERR = 2;
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/ranges/package.html b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/ranges/package.html
deleted file mode 100644
index d8fbae6..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/ranges/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html>
-This package contains unmodified sources provided by http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113/java-binding.zip
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/COPYRIGHT.html b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/COPYRIGHT.html
deleted file mode 100644
index 26049b7..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/COPYRIGHT.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                      "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>W3C IPR SOFTWARE NOTICE</title>
-  </head>
-  <body bgcolor="#FFFFFF" text="#000000">
-    <h1>
-      W3C IPR SOFTWARE NOTICE
-    </h1>
-    <h3>
-      Copyright &copy; 2000 <loc href="http://www.w3.org/">World Wide Web
-      Consortium</loc>, (<loc href="http://www.lcs.mit.edu/">Massachusetts
-      Institute of Technology</loc>, <loc href="http://www.inria.fr/">Institut
-      National de Recherche en Informatique et en Automatique</loc>, <loc
-      href="http://www.keio.ac.jp/">Keio University</loc>). All Rights
-      Reserved.
-    </h3>
-    <p>
-      The DOM bindings are published under the W3C Software Copyright Notice
-      and License. The software license requires "Notice of any changes or
-      modifications to the W3C files, including the date changes were made."
-      Consequently, modified versions of the DOM bindings must document that
-      they do not conform to the W3C standard; in the case of the IDL binding,
-      the pragma prefix can no longer be 'w3c.org'; in the case of the Java
-      binding, the package names can no longer be in the 'org.w3c' package.
-    </p>
-    <p>
-      <b>Note:</b> The original version of the W3C Software Copyright Notice
-      and License could be found at <a
-      href='http://www.w3.org/Consortium/Legal/copyright-software-19980720'>http://www.w3.org/Consortium/Legal/copyright-software-19980720</a>
-    </p>
-    <h3>
-      Copyright &copy; 1994-2000 <a href="http://www.w3.org/">World Wide Web
-      Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts
-      Institute of Technology</a>, <a href="http://www.inria.fr/">Institut
-      National de Recherche en Informatique et en Automatique</a>, <a
-      href="http://www.keio.ac.jp/">Keio University</a>). All Rights
-      Reserved. http://www.w3.org/Consortium/Legal/
-    </h3>
-    <p>
-      This W3C work (including software, documents, or other related items) is
-      being provided by the copyright holders under the following license. By
-      obtaining, using and/or copying this work, you (the licensee) agree that
-      you have read, understood, and will comply with the following terms and
-      conditions:
-    </p>
-    <p>
-      Permission to use, copy, and modify this software and its documentation,
-      with or without modification,&nbsp; for any purpose and without fee or
-      royalty is hereby granted, provided that you include the following on ALL
-      copies of the software and documentation or portions thereof, including
-      modifications, that you make:
-    </p>
-    <ol>
-      <li>
-	The full text of this NOTICE in a location viewable to users of the
-	redistributed or derivative work.
-      </li>
-      <li>
-	Any pre-existing intellectual property disclaimers, notices, or terms
-	and conditions. If none exist, a short notice of the following form
-	(hypertext is preferred, text is permitted) should be used within the
-	body of any redistributed or derivative code: "Copyright &copy;
-	[$date-of-software] <a href="http://www.w3.org/">World Wide Web
-	Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts
-	Institute of Technology</a>, <a href="http://www.inria.fr/">Institut
-	National de Recherche en Informatique et en Automatique</a>, <a
-	href="http://www.keio.ac.jp/">Keio University</a>).  All Rights
-	Reserved. http://www.w3.org/Consortium/Legal/"
-      </li>
-      <li>
-	Notice of any changes or modifications to the W3C files, including the
-	date changes were made. (We recommend you provide URIs to the location
-	from which the code is derived.)
-      </li>
-    </ol>
-    <p>
-      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
-      HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
-      INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
-      FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
-      DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
-      TRADEMARKS OR OTHER RIGHTS.
-    </p>
-    <p>
-      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-      CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
-      DOCUMENTATION.
-    </p>
-    <p>
-      The name and trademarks of copyright holders may NOT be used in
-      advertising or publicity pertaining to the software without specific,
-      written prior permission. Title to copyright in this software and any
-      associated documentation will at all times remain with copyright
-      holders.
-    </p>
-  </body>
-</html>
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/DocumentTraversal.java b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/DocumentTraversal.java
deleted file mode 100644
index b56d0fc..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/DocumentTraversal.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
- */
-
-package org.w3c.dom.traversal;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.DOMException;
-
-/**
- * <code>DocumentTraversal</code> contains methods that create iterators and
- * tree-walkers to traverse a node and its children in document order (depth
- * first, pre-order traversal, which is equivalent to the order in which the
- * start tags occur in the text representation of the document). In DOMs which
- * support the Traversal feature, <code>DocumentTraversal</code> will be
- * implemented by the same objects that implement the Document interface.
- * <p>
- * See also the <a
- * href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document
- * Object Model (DOM) Level 2 Traversal and Range Specification</a>.
- * 
- * @since DOM Level 2
- */
-public interface DocumentTraversal {
-	/**
-	 * Create a new <code>NodeIterator</code> over the subtree rooted at the
-	 * specified node.
-	 * 
-	 * @param rootThe
-	 *            node which will be iterated together with its children. The
-	 *            iterator is initially positioned just before this node. The
-	 *            <code>whatToShow</code> flags and the filter, if any, are
-	 *            not considered when setting this position. The root must not
-	 *            be <code>null</code>.
-	 * @param whatToShowThis
-	 *            flag specifies which node types may appear in the logical
-	 *            view of the tree presented by the iterator. See the
-	 *            description of <code>NodeFilter</code> for the set of
-	 *            possible <code>SHOW_</code> values.These flags can be
-	 *            combined using <code>OR</code>.
-	 * @param filterThe
-	 *            <code>NodeFilter</code> to be used with this
-	 *            <code>TreeWalker</code>, or <code>null</code> to
-	 *            indicate no filter.
-	 * @param entityReferenceExpansionThe
-	 *            value of this flag determines whether entity reference nodes
-	 *            are expanded.
-	 * @return The newly created <code>NodeIterator</code>.
-	 * @exception DOMException
-	 *                NOT_SUPPORTED_ERR: Raised if the specified
-	 *                <code>root</code> is <code>null</code>.
-	 */
-	public NodeIterator createNodeIterator(Node root, int whatToShow, NodeFilter filter, boolean entityReferenceExpansion) throws DOMException;
-
-	/**
-	 * Create a new <code>TreeWalker</code> over the subtree rooted at the
-	 * specified node.
-	 * 
-	 * @param rootThe
-	 *            node which will serve as the <code>root</code> for the
-	 *            <code>TreeWalker</code>. The <code>whatToShow</code>
-	 *            flags and the <code>NodeFilter</code> are not considered
-	 *            when setting this value; any node type will be accepted as
-	 *            the <code>root</code>. The <code>currentNode</code> of
-	 *            the <code>TreeWalker</code> is initialized to this node,
-	 *            whether or not it is visible. The <code>root</code>
-	 *            functions as a stopping point for traversal methods that
-	 *            look upward in the document structure, such as
-	 *            <code>parentNode</code> and nextNode. The
-	 *            <code>root</code> must not be <code>null</code>.
-	 * @param whatToShowThis
-	 *            flag specifies which node types may appear in the logical
-	 *            view of the tree presented by the tree-walker. See the
-	 *            description of <code>NodeFilter</code> for the set of
-	 *            possible SHOW_ values.These flags can be combined using
-	 *            <code>OR</code>.
-	 * @param filterThe
-	 *            <code>NodeFilter</code> to be used with this
-	 *            <code>TreeWalker</code>, or <code>null</code> to
-	 *            indicate no filter.
-	 * @param entityReferenceExpansionIf
-	 *            this flag is false, the contents of
-	 *            <code>EntityReference</code> nodes are not presented in
-	 *            the logical view.
-	 * @return The newly created <code>TreeWalker</code>.
-	 * @exception DOMException
-	 *                NOT_SUPPORTED_ERR: Raised if the specified
-	 *                <code>root</code> is <code>null</code>.
-	 */
-	public TreeWalker createTreeWalker(Node root, int whatToShow, NodeFilter filter, boolean entityReferenceExpansion) throws DOMException;
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/NodeFilter.java b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/NodeFilter.java
deleted file mode 100644
index 5badf1d..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/NodeFilter.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
- */
-
-package org.w3c.dom.traversal;
-
-import org.w3c.dom.Node;
-
-/**
- * Filters are objects that know how to "filter out" nodes. If a
- * <code>NodeIterator</code> or <code>TreeWalker</code> is given a
- * <code>NodeFilter</code>, it applies the filter before it returns the
- * next node. If the filter says to accept the node, the traversal logic
- * returns it; otherwise, traversal looks for the next node and pretends that
- * the node that was rejected was not there.
- * <p>
- * The DOM does not provide any filters. <code>NodeFilter</code> is just an
- * interface that users can implement to provide their own filters.
- * <p>
- * <code>NodeFilters</code> do not need to know how to traverse from node to
- * node, nor do they need to know anything about the data structure that is
- * being traversed. This makes it very easy to write filters, since the only
- * thing they have to know how to do is evaluate a single node. One filter may
- * be used with a number of different kinds of traversals, encouraging code
- * reuse.
- * <p>
- * See also the <a
- * href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document
- * Object Model (DOM) Level 2 Traversal and Range Specification</a>.
- * 
- * @since DOM Level 2
- */
-public interface NodeFilter {
-	// Constants returned by acceptNode
-	/**
-	 * Accept the node. Navigation methods defined for
-	 * <code>NodeIterator</code> or <code>TreeWalker</code> will return
-	 * this node.
-	 */
-	public static final short FILTER_ACCEPT = 1;
-	/**
-	 * Reject the node. Navigation methods defined for
-	 * <code>NodeIterator</code> or <code>TreeWalker</code> will not
-	 * return this node. For <code>TreeWalker</code>, the children of this
-	 * node will also be rejected. <code>NodeIterators</code> treat this as
-	 * a synonym for <code>FILTER_SKIP</code>.
-	 */
-	public static final short FILTER_REJECT = 2;
-	/**
-	 * Skip this single node. Navigation methods defined for
-	 * <code>NodeIterator</code> or <code>TreeWalker</code> will not
-	 * return this node. For both <code>NodeIterator</code> and
-	 * <code>TreeWalker</code>, the children of this node will still be
-	 * considered.
-	 */
-	public static final short FILTER_SKIP = 3;
-
-	// Constants for whatToShow
-	/**
-	 * Show all <code>Nodes</code>.
-	 */
-	public static final int SHOW_ALL = 0xFFFFFFFF;
-	/**
-	 * Show <code>Element</code> nodes.
-	 */
-	public static final int SHOW_ELEMENT = 0x00000001;
-	/**
-	 * Show <code>Attr</code> nodes. This is meaningful only when creating
-	 * an iterator or tree-walker with an attribute node as its
-	 * <code>root</code>; in this case, it means that the attribute node
-	 * will appear in the first position of the iteration or traversal. Since
-	 * attributes are never children of other nodes, they do not appear when
-	 * traversing over the document tree.
-	 */
-	public static final int SHOW_ATTRIBUTE = 0x00000002;
-	/**
-	 * Show <code>Text</code> nodes.
-	 */
-	public static final int SHOW_TEXT = 0x00000004;
-	/**
-	 * Show <code>CDATASection</code> nodes.
-	 */
-	public static final int SHOW_CDATA_SECTION = 0x00000008;
-	/**
-	 * Show <code>EntityReference</code> nodes.
-	 */
-	public static final int SHOW_ENTITY_REFERENCE = 0x00000010;
-	/**
-	 * Show <code>Entity</code> nodes. This is meaningful only when creating
-	 * an iterator or tree-walker with an<code> Entity</code> node as its
-	 * <code>root</code>; in this case, it means that the
-	 * <code>Entity</code> node will appear in the first position of the
-	 * traversal. Since entities are not part of the document tree, they do
-	 * not appear when traversing over the document tree.
-	 */
-	public static final int SHOW_ENTITY = 0x00000020;
-	/**
-	 * Show <code>ProcessingInstruction</code> nodes.
-	 */
-	public static final int SHOW_PROCESSING_INSTRUCTION = 0x00000040;
-	/**
-	 * Show <code>Comment</code> nodes.
-	 */
-	public static final int SHOW_COMMENT = 0x00000080;
-	/**
-	 * Show <code>Document</code> nodes.
-	 */
-	public static final int SHOW_DOCUMENT = 0x00000100;
-	/**
-	 * Show <code>DocumentType</code> nodes.
-	 */
-	public static final int SHOW_DOCUMENT_TYPE = 0x00000200;
-	/**
-	 * Show <code>DocumentFragment</code> nodes.
-	 */
-	public static final int SHOW_DOCUMENT_FRAGMENT = 0x00000400;
-	/**
-	 * Show <code>Notation</code> nodes. This is meaningful only when
-	 * creating an iterator or tree-walker with a <code>Notation</code> node
-	 * as its <code>root</code>; in this case, it means that the
-	 * <code>Notation</code> node will appear in the first position of the
-	 * traversal. Since notations are not part of the document tree, they do
-	 * not appear when traversing over the document tree.
-	 */
-	public static final int SHOW_NOTATION = 0x00000800;
-
-	/**
-	 * Test whether a specified node is visible in the logical view of a
-	 * <code>TreeWalker</code> or <code>NodeIterator</code>. This
-	 * function will be called by the implementation of
-	 * <code>TreeWalker</code> and <code>NodeIterator</code>; it is not
-	 * normally called directly from user code. (Though you could do so if you
-	 * wanted to use the same filter to guide your own application logic.)
-	 * 
-	 * @param nThe
-	 *            node to check to see if it passes the filter or not.
-	 * @return a constant to determine whether the node is accepted, rejected,
-	 *         or skipped, as defined above.
-	 */
-	public short acceptNode(Node n);
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/NodeIterator.java b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/NodeIterator.java
deleted file mode 100644
index 8616e70..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/NodeIterator.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
- */
-
-package org.w3c.dom.traversal;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.DOMException;
-
-/**
- * <code>Iterators</code> are used to step through a set of nodes, e.g. the
- * set of nodes in a <code>NodeList</code>, the document subtree governed
- * by a particular <code>Node</code>, the results of a query, or any other
- * set of nodes. The set of nodes to be iterated is determined by the
- * implementation of the <code>NodeIterator</code>. DOM Level 2 specifies a
- * single <code>NodeIterator</code> implementation for document-order
- * traversal of a document subtree. Instances of these iterators are created
- * by calling <code>DocumentTraversal</code>
- * <code>.createNodeIterator()</code>.
- * <p>
- * See also the <a
- * href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document
- * Object Model (DOM) Level 2 Traversal and Range Specification</a>.
- * 
- * @since DOM Level 2
- */
-public interface NodeIterator {
-	/**
-	 * The root node of the <code>NodeIterator</code>, as specified when it
-	 * was created.
-	 */
-	public Node getRoot();
-
-	/**
-	 * This attribute determines which node types are presented via the
-	 * iterator. The available set of constants is defined in the
-	 * <code>NodeFilter</code> interface. Nodes not accepted by
-	 * <code>whatToShow</code> will be skipped, but their children may still
-	 * be considered. Note that this skip takes precedence over the filter, if
-	 * any.
-	 */
-	public int getWhatToShow();
-
-	/**
-	 * The <code>NodeFilter</code> used to screen nodes.
-	 */
-	public NodeFilter getFilter();
-
-	/**
-	 * The value of this flag determines whether the children of entity
-	 * reference nodes are visible to the iterator. If false, they and their
-	 * descendants will be rejected. Note that this rejection takes precedence
-	 * over <code>whatToShow</code> and the filter. Also note that this is
-	 * currently the only situation where <code>NodeIterators</code> may
-	 * reject a complete subtree rather than skipping individual nodes. <br>
-	 * <br>
-	 * To produce a view of the document that has entity references expanded
-	 * and does not expose the entity reference node itself, use the
-	 * <code>whatToShow</code> flags to hide the entity reference node and
-	 * set <code>expandEntityReferences</code> to true when creating the
-	 * iterator. To produce a view of the document that has entity reference
-	 * nodes but no entity expansion, use the <code>whatToShow</code> flags
-	 * to show the entity reference node and set
-	 * <code>expandEntityReferences</code> to false.
-	 */
-	public boolean getExpandEntityReferences();
-
-	/**
-	 * Returns the next node in the set and advances the position of the
-	 * iterator in the set. After a <code>NodeIterator</code> is created,
-	 * the first call to <code>nextNode()</code> returns the first node in
-	 * the set.
-	 * 
-	 * @return The next <code>Node</code> in the set being iterated over, or
-	 *         <code>null</code> if there are no more members in that set.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if this method is called after
-	 *                the <code>detach</code> method was invoked.
-	 */
-	public Node nextNode() throws DOMException;
-
-	/**
-	 * Returns the previous node in the set and moves the position of the
-	 * <code>NodeIterator</code> backwards in the set.
-	 * 
-	 * @return The previous <code>Node</code> in the set being iterated
-	 *         over, or <code>null</code> if there are no more members in
-	 *         that set.
-	 * @exception DOMException
-	 *                INVALID_STATE_ERR: Raised if this method is called after
-	 *                the <code>detach</code> method was invoked.
-	 */
-	public Node previousNode() throws DOMException;
-
-	/**
-	 * Detaches the <code>NodeIterator</code> from the set which it iterated
-	 * over, releasing any computational resources and placing the iterator in
-	 * the INVALID state. After <code>detach</code> has been invoked, calls
-	 * to <code>nextNode</code> or <code>previousNode</code> will raise
-	 * the exception INVALID_STATE_ERR.
-	 */
-	public void detach();
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/TreeWalker.java b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/TreeWalker.java
deleted file mode 100644
index 0ec2e62..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/TreeWalker.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
- */
-
-package org.w3c.dom.traversal;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.DOMException;
-
-/**
- * <code>TreeWalker</code> objects are used to navigate a document tree or
- * subtree using the view of the document defined by their
- * <code>whatToShow</code> flags and filter (if any). Any function which
- * performs navigation using a <code>TreeWalker</code> will automatically
- * support any view defined by a <code>TreeWalker</code>.
- * <p>
- * Omitting nodes from the logical view of a subtree can result in a structure
- * that is substantially different from the same subtree in the complete,
- * unfiltered document. Nodes that are siblings in the <code>TreeWalker</code>
- * view may be children of different, widely separated nodes in the original
- * view. For instance, consider a <code>NodeFilter</code> that skips all
- * nodes except for Text nodes and the root node of a document. In the logical
- * view that results, all text nodes will be siblings and appear as direct
- * children of the root node, no matter how deeply nested the structure of the
- * original document.
- * <p>
- * See also the <a
- * href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document
- * Object Model (DOM) Level 2 Traversal and Range Specification</a>.
- * 
- * @since DOM Level 2
- */
-public interface TreeWalker {
-	/**
-	 * The <code>root</code> node of the <code>TreeWalker</code>, as
-	 * specified when it was created.
-	 */
-	public Node getRoot();
-
-	/**
-	 * This attribute determines which node types are presented via the
-	 * <code>TreeWalker</code>. The available set of constants is defined
-	 * in the <code>NodeFilter</code> interface. Nodes not accepted by
-	 * <code>whatToShow</code> will be skipped, but their children may still
-	 * be considered. Note that this skip takes precedence over the filter, if
-	 * any.
-	 */
-	public int getWhatToShow();
-
-	/**
-	 * The filter used to screen nodes.
-	 */
-	public NodeFilter getFilter();
-
-	/**
-	 * The value of this flag determines whether the children of entity
-	 * reference nodes are visible to the <code>TreeWalker</code>. If
-	 * false, they and their descendants will be rejected. Note that this
-	 * rejection takes precedence over <code>whatToShow</code> and the
-	 * filter, if any. <br>
-	 * To produce a view of the document that has entity references expanded
-	 * and does not expose the entity reference node itself, use the
-	 * <code>whatToShow</code> flags to hide the entity reference node and
-	 * set <code>expandEntityReferences</code> to true when creating the
-	 * <code>TreeWalker</code>. To produce a view of the document that has
-	 * entity reference nodes but no entity expansion, use the
-	 * <code>whatToShow</code> flags to show the entity reference node and
-	 * set <code>expandEntityReferences</code> to false.
-	 */
-	public boolean getExpandEntityReferences();
-
-	/**
-	 * The node at which the <code>TreeWalker</code> is currently
-	 * positioned. <br>
-	 * Alterations to the DOM tree may cause the current node to no longer be
-	 * accepted by the <code>TreeWalker</code>'s associated filter.
-	 * <code>currentNode</code> may also be explicitly set to any node,
-	 * whether or not it is within the subtree specified by the
-	 * <code>root</code> node or would be accepted by the filter and
-	 * <code>whatToShow</code> flags. Further traversal occurs relative to
-	 * <code>currentNode</code> even if it is not part of the current view,
-	 * by applying the filters in the requested direction; if no traversal is
-	 * possible, <code>currentNode</code> is not changed.
-	 * 
-	 * @exception DOMException
-	 *                NOT_SUPPORTED_ERR: Raised if an attempt is made to set
-	 *                <code>currentNode</code> to <code>null</code>.
-	 */
-	public Node getCurrentNode();
-
-	public void setCurrentNode(Node currentNode) throws DOMException;
-
-	/**
-	 * Moves to and returns the closest visible ancestor node of the current
-	 * node. If the search for <code>parentNode</code> attempts to step
-	 * upward from the <code>TreeWalker</code>'s <code>root</code> node,
-	 * or if it fails to find a visible ancestor node, this method retains the
-	 * current position and returns <code>null</code>.
-	 * 
-	 * @return The new parent node, or <code>null</code> if the current node
-	 *         has no parent in the <code>TreeWalker</code>'s logical view.
-	 */
-	public Node parentNode();
-
-	/**
-	 * Moves the <code>TreeWalker</code> to the first visible child of the
-	 * current node, and returns the new node. If the current node has no
-	 * visible children, returns <code>null</code>, and retains the current
-	 * node.
-	 * 
-	 * @return The new node, or <code>null</code> if the current node has no
-	 *         visible children in the <code>TreeWalker</code>'s logical
-	 *         view.
-	 */
-	public Node firstChild();
-
-	/**
-	 * Moves the <code>TreeWalker</code> to the last visible child of the
-	 * current node, and returns the new node. If the current node has no
-	 * visible children, returns <code>null</code>, and retains the current
-	 * node.
-	 * 
-	 * @return The new node, or <code>null</code> if the current node has no
-	 *         children in the <code>TreeWalker</code>'s logical view.
-	 */
-	public Node lastChild();
-
-	/**
-	 * Moves the <code>TreeWalker</code> to the previous sibling of the
-	 * current node, and returns the new node. If the current node has no
-	 * visible previous sibling, returns <code>null</code>, and retains the
-	 * current node.
-	 * 
-	 * @return The new node, or <code>null</code> if the current node has no
-	 *         previous sibling. in the <code>TreeWalker</code>'s logical
-	 *         view.
-	 */
-	public Node previousSibling();
-
-	/**
-	 * Moves the <code>TreeWalker</code> to the next sibling of the current
-	 * node, and returns the new node. If the current node has no visible next
-	 * sibling, returns <code>null</code>, and retains the current node.
-	 * 
-	 * @return The new node, or <code>null</code> if the current node has no
-	 *         next sibling. in the <code>TreeWalker</code>'s logical view.
-	 */
-	public Node nextSibling();
-
-	/**
-	 * Moves the <code>TreeWalker</code> to the previous visible node in
-	 * document order relative to the current node, and returns the new node.
-	 * If the current node has no previous node, or if the search for
-	 * <code>previousNode</code> attempts to step upward from the
-	 * <code>TreeWalker</code>'s <code>root</code> node, returns
-	 * <code>null</code>, and retains the current node.
-	 * 
-	 * @return The new node, or <code>null</code> if the current node has no
-	 *         previous node in the <code>TreeWalker</code>'s logical view.
-	 */
-	public Node previousNode();
-
-	/**
-	 * Moves the <code>TreeWalker</code> to the next visible node in
-	 * document order relative to the current node, and returns the new node.
-	 * If the current node has no next node, or if the search for nextNode
-	 * attempts to step upward from the <code>TreeWalker</code>'s
-	 * <code>root</code> node, returns <code>null</code>, and retains the
-	 * current node.
-	 * 
-	 * @return The new node, or <code>null</code> if the current node has no
-	 *         next node in the <code>TreeWalker</code>'s logical view.
-	 */
-	public Node nextNode();
-
-}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/package.html b/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/package.html
deleted file mode 100644
index d8fbae6..0000000
--- a/bundles/org.eclipse.wst.xml.core/src/org/w3c/dom/traversal/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html>
-This package contains unmodified sources provided by http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113/java-binding.zip
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.core/.classpath b/bundles/org.eclipse.wst.xsd.core/.classpath
deleted file mode 100644
index b23b03f..0000000
--- a/bundles/org.eclipse.wst.xsd.core/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-contentmodel/"/>
-	<classpathentry kind="src" path="src-validation/"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.xsd.core/.cvsignore b/bundles/org.eclipse.wst.xsd.core/.cvsignore
deleted file mode 100644
index e4254b1..0000000
--- a/bundles/org.eclipse.wst.xsd.core/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-temp.folder
-build.xml
diff --git a/bundles/org.eclipse.wst.xsd.core/.project b/bundles/org.eclipse.wst.xsd.core/.project
deleted file mode 100644
index a95f8ef..0000000
--- a/bundles/org.eclipse.wst.xsd.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsd.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.xsd.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsd.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 62bc9dc..0000000
--- a/bundles/org.eclipse.wst.xsd.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %_UI_PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.xsd.core; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.wst.xsd.core.internal.XSDCorePlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xsd.contentmodel.internal,
- org.eclipse.wst.xsd.contentmodel.internal.util,
- org.eclipse.wst.xsd.core.internal,
- org.eclipse.wst.xsd.core.internal.validation
-Require-Bundle: org.eclipse.core.runtime.compatibility,
- org.eclipse.emf.ecore,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.xsd,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.wst.validation,
- org.apache.xerces
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.wst.xsd.core.internal.XSDCorePlugin
-
diff --git a/bundles/org.eclipse.wst.xsd.core/about.html b/bundles/org.eclipse.wst.xsd.core/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.wst.xsd.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.core/build.properties b/bundles/org.eclipse.wst.xsd.core/build.properties
deleted file mode 100644
index ba1ba95..0000000
--- a/bundles/org.eclipse.wst.xsd.core/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     
-###############################################################################
-bin.includes = META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               .,\
-               about.html
-jars.compile.order = .
-src.includes = build.properties
-output.. = bin/
-source.. = src-contentmodel/,\
-           src-validation/,\
-           src/
diff --git a/bundles/org.eclipse.wst.xsd.core/plugin.properties b/bundles/org.eclipse.wst.xsd.core/plugin.properties
deleted file mode 100644
index 35666bf..0000000
--- a/bundles/org.eclipse.wst.xsd.core/plugin.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-! Properties file for component: XML Schema Validator
-
-!
-! Plugin
-!
-_UI_PLUGIN_NAME                           = XSD Core Plugin
-XSD_Content_Type=XSD
-
-!
-! XSDEditor Menu bar contributor
-!
-
-_UI_MENU_VALIDATE_XML                     = &Validate XML Schema
-
-!
-! Validate Schema 
-!
-_UI_DIALOG_XML_SCHEMA_INVALID_TITLE       = Validation Failed
-_UI_DIALOG_XML_SCHEMA_VALID_TITLE         = Validation Succeeded
-_UI_DIALOG_XML_SCHEMA_VALID_TEXT          = The XML schema file is valid.
-_UI_DIALOG_XML_SCHEMA_VALID_WITH_WARNINGS = The XML schema file is valid however warnings have been issued. See the Problems view for the warning messages.
-_UI_DIALOG_XML_SCHEMA_INVALID_TEXT        = The XML schema file is not valid. See the Problems view for the error messages.
-_UI_DIALOG_XML_SCHEMA_LIMITE_EXCEEDED     = The XML schema file is not valid.  The message limit for the Problems view has been exceeded.  To see all the messages increase the limit and validate again.
-
-
-_UI_XML_SCHEMA_VALIDATOR                  = XML Schema Validator
diff --git a/bundles/org.eclipse.wst.xsd.core/plugin.xml b/bundles/org.eclipse.wst.xsd.core/plugin.xml
deleted file mode 100644
index d0e75f7..0000000
--- a/bundles/org.eclipse.wst.xsd.core/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension point="org.eclipse.core.runtime.contentTypes">
-		<content-type
-			priority="high"
-			name="%XSD_Content_Type"
-			id="xsdsource"
-			base-type="org.eclipse.core.runtime.xml"
-			default-charset="UTF-8"
-			file-extensions="xsd" />
-	</extension>
-
-	<extension point="org.eclipse.wst.xml.core.documentFactories">
-		<factory
-			type="xsd"
-			class="org.eclipse.wst.xsd.contentmodel.internal.CMDocumentFactoryXSD">
-		</factory>
-	</extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/CMDocumentFactoryXSD.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/CMDocumentFactoryXSD.java
deleted file mode 100644
index 8c189d7..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/CMDocumentFactoryXSD.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.factory.CMDocumentFactory;
-
-/**
- *  This builder handles building .dtd / .xsd grammar files
- */
-public class CMDocumentFactoryXSD implements CMDocumentFactory
-{
-  public static final String XSD_FILE_TYPE = "XSD";
-
-  public CMDocumentFactoryXSD() 
-  {  
-    // here we call init on the XSD and DTD packages to avoid strange initialization bugs
-    //
-    org.eclipse.xsd.impl.XSDPackageImpl.init();
-    org.eclipse.xsd.impl.XSDPackageImpl.eINSTANCE.getXSDFactory();  
-  }
-
- 
-  public CMDocument createCMDocument(String uri)
-  {                  	
-    CMDocument result = null;
-    try
-    {                                
-        result = XSDImpl.buildCMDocument(uri);     
-    }
-    catch (Exception e)
-    {
-    	e.printStackTrace();
-    }
-    return result;  
-  } 
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/CMNodeImpl.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/CMNodeImpl.java
deleted file mode 100644
index 18fff5a..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/CMNodeImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-public abstract class CMNodeImpl extends AdapterImpl implements CMNode
-{
-  protected static final String PROPERTY_DOCUMENTATION = "documentation";
-  protected static final String PROPERTY_DOCUMENTATION_SOURCE = "documentationSource";
-  protected static final String PROPERTY_DOCUMENTATION_LANGUAGE = "documentationLanguage";
-  protected static final String PROPERTY_MOF_NOTIFIER = "key";
-  protected static final String PROPERTY_DEFINITION_INFO = "http://org.eclipse.wst/cm/properties/definitionInfo";
-  protected static final String PROPERTY_DEFINITION = "http://org.eclipse.wst/cm/properties/definition";
-
-  public abstract Object getKey();
-
-  public boolean supports(String propertyName)
-  {
-    return propertyName.equals(PROPERTY_MOF_NOTIFIER);
-  }
-
-  public Object getProperty(String propertyName)
-  {
-    return null;
-  }
-
-  public void setProperty(String propertyName, Object object)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDCMManager.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDCMManager.java
deleted file mode 100644
index 796f45c..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDCMManager.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Plugin;
-
-public class XSDCMManager extends Plugin 
-{
-  private static XSDCMManager instance;
-  
-  public XSDCMManager() 
-  {
-    super();
-  }
-  
-  public static XSDCMManager getInstance() {
-    if (instance == null) {
-      instance = new XSDCMManager();
-    }
-    return instance;
-  }
-
-
-  public void startup() throws CoreException 
-  {
-    XSDTypeUtil.initialize();
-    //ContentModelManager.getInstance().setInferredGrammarFactory(new InferredGrammarFactoryImpl());
-  }
-}
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
deleted file mode 100644
index 770bc2a..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDImpl.java
+++ /dev/null
@@ -1,2840 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocumentation;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.annotation.AnnotationMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMAttributeDeclarationImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMDataTypeImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMDocumentImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMEntityDeclarationImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMGroupImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNamedNodeMapImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNodeListImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDescriptionBuilder;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xsd.contentmodel.internal.util.XSDSchemaLocatorAdapterFactory;
-import org.eclipse.xsd.XSDAnnotation;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDAttributeUseCategory;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDConstraint;
-import org.eclipse.xsd.XSDContentTypeCategory;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDEnumerationFacet;
-import org.eclipse.xsd.XSDForm;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaContent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDWildcard;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDConstants;
-import org.eclipse.xsd.util.XSDResourceImpl;
-import org.eclipse.xsd.util.XSDSwitch;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-/**
- * Utility class to build cmnodes from XML Schema nodes. The XML Schema model is
- * found in the org.eclipse.xsd plugin.
- * 
- * TODO: getNamespaceURI()currently always returns '##any'.
- */
-public class XSDImpl
-{
-  /*
-   * properties common to all cmnodes the following properties defined in
-   * CMNodeImpl class: PROPERTY_DOCUMENTATION PROPERTY_DOCUMENTATION_SOURCE
-   * PROPERTY_DOCUMENTATION_LANGUAGE PROPERTY_MOF_NOTIFIER
-   * PROPERTY_DEFINITION_INFO PROPERTY_DEFINITION
-   * 
-   * the following properties defined in this class, XSDImpl:
-   * PROPERTY_CMDOCUMENT PROPERTY_USES_LOCAL_ELEMENT_DECLARATIONS
-   * PROPERTY_IS_NAME_SPACE_AWARE PROPERTY_NS_PREFIX_QUALIFICATION
-   * PROPERTY_NILLABLE PROPERTY_SPEC
-   */
-  public static final String PROPERTY_CMDOCUMENT = "CMDocument";
-  public static final String PROPERTY_USES_LOCAL_ELEMENT_DECLARATIONS = "http://org.eclipse.wst/cm/properties/usesLocalElementDeclarations";
-  public static final String PROPERTY_IS_NAME_SPACE_AWARE = "http://org.eclipse.wst/cm/properties/isNameSpaceAware";
-  public static final String PROPERTY_NS_PREFIX_QUALIFICATION = "http://org.eclipse.wst/cm/properties/nsPrefixQualification";
-  public static final String PROPERTY_NILLABLE = "http://org.eclipse.wst/cm/properties/nillable";
-  public static final String PROPERTY_SPEC = "spec";
-  /*
-   * properties common to all CMDocument nodes: PROPERTY_TARGET_NAMESPACE_URI
-   * PROPERTY_IMPORTED_NAMESPACE_INFO PROPERTY_NAMESPACE_INFO
-   * PROPERTY_ELEMENT_FORM_DEFAULT PROPERTY_ANNOTATION_MAP
-   */
-  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";
-  /*
-   * properties common to all CMElementDeclaration nodes: PROPERTY_XSITYPES
-   * PROPERTY_DERIVED_ELEMENT_DECLARATION PROPERTY_SUBSTITUTION_GROUP
-   * PROPERTY_ABSTRACT
-   */
-  public static final String PROPERTY_XSITYPES = "XSITypes";
-  public static final String PROPERTY_DERIVED_ELEMENT_DECLARATION = "DerivedElementDeclaration";
-  public static final String PROPERTY_SUBSTITUTION_GROUP = "SubstitutionGroup";
-  public static final String PROPERTY_ABSTRACT = "Abstract";
-  /**
-   * Definition info for element declarations.
-   */
-  public static final String DEFINITION_INFO_GLOBAL = "global";
-  public static final String DEFINITION_INFO_LOCAL = "local";
-  public static final String XML_LANG_ATTRIBUTE = "xml:lang";
-  public static final String PLATFORM_PROTOCOL = "platform:";
-  protected static XSDAdapterFactoryImpl xsdAdapterFactoryImpl = new XSDAdapterFactoryImpl();
-  protected static XSIDocument xsiDocument = new XSIDocument();
-
-  /**
-   * Given uri for an XML Schema document, parse the document and build
-   * corresponding CMDocument node.
-   * 
-   * @param uri -
-   *          the uri for an XML Schema document
-   * @param grammarErrorChecking -
-   *          grammar error checking flag
-   * @param errorList -
-   *          the resulting error list
-   * @return the corresponding CMDocument node.
-   * @deprecated -- use buildCMDocument(String uri)
-   */
-  public static CMDocument buildCMDocument(String uri, int grammarErrorChecking, List errorList)
-  {
-    return buildCMDocument(uri);
-  }
-
-  /**
-   * Given uri for an XML Schema document, parse the document and build
-   * corresponding CMDocument node.
-   * 
-   * @param uri -
-   *          the uri for an XML Schema document
-   * @return the corresponding CMDocument node.
-   */
-  public static CMDocument buildCMDocument(String uri)
-  {
-    CMDocument cmDocument = null;
-    XSDSchema xsdSchema = buildXSDModel(uri);
-    if (xsdSchema != null)
-    {
-      cmDocument = (CMDocument) getAdapter(xsdSchema);
-    }
-    return cmDocument;
-  }
-
-  /**
-   * Given uri for an XML Schema document, parse the document and build
-   * corresponding CMDocument node.
-   * 
-   * @param uri -
-   *          the uri for an XML Schema document
-   * @return the corresponding CMDocument node.
-   */
-  public static XSDSchema buildXSDModel(String uriString)
-  {
-    XSDSchema xsdSchema = null;
- 
-    try
-    {
-      // if XML Schema for Schema is requested, get it through schema model 
-      if (uriString.endsWith("2001/XMLSchema.xsd"))
-      {
-      	xsdSchema = XSDSchemaImpl.getSchemaForSchema(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);			
-      }
-      else
-      { 	
-      ResourceSet resourceSet = new ResourceSetImpl();
-      //resourceSet.getAdapterFactories().add(new XSDSchemaLocationResolverAdapterFactory());
-      resourceSet.getAdapterFactories().add(new XSDSchemaLocatorAdapterFactory());
-                  
-      URI uri = createURI(uriString);    
-      XSDResourceImpl resource = (XSDResourceImpl)resourceSet.createResource(URI.createURI("*.xsd"));
-      resource.setURI(uri);
-      resource.load(null);
-      
-      xsdSchema = resource.getSchema();    
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    return xsdSchema;
-  }
-  
-  // TODO ... looks like we can remove this class?
-  //
-  static class InternalURIConverter extends URIConverterImpl
-  {
-    protected InputStream createURLInputStream(URI uri) throws IOException
-    {
-      if ("http".equals(uri.scheme()))
-      {
-        String theURI = uri.toString();
-        String mapped = URIResolverPlugin.createResolver().resolve(theURI, theURI, theURI);
-        if (mapped != null)
-        {
-          uri = createURI(mapped);
-        }
-      }
-      return super.createURLInputStream(uri);
-    }
-  }
-
-  /**
-   * Returns an appropriate URI based on a uri string.
-   * 
-   * @param uriString -
-   *          a uri string.
-   * @return an appropriate URI based on a uri string.
-   */
-  public static URI createURI(String uriString)
-  {
-    if (hasProtocol(uriString))
-      return URI.createURI(uriString);
-    else
-      return URI.createFileURI(uriString);
-  }
-
-  private static boolean hasProtocol(String uri)
-  {
-    boolean result = false;
-    if (uri != null)
-    {
-      int index = uri.indexOf(":");
-      if (index != -1 && index > 2) // assume protocol with be length 3 so that
-                                    // the'C' in 'C:/' is not interpreted as a
-                                    // protocol
-      {
-        result = true;
-      }
-    }
-    return result;
-  }
-
-  /**
-   * Returns true if string begins with platform protocol.
-   * 
-   * @param uriString -
-   *          a uri string.
-   * @return true if string begins with platform protocol.
-   */
-  public static boolean withPlatformProtocol(String uriString)
-  {
-    return uriString.startsWith(PLATFORM_PROTOCOL);
-  }
-
-  /**
-   * Returns the value of the 'Min Occurs' attribute. The default value is "1".
-   * 
-   * @param component -
-   *          a concrete component.
-   * @return the value of the 'Min Occurs' attribute.
-   */
-  public static int getMinOccurs(XSDConcreteComponent component)
-  {
-    int minOccur = 1;
-    if (component != null)
-    {
-      Object o = component.getContainer();
-      if (o instanceof XSDParticle)
-      {
-        if (((XSDParticle) o).isSetMinOccurs())
-        {
-          try
-          {
-            minOccur = ((XSDParticle) o).getMinOccurs();
-          }
-          catch (Exception e)
-          {
-            minOccur = 1;
-          }
-        }
-      }
-    }
-    return minOccur;
-  }
-
-  /**
-   * Returns the value of the 'Max Occurs' attribute. The default value is "1".
-   * 
-   * @param component -
-   *          a concrete component.
-   * @return the value of the 'Max Occurs' attribute.
-   */
-  public static int getMaxOccurs(XSDConcreteComponent component)
-  {
-    int maxOccur = 1;
-    if (component != null)
-    {
-      Object o = component.getContainer();
-      if (o instanceof XSDParticle)
-      {
-        if (((XSDParticle) o).isSetMaxOccurs())
-        {
-          try
-          {
-            maxOccur = ((XSDParticle) o).getMaxOccurs();
-          }
-          catch (Exception e)
-          {
-            maxOccur = 1;
-          }
-        }
-      }
-    }
-    return maxOccur;
-  }
-
-  /**
-   * Returns the enumerated values for the given type.
-   * 
-   * @param type -
-   *          a type definition.
-   * @return the enumerated values for the given type.
-   */
-  public static String[] getEnumeratedValuesForType(XSDTypeDefinition type)
-  {
-    List result = new ArrayList();
-    if (type instanceof XSDSimpleTypeDefinition)
-    {
-      List enumerationFacets = ((XSDSimpleTypeDefinition) type).getEnumerationFacets();
-      for (Iterator i = enumerationFacets.iterator(); i.hasNext();)
-      {
-        XSDEnumerationFacet enumFacet = (XSDEnumerationFacet) i.next();
-        List values = enumFacet.getValue();
-        for (Iterator j = values.iterator(); j.hasNext();)
-        {
-          Object o = j.next();
-          if (o != null)
-          {
-            result.add(o.toString());
-          }  
-        }
-      }
-    }
-    String[] array = new String[result.size()];
-    result.toArray(array);
-    return array;
-  }
-
-  /**
-   * Return a list of documentation elements from the given annotation. Working
-   * with documentation elements requires dropping down into the DOM model.
-   * 
-   * @param annotation -
-   *          an XSDAnnotation node.
-   * @return a list of documentation elements.
-   */
-  public static CMNodeList getDocumentations(XSDAnnotation annotation)
-  {
-    CMNodeListImpl documentations = new CMNodeListImpl();
-    if (annotation != null)
-    {
-      List documentationsElements = annotation.getUserInformation();
-      for (Iterator i = documentationsElements.iterator(); i.hasNext();)
-      {
-        documentations.getList().add(new DocumentationImpl((Element) i.next()));
-      }
-    }
-    return documentations;
-  }
-
-  /**
-   * Adapted from public static List findTypesDerivedFrom(XSDSchema schema,
-   * String namespace, String localName) in class XSDSchemaQueryTools found in
-   * org.eclipse.xsd plugin.
-   * 
-   * Find typeDefinitions that derive from a given type.
-   * 
-   * @param type
-   *          the type derived from
-   * @return List of any XSDTypeDefinitions found
-   */
-  public static List findTypesDerivedFrom(XSDTypeDefinition type)
-  {
-    ArrayList typesDerivedFrom = new ArrayList();
-    if (type != null)
-    {
-      XSDSchema schema = type.getSchema();
-      String localName = type.getName();
-      if ((null != schema) && (null != localName))
-      {
-        String namespace = schema.getTargetNamespace();
-        // A handy convenience method quickly gets all
-        // typeDefinitions within our schema; note that
-        // whether or not this returns types in included,
-        // imported, or redefined schemas is subject to change
-        List typedefs = schema.getTypeDefinitions();
-        for (Iterator iter = typedefs.iterator(); iter.hasNext();)
-        {
-          XSDTypeDefinition typedef = (XSDTypeDefinition) iter.next();
-          if (typedef instanceof XSDComplexTypeDefinition)
-          {
-            // Walk the baseTypes from this typedef seeing if any
-            // of them match the requested one
-            if (isTypeDerivedFrom(typedef, namespace, localName))
-            {
-              // We found it, return the original one and continue
-              typesDerivedFrom.add(typedef);
-              continue;
-            }
-          }
-        }
-      }
-    }
-    return typesDerivedFrom;
-  }
-
-  /**
-   * Adapted from protected static boolean isTypeDerivedFrom(XSDTypeDefinition
-   * typedef, String namespace, String localName) in class XSDSchemaQueryTools
-   * found in org.eclipse.xsd plugin.
-   * 
-   * Recursive worker method to find typeDefinitions that derive from a named
-   * type.
-   * 
-   * @see #findTypesDerivedFrom(XSDSchema, String, String)
-   * @param typeDef
-   *          to see if it's derived from
-   * @param namespace
-   *          for the type derived from
-   * @param localName
-   *          for the type derived from
-   * @return true if it is; false otherwise
-   */
-  protected static boolean isTypeDerivedFrom(XSDTypeDefinition typedef, String namespace, String localName)
-  {
-    // Walk the baseTypes from this typedef seeing if any
-    // of them match the requested one
-    XSDTypeDefinition baseType = typedef.getBaseType();
-    // As this convenience method if our parameters match
-    if (baseType.hasNameAndTargetNamespace(localName, namespace))
-    {
-      return true;
-    }
-    XSDTypeDefinition rootType = typedef.getRootType();
-    if (rootType == baseType)
-    {
-      // If we've hit the root, we aren't derived from it
-      return false;
-    }
-    else
-    {
-      // Otherwise continue to traverse upwards
-      return isTypeDerivedFrom(baseType, namespace, localName);
-    }
-  }
-
-  /**
-   * Returns the corresponding cmnode of the specified XML Schema node.
-   * 
-   * @param target -
-   *          an XML Schema node
-   * @return the corresponding cmnode.
-   */
-  public static CMNode getAdapter(Notifier o)
-  {
-    return (CMNode) xsdAdapterFactoryImpl.adapt(o);
-  }
-
-  /**
-   * Adapted from public String getPrefix(String ns, boolean withColon) in class
-   * TypesHelper found in org.eclipse.wst.xsd.editor plugin.
-   * 
-   * @param schema -
-   *          the relevant schema
-   * @param ns -
-   *          the relevant namespace
-   */
-  public static String getPrefix(XSDSchema schema, String ns)
-  {
-    String key = "";
-    if ((schema != null) && (ns != null))
-    {
-      Map map = schema.getQNamePrefixToNamespaceMap();
-      Iterator iter = map.keySet().iterator();
-      while (iter.hasNext())
-      {
-        Object keyObj = iter.next();
-        Object value = map.get(keyObj);
-        if (value != null && value.toString().equals(ns))
-        {
-          if (keyObj != null)
-          {
-            key = keyObj.toString();
-          }
-          else
-          {
-            key = "";
-          }
-          break;
-        }
-      }
-    }
-    return key;
-  }
-  /**
-   * The Factory for the XSD adapter model. It provides a create method for each
-   * non-abstract class of the model.
-   */
-  public static class XSDAdapterFactoryImpl extends AdapterFactoryImpl
-  {
-    public Adapter createAdapter(Notifier target)
-    {
-      XSDSwitch xsdSwitch = new XSDSwitch()
-      {
-        public Object caseXSDWildcard(XSDWildcard object)
-        {
-          return new XSDWildcardAdapter(object);
-        }
-
-        public Object caseXSDModelGroupDefinition(XSDModelGroupDefinition object)
-        {
-          return new XSDModelGroupDefinitionAdapter(object);
-        }
-
-        public Object caseXSDAttributeUse(XSDAttributeUse object)
-        {
-          return new XSDAttributeUseAdapter(object);
-        }
-
-        public Object caseXSDElementDeclaration(XSDElementDeclaration object)
-        {
-          return new XSDElementDeclarationAdapter(object);
-        }
-
-        public Object caseXSDModelGroup(XSDModelGroup object)
-        {
-          return new XSDModelGroupAdapter(object);
-        }
-
-        public Object caseXSDSchema(XSDSchema object)
-        {
-          return new XSDSchemaAdapter(object);
-        }
-      };
-      Object o = xsdSwitch.doSwitch((EObject) target);
-      Adapter result = null;
-      if (o instanceof Adapter)
-      {
-        result = (Adapter) o;
-      }
-      else
-      {
-        Thread.dumpStack();
-      }
-      return result;
-    }
-
-    public Adapter adapt(Notifier target)
-    {
-      return adapt(target, this);
-    }
-  }
-  /**
-   * XSDBaseAdapter -- an abstract base node in the model. All other model nodes
-   * are derived from it.
-   */
-  public static abstract class XSDBaseAdapter extends CMNodeImpl
-  {
-    protected CMNodeListImpl documentation = new CMNodeListImpl();
-
-    /**
-     * Returns the name of the node. The default value is an empty string value.
-     * All derived classes must override this method if they do not want the
-     * default value.
-     * 
-     * @return the name of the node.
-     */
-    public String getNodeName()
-    {
-      return "";
-    }
-
-    /**
-     * Returns true of the given factory is the factory for this XSD adapter
-     * model.
-     * 
-     * @param type -
-     *          a factory
-     * @return true if the type is the adapter factory for this model.
-     */
-    public boolean isAdapterForType(Object type)
-    {
-      return type == xsdAdapterFactoryImpl;
-    }
-
-    /**
-     * Returns true if the property is supported for this class.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return true if the property is supported.
-     */
-    public boolean supports(String propertyName)
-    {
-      return propertyName.equals(PROPERTY_NS_PREFIX_QUALIFICATION) || propertyName.equals(PROPERTY_NILLABLE) || propertyName.equals(PROPERTY_USES_LOCAL_ELEMENT_DECLARATIONS)
-          || propertyName.equals(PROPERTY_DOCUMENTATION) || propertyName.equals(PROPERTY_DOCUMENTATION_SOURCE) || propertyName.equals(PROPERTY_DOCUMENTATION_LANGUAGE)
-          || propertyName.equals(PROPERTY_MOF_NOTIFIER) || propertyName.equals(PROPERTY_DEFINITION_INFO) || propertyName.equals(PROPERTY_DEFINITION) || propertyName.equals(PROPERTY_CMDOCUMENT)
-          || propertyName.equals(PROPERTY_IS_NAME_SPACE_AWARE) || propertyName.equals(PROPERTY_SPEC) || super.supports(propertyName);
-    }
-
-    /**
-     * Returns the value of the 'Nillable' attribute. This represents the
-     * nillable infoset property. The default value is false. All derived
-     * classes must override this method if they do not want the default value.
-     * 
-     * @return the value of the 'Nillable' attribute.
-     */
-    public boolean isNillable()
-    {
-      return false;
-    }
-
-    /**
-     * Returns the cmdocument that is the owner of this cmnode. The default
-     * value is null; All derived classes must override this method if they do
-     * not want the default value.
-     * 
-     * @return the cmdocument corresponding to this cmnode.
-     */
-    public CMDocument getCMDocument()
-    {
-      return null;
-    }
-
-    /**
-     * Return a list of documentation elements. The default value is an empty
-     * CMNodeList; All derived classes must override this method if they do not
-     * want the default value.
-     * 
-     * @return a list of documentation elements.
-     */
-    protected CMNodeList getDocumentation()
-    {
-      return documentation;
-    }
-
-    /**
-     * Returns the property value for the property name. Returns null if the
-     * property is not supported.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return the property value for the property name.
-     */
-    public Object getProperty(String propertyName)
-    {
-      Object result = null;
-      if (propertyName.equals(PROPERTY_CMDOCUMENT))
-      {
-        result = getCMDocument();
-      }
-      else if (propertyName.equals(PROPERTY_DOCUMENTATION))
-      {
-        result = getDocumentation();
-      }
-      else if (propertyName.equals(PROPERTY_USES_LOCAL_ELEMENT_DECLARATIONS))
-      {
-        result = Boolean.TRUE;
-      }
-      else if (propertyName.equals(PROPERTY_IS_NAME_SPACE_AWARE))
-      {
-        result = Boolean.TRUE;
-      }
-      else if (propertyName.equals(PROPERTY_NS_PREFIX_QUALIFICATION))
-      {
-        result = getNSPrefixQualification();
-      }
-      else if (propertyName.equals(PROPERTY_NILLABLE))
-      {
-        result = isNillable() ? xsiDocument.nilAttribute : null;
-      }
-      else if (propertyName.equals(PROPERTY_MOF_NOTIFIER))
-      {
-        result = getKey();
-      }
-      else if (propertyName.equals(PROPERTY_SPEC))
-      {
-        result = getSpec();
-      }
-      else
-      {
-        result = super.getProperty(propertyName);
-        {
-          CMDocument cmDocument = getCMDocument();
-          if (cmDocument instanceof XSDSchemaAdapter)
-          {
-            AnnotationMap map = ((XSDSchemaAdapter) cmDocument).annotationMap;
-            if (map != null)
-            {
-              String spec = getSpec();
-              if (spec != null)
-              {
-                result = map.getProperty(getSpec(), propertyName);
-              }
-            }
-          }
-        }
-      }
-      return result;
-    }
-       
-
-
-    /*
-     * Returns the value of the form [attribute] which affects the target
-     * namespace of locally scoped features. The default value is null. All
-     * derived classes must override this method if they do not want the default
-     * value. @return the value of the form [attribute].
-     */
-    public Object getNSPrefixQualification()
-    {
-      return null;
-    }
-
-    /**
-     * Returns a general XPath expression for the node.
-     * 
-     * @return a general XPath expression for the node.
-     */
-    public String getSpec()
-    {
-      return "//" + getNodeName();
-    }
-  }
-  /**
-   * XSDSchemaAdapter implements CMDocument. A representation of the model
-   * object 'Schema'.
-   */
-  public static class XSDSchemaAdapter extends XSDBaseAdapter implements CMDocument
-  {
-    protected XSDSchema xsdSchema;
-    protected CMNamedNodeMapImpl namedNodeMap;
-    protected CMNamedNodeMapImpl entityNodeMap;
-    protected AnnotationMap annotationMap = new AnnotationMap();
-    protected Hashtable substitutionGroupTable;
-
-    /**
-     * Constructor.
-     * 
-     * @param xsdSchema -
-     *          the schema node.
-     */
-    public XSDSchemaAdapter(XSDSchema xsdSchema)
-    {
-      this.xsdSchema = xsdSchema;
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public Object getKey()
-    {
-      return xsdSchema;
-    }
-
-    /**
-     * Returns the filename.
-     * 
-     * @return the filename.
-     */
-    public String getNodeName()
-    {
-      // See buildCMDocument() above.
-      return xsdSchema.getSchemaLocation();
-    }
-
-    /**
-     * Returns true if the property is supported for this class.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return true if the property is supported.
-     */
-    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) || super.supports(propertyName);
-    }
-
-    /**
-     * Returns true if a prefix is globally required for elements.
-     * 
-     * @param xsdSchema -
-     *          the corresponding schema node.
-     * @return true if a prefix is globally required for elements.
-     */
-    protected boolean isPrefixRequired(XSDSchema xsdSchema)
-    {
-      boolean result = true;
-      if (xsdSchema.isSetElementFormDefault())
-        result = !(xsdSchema.getElementFormDefault().getValue() == XSDForm.QUALIFIED);
-      return result;
-    }
-
-    /**
-     * Returns the property value for the property name. Returns null if the
-     * property is not supported.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return the property value for the property name.
-     */
-    public Object getProperty(String propertyName)
-    {
-      Object result = null;
-      if (propertyName.equals(PROPERTY_TARGET_NAMESPACE_URI))
-      {
-        result = xsdSchema.getTargetNamespace();
-      }
-      else if (propertyName.equals(PROPERTY_IMPORTED_NAMESPACE_INFO))
-      {
-        List list = new Vector();
-        getImportedNamespaceInfo(xsdSchema, list);
-        result = list;
-      }
-      else if (propertyName.equals(PROPERTY_NAMESPACE_INFO))
-      {
-        List list = new Vector();
-        NamespaceInfo info = new NamespaceInfo();
-        info.uri = xsdSchema.getTargetNamespace();
-        info.prefix = getPrefix(xsdSchema, info.uri);
-        info.locationHint = null; // note that this locationHint info is null
-                                  // for the root xsd file
-        info.isPrefixRequired = isPrefixRequired(xsdSchema);
-        list.add(info);
-        getImportedNamespaceInfo(xsdSchema, list);
-        result = list;
-      }
-      else if (propertyName.equals(PROPERTY_ELEMENT_FORM_DEFAULT))
-      {
-        result = xsdSchema.getElementFormDefault().getName();
-      }
-      else if (propertyName.equals(PROPERTY_ANNOTATION_MAP))
-      {
-        result = annotationMap;
-      }
-      else if (propertyName.equals("allElements"))
-      {
-        result = getAllElements();
-      }  
-      else if (propertyName.startsWith("getElementForType#"))
-      {
-        int index = propertyName.indexOf("#");
-        String typeName = propertyName.substring(index + 1, propertyName.length());
-        //
-        //
-        XSDTypeDefinition td = xsdSchema.resolveTypeDefinition(typeName);
-        if (td != null)
-        {
-          LocalElementVisitor localElementVisitor = new LocalElementVisitor();
-          localElementVisitor.visitTypeDefinition(td);
-          result = localElementVisitor.getCMNamedNodeMap();
-        }
-      }
-      else
-      {
-        result = super.getProperty(propertyName);
-      }
-      return result;
-    }
-
-    /**
-     * Gather information on namespaces used in external references.
-     * 
-     * @param theXSDSchema -
-     *          the corresponding schema node
-     * @param list -
-     *          the list of imported namespaces.
-     */
-    public void getImportedNamespaceInfo(XSDSchema theXSDSchema, List list)
-    {
-      for (Iterator iterator = theXSDSchema.getContents().iterator(); iterator.hasNext();)
-      {
-        XSDSchemaContent content = (XSDSchemaContent) iterator.next();
-        if (content instanceof XSDImport)
-        {
-          XSDImport xImport = (XSDImport) content;
-          XSDSchema importedXSDSchema = xImport.getResolvedSchema();
-          NamespaceInfo info = new NamespaceInfo();
-          info.uri = xImport.getNamespace();
-          info.prefix = getPrefix(importedXSDSchema, info.uri);
-          info.locationHint = xImport.getSchemaLocation();
-          if (importedXSDSchema != null)
-          {
-            info.isPrefixRequired = isPrefixRequired(importedXSDSchema);
-          }
-          list.add(info);
-        }
-      }
-    }
-
-    /**
-     * Returns set of named (top-level) element declarations for this schema
-     * node.
-     * 
-     * @return a set of named (top-level) element declarations.
-     */
-    public CMNamedNodeMap getElements()
-    {
-      if (namedNodeMap == null)
-      {
-        namedNodeMap = new CMNamedNodeMapImpl();
-        
-        // Note that if we call xsdSchema.getElementDeclarations()
-        // we get 'more' elements than we really want since we also
-        // get 'imported' elements.  Below we test to ensure the elements
-        // actually have the same target namespace as the schema.
-        String targetNamespace = xsdSchema.getTargetNamespace();
-        for (Iterator i = xsdSchema.getElementDeclarations().iterator(); i.hasNext();)
-        {
-          XSDElementDeclaration ed = (XSDElementDeclaration) i.next();
-          if (targetNamespace != null ? targetNamespace.equals(ed.getTargetNamespace()) : ed.getTargetNamespace() == null)
-          {
-            XSDElementDeclarationAdapter adapter = (XSDElementDeclarationAdapter) getAdapter(ed);
-            namedNodeMap.getHashtable().put(adapter.getNodeName(), adapter);
-          }
-        }
-      }
-      return namedNodeMap;
-    }
-
-    /**
-     * Returns the built-in entity declarations.
-     * 
-     * @return the built-in entity declarations.
-     */
-    public CMNamedNodeMap getEntities()
-    {
-      if (entityNodeMap == null)
-      {
-        entityNodeMap = new CMNamedNodeMapImpl();
-        // add the built in entity declarations
-        entityNodeMap.getHashtable().put("amp", new CMEntityDeclarationImpl("amp", "&"));
-        entityNodeMap.getHashtable().put("lt", new CMEntityDeclarationImpl("lt", "<"));
-        entityNodeMap.getHashtable().put("gt", new CMEntityDeclarationImpl("gt", ">"));
-        entityNodeMap.getHashtable().put("quot", new CMEntityDeclarationImpl("quot", "\""));
-        entityNodeMap.getHashtable().put("apos", new CMEntityDeclarationImpl("apos", "'"));
-      }
-      return entityNodeMap;
-    }
-
-    /**
-     * Returns the type of the node. The types are defined in CMNode class
-     * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-     * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-     * DOCUMENTATION).
-     * 
-     * @return the type of this node.
-     */
-    public int getNodeType()
-    {
-      return DOCUMENT;
-    }
-
-    /*
-     * Returns null. !!! Why are we not implementing this???? @return null.
-     */
-    public CMNamespace getNamespace()
-    {
-      return null;
-    }
-
-    /**
-     * Returns this.
-     * 
-     * @return this.
-     */
-    public CMDocument getCMDocument()
-    {
-      return this;
-    }
-    
-    public CMNamedNodeMap getAllElements()
-    {
-      CMNamedNodeMapImpl map = new CMNamedNodeMapImpl();
-      for (Iterator i = getElements().iterator(); i.hasNext(); )
-      {
-        CMElementDeclaration ed = (CMElementDeclaration)i.next();
-        map.put(ed);           
-        addLocalElementDefinitions(map, ed);              
-      }     
-      return map;
-    }
-    
-    protected void addLocalElementDefinitions(CMNamedNodeMapImpl map, CMElementDeclaration parentElementDeclaration)
-    {
-      CMNamedNodeMap localElementMap = parentElementDeclaration.getLocalElements();
-      for (Iterator i = localElementMap.iterator(); i.hasNext(); )
-      {
-        CMElementDeclaration ed = (CMElementDeclaration)i.next();
-        if (map.getNamedItem(ed.getNodeName()) == null)
-        {  
-          map.put(ed);        
-          addLocalElementDefinitions(map, ed);
-        }  
-      }               
-    }
-  }
-  /**
-   * XSDAttributeUseAdapter implements CMAttributeDeclaration. A representation
-   * of the model object 'Attribute Use'.
-   */
-  public static class XSDAttributeUseAdapter extends XSDBaseAdapter implements CMAttributeDeclaration
-  {
-    // provides access to the XML Schema node
-    protected XSDAttributeUse xsdAttributeUse;
-    // provides access to the type of the attribute
-    protected CMDataType dataType = new DataTypeImpl();
-
-    /**
-     * Constructor.
-     * 
-     * @param xsdAttributeUse -
-     *          the XML Schema node.
-     */
-    public XSDAttributeUseAdapter(XSDAttributeUse xsdAttributeUse)
-    {
-      this.xsdAttributeUse = xsdAttributeUse;
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public Object getKey()
-    {
-      return xsdAttributeUse;
-    }
-
-    /**
-     * Returns a general XPath expression for the node.
-     * 
-     * @return a general XPath expression for the node.
-     */
-    public String getSpec()
-    {
-      return "//@" + getAttrName();
-    }
-
-    /**
-     * Returns the type of the node. The types are defined in CMNode class
-     * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-     * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-     * DOCUMENTATION).
-     * 
-     * @return the type of this node.
-     */
-    public int getNodeType()
-    {
-      return ATTRIBUTE_DECLARATION;
-    }
-
-    /**
-     * Returns the name of the node. Similar to getAttrName().
-     * 
-     * @return the name of the node.
-     */
-    public String getNodeName()
-    {
-      return getAttrName();
-    }
-
-    /**
-     * getEnumAttr method
-     * 
-     * @return java.util.Enumeration
-     * @deprecated -- to be replaced in future with additional CMDataType
-     *             methods (currently found on CMDataTypeHelper)
-     */
-    public Enumeration getEnumAttr()
-    {
-      return Collections.enumeration(Collections.EMPTY_LIST);
-    }
-
-    /**
-     * Returns the name of this attribute. Similar to getNodeName().
-     * 
-     * @return the name of this attribute.
-     */
-    public String getAttrName()
-    {
-      return xsdAttributeUse.getAttributeDeclaration().getName();
-    }
-
-    /**
-     * Returns the type of the attribute.
-     * 
-     * @return the type of the attribute.
-     */
-    public CMDataType getAttrType()
-    {
-      return dataType;
-    }
-
-    /**
-     * Returns the value of the default or fixed constraint.
-     * 
-     * @return the value of the default or fixed constraint.
-     */
-    public String getDefaultValue()
-    {
-      return dataType.getImpliedValue();
-    }
-
-    /**
-     * Returns the usage constraint for this attribute. The usages are defined
-     * in CMAttributeDeclaration class (OPTIONAL, REQUIRED, FIXED or
-     * PROHIBITED).
-     * 
-     * @return the usage constraint for this attribute.
-     */
-    public int getUsage()
-    {
-      int useKind = OPTIONAL;
-      switch (xsdAttributeUse.getUse().getValue())
-      {
-        case XSDAttributeUseCategory.OPTIONAL : {
-          useKind = OPTIONAL;
-          break;
-        }
-        case XSDAttributeUseCategory.PROHIBITED : {
-          useKind = PROHIBITED;
-          break;
-        }
-        case XSDAttributeUseCategory.REQUIRED : {
-          useKind = REQUIRED;
-          break;
-        }
-      }
-      return useKind;
-    }
-
-    /*
-     * Returns the value of the form [attribute] which affects the target
-     * namespace of locally scoped features. If the form is not set on this
-     * attribute, then see if there is a globally defined default. @return the
-     * value of the form [attribute].
-     */
-    public Object getNSPrefixQualification()
-    {
-      String form = null;
-      if (xsdAttributeUse.getContent() != xsdAttributeUse.getAttributeDeclaration())
-      {
-      	form =  "qualified";
-      }	
-      else if (xsdAttributeUse.getContent().isSetForm())
-      {
-        form = xsdAttributeUse.getContent().getForm().getName();
-      }
-      else
-      {
-        XSDSchema schema = xsdAttributeUse.getSchema();
-        if (schema != null)
-          form = schema.getAttributeFormDefault().getName();
-      }
-      return form;
-    }
-
-    /**
-     * Return a list of documentation elements.
-     * 
-     * @return a list of documentation elements.
-     */
-    protected CMNodeList getDocumentation()
-    {
-      XSDAnnotation annotation = xsdAttributeUse.getAttributeDeclaration().getAnnotation();
-      return getDocumentations(annotation);
-    }
-
-    /**
-     * Returns the cmdocument that is the owner of this cmnode.
-     * 
-     * @return the cmdocument corresponding to this cmnode.
-     */
-    public CMDocument getCMDocument()
-    {
-      return (CMDocument) getAdapter(xsdAttributeUse.getSchema());
-    }
-    /**
-     * XSDAttributeUseAdapter.DataTypeImpl An inner class to hold type
-     * information for this attribute.
-     */
-    public class DataTypeImpl implements CMDataType
-    {
-      /**
-       * Returns the type of the node. The types are defined in CMNode class
-       * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-       * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-       * DOCUMENTATION).
-       * 
-       * @return the type of this node.
-       */
-      public int getNodeType()
-      {
-        return CMNode.DATA_TYPE;
-      }
-
-      /**
-       * Returns the name of the attribute type. Same as getDataTypeName().
-       * 
-       * @return the name of the attribute type.
-       */
-      public String getNodeName()
-      {
-        return getDataTypeName();
-      }
-
-      /**
-       * Returns false. This class does not support any properties.
-       * 
-       * @param propertyName -
-       *          name of a property
-       * @return false.
-       */
-      public boolean supports(String propertyName)
-      {
-        return false;
-      }
-
-      /**
-       * Returns null. This class does not support any properties.
-       * 
-       * @param propertyName -
-       *          name of a property
-       * @return null.
-       */
-      public Object getProperty(String propertyName)
-      {
-        return null;
-      }
-
-      /**
-       * Returns the name of the attribute type. Same as getNodeName().
-       * 
-       * @return the name of the attribute type.
-       */
-      public String getDataTypeName()
-      {
-        XSDSimpleTypeDefinition sc = xsdAttributeUse.getAttributeDeclaration().getTypeDefinition();
-        String typeName = sc.getName();
-        return typeName != null ? typeName : "string";
-      }
-
-      /**
-       * Returns the kind of constraint: none, default or fixed. The kinds are
-       * defined in CMDataType class (IMPLIED_VALUE_NONE, IMPLIED_VALUE_FIXED or
-       * IMPLIED_VALUE_DEFAULT).
-       * 
-       * @return the kind of constraint: none, default or fixed.
-       */
-      public int getImpliedValueKind()
-      {
-        int result = IMPLIED_VALUE_NONE;
-        if (xsdAttributeUse.isSetConstraint())
-        {
-          if (xsdAttributeUse.getConstraint().getValue() == XSDConstraint.DEFAULT)
-            result = IMPLIED_VALUE_DEFAULT;
-          else if (xsdAttributeUse.getConstraint().getValue() == XSDConstraint.FIXED)
-            result = IMPLIED_VALUE_FIXED;
-        }
-        return result;
-      }
-
-      /**
-       * Returns the value of the default or fixed constraint.
-       * 
-       * @return the value of the default or fixed constraint.
-       */
-      public String getImpliedValue()
-      {
-        String result = null;
-        if (xsdAttributeUse.isSetConstraint())
-        {
-          result = xsdAttributeUse.getLexicalValue();
-        }
-        return result;
-      }
-
-      /**
-       * Returns the enumerated values for the attribute type.
-       * 
-       * @return the enumerated values for the attribute type.
-       */
-      public String[] getEnumeratedValues()
-      {
-        return getEnumeratedValuesForType(getXSDType());
-      }
-
-      /**
-       * Generate a valid value for the attribute based on its type.
-       * 
-       * @return a valid value for the attribute based on its type.
-       */
-      public String generateInstanceValue()
-      {
-        XSDAttributeDeclaration attr = xsdAttributeUse.getAttributeDeclaration();
-        return XSDTypeUtil.getInstanceValue(attr.getResolvedAttributeDeclaration().getTypeDefinition());
-      }
-
-      /**
-       * Returns the corresponding XML Schema type definition.
-       * 
-       * @return the corresponding XML Schema type definition.
-       */
-      protected XSDTypeDefinition getXSDType()
-      {
-        XSDAttributeDeclaration attr = xsdAttributeUse.getAttributeDeclaration();
-        return attr.getResolvedAttributeDeclaration().getTypeDefinition();
-      }
-    }
-  }
-  /**
-   * ElementDeclarationBaseImpl implements CMElementDeclaration. This is the
-   * base class for XSDElementDeclaration and DerivedElementDeclarationImpl.
-   * 
-   * Abstract methods in this class are: public abstract Object getKey(); public
-   * abstract Object getNSPrefixQualification(); public abstract
-   * XSDElementDeclaration getXSDElementDeclaration(); public abstract
-   * XSDTypeDefinition getXSDType(); public abstract List getXSITypes(); public
-   * abstract CMElementDeclaration getDerivedElementDeclaration(String
-   * uriQualifiedTypeName); public abstract CMNode getDefinition(); public
-   * abstract String getDefinitionInfo(); public abstract CMNodeListImpl
-   * getSubstitutionGroup();
-   */
-  public static abstract class ElementDeclarationBaseImpl extends XSDBaseAdapter implements CMElementDeclaration
-  {
-    protected CMDataType dataType = new DataTypeImpl();
-    protected CMNamedNodeMap namedNodeMap;
-
-    /**
-     * Returns corresponding XML Schema element declaration.
-     * 
-     * @return corresponding XML Schema element declaration.
-     */
-    protected abstract XSDElementDeclaration getXSDElementDeclaration();
-
-    /**
-     * Returns corresponding XML Schema element declaration.
-     * 
-     * @return corresponding XML Schema element declaration.
-     */
-    protected abstract XSDElementDeclaration getResolvedXSDElementDeclaration();
-
-    /**
-     * Returns the type of the node. The types are defined in CMNode class
-     * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-     * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-     * DOCUMENTATION).
-     * 
-     * @return the type of this node.
-     */
-    public int getNodeType()
-    {
-      return ELEMENT_DECLARATION;
-    }
-
-    /**
-     * Returns the name of the node. The same as getElementName().
-     * 
-     * @return the name of the node.
-     */
-    public String getNodeName()
-    {
-      return getElementName();
-    }
-
-    /**
-     * Returns the name of this element. The same as getNodeName().
-     * 
-     * @return the name of this element.
-     */
-    public String getElementName()
-    {
-      String result = getResolvedXSDElementDeclaration().getName();
-      return result != null ? result : "";
-    }
-
-    /**
-     * Returns true if the property is supported for this class.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return true if the property is supported.
-     */
-    public boolean supports(String propertyName)
-    {
-      return propertyName.equals(PROPERTY_XSITYPES) || propertyName.equals(PROPERTY_DERIVED_ELEMENT_DECLARATION) || propertyName.equals(PROPERTY_SUBSTITUTION_GROUP)
-          || propertyName.equals(PROPERTY_ABSTRACT) || super.supports(propertyName);
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public abstract Object getKey();
-
-    /**
-     * Returns the set of attributes defined for this element.
-     * 
-     * @return the set of attributes defined for this element.
-     */
-    public CMNamedNodeMap getAttributes()
-    {
-      CMNamedNodeMapImpl map = new CMNamedNodeMapImpl();
-      XSDTypeDefinition td = getXSDType();
-      getAttributes(map, td);
-      addXSITypeAttribute(map);
-      return map;
-    }
-
-    /**
-     * Gather the set of attributes defined for this element.
-     * 
-     * @param map -
-     *          used for returning the set of attributes.
-     * @param xsdTypeDefinition -
-     *          the type definition for this element.
-     */
-    public void getAttributes(CMNamedNodeMapImpl map, XSDTypeDefinition xsdTypeDefinition)
-    {
-      if (xsdTypeDefinition instanceof XSDComplexTypeDefinition)
-      {
-        XSDComplexTypeDefinition ctd = (XSDComplexTypeDefinition) xsdTypeDefinition;
-        for (Iterator i = ctd.getAttributeUses().iterator(); i.hasNext();)
-        {
-          XSDAttributeUse xsdAttributeUse = (XSDAttributeUse) i.next();
-          XSDAttributeUseAdapter adapter = (XSDAttributeUseAdapter) getAdapter(xsdAttributeUse);
-          if (adapter != null && adapter.getNodeName() != null)
-          {
-            map.getHashtable().put(adapter.getNodeName(), adapter);
-          }
-        }
-      }
-    }
-
-    /**
-     * Returns the content for this element.
-     * 
-     * @return the content for this element.
-     */
-    public CMContent getContent()
-    {
-      CMContent result = null;
-      XSDTypeDefinition td = getXSDType();
-      if (td instanceof XSDComplexTypeDefinition)
-      {
-        DerivedChildVisitor dcv = new DerivedChildVisitor(td);
-        dcv.visitTypeDefinition(td);
-        CMNodeList nodeList = dcv.getChildNodeList();
-        if (nodeList.getLength() > 1)
-        {
-          result = new CMGroupImpl(nodeList, CMGroup.SEQUENCE);
-        }
-        else if (nodeList.getLength() > 0)
-        {
-          result = (CMContent) nodeList.item(0);
-        }
-      }
-      return result;
-    }
-
-    /**
-     * Returns the content type of this element. The content type is defined in
-     * CMElementDeclaration (ANY, EMPTY, ELEMENT, MIXED, PCDATA or CDATA).
-     * 
-     * @return the content type of this element.
-     */
-    public int getContentType()
-    {
-      int contentType = EMPTY;
-      XSDTypeDefinition td = getXSDType();
-      if (td instanceof XSDSimpleTypeDefinition)
-      {
-        String typeName = td.getName();
-        if (typeName != null && typeName.equals("anyType"))
-        {
-          contentType = ANY;
-        }
-        else
-        {
-          contentType = PCDATA;
-        }
-      }
-      else if (td instanceof XSDComplexTypeDefinition)
-      {
-        XSDContentTypeCategory category = ((XSDComplexTypeDefinition) td).getContentTypeCategory();
-        if (category != null)
-        {
-          switch (category.getValue())
-          {
-            case XSDContentTypeCategory.ELEMENT_ONLY :
-              contentType = ELEMENT;
-              break;
-            case XSDContentTypeCategory.EMPTY :
-              contentType = EMPTY;
-              break;
-            case XSDContentTypeCategory.MIXED :
-              contentType = MIXED;
-              break;
-            case XSDContentTypeCategory.SIMPLE :
-              contentType = PCDATA;
-              break;
-          }
-        }
-      }
-      return contentType;
-    }
-
-    /**
-     * Returns the name of the element type.
-     * 
-     * @return the name of the element type.
-     */
-    public CMDataType getDataType()
-    {
-      CMDataType result = null;
-      int contentType = getContentType();
-      boolean hasDataType = contentType == PCDATA || contentType == MIXED;
-      if (hasDataType)
-      {
-        result = dataType;
-      }
-      return result;
-    }
-
-    /**
-     * Returns the value of 'Min Occurs' attribute. The default value is "1".
-     * 
-     * @return the value of the 'Min Occurs' attribute.
-     */
-    public int getMinOccur()
-    {
-      return getMinOccurs(getXSDElementDeclaration());
-    }
-
-    /**
-     * Returns the value of the 'Max Occurs' attribute. The default value is
-     * "1".
-     * 
-     * @return the value of the 'Max Occurs' attribute.
-     */
-    public int getMaxOccur()
-    {
-      return getMaxOccurs(getXSDElementDeclaration());
-    }
-
-    /**
-     * Returns the referenced element declaration if this is an element
-     * reference. Otherwise it returns itself.
-     * 
-     * @return an element declaration.
-     */
-    protected abstract CMNode getDefinition();
-
-    /**
-     * Returns a string indicating whether the element declaration is global or
-     * local. Returns null if this is an element reference.
-     * 
-     * @return a string indicating whether the element declaration is global or
-     *         local.
-     */
-    protected abstract String getDefinitionInfo();
-
-    /**
-     * Returns the elements local to this element declaration.
-     * 
-     * @return the elements local to this element declaration.
-     */
-    public CMNamedNodeMap getLocalElements()
-    {
-      if (namedNodeMap == null)
-      {
-        LocalElementVisitor localElementVisitor = new LocalElementVisitor();
-        localElementVisitor.visitTypeDefinition(getXSDType());
-        namedNodeMap = localElementVisitor.getCMNamedNodeMap();
-      }
-      return namedNodeMap;
-    }
-
-    /**
-     * Returns the property value for the property name. Returns null if the
-     * property is not supported.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return the property value for the property name.
-     */
-    public Object getProperty(String propertyName)
-    {
-      Object result = null;
-      if (propertyName.equals(PROPERTY_DEFINITION_INFO))
-      {
-        result = getDefinitionInfo();
-      }
-      else if (propertyName.equals(PROPERTY_DEFINITION))
-      {
-        result = getDefinition();
-      }
-      else if (propertyName.equals(PROPERTY_XSITYPES))
-      {
-        result = getXSITypes();
-      }
-      else if (propertyName.startsWith(PROPERTY_DERIVED_ELEMENT_DECLARATION))
-      {
-        int index = propertyName.indexOf("=");
-        if (index != -1)
-        {
-          String uriQualifiedTypeName = propertyName.substring(index + 1);
-          result = getDerivedElementDeclaration(uriQualifiedTypeName);
-        }
-      }
-      else if (propertyName.equals(PROPERTY_SUBSTITUTION_GROUP))
-      {
-        return getSubstitutionGroup();
-      }
-      else if (propertyName.equals(PROPERTY_ABSTRACT))
-      {
-        return getAbstract();
-      }
-      else
-      {
-        result = super.getProperty(propertyName);
-      }
-      return result;
-    }
-
-    /**
-     * Returns the value of the 'Nillable' attribute. This represents the
-     * nillable infoset property. The default value is false.
-     * 
-     * @return the value of the 'Nillable' attribute.
-     */
-    public boolean isNillable()
-    {
-      if (getXSDElementDeclaration().isSetNillable())
-        return getXSDElementDeclaration().isNillable();
-      else
-        return false;
-    }
-
-    /**
-     * Returns whether the element is 'Abstract'.
-     * 
-     * @return true if the element is 'Abstract'.
-     */
-    public Boolean getAbstract()
-    {
-      boolean result = getResolvedXSDElementDeclaration().isAbstract();
-      // TODO... how do we handle elements with abstract type's ?
-      return result ? Boolean.TRUE : Boolean.FALSE;
-    }
-
-    /**
-     * Returns a list of documentation elements.
-     * 
-     * @return a list of documentation elements.
-     */
-    protected CMNodeList getDocumentation()
-    {
-      XSDAnnotation annotation = getXSDElementDeclaration().getAnnotation();
-      return getDocumentations(annotation);
-    }
-
-    /**
-     * Returns the corresponding XML Schema type definition.
-     * 
-     * @return the corresponding XML Schema type definition.
-     */
-    protected abstract XSDTypeDefinition getXSDType();
-
-    /**
-     * Returns a list of type names.
-     * 
-     * @return a list of type names.
-     */
-    protected abstract List getXSITypes();
-
-    /**
-     * Return the element declaration corresponding to the given uri qualified
-     * type name.
-     * 
-     * @param uriQualifiedTypeName -
-     *          a uri qualified type name
-     * @return corresponding element declaration.
-     */
-    protected abstract CMElementDeclaration getDerivedElementDeclaration(String uriQualifiedTypeName);
-
-    /**
-     * Returns a list of documentation elements.
-     * 
-     * @return a list of documentation elements.
-     */
-    protected void addXSITypeAttribute(CMNamedNodeMapImpl map)
-    {
-      List list = getXSITypes();
-      int listSize = list.size();
-      if (listSize > 1)
-      {
-        CMDataType dataType = new CMDataTypeImpl("typeNames", (String) null);
-        CMAttributeDeclarationImpl attribute = new CMAttributeDeclarationImpl("type", CMAttributeDeclaration.OPTIONAL, dataType);
-        attribute.setCMDocument(xsiDocument);
-        attribute.setPrefixQualification(true);
-        attribute.setXSITypes(list);
-        map.getHashtable().put(attribute.getNodeName(), attribute);
-      }
-    }
-
-    /**
-     * Returns the cmdocument that is the owner of this cmnode.
-     * 
-     * @return the cmdocument corresponding to this cmnode.
-     */
-    public CMDocument getCMDocument()
-    {      
-      XSDSchema schema = getResolvedXSDElementDeclaration().getSchema();
-      if (schema == null)
-        return null;
-      else  
-        return (CMDocument) getAdapter(schema);
-    }
-
-    /**
-     * Returns the substitution group for this element. The group consists of:
-     * 1. the element declaration itself 2. and any element declaration that has
-     * a {substitution group affiliation} in the group
-     * 
-     * @return the substitution group for this element.
-     */
-    protected abstract CMNodeListImpl getSubstitutionGroup();
-    /*
-     * XSDElementDeclarationAdapter.DataTypeImpl An inner class to hold type
-     * information for this element.
-     */
-    public class DataTypeImpl implements CMDataType
-    {
-      /**
-       * Returns the type of the node. The types are defined in CMNode class
-       * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-       * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-       * DOCUMENTATION).
-       * 
-       * @return the type of this node.
-       */
-      public int getNodeType()
-      {
-        return CMNode.DATA_TYPE;
-      }
-
-      /**
-       * Returns the name of the element type. Same as getDataTypeName().
-       * 
-       * @return the name of the element type.
-       */
-      public String getNodeName()
-      {
-        return getDataTypeName();
-      }
-
-      /**
-       * Returns false. This class does not support any properties.
-       * 
-       * @param propertyName -
-       *          name of a property
-       * @return false.
-       */
-      public boolean supports(String propertyName)
-      {
-        return false;
-      }
-
-      /**
-       * Returns null. This class does not support any properties.
-       * 
-       * @param propertyName -
-       *          name of a property
-       * @return null.
-       */
-      public Object getProperty(String propertyName)
-      {
-        return null;
-      }
-
-      /**
-       * Returns the name of the element type. Same as getNodeName().
-       * 
-       * @return the name of the element type.
-       */
-      public String getDataTypeName()
-      {
-        String typeName = null;
-        XSDSimpleTypeDefinition std = getXSDType().getSimpleType();
-        if (std != null)
-          typeName = std.getName();
-        return typeName != null ? typeName : "string";
-      }
-
-      /**
-       * Returns the kind of constraint: none, default or fixed. The kinds are
-       * defined in CMDataType class (IMPLIED_VALUE_NONE, IMPLIED_VALUE_FIXED or
-       * IMPLIED_VALUE_DEFAULT).
-       * 
-       * @return the kind of constraint: none, default or fixed.
-       */
-      public int getImpliedValueKind()
-      {
-        int result = IMPLIED_VALUE_NONE;
-        if (getXSDElementDeclaration().isSetConstraint())
-        {
-          if (getXSDElementDeclaration().getConstraint().getValue() == XSDConstraint.DEFAULT)
-            result = IMPLIED_VALUE_DEFAULT;
-          else if (getXSDElementDeclaration().getConstraint().getValue() == XSDConstraint.FIXED)
-            result = IMPLIED_VALUE_FIXED;
-        }
-        return result;
-      }
-
-      /**
-       * Returns the value of the default or fixed constraint.
-       * 
-       * @return the value of the default or fixed constraint.
-       */
-      public String getImpliedValue()
-      {
-        String result = null;
-        if (getXSDElementDeclaration().isSetConstraint())
-        {
-          result = getXSDElementDeclaration().getLexicalValue();
-        }
-        return result;
-      }
-
-      /**
-       * Returns the enumerated values for the attribute type.
-       * 
-       * @return the enumerated values for the attribute type.
-       */
-      public String[] getEnumeratedValues()
-      {
-        return getEnumeratedValuesForType(getXSDType());
-      }
-
-      public String generateInstanceValue()
-      {
-        return XSDTypeUtil.getInstanceValue(getXSDType());
-      }
-
-      /**
-       * Returns the cmdocument that is the owner of this cmnode.
-       * 
-       * @return the cmdocument corresponding to this cmnode.
-       */
-      public CMDocument getCMDocument()
-      {
-        return (CMDocument) getAdapter(getXSDElementDeclaration().getSchema());
-      }
-    }
-  }
-  /**
-   * XSDElementDeclarationAdapter implements CMElementDeclaration. A
-   * representation of the model object 'Element Declaration'.
-   */
-  public static class XSDElementDeclarationAdapter extends ElementDeclarationBaseImpl
-  {
-    protected List derivedElementDeclarations = null;
-    protected List xsiTypes = null;
-    protected XSDElementDeclaration xsdElementDeclaration;
-    protected CMNodeListImpl substitutionGroup;
-
-    /**
-     * Constructor.
-     * 
-     * @param xsdElementDeclaration -
-     *          the XML Schema node.
-     */
-    public XSDElementDeclarationAdapter(XSDElementDeclaration xsdElementDeclaration)
-    {
-      this.xsdElementDeclaration = xsdElementDeclaration;
-    }
-
-    /**
-     * Returns corresponding XML Schema element declaration.
-     * 
-     * @return corresponding XML Schema element declaration.
-     */
-    protected XSDElementDeclaration getXSDElementDeclaration()
-    {
-      return xsdElementDeclaration;
-    }
-
-    /**
-     * Returns corresponding XML Schema element declaration.
-     * 
-     * @return corresponding XML Schema element declaration.
-     */
-    protected XSDElementDeclaration getResolvedXSDElementDeclaration()
-    {
-      return xsdElementDeclaration.getResolvedElementDeclaration();
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public Object getKey()
-    {
-      return xsdElementDeclaration;
-    }
-
-    /**
-     * Returns the referenced element declaration if this is an element
-     * reference. Otherwise it returns itself.
-     * 
-     * @return an element declaration.
-     */
-    public CMNode getDefinition()
-    {
-      return getAdapter(xsdElementDeclaration.getResolvedElementDeclaration());
-    }
-
-    /**
-     * Returns a string indicating whether the element declaration is global or
-     * local. Returns null if this is an element reference.
-     * 
-     * @return a string indicating whether the element declaration is global or
-     *         local.
-     */
-    protected String getDefinitionInfo()
-    {
-      if (xsdElementDeclaration.isElementDeclarationReference())
-        return null;
-      else if (xsdElementDeclaration.isGlobal())
-        return DEFINITION_INFO_GLOBAL;
-      else
-        return DEFINITION_INFO_LOCAL;
-    }
-
-    public Object getNSPrefixQualification()
-    {
-      String form = null;
-      if (xsdElementDeclaration.isElementDeclarationReference())
-      {
-        form = "qualified";
-      }
-      else
-      {
-        if (xsdElementDeclaration.isSetForm())
-        {
-          form = xsdElementDeclaration.getForm().getName();
-        }
-        else
-        {
-          XSDSchema schema = xsdElementDeclaration.getSchema();
-          if (schema != null)
-            form = schema.getElementFormDefault().getName();
-        }
-      }
-      return form;
-    }
-
-    /**
-     * Returns the corresponding XML Schema type definition.
-     * 
-     * @return the corresponding XML Schema type definition.
-     */
-    protected XSDTypeDefinition getXSDType()
-    {
-      return xsdElementDeclaration.getResolvedElementDeclaration().getTypeDefinition();
-    }
-
-    /**
-     * Returns a list of type names.
-     * 
-     * @return a list of type names.
-     */
-    protected List getXSITypes()
-    {
-      if (xsiTypes == null)
-      {
-        computeDerivedTypeInfo();
-      }
-      return xsiTypes;
-    }
-
-    protected void computeDerivedTypeInfo()
-    {
-      xsiTypes = new Vector();
-      derivedElementDeclarations = new Vector();
-      computeDerivedTypeInfoHelper(getXSDType(), xsiTypes, derivedElementDeclarations);
-    }
-
-    protected void computeDerivedTypeInfoHelper(XSDTypeDefinition type, List typeNameList, List edList)
-    {
-      if (type instanceof XSDComplexTypeDefinition)
-      {
-        List derivedTypes = findTypesDerivedFrom(type);
-        ArrayList inclusiveDerivedTypes = new ArrayList();
-        inclusiveDerivedTypes.add(type);
-        if ((derivedTypes != null) && (derivedTypes.size() > 0))
-        {
-          inclusiveDerivedTypes.addAll(derivedTypes);
-        }
-        for (Iterator i = inclusiveDerivedTypes.iterator(); i.hasNext();)
-        {
-          XSDTypeDefinition derivedType = (XSDTypeDefinition) i.next();
-          XSDSchema schema = derivedType.getSchema();
-          if (schema != null)
-          {
-            String uri = schema.getTargetNamespace();
-            String name = derivedType.getName();
-            if (name != null)
-            {
-              name = uri != null ? ("[" + uri + "]" + name) : name;
-              typeNameList.add(name);
-              DerivedElementDeclarationImpl ed = new DerivedElementDeclarationImpl(this, derivedType, name);
-              edList.add(ed);
-            }
-          }
-        }
-      }
-    }
-
-    /**
-     * Return the element declaration corresponding to the given uri qualified
-     * type name.
-     * 
-     * @param uriQualifiedTypeName -
-     *          a uri qualified type name
-     * @return corresponding element declaration.
-     */
-    protected CMElementDeclaration getDerivedElementDeclaration(String uriQualifiedTypeName)
-    {
-      CMElementDeclaration result = null;
-      if (derivedElementDeclarations == null)
-      {
-        computeDerivedTypeInfo();
-      }
-      for (Iterator i = derivedElementDeclarations.iterator(); i.hasNext();)
-      {
-        DerivedElementDeclarationImpl ed = (DerivedElementDeclarationImpl) i.next();
-        if ((ed != null) && (ed.uriQualifiedTypeName != null))
-        {
-          if (ed.uriQualifiedTypeName.equals(uriQualifiedTypeName))
-          {
-            result = ed;
-            break;
-          }
-        }
-      }
-      return result;
-    }
-
-    /**
-     * Returns the substitution group for this element. The group consists of:
-     * 1. the element declaration itself 2. and any element declaration that has
-     * a {substitution group affiliation} in the group
-     * 
-     * @return the substitution group for this element.
-     */
-    protected CMNodeListImpl getSubstitutionGroup()
-    {
-      if (substitutionGroup == null)
-      {
-        substitutionGroup = new CMNodeListImpl();
-        List sgroup = getResolvedXSDElementDeclaration().getSubstitutionGroup();
-        for (Iterator i = sgroup.iterator(); i.hasNext();)
-        {
-          XSDElementDeclaration ed = (XSDElementDeclaration) i.next();  
-          substitutionGroup.add(getAdapter(ed));
-        }
-      }
-      return substitutionGroup;
-    }
-  }
-  /**
-   * DerivedElementDeclarationImpl extends ElementDeclarationBaseImpl
-   *  
-   */
-  public static class DerivedElementDeclarationImpl extends ElementDeclarationBaseImpl
-  {
-    protected XSDElementDeclarationAdapter owner;
-    protected XSDTypeDefinition xsdType;
-    public String uriQualifiedTypeName;
-
-    /**
-     * Constructor.
-     * 
-     * @param owner -
-     * @param xsdType -
-     * @param uriQualifiedTypeName -
-     */
-    public DerivedElementDeclarationImpl(XSDElementDeclarationAdapter owner, XSDTypeDefinition xsdType, String uriQualifiedTypeName)
-    {
-      this.owner = owner;
-      this.xsdType = xsdType;
-      this.uriQualifiedTypeName = uriQualifiedTypeName;
-    }
-
-    /**
-     * Returns corresponding XML Schema element declaration.
-     * 
-     * @return corresponding XML Schema element declaration.
-     */
-    protected XSDElementDeclaration getXSDElementDeclaration()
-    {
-      return (XSDElementDeclaration) owner.getKey();
-    }
-
-    /**
-     * Returns corresponding XML Schema element declaration.
-     * 
-     * @return corresponding XML Schema element declaration.
-     */
-    protected XSDElementDeclaration getResolvedXSDElementDeclaration()
-    {
-      return ((XSDElementDeclaration) owner.getKey()).getResolvedElementDeclaration();
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public Object getKey()
-    {
-      return owner.getKey();
-    }
-
-    /**
-     * Returns the corresponding XML Schema type definition.
-     * 
-     * @return the corresponding XML Schema type definition.
-     */
-    protected XSDTypeDefinition getXSDType()
-    {
-      return xsdType;
-    }
-
-    /**
-     * Returns a list of type names.
-     * 
-     * @return a list of type names.
-     */
-    protected List getXSITypes()
-    {
-      return owner.getXSITypes();
-    }
-
-    /**
-     * Return the element declaration corresponding to the given uri qualified
-     * type name.
-     * 
-     * @param uriQualifiedTypeName -
-     *          a uri qualified type name
-     * @return corresponding element declaration.
-     */
-    protected CMElementDeclaration getDerivedElementDeclaration(String uriQualifiedTypeName)
-    {
-      return owner.getDerivedElementDeclaration(uriQualifiedTypeName);
-    }
-
-    /**
-     * Returns the referenced element declaration if this is an element
-     * reference. Otherwise it returns itself.
-     * 
-     * @return an element declaration.
-     */
-    protected CMNode getDefinition()
-    {
-      return this;
-    }
-
-    /**
-     * Returns a string indicating whether the element declaration is global or
-     * local. Returns null if this is an element reference.
-     * 
-     * @return a string indicating whether the element declaration is global or
-     *         local.
-     */
-    protected String getDefinitionInfo()
-    {
-      return owner.getDefinitionInfo();
-    }
-
-    /*
-     * Returns the value of the form [attribute] which affects the target
-     * namespace of locally scoped features. @return the value of the form
-     * [attribute].
-     */
-    public Object getNSPrefixQualification()
-    {
-      return owner.getNSPrefixQualification();
-    }
-
-    /**
-     * Returns the substitution group for this element. The group consists of:
-     * 1. the element declaration itself 2. and any element declaration that has
-     * a {substitution group affiliation} in the group
-     * 
-     * @return the substitution group for this element.
-     */
-    protected CMNodeListImpl getSubstitutionGroup()
-    {
-      return owner.getSubstitutionGroup();
-    }
-  }
-  /**
-   * XSDWildcardAdapter
-   */
-  public static class XSDWildcardAdapter extends XSDBaseAdapter implements CMAnyElement
-  {
-    protected XSDWildcard xsdWildcard;
-
-    public XSDWildcardAdapter(XSDWildcard xsdWildcard)
-    {
-      this.xsdWildcard = xsdWildcard;
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public Object getKey()
-    {
-      return xsdWildcard;
-    }
-
-    /**
-     * Returns the type of the node. The types are defined in CMNode class
-     * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-     * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-     * DOCUMENTATION).
-     * 
-     * @return the type of this node.
-     */
-    public int getNodeType()
-    {
-      return ANY_ELEMENT;
-    }
-
-    /**
-     * Returns the name of the node. The default value is an empty string value.
-     * All derived classes must override this method if they do not want the
-     * default value.
-     * 
-     * @return the name of the node.
-     */
-    public String getNodeName()
-    {
-      return "any";
-    }
-
-    public String getNamespaceURI()
-    {
-      String uri = xsdWildcard.getElement().getAttribute("namespace");
-      return (uri != null || uri.length() == 0) ? uri : "##any";
-    }
-
-    /**
-     * Returns the value of 'Min Occurs' attribute. The default value is "1".
-     * 
-     * @return the value of the 'Min Occurs' attribute.
-     */
-    public int getMinOccur()
-    {
-      return getMinOccurs(xsdWildcard);
-    }
-
-    /**
-     * Returns the value of the 'Max Occurs' attribute. The default value is
-     * "1".
-     * 
-     * @return the value of the 'Max Occurs' attribute.
-     */
-    public int getMaxOccur()
-    {
-      return getMaxOccurs(xsdWildcard);
-    }
-
-    /**
-     * Returns the cmdocument that is the owner of this cmnode.
-     * 
-     * @return the cmdocument corresponding to this cmnode.
-     */
-    public CMDocument getCMDocument()
-    {
-      return (CMDocument) getAdapter(xsdWildcard.getSchema());
-    }
-
-    /**
-     * Returns a list of documentation elements.
-     * 
-     * @return a list of documentation elements.
-     */
-    protected CMNodeList getDocumentation()
-    {
-      XSDAnnotation annotation = xsdWildcard.getAnnotation();
-      return getDocumentations(annotation);
-    }
-  }
-  /**
-   * XSDModelGroupAdapter
-   */
-  public static class XSDModelGroupAdapter extends XSDBaseAdapter implements CMGroup
-  {
-    protected XSDModelGroup xsdModelGroup;
-
-    public XSDModelGroupAdapter()
-    {
-    }
-
-    public XSDModelGroupAdapter(XSDModelGroup xsdModelGroup)
-    {
-      this.xsdModelGroup = xsdModelGroup;
-    }
-
-    /**
-     * Returns the type of the node. The types are defined in CMNode class
-     * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-     * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-     * DOCUMENTATION).
-     * 
-     * @return the type of this node.
-     */
-    public int getNodeType()
-    {
-      return GROUP;
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public Object getKey()
-    {
-      return xsdModelGroup;
-    }
-
-    /**
-     * Returns a list of the children of this group.
-     * 
-     * @return a list of the children of this group.
-     */
-    public CMNodeList getChildNodes()
-    {
-      CMNodeListImpl nodeList = new CMNodeListImpl();
-      if (xsdModelGroup != null)
-      {
-        for (Iterator i = xsdModelGroup.getParticles().iterator(); i.hasNext();)
-        {
-          XSDParticle particle = (XSDParticle) i.next();
-          XSDParticleContent content = particle.getContent();
-          CMNode adapter = getAdapter(content);
-          if (adapter != null)
-          {
-            nodeList.getList().add(adapter);
-          }
-        }
-      }
-      return nodeList;
-    }
-
-    /**
-     * Returns the name of the node. The default value is an empty string value.
-     * All derived classes must override this method if they do not want the
-     * default value.
-     * 
-     * @return the name of the node.
-     */
-    public String getNodeName()
-    {
-      CMDescriptionBuilder descriptionBuilder = new CMDescriptionBuilder();
-      return descriptionBuilder.buildDescription(this);
-    }
-
-    /**
-     * Returns the value of 'Min Occurs' attribute. The default value is "1".
-     * 
-     * @return the value of the 'Min Occurs' attribute.
-     */
-    public int getMinOccur()
-    {
-      return getMinOccurs(xsdModelGroup);
-    }
-
-    /**
-     * Returns the value of the 'Max Occurs' attribute. The default value is
-     * "1".
-     * 
-     * @return the value of the 'Max Occurs' attribute.
-     */
-    public int getMaxOccur()
-    {
-      return getMaxOccurs(xsdModelGroup);
-    }
-
-    /**
-     * Return operator of this group -- CHOICE, SEQUENCE or ALL value.
-     * 
-     * @return the operator of this group.
-     */
-    public int getOperator()
-    {
-      int result = 0;
-      //todo... handle ALONE case by checkig if child count == 1
-      if (xsdModelGroup != null)
-      {
-        switch (xsdModelGroup.getCompositor().getValue())
-        {
-          case XSDCompositor.CHOICE : {
-            result = CHOICE;
-            break;
-          }
-          case XSDCompositor.SEQUENCE : {
-            result = SEQUENCE;
-            break;
-          }
-          case XSDCompositor.ALL : {
-            result = ALL;
-            break;
-          }
-        }
-      }
-      return result;
-    }
-
-    /**
-     * Returns a list of documentation elements.
-     * 
-     * @return a list of documentation elements.
-     */
-    protected CMNodeList getDocumentation()
-    {
-      XSDAnnotation annotation = xsdModelGroup.getAnnotation();
-      return getDocumentations(annotation);
-    }
-
-    /**
-     * Returns the cmdocument that is the owner of this cmnode.
-     * 
-     * @return the cmdocument corresponding to this cmnode.
-     */
-    public CMDocument getCMDocument()
-    {
-      return (CMDocument) getAdapter(xsdModelGroup.getSchema());
-    }
-  }
-  /**
-   * XSDModelGroupDefinitionAdapter
-   */
-  public static class XSDModelGroupDefinitionAdapter extends XSDBaseAdapter implements CMGroup
-  {
-    protected XSDModelGroupDefinition xsdModelGroupDefinition;
-
-    public XSDModelGroupDefinitionAdapter(XSDModelGroupDefinition xsdModelGroupDefinition)
-    {
-      this.xsdModelGroupDefinition = xsdModelGroupDefinition;
-    }
-
-    /**
-     * Returns the type of the node. The types are defined in CMNode class
-     * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-     * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-     * DOCUMENTATION).
-     * 
-     * @return the type of this node.
-     */
-    public int getNodeType()
-    {
-      return GROUP;
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public Object getKey()
-    {
-      return xsdModelGroupDefinition;
-    }
-
-    /**
-     * Returns a list of the children of this group.
-     * 
-     * @return a list of the children of this group.
-     */
-    public CMNodeList getChildNodes()
-    {
-      CMNodeListImpl nodeList = new CMNodeListImpl();
-      XSDModelGroup modelGroup = xsdModelGroupDefinition.getResolvedModelGroupDefinition().getModelGroup();
-      if (modelGroup != null)
-      {
-        CMNode adapter = getAdapter(modelGroup);
-        nodeList.add(adapter);
-      }
-      return nodeList;
-    }
-
-    /**
-     * Returns the name of the node. The default value is an empty string value.
-     * All derived classes must override this method if they do not want the
-     * default value.
-     * 
-     * @return the name of the node.
-     */
-    public String getNodeName()
-    {
-      CMDescriptionBuilder descriptionBuilder = new CMDescriptionBuilder();
-      return descriptionBuilder.buildDescription(this);
-    }
-
-    /**
-     * Returns the value of 'Min Occurs' attribute. The default value is "1".
-     * 
-     * @return the value of the 'Min Occurs' attribute.
-     */
-    public int getMinOccur()
-    {
-      return getMinOccurs(xsdModelGroupDefinition);
-    }
-
-    /**
-     * Returns the value of the 'Max Occurs' attribute. The default value is
-     * "1".
-     * 
-     * @return the value of the 'Max Occurs' attribute.
-     */
-    public int getMaxOccur()
-    {
-      return getMaxOccurs(xsdModelGroupDefinition);
-    }
-
-    /**
-     * Return operator of this group -- CHOICE, SEQUENCE or ALL value.
-     * 
-     * @return the operator of this group.
-     */
-    public int getOperator()
-    {
-      return XSDCompositor.SEQUENCE;
-    }
-
-    /**
-     * Returns a list of documentation elements.
-     * 
-     * @return a list of documentation elements.
-     */
-    protected CMNodeList getDocumentation()
-    {
-      XSDAnnotation annotation = xsdModelGroupDefinition.getAnnotation();
-      return getDocumentations(annotation);
-    }
-
-    /**
-     * Returns the cmdocument that is the owner of this cmnode.
-     * 
-     * @return the cmdocument corresponding to this cmnode.
-     */
-    public CMDocument getCMDocument()
-    {
-      return (CMDocument) getAdapter(xsdModelGroupDefinition.getSchema());
-    }
-  }
-  /**
-   * DocumentationImpl implements CMDocumentation. A representation of the
-   * documentation element part of the 'User Information' feature. Working with
-   * the documentation element requires dropping down into the DOM model.
-   */
-  public static class DocumentationImpl implements CMDocumentation
-  {
-    protected Element documentation;
-
-    /**
-     * Constructor.
-     * 
-     * @param documentation -
-     *          a documentation element.
-     */
-    public DocumentationImpl(Element documentation)
-    {
-      this.documentation = documentation;
-    }
-
-    /**
-     * Returns the type of the node. The types are defined in CMNode class
-     * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-     * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-     * DOCUMENTATION).
-     * 
-     * @return the type of this node.
-     */
-    public int getNodeType()
-    {
-      return DOCUMENTATION;
-    }
-
-    /**
-     * Returns an empty string value.
-     * 
-     * @return an empty string value.
-     */
-    public String getNodeName()
-    {
-      return "";
-    }
-
-    /**
-     * Returns false. This class does not support any properties.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return false.
-     */
-    public boolean supports(String propertyName)
-    {
-      return false;
-    }
-
-    /**
-     * Returns null. This class does not support any properties.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return null.
-     */
-    public Object getProperty(String propertyName)
-    {
-      return null;
-    }
-
-    /**
-     * Returns the content of the documentation element.
-     * 
-     * @return the content of the documentation element.
-     */
-    public String getValue()
-    {
-      String content = "";
-      boolean contentFound = false;
-      NodeList nodes = documentation.getChildNodes();
-      for (int i = 0; i < nodes.getLength(); i++)
-      {
-        Node node = nodes.item(i);
-        if (node instanceof Text)
-        {
-          contentFound = true;
-          content += node.getNodeValue();
-        }
-      }
-      return contentFound ? content : null;
-    }
-
-    /**
-     * Returns the xml:lang attribute value of the documentation element.
-     * 
-     * @return the xml:lang attribute value of the documentation element.
-     */
-    public String getLanguage()
-    {
-      return documentation.hasAttributeNS(XSDConstants.XML_NAMESPACE_URI_1998, XML_LANG_ATTRIBUTE) ? documentation.getAttributeNS(XSDConstants.XML_NAMESPACE_URI_1998, XML_LANG_ATTRIBUTE) : null;
-    }
-
-    /**
-     * Returns the source attribute value of the documentation element.
-     * 
-     * @return the source attribute value of the documentation element.
-     */
-    public String getSource()
-    {
-      return documentation.hasAttributeNS(null, XSDConstants.SOURCE_ATTRIBUTE) ? documentation.getAttributeNS(null, XSDConstants.SOURCE_ATTRIBUTE) : null;
-    }
-  }
-  /**
-   * XSIDocument extends CMDocumentImpl. This class is used to hold those
-   * attributes that are for direct use in any XML documents. These attributes
-   * are in a different namespace, which has the namespace name
-   * http://www.w3.org/2001/XMLSchema-instance. Attributes in this namespace
-   * include: xsi:type xsi:nil xsi:schemaLocation xsi:noNamespaceSchemaLocation
-   */
-  public static class XSIDocument extends CMDocumentImpl
-  {
-    public CMAttributeDeclarationImpl nilAttribute;
-
-    /**
-     * Constructor. Creates the 'xsi:nil'
-     */
-    public XSIDocument()
-    {
-      super(XSDConstants.SCHEMA_INSTANCE_URI_2001);
-      // create the 'nill' attribute
-      String[] values = {"false", "true"};
-      nilAttribute = new CMAttributeDeclarationImpl("nil", CMAttributeDeclaration.REQUIRED, new CMDataTypeImpl("boolean", values));
-      nilAttribute.setPrefixQualification(true);
-      nilAttribute.setCMDocument(this);
-    }
-  }
-  /**
-   * Note this XSD model visitor differs from the XSD model visitor in
-   * org.eclipse.wst.xsd.editor plugin. In visitModelGroup method we call
-   * getParticles() instead of getContents(). This gathers all of the content of
-   * a derived type.
-   */
-  public static class XSDCMVisitor extends XSDVisitor
-  {
-    public void visitSimpleTypeDefinition(XSDSimpleTypeDefinition type)
-    {
-      XSDParticle ctd = type.getComplexType();
-      if (ctd != null)
-        visitParticle(ctd);
-    }
-
-    public void visitModelGroup(XSDModelGroup modelGroup)
-    {
-      if (modelGroup.getParticles() != null)
-      {
-        for (Iterator iterator = modelGroup.getParticles().iterator(); iterator.hasNext();)
-        {
-          XSDParticle particle = (XSDParticle) iterator.next();
-          visitParticle(particle);
-        }
-      }
-    }
-
-    public void visitModelGroupDefinition(XSDModelGroupDefinition modelGroupDef)
-    {
-      XSDModelGroup modelGroup = modelGroupDef.getResolvedModelGroupDefinition().getModelGroup();
-      if (modelGroup != null)
-      {
-        visitModelGroup(modelGroup);
-      }
-    }
-  }
-  /**
-   * A visitor class that walks the xsd model and computes the list of children
-   * that belong to the initially visited element type.
-   */
-  public static class DerivedChildVisitor extends XSDCMVisitor
-  {
-    protected CMNodeListImpl childNodeList = new CMNodeListImpl();
-    protected List baseTypeList = new Vector();
-    Object root;
-
-    DerivedChildVisitor(Object root)
-    {
-      this.root = root;
-    }
-
-    public CMNodeListImpl getChildNodeList()
-    {
-      return childNodeList;
-    }
-
-    public void visitWildcard(XSDWildcard wildcard)
-    {
-      childNodeList.getList().add(getAdapter(wildcard));
-    }
-
-    public void visitElementDeclaration(XSDElementDeclaration element)
-    {
-      childNodeList.getList().add(getAdapter(element));
-    }
-
-    public void visitModelGroup(XSDModelGroup modelGroup)
-    {
-      childNodeList.getList().add(getAdapter(modelGroup));
-    }
-
-    public void visitModelGroupDefinition(XSDModelGroupDefinition modelGroupDefinition)
-    {
-      childNodeList.getList().add(getAdapter(modelGroupDefinition));
-    }
-  }
-  /**
-   * A visitor class that gathers all of the elements within a type definition.
-   */
-  public static class LocalElementVisitor extends XSDCMVisitor
-  {
-    protected CMNamedNodeMapImpl namedNodeMap = new CMNamedNodeMapImpl();
-    protected List baseTypeList = new Vector();
-
-    public void visitElementDeclaration(XSDElementDeclaration element)
-    {
-      XSDElementDeclarationAdapter adapter = (XSDElementDeclarationAdapter) getAdapter(element);
-      namedNodeMap.getHashtable().put(adapter.getNodeName(), adapter);
-    }
-
-    public CMNamedNodeMap getCMNamedNodeMap()
-    {
-      return namedNodeMap;
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDTypeUtil.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDTypeUtil.java
deleted file mode 100644
index 3946868..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDTypeUtil.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-/**
- * Helper class to generate valid values for built-in simple types.
- */
-
-public class XSDTypeUtil
-{
-  protected static Map defaultValue = new HashMap();
-
-  public static void initialize()
-  {
-    defaultValue.put("anySimpleType", null);
-    defaultValue.put("anyType", null);
-    defaultValue.put("anyURI", "http://tempuri.org");
-    defaultValue.put("base64Binary", "0");
-    defaultValue.put("boolean", "true");
-    defaultValue.put("byte", "0");
-    defaultValue.put("date", "2001-01-01");
-    defaultValue.put("dateTime", "2001-12-31T12:00:00");
-    defaultValue.put("decimal", "0.0");
-    defaultValue.put("double", "0.0");
-    defaultValue.put("duration", "P1D");
-    defaultValue.put("ENTITY", "entity");
-    defaultValue.put("ENTITIES", "entities");
-    defaultValue.put("float", "0.0");
-    defaultValue.put("gDay", "---01");
-    defaultValue.put("gMonth", "--01--");
-    defaultValue.put("gMonthDay", "--01-01");
-    defaultValue.put("gYear", "2001");
-    defaultValue.put("gYearMonth", "2001-01");
-    defaultValue.put("hexBinary", "0F00");
-    defaultValue.put("ID", null);
-    defaultValue.put("IDREF", null);
-    defaultValue.put("IDREFS", null);
-    defaultValue.put("int", "0");
-    defaultValue.put("integer", "0");
-    defaultValue.put("language", "EN");
-    defaultValue.put("long", "0");
-    defaultValue.put("Name", "Name");
-    defaultValue.put("NCName", "NCName");
-    defaultValue.put("negativeInteger", "-1");
-    defaultValue.put("NMTOKEN", "NMTOKEN");
-    defaultValue.put("NMTOKENS", "NMTOKENS");
-    defaultValue.put("nonNegativeInteger", "0");
-    defaultValue.put("nonPositiveInteger", "0");
-    defaultValue.put("normalizedString", null);
-    defaultValue.put("NOTATION", "NOTATION");
-    defaultValue.put("positiveInteger", "1");
-    defaultValue.put("QName", "QName");
-    defaultValue.put("short", "0");
-    defaultValue.put("string", null);
-    defaultValue.put("time", "12:00:00");
-    defaultValue.put("token", "token");
-    defaultValue.put("unsignedByte", "0");
-    defaultValue.put("unsignedInt", "0");
-    defaultValue.put("unsignedLong", "0");
-    defaultValue.put("unsignedShort", "0");
-  }
-
-
-  /*
-   * Returns true if the type is built-in.
-   * @param type - an XSDTypeDefinition object.
-   * @return true if the type is built-in.
-   */
-  public static boolean isBuiltIn(XSDTypeDefinition type)
-  { 
-    boolean result = false;
-    if (type instanceof XSDSimpleTypeDefinition)
-    {
-      String name = type.getName();
-      if (name != null)
-      {
-        return  defaultValue.containsKey(name); 
-      }
-    }
-    return result;
-  }
-
-
-  /**
-   * Returns a valid default value for the simple type.
-   * @param type - a simple built-in type.
-   * @return a valid default value for the simple type.
-   */
-  public static String getInstanceValue(XSDTypeDefinition type)
-  {
-    if (type != null)
-    {
-      if (isBuiltIn(type))
-      {
-        String nameID = type.getName();
-        return (String)defaultValue.get(nameID);
-      }
-      else
-      {
-        XSDTypeDefinition basetype = type.getBaseType();
-        if (basetype != type) return getInstanceValue(basetype);
-      }
-    }
-    return null;
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDVisitor.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDVisitor.java
deleted file mode 100644
index f40e1a4..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDVisitor.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal;
-
-import java.util.Iterator;
-
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDIdentityConstraintDefinition;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNotationDeclaration;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDWildcard;
-
-public class XSDVisitor
-{
-  public XSDVisitor()
-  {
-  }
-  
-  protected XSDSchema schema;
-  
-  public void visitSchema(XSDSchema schema)
-  {
-    this.schema = schema;
-    for (Iterator iterator = schema.getAttributeDeclarations().iterator(); iterator.hasNext();)
-    {
-      XSDAttributeDeclaration attr = (XSDAttributeDeclaration) iterator.next();
-      visitAttributeDeclaration(attr);
-    }
-    for (Iterator iterator = schema.getTypeDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDTypeDefinition type = (XSDTypeDefinition) iterator.next();
-      visitTypeDefinition(type);
-    }
-    for (Iterator iterator = schema.getElementDeclarations().iterator(); iterator.hasNext();)
-    {
-      XSDElementDeclaration element = (XSDElementDeclaration) iterator.next();
-      visitElementDeclaration(element);
-    }
-    for (Iterator iterator = schema.getIdentityConstraintDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDIdentityConstraintDefinition identityConstraint = (XSDIdentityConstraintDefinition) iterator.next();
-      visitIdentityConstraintDefinition(identityConstraint);
-    }
-    for (Iterator iterator = schema.getModelGroupDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDModelGroupDefinition modelGroup = (XSDModelGroupDefinition) iterator.next();
-      visitModelGroupDefinition(modelGroup);
-    }
-    for (Iterator iterator = schema.getAttributeGroupDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDAttributeGroupDefinition attributeGroup = (XSDAttributeGroupDefinition) iterator.next();
-      visitAttributeGroupDefinition(attributeGroup);
-    }
-    for (Iterator iterator = schema.getNotationDeclarations().iterator(); iterator.hasNext();)
-    {
-      XSDNotationDeclaration element = (XSDNotationDeclaration) iterator.next();
-      visitNotationDeclaration(element);
-    }
-    
-  }
-  
-  public void visitAttributeDeclaration(XSDAttributeDeclaration attr)
-  {
-  }
-  
-  public void visitTypeDefinition(XSDTypeDefinition type)
-  {
-    if (type instanceof XSDSimpleTypeDefinition)
-    {
-      visitSimpleTypeDefinition((XSDSimpleTypeDefinition)type);
-    }
-    else if (type instanceof XSDComplexTypeDefinition)
-    {
-      visitComplexTypeDefinition((XSDComplexTypeDefinition)type);
-    }
-  }
-  
-  public void visitElementDeclaration(XSDElementDeclaration element)
-  {
-    if (element.isElementDeclarationReference())
-    {
-    }
-    else if (element.getAnonymousTypeDefinition() != null)
-    {
-      visitTypeDefinition(element.getAnonymousTypeDefinition());
-    }
-  }
-  
-  public void visitIdentityConstraintDefinition(XSDIdentityConstraintDefinition identityConstraint)
-  {
-  }
-  
-  public void visitModelGroupDefinition(XSDModelGroupDefinition modelGroupDef)
-  {
-    if (!modelGroupDef.isModelGroupDefinitionReference())
-    {
-      if (modelGroupDef.getModelGroup() != null)
-      {
-        visitModelGroup(modelGroupDef.getModelGroup());
-      }
-    }
-  }
-  
-  public void visitAttributeGroupDefinition(XSDAttributeGroupDefinition attributeGroup)
-  {
-  }
-  
-  public void visitNotationDeclaration(XSDNotationDeclaration notation)
-  {
-  }
-  
-  public void visitSimpleTypeDefinition(XSDSimpleTypeDefinition type)
-  {
-  }
-  
-  public void visitComplexTypeDefinition(XSDComplexTypeDefinition type)
-  {
-    if (type.getContentType() != null)
-    {
-      XSDComplexTypeContent complexContent = type.getContentType();
-      if (complexContent instanceof XSDSimpleTypeDefinition)
-      {
-        visitSimpleTypeDefinition((XSDSimpleTypeDefinition)complexContent);
-      }
-      else if (complexContent instanceof XSDParticle)
-      {
-        visitParticle((XSDParticle) complexContent);
-      }
-    }
-  }
-  
-  public void visitParticle(XSDParticle particle)
-  {
-    visitParticleContent(particle.getContent());
-  }
-  
-  public void visitParticleContent(XSDParticleContent particleContent)
-  {
-    if (particleContent instanceof XSDModelGroupDefinition)
-    {
-      visitModelGroupDefinition((XSDModelGroupDefinition) particleContent);
-    }
-    else if (particleContent instanceof XSDModelGroup)
-    {
-      visitModelGroup((XSDModelGroup)particleContent);
-    }
-    else if (particleContent instanceof XSDElementDeclaration)
-    {
-      visitElementDeclaration((XSDElementDeclaration)particleContent);
-    }
-    else if (particleContent instanceof XSDWildcard)
-    {
-      visitWildcard((XSDWildcard)particleContent);
-    }
-  }
-  
-  public void visitModelGroup(XSDModelGroup modelGroup)
-  {
-    if (modelGroup.getContents() != null)
-    {
-      for (Iterator iterator = modelGroup.getContents().iterator(); iterator.hasNext();)
-      {
-        XSDParticle particle = (XSDParticle) iterator.next();
-        visitParticle(particle);
-      }
-    }
-  }
-  
-  public void visitWildcard(XSDWildcard wildcard)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/util/XSDSchemaLocatorAdapterFactory.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/util/XSDSchemaLocatorAdapterFactory.java
deleted file mode 100644
index cba5df1..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/util/XSDSchemaLocatorAdapterFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.xsd.util.XSDSchemaLocator;
-
-public class XSDSchemaLocatorAdapterFactory extends AdapterFactoryImpl
-{
-    protected XSDSchemaLocatorImpl schemaLocator = new XSDSchemaLocatorImpl();
-
-    public boolean isFactoryForType(Object type)
-    {
-      return type == XSDSchemaLocator.class;
-    }
-
-    public Adapter adaptNew(Notifier target, Object type)
-    {
-      return schemaLocator;
-    }
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/util/XSDSchemaLocatorImpl.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/util/XSDSchemaLocatorImpl.java
deleted file mode 100644
index a8422b7..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/util/XSDSchemaLocatorImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDResourceImpl;
-import org.eclipse.xsd.util.XSDSchemaLocator;
-
-public class XSDSchemaLocatorImpl extends AdapterImpl implements XSDSchemaLocator
-{
-    /**
-     * @see org.eclipse.xsd.util.XSDSchemaLocator#locateSchema(org.eclipse.xsd.XSDSchema,
-     *      java.lang.String, java.lang.String, java.lang.String)
-     */
-    public XSDSchema locateSchema(XSDSchema xsdSchema, String namespaceURI, String rawSchemaLocationURI, String resolvedSchemaLocationURI)
-    {
-      XSDSchema result = null;
-      String baseLocation = xsdSchema.getSchemaLocation();      
-      String resolvedURI = URIResolverPlugin.createResolver().resolve(baseLocation, namespaceURI, rawSchemaLocationURI); 
-      if (resolvedURI == null) 
-      {
-        resolvedURI = resolvedSchemaLocationURI;       
-      }
-      try
-      {        
-        ResourceSet resourceSet = xsdSchema.eResource().getResourceSet();
-        URI uri = URI.createURI(resolvedURI);
-        Resource r = resourceSet.getResource(uri, false); 
-        XSDResourceImpl resolvedResource = null;
-        if (r instanceof XSDResourceImpl)
-        {
-          resolvedResource = (XSDResourceImpl)r;
-        }
-        else        
-        {  
-          String physicalLocation = URIResolverPlugin.createResolver().resolvePhysicalLocation(baseLocation, namespaceURI, resolvedURI);     
-          InputStream inputStream = resourceSet.getURIConverter().createInputStream(URI.createURI(physicalLocation));
-          resolvedResource = (XSDResourceImpl)resourceSet.createResource(URI.createURI("*.xsd"));
-          resolvedResource.setURI(uri);
-          resolvedResource.load(inputStream, null);           
-        }
-
-        result = resolvedResource.getSchema();
-      }
-      catch (IOException exception)
-      {
-        // It is generally not an error to fail to resolve.
-        // If a resource is actually created, 
-        // which happens only when we can create an input stream,
-        // then it's an error if it's not a good schema
-      }
-      return result;
-    }
-
-    public boolean isAdatperForType(Object type)
-    {
-      return type == XSDSchemaLocator.class;
-    }  
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/XSDValidator.java b/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/XSDValidator.java
deleted file mode 100644
index 3ba0e7e..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/XSDValidator.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-
-import org.apache.xerces.parsers.SAXParser;
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.xml.core.internal.validation.XMLValidator;
-import org.eclipse.wst.xml.core.internal.validation.core.LazyURLInputStream;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationInfo;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-
-/**
- * The XSDValidator will validate XSD files.
- * 
- * @author Lawrence Mandel, IBM
- */
-public class XSDValidator
-{
-
-  private final boolean WRAPPER_ERROR_SUPPORT_ENABLED = true;
-
-  private final String XML_INSTANCE_DOC_TOP = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<root \n" 
-  + "  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";
-
-  private final String XML_INSTANCE_DOC_MID = " xsi:noNamespaceSchemaLocation=\"";
-
-  private final String XML_INSTANCE_DOC_BOT = "\">\n" + "</root>\n";
-
-  private final String DUMMY_URI = "http://example.org/dummy";
-  
-  private URIResolver uriresolver = null;
-
-  public ValidationReport validate(String uri)
-  {
-    return validate(uri, null);
-  }
-
-  /**
-   * Validate the XSD file specified by the URI.
-   * 
-   * @param uri
-   *          The URI of the XSD file to validate.
-   */
-  public ValidationReport validate(String uri, InputStream inputStream)
-  {
-    ValidationInfo valinfo = new ValidationInfo(uri);
-    try
-    {
-      String ns = null;
-      String schemaLocationString = "";
-
-      URL url = new URL(uri);
-      if (url != null)
-      {
-        BufferedReader bufreader = new BufferedReader(new InputStreamReader(url.openStream()));
-
-        if (bufreader != null)
-        {
-          StringBuffer source = new StringBuffer();
-          while (bufreader.ready())
-          {
-            source.append(bufreader.readLine());
-          }
-          bufreader.close();
-          int tn = source.indexOf("targetNamespace");
-          if (tn != -1)
-          {
-            int firstquote = source.indexOf("\"", tn) + 1;
-            int secondquote = source.indexOf("\"", firstquote);
-            ns = source.substring(firstquote, secondquote);
-          }
-        }
-        bufreader.close();
-      }
-
-      XSDErrorHandler errorHandler = new XSDErrorHandler(valinfo);
-      try
-      {
-        StringBuffer instanceDoc = new StringBuffer(XML_INSTANCE_DOC_TOP);
-        if (ns != null && !ns.equals(""))
-        {
-          instanceDoc.append(" xmlns=\"").append(ns).append("\"\n");
-          instanceDoc.append(" xsi:schemaLocation=\"");
-          instanceDoc.append(ns);
-          instanceDoc.append(" ");
-        } else
-        {
-          instanceDoc.append(XML_INSTANCE_DOC_MID);
-        }
-        instanceDoc.append(uri.replaceAll(" ", "%20"));
-        if (!schemaLocationString.equals(""))
-        {
-          instanceDoc.append(" ").append(schemaLocationString);
-        }
-        instanceDoc.append(XML_INSTANCE_DOC_BOT);
-        InputSource is = new InputSource(new StringReader(instanceDoc.toString()));
-        is.setSystemId(DUMMY_URI);
-
-        String soapFile = "platform:/plugin/org.eclipse.wst.wsdl.validation./xsd/xml-soap.xsd";
-        XMLReader reader = new SAXParser();
-        try
-        {
-          reader.setFeature("http://apache.org/xml/features/continue-after-fatal-error", false);
-          reader.setFeature("http://xml.org/sax/features/namespaces", true);
-          reader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
-          reader.setFeature("http://xml.org/sax/features/validation", true);
-          reader.setFeature("http://apache.org/xml/features/validation/schema", true);
-          reader.setFeature("http://apache.org/xml/features/validation/schema-full-checking", true);
-          reader.setFeature("http://xml.org/sax/features/external-general-entities", true);
-          reader.setFeature("http://xml.org/sax/features/external-parameter-entities", true);
-          reader.setFeature("http://apache.org/xml/features/validation/warn-on-duplicate-attdef", true);
-
-          reader.setProperty("http://apache.org/xml/properties/schema/external-schemaLocation", 
-          		"http://xml.apache.org/xml-soap " + soapFile);
-          reader.setErrorHandler(errorHandler);
-
-          if (uriresolver != null)
-          {
-            XSDEntityResolver resolver = new XSDEntityResolver(uriresolver, uri, inputStream);
-            try
-            {
-              reader.setProperty("http://apache.org/xml/properties/internal/entity-resolver", resolver);
-            }
-            catch (Exception e)
-            {
-              // TODO: log failure to register the entity resolver.
-            }
-          }
-
-          reader.parse(is);
-
-        } catch (SAXException e)
-        {
-          //LoggerFactory.getLoggerInstance().logError("XSD Validator Exception: ", e);
-        }
-      } catch (IOException except)
-      {
-        //LoggerFactory.getLoggerInstance().logError("XSD Validator Exception: ", except);
-      }
-    } catch (Exception e)
-    { 
-      //LoggerFactory.getLoggerInstance().logError("XSD Validator Exception: ", e);
-    }
-
-    return valinfo;
-  }
-
-  /**
-   * Set the URI resolver to use with XSD validation.
-   * 
-   * @param uriresolver
-   *          The URI resolver to use.
-   */
-  public void setURIResolver(URIResolver uriresolver)
-  {
-    this.uriresolver = uriresolver;
-  }
-
-  /**
-   * The XSDErrorHandler handle Xerces parsing errors and puts the errors
-   * into the given ValidationInfo object.
-   * 
-   * @author Lawrence Mandel, IBM
-   */
-  protected class XSDErrorHandler implements org.xml.sax.ErrorHandler
-  {
-
-    private final int ERROR = 0;
-
-    private final int WARNING = 1;
-
-    private final ValidationInfo valinfo;
-
-    public XSDErrorHandler(ValidationInfo valinfo)
-    {
-      this.valinfo = valinfo;
-    }
-    
-    /**
-     * Add a validation message with the given severity.
-     * 
-     * @param exception The exception that contains the information about the message.
-     * @param severity The severity of the validation message.
-     */
-    protected void addValidationMessage(SAXParseException exception, int severity)
-    { 
-      // get the error key by taking the substring of what is before the ':' in the error message:
-      String errorKey = exception.getLocalizedMessage();
-      if (errorKey != null)
-      {
-        int index = errorKey.indexOf(':');
-        if (index != -1)
-        { errorKey = errorKey.substring(0, index);
-        }
-      }
-      
-      if (exception.getSystemId() != null && !exception.getSystemId().equals(DUMMY_URI))
-      {
-        if (severity == WARNING)
-        {
-          valinfo.addWarning(exception.getLocalizedMessage(), exception.getLineNumber(), exception.getColumnNumber(), exception.getSystemId());
-        }
-        else
-        {
-          valinfo.addError(exception.getLocalizedMessage(), exception.getLineNumber(), exception.getColumnNumber(), exception.getSystemId(), errorKey, null);
-        }
-      }
-    }
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
-     */
-    public void error(SAXParseException exception) throws SAXException
-    {
-      addValidationMessage(exception, ERROR);
-    }
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
-     */
-    public void fatalError(SAXParseException exception) throws SAXException
-    {
-      addValidationMessage(exception, ERROR);
-    }
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
-     */
-    public void warning(SAXParseException exception) throws SAXException
-    {
-      addValidationMessage(exception, WARNING);
-    }
-  }
-
-  /**
-   * The XSDEntityResolver wraps an idresolver to provide entity resolution to
-   * the XSD validator.
-   */
-  protected class XSDEntityResolver implements XMLEntityResolver
-  {
-    private URIResolver uriresolver = null;
-
-    private InputStream inputStream;
-
-    /**
-     * Constructor.
-     * 
-     * @param idresolver
-     *          The idresolver this entity resolver wraps.
-     * @param baselocation The base location to resolve with.
-     */
-    public XSDEntityResolver(URIResolver uriresolver, String baselocation, InputStream inputStream)
-    {
-      this.uriresolver = uriresolver;
-      this.inputStream = inputStream;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-     */
-    public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier) throws XNIException, IOException
-    {
-      // consider the resourceIdentifier's fields to see we're actually in the dummy xml file
-      // and if this is the reference to the schema we want to validate
-      // ... if so return an XMLInputSource built from the dirty copy of the schema
-      boolean isDummyXML = DUMMY_URI.equals(resourceIdentifier.getBaseSystemId());
-      if (isDummyXML && inputStream != null)
-      {
-        XMLInputSource inputSource = new XMLInputSource(null, resourceIdentifier.getLiteralSystemId(), null, inputStream, null);
-        return inputSource;
-      }
-      else
-      {
-        // TODO cs: In revision 1.1 we explicitly opened a stream to ensure
-        // file I/O problems produced messages. I've remove this fudge for now
-        // since I can't seem to reproduce the problem it was intended to fix.
-        // I'm hoping the newer Xerces code base has fixed this problem and the fudge is defunct.
-        return XMLValidator._internalResolveEntity(uriresolver, resourceIdentifier);
-      }
-    }
-  }   
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src/org/eclipse/wst/xsd/core/internal/XSDCorePlugin.java b/bundles/org.eclipse.wst.xsd.core/src/org/eclipse/wst/xsd/core/internal/XSDCorePlugin.java
deleted file mode 100644
index 41ab742..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src/org/eclipse/wst/xsd/core/internal/XSDCorePlugin.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.wst.xsd.core.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.xsd.contentmodel.internal.XSDCMManager;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class XSDCorePlugin extends Plugin {
-	//The shared instance.
-	private static XSDCorePlugin plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public XSDCorePlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-    XSDCMManager.getInstance().startup();
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static XSDCorePlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.wst.xsd.core", path);
-	}
-}
diff --git a/development/org.eclipse.wst.sse.unittests/.classpath b/development/org.eclipse.wst.sse.unittests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/development/org.eclipse.wst.sse.unittests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/development/org.eclipse.wst.sse.unittests/.cvsignore b/development/org.eclipse.wst.sse.unittests/.cvsignore
deleted file mode 100644
index a37b9c5..0000000
--- a/development/org.eclipse.wst.sse.unittests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.properties
-build.xml
-ssejunit.jar
-temp.folder
diff --git a/development/org.eclipse.wst.sse.unittests/.project b/development/org.eclipse.wst.sse.unittests/.project
deleted file mode 100644
index e6f5109..0000000
--- a/development/org.eclipse.wst.sse.unittests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.sse.unittests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.jdt.core.prefs b/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c1373fb..0000000
--- a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-#Mon May 30 19:10:44 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.pde.prefs b/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 498dec4..0000000
--- a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Fri May 27 23:41:23 EDT 2005
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/development/org.eclipse.wst.sse.unittests/META-INF/MANIFEST.MF b/development/org.eclipse.wst.sse.unittests/META-INF/MANIFEST.MF
deleted file mode 100644
index 43219cb..0000000
--- a/development/org.eclipse.wst.sse.unittests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,39 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Unittests
-Bundle-SymbolicName: org.eclipse.wst.sse.unittests; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: sseunittests.jar
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.sse.unittests
-Require-Bundle: org.junit,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jst.jsp.core.tests,
- org.eclipse.jst.jsp.tests.encoding,
- org.eclipse.jst.jsp.ui.tests,
- org.eclipse.jst.jsp.ui.tests.performance,
- org.eclipse.wst.css.core.tests,
- org.eclipse.wst.css.tests.encoding,
- org.eclipse.wst.css.ui.tests.performance,
- org.eclipse.wst.dtd.ui.tests,
- org.eclipse.wst.html.core.tests,
- org.eclipse.wst.html.tests.encoding,
- org.eclipse.wst.html.ui.tests,
- org.eclipse.wst.html.ui.tests.performance,
- org.eclipse.wst.sse.core.tests,
- org.eclipse.wst.sse.ui.tests,
- org.eclipse.wst.sse.ui.tests.performance,
- org.eclipse.wst.xml.core.tests,
- org.eclipse.wst.xml.tests.encoding,
- org.eclipse.wst.xml.ui.tests,
- org.eclipse.wst.xml.ui.tests.performance,
- org.eclipse.wst.xml.validation.tests,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.javascript.ui,
- org.eclipse.wst.xsd.validation.tests,
- org.eclipse.wst.wsi.tests,
- org.eclipse.wst.wsdl.tests,
- org.eclipse.wst.css.ui.tests,
- org.eclipse.wst.sse.ui
diff --git a/development/org.eclipse.wst.sse.unittests/icons/sourceEditor.gif b/development/org.eclipse.wst.sse.unittests/icons/sourceEditor.gif
deleted file mode 100644
index 75ebdb8..0000000
--- a/development/org.eclipse.wst.sse.unittests/icons/sourceEditor.gif
+++ /dev/null
Binary files differ
diff --git a/development/org.eclipse.wst.sse.unittests/plugin.properties b/development/org.eclipse.wst.sse.unittests/plugin.properties
deleted file mode 100644
index 535a870..0000000
--- a/development/org.eclipse.wst.sse.unittests/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     
-###############################################################################
-XML_Source_Page_Editor.name=XML Source Page Editor
-JavaScript_Source_Page_Editor.name=JavaScript Source Page Editor
-
diff --git a/development/org.eclipse.wst.sse.unittests/plugin.xml b/development/org.eclipse.wst.sse.unittests/plugin.xml
deleted file mode 100644
index c869906..0000000
--- a/development/org.eclipse.wst.sse.unittests/plugin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-        <extension point="org.eclipse.ui.editors">
-                <editor
-                        name="%XML_Source_Page_Editor.name"
-                        icon="icons/sourceEditor.gif"
-                        contributorClass="org.eclipse.wst.xml.ui.internal.actions.ActionContributorXML"
-                        class="org.eclipse.wst.sse.ui.StructuredTextEditor"
-                        symbolicFontName="org.eclipse.wst.sse.ui.textfont"
-                        id="org.eclipse.core.runtime.xml.source">
-                        <contentTypeBinding
-                                contentTypeId="org.eclipse.core.runtime.xml" />
-                        <contentTypeBinding
-                                contentTypeId="org.eclipse.wst.xml.core.xmlsource" />
-                </editor>
-        </extension>
-        	<extension point="org.eclipse.ui.editors">
-		<editor
-			name="%JavaScript_Source_Page_Editor.name"
-			icon="icons/sourceEditor.gif"
-			extensions="js"
-			contributorClass="org.eclipse.wst.javascript.ui.internal.actions.ActionContributorJS"
-			class="org.eclipse.wst.javascript.ui.internal.editor.JSEditor"
-			symbolicFontName="org.eclipse.wst.sse.ui.textfont"
-			id="org.eclipse.wst.javascript.core.javascriptsource.source">
-			<contentTypeBinding
-				contentTypeId="org.eclipse.wst.javascript.core.javascriptsource" />
-		</editor>
-	</extension>
-</plugin>
\ No newline at end of file
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterListTestSuite.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterListTestSuite.java
deleted file mode 100644
index ba7e617..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterListTestSuite.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.sse.unittests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestSuite;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestSuite;
-import org.eclipse.jst.jsp.ui.tests.JSPUITestSuite;
-import org.eclipse.wst.css.core.tests.CSSCoreTestSuite;
-import org.eclipse.wst.css.tests.encoding.CSSEncodingTestSuite;
-import org.eclipse.wst.css.ui.tests.CSSUITestSuite;
-import org.eclipse.wst.dtd.ui.tests.DTDUITestSuite;
-import org.eclipse.wst.html.core.tests.HTMLCoreTestSuite;
-import org.eclipse.wst.html.tests.encoding.HTMLEncodingTestSuite;
-import org.eclipse.wst.html.ui.tests.HTMLUITestSuite;
-import org.eclipse.wst.sse.core.tests.SSEModelTestSuite;
-import org.eclipse.wst.sse.ui.tests.SSEUITestSuite;
-import org.eclipse.wst.wsdl.tests.AllTestCases;
-import org.eclipse.wst.wsi.tests.internal.RegressionBucket;
-import org.eclipse.wst.xml.core.tests.SSEModelXMLTestSuite;
-import org.eclipse.wst.xml.tests.encoding.EncodingTestSuite;
-import org.eclipse.wst.xml.ui.tests.XMLUITestSuite;
-import org.eclipse.wst.xml.validation.tests.internal.AllXMLTests;
-import org.eclipse.wst.xsd.validation.tests.internal.AllXSDTests;
-
-/*****************************************************************************
- * Copyright (c) 2004 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- * 
- ****************************************************************************/
-
-public class MasterListTestSuite extends TestSuite {
-
-	public MasterListTestSuite() {
-		super("All Tests");
-		
-		System.setProperty("wtp.autotest.noninteractive", "true");
-
-		addTest(SSEModelTestSuite.suite());
-		addTest(SSEModelXMLTestSuite.suite());
-		addTest(CSSCoreTestSuite.suite());
-		addTest(HTMLCoreTestSuite.suite());
-		addTest(JSPCoreTestSuite.suite());
-
-		addTest(AllXMLTests.suite());
-		
-		addTest(EncodingTestSuite.suite());
-		addTest(CSSEncodingTestSuite.suite());
-		addTest(HTMLEncodingTestSuite.suite());
-		addTest(JSPEncodingTestSuite.suite());
-
-		addTest(CSSUITestSuite.suite());
-		addTest(HTMLUITestSuite.suite());
-		addTest(SSEUITestSuite.suite());
-		addTest(XMLUITestSuite.suite());
-		addTest(DTDUITestSuite.suite());
-		addTest(JSPUITestSuite.suite());
-		
-		addTest(AllXSDTests.suite());
-		addTest(RegressionBucket.suite());
-		addTest(AllTestCases.suite());
-
-	}
-
-	public void testAll() {
-		// this method needs to exist, but doesn't really do anything
-		// other than to signal to create an instance of this class.
-		// The rest it automatic from the tests added in constructor. 
-	}
-}
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterPerformanceTestSuite.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterPerformanceTestSuite.java
deleted file mode 100644
index 8491014..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterPerformanceTestSuite.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.sse.unittests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.ui.tests.performance.JSPUIPerformanceTests;
-import org.eclipse.wst.css.ui.tests.performance.CSSUIPerformanceTestSuite;
-import org.eclipse.wst.html.ui.tests.performance.HTMLUIPerformanceTestSuite;
-import org.eclipse.wst.sse.ui.tests.performance.SSEUIPerformanceTestSuite;
-import org.eclipse.wst.xml.ui.tests.performance.XMLUIPerformanceTestSuite;
-
-/*****************************************************************************
- * Copyright (c) 2004 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- * 
- ****************************************************************************/
-
-public class MasterPerformanceTestSuite extends TestSuite {
-
-	public MasterPerformanceTestSuite() {
-		super("All Tests");
-
-		addTest(JSPUIPerformanceTests.suite());
-		addTest(CSSUIPerformanceTestSuite.suite());
-		addTest(HTMLUIPerformanceTestSuite.suite());
-		addTest(SSEUIPerformanceTestSuite.suite());
-		addTest(XMLUIPerformanceTestSuite.suite());
-
-
-	}
-
-	public void testAll() {
-		// this method needs to exist, but doesn't really do anything
-	}
-
-}
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/TestStringUtils.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/TestStringUtils.java
deleted file mode 100644
index 300d5e5..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/TestStringUtils.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.sse.unittests.minortools;
-
-
-
-public class TestStringUtils {
-
-	/**
-	 * TestStringUtils constructor comment.
-	 */
-	private TestStringUtils() {
-		super();
-	}
-
-	/**
-	 * Replace matching literal portions of a string with another string
-	 */
-	public static String replace(String aString, String source, String target) {
-		if (aString == null)
-			return null;
-		String normalString = ""; //$NON-NLS-1$
-		int length = aString.length();
-		int position = 0;
-		int previous = 0;
-		int spacer = source.length();
-		while (position + spacer - 1 < length && aString.indexOf(source, position) > -1) {
-			position = aString.indexOf(source, previous);
-			normalString = normalString + aString.substring(previous, position) + target;
-			position += spacer;
-			previous = position;
-		}
-		normalString = normalString + aString.substring(position, aString.length());
-
-		return normalString;
-	}
-
-}
\ No newline at end of file
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/VersionRemover.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/VersionRemover.java
deleted file mode 100644
index 811a668..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/VersionRemover.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.sse.unittests.minortools;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.eclipse.wst.xml.core.tests.util.CommonXML;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-
-
-/**
- * Modifies plugin.xml and fragment.xml files to not require specific versions
- * of their plugin dependencies.
- * 
- * @author nitin
- */
-public class VersionRemover {
-
-	char[] charbuff = new char[2048];
-	StringBuffer s = null;
-
-	public VersionRemover() {
-		super();
-	}
-
-
-
-	public static void main(String[] args) {
-		if (args.length < 1)
-			new VersionRemover().visit(new File("d:/target"));
-		else
-			new VersionRemover().visit(new File(args[0]));
-	}
-
-
-
-	protected void visit(File file) {
-		// Skip directories like org.eclipse.*, org.apache.*, and org.junit.*
-		if (file.isDirectory() && !file.getName().startsWith("org.eclipse.") && !file.getName().startsWith("org.apache") && !file.getName().startsWith("org.junit")) {
-			String[] contents = file.list();
-			for (int i = 0; i < contents.length; i++)
-				visit(new File(file.getAbsolutePath() + '/' + contents[i]));
-		}
-		else {
-			fixupFile(file);
-		}
-	}
-
-	protected void fixupFile(File file) {
-		// only load and fixup files named plugin.xml or fragment.xml under eclipse\plugins\XXXXXXX.*
-		if (!(file.getName().equalsIgnoreCase("plugin.xml") || file.getName().equalsIgnoreCase("fragment.xml")) || file.getAbsolutePath().indexOf("eclipse\\plugins\\XXXXXXX.") == -1)
-			return;
-		//		System.out.println(file.getAbsolutePath());
-		try {
-			Document doc = CommonXML.getDocumentBuilder().parse(file);
-			NodeList imports = null;
-			if (file.getName().equalsIgnoreCase("plugin.xml"))
-				imports = doc.getElementsByTagName("import");
-			else if (file.getName().equalsIgnoreCase("fragment.xml"))
-				imports = doc.getElementsByTagName("fragment");
-			boolean changed = false;
-			for (int i = 0; i < imports.getLength(); i++) {
-				Node importNode = imports.item(i);
-				if (importNode.getNodeName().equalsIgnoreCase("import") && importNode.getAttributes().getNamedItem("version") != null) {
-					changed = true;
-					importNode.getAttributes().removeNamedItem("version");
-				}
-				if (importNode.getAttributes().getNamedItem("plugin-version") != null) {
-					changed = true;
-					importNode.getAttributes().removeNamedItem("plugin-version");
-				}
-				if (importNode.getAttributes().getNamedItem("match") != null) {
-					importNode.getAttributes().removeNamedItem("match");
-					changed = true;
-				}
-			}
-			if (changed) {
-				FileOutputStream ostream = new FileOutputStream(file.getAbsolutePath());
-				CommonXML.serialize(doc, ostream);
-				ostream.close();
-				System.out.println("Modified " + file.getAbsolutePath());
-			}
-		}
-		catch (SAXException e) {
-			System.err.println(file.getPath() + ": " + e);
-		}
-		catch (IOException e) {
-			System.err.println(file.getPath() + ": " + e);
-		}
-	}
-}
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/.project b/docs/org.eclipse.jst.jsp.ui.infopop/.project
deleted file mode 100644
index 01be1bc..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.jsp.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts.xml b/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts.xml
deleted file mode 100644
index 3abddee..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="jspf1000">
-<description>Select values for the following properties from the drop-down lists:
--  <b>Character code:</b> Specifies the page directive's pageEncoding value and contentType charset. In HTML documents, this value is also used for the &lt;META&gt; tag's charset property.
--  <b>Language:</b> Specifies the page directive's programming language.
--  <b>Content Type:</b> Specifies the contentType's TYPE value for the page directive. In HTML documents, this value is also used for the &lt;META&gt; tag's content property.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="jspr0010">
-<description>Select this option to open the <b>Refactor Rename</b> dialog, if applicable, which lets you rename the currently selected Java element and references to that element.
-</description>
-<topic label="Source editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing source code - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-<context id="jspr0020">
-<description>Select this option to open the <b>Refactor Move</b> dialog, if applicable, which lets you move the currently selected Java element. For example, you can move a method from one class to another.
-</description>
-<topic label="Source editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing source code - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="webx0050">
-<description>This page lets you specify the line delimiter and the text encoding that will be used when you create or save a JavaServer Pages (JSP) file.
-
-Various development platforms use different line delimiters to indicate the start of a new line. Select the operating system that corresponds to your development or deployment platform.
-<b>Note:</b> This delimiter will not automatically be added to any documents that currently exist. It will be added only to documents that you create after you select the line delimiter type and click <b>Apply</b>, or to existing files that you open and then resave after you select the line delimiter type and click <b>Apply</b>.
-
-The encoding attribute is used to specify the default character encoding set that is used when creating JSP files.  Changing the encoding causes any new JSP files that are created from scratch to use the selected encoding.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0051">
-<description>This page lets you customize the syntax highlighting that the JavaServer Pages (JSP) editor does when you are editing a file."
-
-The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
-
-The <b>Foreground</b> and <b>Background</b> push buttons open <b>Color</b> dialog boxes that let you specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
-
-Click the <b>Restore Default</b> push button to set the highlighting styles back to their default values.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0052">
-<description>This page lets you create new and edit existing templates that will be used when you edit a JSP file.
-</description>
-<topic label="Adding and removing JSP templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html"/>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="xmlm1050">
-<description>Select this option to open the <b>Cleanup</b> dialog, which contains settings to update a document so that it is well-formed and formatted. Cleanup includes such activities as inserting missing tags, adding quotation marks around attribute values, node capitalization, and formatting a document.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts2.xml b/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts2.xml
deleted file mode 100644
index 780835a..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts2.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="jspsource_source_HelpId">
-<description>The JSP source page editor lets you edit a JavaServer Pages file. The editor provides many text editing features, such as content assist, user-defined templates, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-<topic label="Adding and removing JSP templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html"/>
-<topic label="Making content assist work for JSP files" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html"/>
-</context>
-
-<context id="jspf1000">
-<description>Select values for the following properties from the drop-down lists:
--  <b>Character code:</b> Specifies the page directive's pageEncoding value and contentType charset. In HTML documents, this value is also used for the &lt;META&gt; tag's charset property.
--  <b>Language:</b> Specifies the page directive's programming language.
--  <b>Content Type:</b> Specifies the contentType's TYPE value for the page directive. In HTML documents, this value is also used for the &lt;META&gt; tag's content property.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="jspr0010">
-<description>Select this option to open the <b>Refactor Rename</b> dialog, if applicable, which lets you rename the currently selected Java element and references to that element.
-</description>
-<topic label="Source editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing source code - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-<context id="jspr0020">
-<description>Select this option to open the <b>Refactor Move</b> dialog, if applicable, which lets you move the currently selected Java element. For example, you can move a method from one class to another.
-</description>
-<topic label="Source editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing source code - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="webx0050">
-<description>This page lets you specify the line delimiter and the text encoding that will be used when you create or save a JavaServer Pages (JSP) file.
-
-Various development platforms use different line delimiters to indicate the start of a new line. Select the operating system that corresponds to your development or deployment platform.
-<b>Note:</b> This delimiter will not automatically be added to any documents that currently exist. It will be added only to documents that you create after you select the line delimiter type and click <b>Apply</b>, or to existing files that you open and then resave after you select the line delimiter type and click <b>Apply</b>.
-
-The encoding attribute is used to specify the default character encoding set that is used when creating JSP files.  Changing the encoding causes any new JSP files that are created from scratch to use the selected encoding.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0051">
-<description>This page lets you customize the syntax highlighting that the JavaServer Pages (JSP) editor does when you are editing a file."
-
-The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
-
-The <b>Foreground</b> and <b>Background</b> push buttons open <b>Color</b> dialog boxes that let you specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
-
-Click the <b>Restore Default</b> push button to set the highlighting styles back to their default values.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0052">
-<description>This page lets you create new and edit existing templates that will be used when you edit a JSP file.
-</description>
-<topic label="Adding and removing JSP templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html"/>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="xmlm1050">
-<description>Select this option to open the <b>Cleanup</b> dialog, which contains settings to update a document so that it is well-formed and formatted. Cleanup includes such activities as inserting missing tags, adding quotation marks around attribute values, node capitalization, and formatting a document.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.jsp.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index ee02199..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.jst.jsp.ui.infopop; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/about.html b/docs/org.eclipse.jst.jsp.ui.infopop/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/build.properties b/docs/org.eclipse.jst.jsp.ui.infopop/build.properties
deleted file mode 100644
index c709b51..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = EditorJspContexts.xml,\
-               EditorJspContexts2.xml,\
-               about.html,\
-               plugin.xml,\
-               META-INF,/
-               plugin.properties/
-src.includes = build.properties
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.properties b/docs/org.eclipse.jst.jsp.ui.infopop/plugin.properties
deleted file mode 100644
index fc2e115..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-# ==============================================================================
-# Translation Instruction: section to be translated
-# ==============================================================================
-Plugin.name = JSP tools infopops
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml b/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml
deleted file mode 100644
index aefe666..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.1"?>
-
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-       <contexts file="EditorJspContexts.xml" plugin="org.eclipse.jst.jsp.ui"/>
-       <contexts file="EditorJspContexts2.xml" plugin="org.eclipse.jst.jsp.core"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/.project b/docs/org.eclipse.wst.doc.user/.project
deleted file mode 100644
index cd8121a..0000000
--- a/docs/org.eclipse.wst.doc.user/.project
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.doc.user</name>
-	<comment></comment>
-	<projects></projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments></arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments></arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 2050e63..0000000
--- a/docs/org.eclipse.wst.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: master user doc toc
-Bundle-SymbolicName: org.eclipse.wst.doc.user; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.doc.user/about.html b/docs/org.eclipse.wst.doc.user/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.wst.doc.user/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/book.css b/docs/org.eclipse.wst.doc.user/book.css
deleted file mode 100644
index 3a1519e..0000000
--- a/docs/org.eclipse.wst.doc.user/book.css
+++ /dev/null
@@ -1,201 +0,0 @@
-P.Code {
-	display: block;
-	text-align: left;
-	text-indent: 0.00pt;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 15pt;
-	font-size: 10.000000pt;
-	font-weight: medium;
-	font-style: Regular;
-	color: #4444CC;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Courier New";
-}
-
-H6.CaptionFigColumn {
-	display: block;
-	text-align: left;
-	text-indent: 0.000000pt;
-	margin-top: 3.000000pt;
-	margin-bottom: 11.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-	font-size: 9.000000pt;
-	font-weight: medium;
-	font-style: Italic;
-	color: #000000;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Arial";
-}
-
-P.Note {
-	display: block;
-	text-align: left;
-	text-indent: 0pt;
-	margin-top: 19.500000pt;
-	margin-bottom: 19.500000pt;
-	margin-right: 0.000000pt;
-	margin-left: 30pt;
-	font-size: 11.000000pt;
-	font-weight: medium;
-	font-style: Italic;
-	color: #000000;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Arial";
-}
-
-EM.UILabel {
-	font-weight: Bold;
-	font-style: Regular;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-}
-
-EM.CodeName {
-	font-weight: Bold;
-	font-style: Regular;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Courier New";
-}
-
-/* following font face declarations need to be removed for DBCS */
-body,h1,h2,h3,h4,h5,h6,p,table,td,caption,th,ul,ol,dl,li,dd,dt {
-	font-family: Arial, Helvetica, sans-serif;
-	color: #000000
-}
-
-pre {
-	font-family: Courier, monospace
-}
-
-/* end font face declarations */
-	/* following font size declarations should be OK for DBCS */
-body,h1,h2,h3,h4,h5,h6,p,table,td,caption,th,ul,ol,dl,li,dd,dt {
-	font-size: 10pt;
-}
-
-pre {
-	font-size: 10pt
-}
-
-/* end font size declarations */
-body {
-	background: #FFFFFF
-}
-
-h1 {
-	font-size: 18pt;
-	margin-top: 5;
-	margin-bottom: 1
-}
-
-h2 {
-	font-size: 14pt;
-	margin-top: 25;
-	margin-bottom: 3
-}
-
-h3 {
-	font-size: 11pt;
-	margin-top: 20;
-	margin-bottom: 3
-}
-
-h4 {
-	font-size: 10pt;
-	margin-top: 20;
-	margin-bottom: 3;
-	font-style: italic
-}
-
-p {
-	margin-top: 10px;
-	margin-bottom: 10px
-}
-
-pre {
-	margin-left: 6;
-	font-size: 9pt
-}
-
-a:link {
-	color: #0000FF
-}
-
-a:hover {
-	color: #000080
-}
-
-a:visited {
-	text-decoration: underline
-}
-
-ul {
-	margin-top: 0;
-	margin-bottom: 10
-}
-
-li {
-	margin-top: 0;
-	margin-bottom: 0
-}
-
-li p {
-	margin-top: 0;
-	margin-bottom: 0
-}
-
-ol {
-	margin-top: 0;
-	margin-bottom: 10
-}
-
-dl {
-	margin-top: 0;
-	margin-bottom: 10
-}
-
-dt {
-	margin-top: 0;
-	margin-bottom: 0;
-	font-weight: bold
-}
-
-dd {
-	margin-top: 0;
-	margin-bottom: 0
-}
-
-strong {
-	font-weight: bold
-}
-
-em {
-	font-style: italic
-}
-
-var {
-	font-style: italic
-}
-
-div.revision {
-	border-left-style: solid;
-	border-left-width: thin;
-	border-left-color: #7B68EE;
-	padding-left: 5
-}
-
-th {
-	font-weight: bold
-}
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/build.properties b/docs/org.eclipse.wst.doc.user/build.properties
deleted file mode 100644
index 51a6d97..0000000
--- a/docs/org.eclipse.wst.doc.user/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = about.html,\
-               common.css,\
-               images/,\
-               META-INF/,\
-               notices.html,\
-               plugin.properties,\
-               plugin.xml,\
-               toc.xml,\
-               topics/
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.doc.user/common.css b/docs/org.eclipse.wst.doc.user/common.css
deleted file mode 100644
index 741d750..0000000
--- a/docs/org.eclipse.wst.doc.user/common.css
+++ /dev/null
@@ -1,1193 +0,0 @@
-body {
-	font-family: Arial, sans-serif;
-	font-size: 0.8em;
-	background-color: #ffffff;
-	color: Black;
-	margin-right: 5em;
-	margin-bottom: 1em;
-}
-
-.ibmfilepath {
-	font-family: monospace;
-	font-size: 100%;
-}
-
-.ibmcommand {
-	font-weight: bold;
-}
-
-.ibmemphasis {
-	font-style: italic;
-}
-
-.mv,.pk,.pkdef,.pv {
-	font-family: monospace;
-	font-size: 100%;
-	padding-top: 0em;
-	padding-right: .3em;
-	padding-bottom: 0em;
-	padding-left: .3em;
-}
-
-tt,samp {
-	font-family: monospace;
-	font-size: 100%;
-}
-
-BODY.nav {
-	background-color: #FFFFFF;
-	border-right: 0.2em ridge black;
-	font-size: 0.95em;
-}
-
-.base {
-	font-weight: normal;
-	font-style: normal;
-	font-variant: normal;
-	text-decoration: none;
-	background-color: #ffffff;
-}
-
-TABLE {
-	color: black;
-	width: 90%;
-	border-collapse: collapse;
-	border-color: Black;
-	background: white;
-	margin-top: 0.5em;
-	margin-bottom: 0.5em;
-	margin-left: 0em;
-	margin-right: 0em;
-}
-
-.tbldesc {
-	font-style: italic;
-}
-
-TH {
-	font-weight: bold;
-	font-size: 0.7em;
-	color: black;
-	background-color: #dadada;
-	padding-top: 0.1em;
-	padding-bottom: 0.3em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-TH.base {
-	font-weight: bold;
-	color: black;
-	border: 1 solid #606060;
-	background-color: #dcdada;
-	padding-top: 0.65em;
-	padding-bottom: 0.65em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-TD {
-	font-size: 0.7em;
-	color: black;
-	background-color: white;
-	padding-top: 0.1em;
-	padding-bottom: 0.3em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-CITE {
-	font-style: italic;
-}
-
-EM {
-	font-style: italic;
-}
-
-STRONG {
-	font-weight: bold;
-}
-
-caption {
-	text-align: left;
-	font-style: italic;
-}
-
-DT {
-	margin-top: 0.5em;
-	margin-bottom: 0.5em;
-}
-
-DD {
-	margin-left: 1.0em;
-}
-
-PRE,pre.cgraphic {
-	font-family: monospace;
-	font-size: 12px;
-	background-color: #dadada;
-	padding: 5px;
-}
-
-.italic {
-	font-style: italic;
-}
-
-.bold {
-	font-weight: bold;
-}
-
-.underlined {
-	text-decoration: underline;
-}
-
-.bold-italic,.boldItalic {
-	font-weight: bold;
-	font-style: italic;
-}
-
-.smallCaps,.smallcaps {
-	text-transform: uppercase;
-	font-size: smaller;
-	font-variant: small-caps;
-}
-
-.italic-underlined {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-.bold-underlined {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-.bold-italic-underlined {
-	font-weight: bold;
-	font-style: italic;
-	text-decoration: underline;
-}
-
-.smallcaps-underlined {
-	font-variant: small-caps;
-	text-decoration: underline;
-}
-
-.emphasis {
-	font-style: italic;
-}
-
-.inlinedef {
-	font-style: italic;
-}
-
-.sidebar {
-	background: #cccccc;
-}
-
-A:link {
-	color: #006699;
-	text-decoration: underline;
-}
-
-A:visited {
-	color: #996699;
-	text-decoration: underline;
-}
-
-A:active {
-	color: #006699;
-	text-decoration: underline;
-}
-
-A:hover {
-	color: #996699;;
-	text-decoration: underline;
-}
-
-a.toclink:link {
-	text-decoration: none;
-}
-
-a.toclink:active {
-	text-decoration: none;
-}
-
-a.toclink:visited {
-	text-decoration: none;
-}
-
-a.toclink:hover {
-	text-decoration: underline;
-}
-
-a.ptoclink:link {
-	text-decoration: none;
-}
-
-a.ptoclink:active {
-	text-decoration: none;
-}
-
-a.ptoclink:visited {
-	text-decoration: none;
-}
-
-a.ptoclink:hover {
-	text-decoration: underline;
-}
-
-a.indexlink:link {
-	text-decoration: none;
-}
-
-a.indexlink:active {
-	text-decoration: none;
-}
-
-a.indexlink:visited {
-	text-decoration: none;
-}
-
-a.indexlink:hover {
-	text-decoration: underline;
-}
-
-a.figurelist:link {
-	text-decoration: none;
-}
-
-a.figurelist:active {
-	text-decoration: none;
-}
-
-a.figurelist:visited {
-	text-decoration: none;
-}
-
-a.figurelist:hover {
-	text-decoration: underline;
-}
-
-a.tablelist:link {
-	text-decoration: none;
-}
-
-a.tablelist:active {
-	text-decoration: none;
-}
-
-a.tablelist:visited {
-	text-decoration: none;
-}
-
-a.tablelist:hover {
-	text-decoration: underline;
-}
-
-a.boldgreylink:link {
-	text-decoration: none;
-	color: #333333;
-	font-family: Verdana, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 0.9em;
-}
-
-a.boldgreylink:visited {
-	text-decoration: none;
-	color: #333333;
-	font-family: Verdana, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 0.9em;
-}
-
-a.boldgreylink:hover {
-	text-decoration: underline;
-	color: #333333;
-	font-family: Verdana, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 0.9em;
-}
-
-.runningheader {
-	font-family: Verdana, Arial, sans-serif;
-	font-size: 0.7em;
-}
-
-.runningfooter {
-	font-family: Verdana, Arial, sans-serif;
-	font-size: 0.7em;
-}
-
-.runningfooter a:link {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-}
-
-.runningfooter a:active {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-}
-
-.runningfooter a:visited {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-}
-
-.runningfooter a:hover {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: underline;
-}
-
-#breadcrumb,.breadcrumb,span.breadcrumbs {
-	font-size: 0.75em;
-}
-
-.fastpath {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.fastpathtitle {
-	font-weight: bold;
-}
-
-.toc {
-	font-size: small;
-}
-
-.nested0 {
-	margin-top: 0em;
-}
-
-.p {
-	margin-top: 1em;
-}
-
-span.figcap {
-	font-style: italic;
-}
-
-span.figdesc {
-	font-style: italic;
-}
-
-div.figbox {
-	
-}
-
-div.figrules {
-	
-}
-
-div.fignone {
-	
-}
-
-.fignone {
-	
-}
-
-.figborder {
-	
-}
-
-.figsides {
-	
-}
-
-.figtop {
-	
-}
-
-.figbottom {
-	
-}
-
-.figtopbot {
-	
-}
-
-.parentlink {
-	
-}
-
-.prevlink {
-	
-}
-
-.nextlink {
-	
-}
-
-.relconceptshd {
-	
-}
-
-.reltaskshd {
-	
-}
-
-.relrefhd {
-	
-}
-
-.synnone {
-	
-}
-
-.synborder {
-	
-}
-
-.synsides {
-	
-}
-
-.syntop {
-	
-}
-
-.synbottom {
-	
-}
-
-.syntopbot {
-	
-}
-
-.skip {
-	margin-top: 1em;
-}
-
-.skipspace {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.ulchildlink {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.olchildlink {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-ul,ol {
-	margin-top: 0.1em;
-	padding-top: 0.1em;
-}
-
-ul.simple {
-	list-style-type: none;
-}
-
-ul.indexlist {
-	list-style-type: none;
-}
-
-OL LI {
-	margin-top: 0.0em;
-	margin-bottom: 0.0em;
-	margin-left: 0.0em;
-}
-
-UL LI {
-	margin-top: 0.0em;
-	margin-bottom: 0.0em;
-	margin-left: 0.0em;
-}
-
-OL LI DIV P {
-	list-style-type: decimal;
-	margin-top: 0.2em;
-	margin-bottom: 0.2em;
-}
-
-UL LI DIV P {
-	list-style-type: disc;
-	margin-top: 0.2em;
-	margin-bottom: 0.2em;
-}
-
-* [compact="yes"]>li {
-	margin-top: 0 em;
-}
-
-* [compact="no"]>li {
-	margin-top: 0.5em;
-}
-
-hr {
-	margin-bottom: 0em;
-	margin-top: 0em;
-	padding-top: 0em;
-	padding-bottom: 0em;
-	width: 90%;
-	color: #cccccc;
-	text-align: center;
-}
-
-H1,.title,.pagetitle,.topictitle1 {
-	font-size: 1.5em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.5em;
-	word-spacing: 0.1em;
-}
-
-H2,.subtitle,.pagesubtitle,.topictitle2 {
-	font-size: 1.25em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.0em;
-	padding-bottom: 0.0em;
-}
-
-H3,.boldtitle,.topictitle3 {
-	font-size: 1.0em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.2em;
-	padding-bottom: 0.1em;
-}
-
-H4,.topictitle4 {
-	font-size: 0.9em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.1em;
-	padding-bottom: 0.1em;
-}
-
-h5,.topictitle5 {
-	font-size: 0.8em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0em;
-	padding-bottom: 0em;
-}
-
-h6,.topictitle6 {
-	font-size: 0.7em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0em;
-	padding-bottom: 0em;
-}
-
-div.headtitle {
-	font-size: 1em;
-	font-weight: bold;
-	margin-left: 0em;
-}
-
-div.head0 {
-	font-size: 0.9em;
-	font-weight: bold;
-	margin-left: 0em;
-	margin-top: 0.5em;
-}
-
-div.head1 {
-	font-size: 0.8em;
-	font-weight: bold;
-	margin-left: 1em;
-	padding-top: 0.5em;
-}
-
-div.head2 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 2em;
-}
-
-div.head3 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 3em;
-}
-
-div.head4 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 4em;
-}
-
-div.head5 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 5em;
-}
-
-div.head6 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 6em;
-}
-
-div.head7 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 7em;
-}
-
-div.head8 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 8em;
-}
-
-div.head9 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 9em;
-}
-
-.tip {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.tiptitle {
-	font-weight: bold;
-}
-
-.firstcol {
-	font-weight: bold;
-}
-
-.ptocH1 {
-	font-size: x-small;
-}
-
-.ptocH2 {
-	font-size: x-small;
-}
-
-.stitle {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-.nte {
-	
-}
-
-.xxlines {
-	white-space: pre;
-	font-size: 0.95em;
-}
-
-.sectiontitle {
-	margin-top: 1em;
-	margin-bottom: 0em;
-	color: black;
-	font-size: 1.2em;
-	font-weight: bold;
-}
-
-div.imageleft {
-	text-align: left;
-}
-
-div.imagecenter {
-	text-align: center;
-}
-
-div.imageright {
-	text-align: right;
-}
-
-div.imagejustify {
-	text-align: justify;
-}
-
-div.mmobj {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: center;
-}
-
-div.mmobjleft {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: left;
-}
-
-div.mmobjcenter {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: center;
-}
-
-div.mmobjright {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: right;
-}
-
-pre.screen {
-	padding: 1em 1em 1em 1em;
-	margin-top: 0.4em;
-	margin-bottom: 0.4em;
-	border: thin solid Black;
-	font-size: 100%;
-}
-
-.prereq {
-	margin-left: 1.5em;
-}
-
-.defListHead {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-span.mv {
-	font-style: italic;
-}
-
-span.md {
-	text-decoration: line-through;
-}
-
-.pk,span.pk {
-	font-weight: bold;
-}
-
-span.pkdef {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-span.pv {
-	font-style: italic;
-}
-
-span.pvdef {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-span.kwd {
-	font-weight: bold;
-}
-
-span.kdwdef {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-.parmListKwd {
-	font-weight: bold;
-}
-
-.parmListVar {
-	font-style: italic;
-}
-
-span.oper {
-	font-style: normal;
-}
-
-span.operdef {
-	text-decoration: underline;
-}
-
-VAR,span.var {
-	font-style: italic;
-}
-
-span.vardef {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-div.msg {
-	padding: 0.2em 1em 1em 1em;
-	margin-top: 0.4em;
-	margin-bottom: 0.4em;
-}
-
-div.msgnum {
-	float: left;
-	font-weight: bold;
-	margin-bottom: 1em;
-	margin-right: 1em;
-}
-
-div.msgtext {
-	font-weight: bold;
-	margin-bottom: 1em;
-}
-
-div.msgitemtitle {
-	font-weight: bold;
-}
-
-p.msgitem {
-	margin-top: 0em;
-}
-
-.attention,div.attention {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.attentiontitle,span.attentiontitle {
-	font-weight: bold;
-}
-
-.cautiontitle,div.cautiontitle {
-	margin-top: 1em;
-	font-weight: bold;
-}
-
-.caution,div.caution {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.danger,div.danger {
-	padding: 0.5em 0.5em 0.5em 0.5em;
-	border: solid;
-	border-width: thin;
-	font-weight: bold;
-	margin-top: 0.2em;
-	margin-bottom: 1em;
-}
-
-.dangertitle,div.dangertitle {
-	margin-top: 1em;
-	font-weight: bold;
-}
-
-.important {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.importanttitle {
-	font-weight: bold;
-}
-
-.remember {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.remembertitle {
-	font-weight: bold;
-}
-
-.restriction {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.restrictiontitle {
-	font-weight: bold;
-}
-
-div.warningtitle {
-	font-weight: bold;
-}
-
-div.warningbody {
-	margin-left: 2em
-}
-
-.note {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.notetitle,div.notetitle {
-	font-weight: bold;
-}
-
-div.notebody {
-	margin-left: 2em;
-}
-
-div.notelisttitle {
-	font-weight: bold;
-}
-
-div.fnnum {
-	float: left;
-}
-
-div.fntext {
-	margin-left: 2em;
-}
-
-div.stepl {
-	margin-left: 2em;
-}
-
-div.steplnum {
-	font-weight: bold;
-	float: left;
-	margin-left: 0.5em;
-}
-
-div.stepltext {
-	margin-left: 5em;
-}
-
-div.steplnum {
-	font-style: italic;
-	font-weight: bold;
-	float: left;
-	margin-left: 0.5em;
-}
-
-div.stepltext {
-	margin-bottom: 0.5em;
-	margin-left: 3em;
-}
-
-div.ledi {
-	margin-left: 3em;
-}
-
-div.ledesc {
-	margin-left: 3em;
-}
-
-span.pblktitle {
-	font-weight: bold;
-}
-
-div.pblklblbox {
-	padding: 0.5em 0.5em 0.5em 0.5em;
-	border: solid;
-	border-width: thin;
-	margin-top: 0.2em;
-}
-
-span.ednoticestitle {
-	font-weight: bold;
-}
-
-span.term {
-	font-weight: bold;
-}
-
-span.idxshow {
-	color: green;
-}
-
-div.code {
-	font-weight: bold;
-	margin-bottom: 1em;
-}
-
-span.refkey {
-	font-weight: bold;
-	color: white;
-	background-color: black;
-}
-
-tt.apl {
-	font-style: italic;
-}
-
-div.qualifstart {
-	padding: 0.1em 0.5em 0.5em 0.5em;
-	border-top: solid;
-	border-left: solid;
-	border-right: solid;
-	border-width: thin;
-	font-weight: bold;
-	margin-top: 0.2em;
-	margin-bottom: 0.2em;
-	text-align: center;
-}
-
-div.qualifend {
-	padding: 0.5em 0.5em 0.1em 0.5em;
-	border-bottom: solid;
-	border-left: solid;
-	border-right: solid;
-	border-width: thin;
-	font-weight: bold;
-	margin-bottom: 0.2em;
-	text-align: center;
-}
-
-.noshade {
-	background-color: transparent;
-}
-
-.xlight {
-	background-color: #DADADA;
-}
-
-.light {
-	background-color: #B0B0B0;
-}
-
-.medium {
-	background-color: #8C8C8C;
-}
-
-.dark {
-	background-color: #6E6E6E;
-}
-
-.xdark {
-	background-color: #585858;
-}
-
-.light-yellow {
-	background-color: #FFFFCC;
-}
-
-.khaki {
-	background-color: #CCCC99;
-}
-
-.medium-blue {
-	background-color: #6699CC;
-}
-
-.light-blue {
-	background-color: #CCCCFF;
-}
-
-.mid-grey {
-	background-color: #CCCCCC;
-}
-
-.light-grey {
-	background-color: #DADADA;
-}
-
-.lightest-grey {
-	background-color: #E6E6E6;
-}
-
-#changed {
-	position: absolute;
-	left: 0.2em;
-	color: #7B68EE;
-	background-color: #FFFFFF;
-	font-style: normal;
-	font-weight: bold;
-}
-
-INPUT.buttons {
-	font-size: 0.75em;
-	border-top: 0.2em outset #B1B1B1;
-	border-right: 0.2em outset #000000;
-	border-bottom: 0.2em outset #000000;
-	border-left: 0.2em outset #B1B1B1;
-	background-color: #E2E2E2;
-	margin-bottom: 0.2em;
-}
-
-.cgraphic {
-	font-size: 90%;
-	color: black;
-}
-
-.aix,.hpux,.sun,.unix,.win2,.winnt,.win,.zos,.linux,.os390,.os400,.c,.cplusplus,.cobol,.fortran,.java,.macosx,.os2,.pl1,.rpg
-	{
-	background-repeat: no-repeat;
-	background-position: top left;
-	margin-top: 0.5em;
-	text-indent: 55px;
-}
-
-.aix {
-	background-image: url(ngaix.gif);
-}
-
-.hpux {
-	background-image: url(nghpux.gif);
-}
-
-.sun {
-	background-image: url(ngsolaris.gif);
-}
-
-.unix {
-	background-image: url(ngunix.gif);
-}
-
-.win2 {
-	background-image: url(ng2000.gif);
-}
-
-.winxp {
-	background-image: url(ngxp.gif);
-}
-
-.winnt {
-	background-image: url(ngnt.gif);
-}
-
-.win {
-	background-image: url(ngwin.gif);
-}
-
-.zos {
-	background-image: url(ngzos.gif);
-}
-
-.linux {
-	background-image: url(nglinux.gif);
-}
-
-.os390 {
-	background-image: url(ng390.gif);
-}
-
-.os400 {
-	background-image: url(ng400.gif);
-}
-
-.c {
-	background-image: url(ngc.gif);
-}
-
-.cplusplus {
-	background-image: url(ngcpp.gif);
-}
-
-.cobol {
-	background-image: url(ngcobol.gif);
-}
-
-.fortran {
-	background-image: url(ngfortran.gif);
-}
-
-.java {
-	background-image: url(ngjava.gif);
-}
-
-.macosx {
-	background-image: url(ngmacosx.gif);
-}
-
-.os2 {
-	background-image: url(ngos2.gif);
-}
-
-.pl1 {
-	background-image: url(ngpl1.gif);
-}
-
-.rpg {
-	background-image: url(ngrpg.gif);
-}
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/images/SelectExistingServer.jpg b/docs/org.eclipse.wst.doc.user/images/SelectExistingServer.jpg
deleted file mode 100644
index 398dbe4..0000000
--- a/docs/org.eclipse.wst.doc.user/images/SelectExistingServer.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/SelectNewServer.jpg b/docs/org.eclipse.wst.doc.user/images/SelectNewServer.jpg
deleted file mode 100644
index 95f6b44..0000000
--- a/docs/org.eclipse.wst.doc.user/images/SelectNewServer.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure1.jpg b/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure1.jpg
deleted file mode 100644
index 9064bb8..0000000
--- a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure1.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure2.jpg b/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure2.jpg
deleted file mode 100644
index eca4347..0000000
--- a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure2.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure3.jpg b/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure3.jpg
deleted file mode 100644
index 5d87d0c..0000000
--- a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure3.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure4.jpg b/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure4.jpg
deleted file mode 100644
index c334bbf..0000000
--- a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure4.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure5.jpg b/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure5.jpg
deleted file mode 100644
index a94614e..0000000
--- a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure5.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/image99L.jpg b/docs/org.eclipse.wst.doc.user/images/image99L.jpg
deleted file mode 100644
index 506abdb..0000000
--- a/docs/org.eclipse.wst.doc.user/images/image99L.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/imageEJ9.jpg b/docs/org.eclipse.wst.doc.user/images/imageEJ9.jpg
deleted file mode 100644
index be7350e..0000000
--- a/docs/org.eclipse.wst.doc.user/images/imageEJ9.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/imageIAI.jpg b/docs/org.eclipse.wst.doc.user/images/imageIAI.jpg
deleted file mode 100644
index d2f625c..0000000
--- a/docs/org.eclipse.wst.doc.user/images/imageIAI.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/imageLKF.jpg b/docs/org.eclipse.wst.doc.user/images/imageLKF.jpg
deleted file mode 100644
index ff98f42..0000000
--- a/docs/org.eclipse.wst.doc.user/images/imageLKF.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/imageO78.jpg b/docs/org.eclipse.wst.doc.user/images/imageO78.jpg
deleted file mode 100644
index 67077f8..0000000
--- a/docs/org.eclipse.wst.doc.user/images/imageO78.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/imageU71.jpg b/docs/org.eclipse.wst.doc.user/images/imageU71.jpg
deleted file mode 100644
index 9ee0430..0000000
--- a/docs/org.eclipse.wst.doc.user/images/imageU71.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/note.gif b/docs/org.eclipse.wst.doc.user/images/note.gif
deleted file mode 100644
index f6260db..0000000
--- a/docs/org.eclipse.wst.doc.user/images/note.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/selectRootElementDTD.png b/docs/org.eclipse.wst.doc.user/images/selectRootElementDTD.png
deleted file mode 100644
index 25f260f..0000000
--- a/docs/org.eclipse.wst.doc.user/images/selectRootElementDTD.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/selectRootElementXSD.png b/docs/org.eclipse.wst.doc.user/images/selectRootElementXSD.png
deleted file mode 100644
index 9955ed3..0000000
--- a/docs/org.eclipse.wst.doc.user/images/selectRootElementXSD.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdl.gif b/docs/org.eclipse.wst.doc.user/images/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdl_main.gif b/docs/org.eclipse.wst.doc.user/images/wsdl_main.gif
deleted file mode 100644
index 9f074e8..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdl_main.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-backbutton.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-backbutton.jpg
deleted file mode 100644
index ebcd1c7..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-backbutton.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-binding.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-binding.jpg
deleted file mode 100644
index be74d57..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-binding.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-complex-type.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-complex-type.jpg
deleted file mode 100644
index 15d6071..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-complex-type.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-finished-wsdl.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-finished-wsdl.jpg
deleted file mode 100644
index 9c56342..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-finished-wsdl.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-operation.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-operation.jpg
deleted file mode 100644
index 8dc34a3..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-operation.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-skeleton.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-skeleton.jpg
deleted file mode 100644
index 57ddb29..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-skeleton.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-wizard.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-wizard.jpg
deleted file mode 100644
index 50553f6..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-wizard.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-setelement-dialog.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-setelement-dialog.jpg
deleted file mode 100644
index f48165e..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-setelement-dialog.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-settype-dialog.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-settype-dialog.jpg
deleted file mode 100644
index 8a36a66..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-settype-dialog.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-smart-rename1.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-smart-rename1.jpg
deleted file mode 100644
index cc68a44..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-smart-rename1.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-backbutton.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-backbutton.jpg
deleted file mode 100644
index 2092605..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-backbutton.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure1.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure1.jpg
deleted file mode 100644
index f3b4f6f..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure1.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure2.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure2.jpg
deleted file mode 100644
index 518c606..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure2.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure3.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure3.jpg
deleted file mode 100644
index a66b6e7..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure3.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure4.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure4.jpg
deleted file mode 100644
index 2a187da..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure4.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure5.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure5.jpg
deleted file mode 100644
index b9622ef..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure5.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure6.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure6.jpg
deleted file mode 100644
index 6e253b8..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure6.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure7.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure7.jpg
deleted file mode 100644
index dfb7523..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure7.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure8.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure8.jpg
deleted file mode 100644
index ef61772..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure8.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure9.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure9.jpg
deleted file mode 100644
index 664eecc..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure9.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/notices.html b/docs/org.eclipse.wst.doc.user/notices.html
deleted file mode 100644
index e0cf4d1..0000000
--- a/docs/org.eclipse.wst.doc.user/notices.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<LINK REL="STYLESHEET" HREF="book.css" CHARSET="ISO-8859-1"
-	TYPE="text/css">
-<title>Legal Notices</title>
-</head>
-<body>
-
-<h3><a NAME="Notices"></a>Notices</h3>
-<p>The material in this guide is Copyright (c) IBM Corporation and
-others 2000, 2005.</p>
-<p><a href="about.html">Terms and conditions regarding the use of this
-guide.</a></p>
-</body>
-</html>
diff --git a/docs/org.eclipse.wst.doc.user/plugin.properties b/docs/org.eclipse.wst.doc.user/plugin.properties
deleted file mode 100644
index 2e49616..0000000
--- a/docs/org.eclipse.wst.doc.user/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-providerName=Eclipse.org
diff --git a/docs/org.eclipse.wst.doc.user/plugin.xml b/docs/org.eclipse.wst.doc.user/plugin.xml
deleted file mode 100644
index 0aa617f..0000000
--- a/docs/org.eclipse.wst.doc.user/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-	<extension point="org.eclipse.help.toc">
-		<toc file="toc.xml" primary="true" />
-	</extension>
-</plugin>
diff --git a/docs/org.eclipse.wst.doc.user/toc.xml b/docs/org.eclipse.wst.doc.user/toc.xml
deleted file mode 100644
index 7ec53c2..0000000
--- a/docs/org.eclipse.wst.doc.user/toc.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
-	* Copyright (c) 2000, 2005 IBM Corporation and others.
-	* All rights reserved. This program and the accompanying materials
-	* are made available under the terms of the Eclipse Public License v1.0
-	* which accompanies this distribution, and is available at
-	* http://www.eclipse.org/legal/epl-v10.html
-	* 
-	* Contributors:
-	*     IBM Corporation - initial API and implementation
-	*******************************************************************************/ -->
-<!-- ============================================================================= -->
-<!-- Define the top level topics                                                   -->
-<!-- ============================================================================= -->
-<toc label="Web Application Development Guide"
-	topic="topics/overview.html">
-
-	<topic label="Creating Web applications">
-		<link
-			toc="../org.eclipse.wst.webtools.doc.user/webtools_toc.xml" />
-	</topic>
-	<topic label="Creating J2EE and enterprise applications">
-		<link toc="../org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.xml" />
-		<link toc="../org.eclipse.jst.ejb.doc.user/ejb_toc.xml" />
-	</topic>
-	<topic label="Editing markup language files"
-		href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html">
-		<link toc="../org.eclipse.wst.sse.doc.user/sse_toc.xml" />
-		<link
-			toc="../org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml" />
-		<link
-			toc="../org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml" />
-		<link
-			toc="../org.eclipse.wst.xsdeditor.doc.user/WXDeditormap_toc.xml" />
-	</topic>
-	<!-- <link toc="../org.eclipse.wst.xml.doc.user/xml_toc.xml"/>-->
-	<topic label="Creating Web service applications">
-		<link toc="../org.eclipse.jst.ws.doc.user/webservice_toc.xml" />
-	</topic>
-	<topic label="Using data tools">
-		<link
-			toc="../org.eclipse.wst.datatools.connection.ui.doc.user/connection_ui_toc.xml" />
-		<link
-			toc="../org.eclipse.wst.datatools.fe.ui.doc.user/fe_ui_toc.xml" />
-		<link
-			toc="../org.eclipse.wst.datatools.server.ui.doc.user/database_explorer_toc.xml" />
-	</topic>
-	<topic label="Using the server tools">
-		<anchor id="server_install" />
-		<link toc="../org.eclipse.wst.server.ui.doc.user/build_toc.xml" />
-		<link toc="../org.eclipse.jst.server.ui.doc.user/build_toc.xml" />
-	</topic>
-	<topic label="Legal" href="notices.html" />
-</toc>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/topics/overview.html b/docs/org.eclipse.wst.doc.user/topics/overview.html
deleted file mode 100644
index fb18681..0000000
--- a/docs/org.eclipse.wst.doc.user/topics/overview.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css"
-	href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Web Tools Project Overview</title>
-</head>
-<body>
-<h1>Web Tools Project Overview</h1>
-<p>The Web Tools Project aims to provide common infrastructure available
-to any Eclipse-based development environment targeting Web-enabled
-applications.</p>
-</body>
-</html>
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/.project b/docs/org.eclipse.wst.dtd.ui.infopop/.project
deleted file mode 100644
index df2f69d..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.dtd.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts.xml b/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts.xml
deleted file mode 100644
index 910255f..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<contexts>
-<context id="webx0020">
-<description>This page lets you specify the line delimiter and the text encoding that will be used when you create or save a document type definition (DTD) file.
-The line delimiters are Ctrl-J (UNIX), Ctrl-M (Mac), or Ctrl-M Ctrl-J (Windows).
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0021">
-<description>This page lets you customize the syntax highlighting that the document type definition (DTD) editor does when you are editing a file.
-
-The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
-
-The <b>Foreground</b> and <b>Background</b> push buttons open <b>Color</b> dialog boxes that allow you to specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
-
-Click the <b>Restore Default</b> push button to set the highlighting styles back to their default values.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0022">
-<description>This page lets you create new and edit existing templates that will be used when you edit a DTD file.
-</description>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts2.xml b/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts2.xml
deleted file mode 100644
index f9df076..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<contexts>
-<context id="dtdsource_source_HelpId">
-<description>The DTD source page editor lets you edit a document type definition. The editor provides text editing features such as syntax highlighting and unlimited undo and redo.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.dtd.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 27c56c0..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: DTD infopops
-Bundle-SymbolicName: org.eclipse.wst.dtd.ui.infopop; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/about.html b/docs/org.eclipse.wst.dtd.ui.infopop/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/build.properties b/docs/org.eclipse.wst.dtd.ui.infopop/build.properties
deleted file mode 100644
index 784ca85..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               EditorDtdContexts.xml,\
-               META-INF/,\
-               EditorDtdContexts2.xml
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.properties b/docs/org.eclipse.wst.dtd.ui.infopop/plugin.properties
deleted file mode 100644
index d6dee26..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-pluginName = DTD Editor infopops
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml b/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml
deleted file mode 100644
index aa57fbc..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-       <contexts file="EditorDtdContexts.xml" plugin ="org.eclipse.wst.dtd.ui"/>
-       <contexts file="EditorDtdContexts2.xml" plugin ="org.eclipse.wst.dtd.core"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/.project b/docs/org.eclipse.wst.dtdeditor.doc.user/.project
deleted file mode 100644
index 4486d7a..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.dtdeditor.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml
deleted file mode 100644
index af5d27b..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
- 
-<toc label="DTD Editor" topic="topics/tcretdtd.html">
-   <topic label="Working with DTDs">
-      <topic label="Creating DTDs" href="topics/tcretdtd.html">
-         <topic label="Document type definitions (DTDs) - overview" href="topics/cdtdover.html"/>
-      </topic>
-      <topic label="Importing DTDs" href="topics/timptdtd.html"/>
-      <topic label="Editing DTDs" href="topics/tedtdtd.html">
-         <topic label="DTD editor" href="topics/cdtdedit.html"/>
-         <topic label="Creating elements" href="topics/tcretelm.html">
-            <topic label="Creating attributes and attribute lists" href="topics/tcretattr.html"/>
-            <topic label="Editing an element's content model" href="topics/tchgelm.html">
-               <topic label="Editing a group node" href="topics/tedtgnde.html"/>
-            </topic>
-         </topic>
-         <topic label="Creating entities" href="topics/tcretent.html">
-            <topic label="Reusing internal parameter entities in an attribute name or type" href="topics/trusintp.html"/>
-            <topic label="Reusing the value of one entity in another entity" href="topics/trusents.html"/>
-            <topic label="Reusing external parameter entities in an element's content model" href="topics/trusextp.html"/>
-         </topic>
-         <topic label="Creating notations" href="topics/tcretnot.html"/>
-         <topic label="Creating a comment" href="topics/tcretcomm.html"/>
-         <topic label="Deleting elements, attributes, entities, notations, and comments" href="topics/tremvelm.html">
-            <topic label="Referential integrity in the DTD editor" href="topics/rrefint.html"/>
-         </topic>
-      </topic>
-      <topic label="Validating DTDs" href="topics/tvaldtd.html"/>
-      <topic label="Generating XML schemas from DTD files" href="topics/tgenxmls.html"/>
-      <topic label="Icons used in the DTD editor" href="topics/rdtdicons.html"/>
-   </topic>
-</toc>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.dtdeditor.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 8179b4a..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: DTD Editor documentation
-Bundle-SymbolicName: org.eclipse.wst.dtdeditor.doc.user; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/about.html b/docs/org.eclipse.wst.dtdeditor.doc.user/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/build.properties b/docs/org.eclipse.wst.dtdeditor.doc.user/build.properties
deleted file mode 100644
index 169d040..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = DTDEditormap_toc.xml,\
-               about.html,\
-               dtdeditor_reference_toc.xml,\
-               images/,\
-               plugin.properties,\
-               plugin.xml,\
-               topics/,\
-               META-INF/
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/dtdeditor_reference_toc.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/dtdeditor_reference_toc.xml
deleted file mode 100644
index e09310a..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/dtdeditor_reference_toc.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<toc label="DTD editor reference files" topic="topics/rrefint.html">
-   <topic label="Referential integrity in the DTD editor" href="topics/rrefint.html"/>
-   <topic label="Icons used in the DTD editor" href="topics/rdtdicons.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Comment.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Comment.gif
deleted file mode 100644
index 39611d6..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Comment.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Element.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Element.gif
deleted file mode 100644
index 01f4889..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Element.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity.gif
deleted file mode 100644
index cb41506..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity_Reference.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity_Reference.gif
deleted file mode 100644
index 5efa9b9..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity_Reference.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Notation.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Notation.gif
deleted file mode 100644
index 57ad089..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Notation.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDChoice.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDChoice.gif
deleted file mode 100644
index 89ba825..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDChoice.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDSequence.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDSequence.gif
deleted file mode 100644
index 8bf3f97..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDSequence.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute.gif
deleted file mode 100644
index c6cde94..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute_list.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute_list.gif
deleted file mode 100644
index 6df0291..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute_list.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nDTDFile.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/nDTDFile.gif
deleted file mode 100644
index e799143..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nDTDFile.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nany.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/nany.gif
deleted file mode 100644
index 7017d91..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nany.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nempty.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/nempty.gif
deleted file mode 100644
index 119e3d4..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nempty.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/organize_dtd_logically.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/organize_dtd_logically.gif
deleted file mode 100644
index 093c6ba..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/organize_dtd_logically.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/sort.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/sort.gif
deleted file mode 100644
index 23c5d0b..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/sort.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.properties b/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.properties
deleted file mode 100644
index e9909ab..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-
-Plugin.name = DTD Editor
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml
deleted file mode 100644
index 4f44e65..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.1"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-  <extension point="org.eclipse.help.toc">
-
-   <toc file="DTDEditormap_toc.xml"/>
- 
-         <toc file="dtdeditor_reference_toc.xml"/>
-         
-       
-  </extension>
-
-</plugin>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdedit.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdedit.html
deleted file mode 100644
index 98ba40c..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdedit.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>DTD editor</title>
-</head>
-<body id="cdtdedit"><a name="cdtdedit"><!-- --></a>
-
-<h1 class="topictitle1">DTD editor</h1>
-<div><p>After you have created or imported a DTD, you can open it in the
-DTD editor (by double-clicking it in the Navigator view), a tool for viewing
-and editing DTDs. You can use the DTD editor to perform a variety of tasks
-such as creating, editing, and deleting DTD elements, attributes, entities,
-notations, and comments</p><p>Before you can perform any of these tasks, you must create a DTD and open
-it in the DTD editor. After you open the DTD, you can use the <span class="uicontrol">Outline</span> view
-to create nodes and the <span class="uicontrol">Properties</span> view to provide
-details about the nodes.</p>
-<p></p>
-<p> <b>Note</b>: In the <span class="uicontrol">Outline</span> view, you can either
-work in default mode (all nodes appear in the order you added them to the
-DTD in) or group the DTD nodes into the following logical groups: notations,
-entities, elements, and other, by clicking the <span class="uicontrol">Group items logically</span> button <img src="../images/organize_dtd_logically.gif" />. </p>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tedtdtd.html" title="You can edit DTD files in both the Outline view and the Source view. Modifying the content of a DTD determines what can be used in any XML file that is associated with it.">Editing DTDs</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcretdtd.html" title="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.">Creating DTDs</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html
deleted file mode 100644
index 67d7224..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Document type definition (DTD) - overview</title>
-</head>
-<body id="cdtdover"><a name="cdtdover"><!-- --></a>
-
-<h1 class="topictitle1">Document type definitions (DTDs) - overview</h1>
-<div><p>A document type definition (DTD) provides you with the means to
-validate XML files against a set of rules. When you create a DTD file, you
-can specify rules that control the structure of any XML files that reference
-the DTD file.</p><p>A DTD can contain declarations that define elements, attributes, notations,
-and entities for any XML files that reference the DTD file. It also establishes
-constraints for how each element, attribute, notation, and entity can be used
-within any of the XML files that reference the DTD file.</p>
-<p>To be considered a valid XML file, the document must be accompanied by
-a DTD (or an XML schema), and conform to all of the declarations in the DTD
-(or XML schema).</p>
-<p>Certain XML parsers have the ability to read DTDs and check to see if the
-XML file it is reading follows all of those rules. While the parser is reading
-the XML file, it will check each line to be sure that it conforms
-to the rules that are laid out in the DTD file. If there is a problem, the
-parser generates an error and points to where the error occurs in the XML
-file. This kind of parser is called a validating parser because it validates
-the content of the XML file against the DTD.</p>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tcretdtd.html" title="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.">Creating DTDs</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tvaldtd.html" title="Validating a DTD file lets you verify that it is well formed and does not contain any errors.">Validating DTDs</a><br />
-</p>
-</div>
-		<p>
-		(C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
-		</p> 
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html
deleted file mode 100644
index 8a3ec7f..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="../org.eclipse.wst.doc.user/common.css" />
-<title>Icons used in the DTD editor</title>
-</head>
-<body id="ricons"><a name="ricons"><!-- --></a>
-
-<h1 class="topictitle1">Icons used in the DTD editor</h1>
-<div><p>The following DTD editor icons appear in the Outline view.</p>
-<div class="skipspace"><table cellpadding="4" cellspacing="0" summary="" frame="border" border="1" rules="all"><thead align="left"><tr><th valign="top" id="d0e20">Icon </th>
-<th valign="top" id="d0e22">Description</th>
-</tr>
-</thead>
-<tbody><tr><td valign="top" headers="d0e20 ">&nbsp;</td>
-<td valign="top" headers="d0e22 ">&nbsp;</td>
-</tr>
-<tr><td valign="top" headers="d0e20 "> <img src="../images/nany.gif" /> </td>
-<td valign="top" headers="d0e22 ">ANY content (content model)</td>
-</tr>
-<tr><td valign="top" headers="d0e20 "><img src="../images/attribute.gif" /> </td>
-<td valign="top" headers="d0e22 ">attribute</td>
-</tr>
-<tr><td valign="top" headers="d0e20 "><img src="../images/attribute_list.gif" /> </td>
-<td valign="top" headers="d0e22 ">attribute list</td>
-</tr>
-<tr><td valign="top" headers="d0e20 "><img src="../images/ADD_Comment.gif" /></td>
-<td valign="top" headers="d0e22 ">comment</td>
-</tr>
-<tr><td valign="top" headers="d0e20 "> <img src="../images/XSDChoice.gif" /></td>
-<td valign="top" headers="d0e22 ">content model - choice</td>
-</tr>
-<tr><td valign="top" headers="d0e20 ">   <img src="../images/XSDSequence.gif" /></td>
-<td valign="top" headers="d0e22 ">content model - sequence</td>
-</tr>
-<tr><td valign="top" headers="d0e20 "><img src="../images/ADD_Element.gif" /> </td>
-<td valign="top" headers="d0e22 ">element</td>
-</tr>
-<tr><td valign="top" headers="d0e20 "> <img src="../images/nempty.gif" /> </td>
-<td valign="top" headers="d0e22 ">EMPTY content (content model)</td>
-</tr>
-<tr><td valign="top" headers="d0e20 "><img src="../images/ADD_Entity.gif" /> </td>
-<td valign="top" headers="d0e22 ">entity</td>
-</tr>
-<tr><td valign="top" headers="d0e20 "><img src="../images/ADD_Notation.gif" /> </td>
-<td valign="top" headers="d0e22 ">notation</td>
-</tr>
-<tr><td valign="top" headers="d0e20 "> <img src="../images/ADD_Entity_Reference.gif" /></td>
-<td valign="top" headers="d0e22 ">parameter entity reference</td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="skipspace"></div>
-</div>
-		<p>
-		(C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
-		</p> 
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rrefint.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rrefint.html
deleted file mode 100644
index fe71136..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rrefint.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="../org.eclipse.wst.doc.user/common.css" />
-<title>Referential integrity in the DTD editor</title>
-</head>
-<body id="rrefint"><a name="rrefint"><!-- --></a>
-
-<h1 class="topictitle1">Referential integrity in the DTD editor</h1>
-<div><p>The DTD editor has a built-in mechanism to handle referential integrity
-issues. When you delete or rename certain nodes, clean up for any nodes affected
-will automatically occur.</p><div class="skipspace">The following table describes the clean up that occurs when you delete
-or rename certain nodes.</div>
-
-<div class="skipspace"><table cellpadding="4" cellspacing="0" summary="" frame="border" border="1" rules="all"><thead align="left"><tr><th valign="top" id="d0e21"> Action taken</th>
-<th valign="top" id="d0e23"> Clean up </th>
-</tr>
-</thead>
-<tbody><tr><td valign="top" headers="d0e21 ">An element is renamed.</td>
-<td valign="top" headers="d0e23 ">All references to that element will be renamed.</td>
-</tr>
-<tr><td valign="top" headers="d0e21 ">An external parameter entity is renamed.</td>
-<td valign="top" headers="d0e23 ">Any external parameter entity references to it will be renamed.</td>
-</tr>
-<tr><td valign="top" headers="d0e21 ">A notation is renamed.</td>
-<td valign="top" headers="d0e23 ">All references to the notation will be renamed.</td>
-</tr>
-<tr><td valign="top" headers="d0e21 ">An element is deleted.</td>
-<td valign="top" headers="d0e23 ">All references to that element will be cleaned up or reset. The original
-element will be removed from the DTD file, and any references to it will be
-reset to the next available element. If there are no elements available, references
-to it will be reset to (#PCDATA).</td>
-</tr>
-<tr><td valign="top" headers="d0e21 ">An external parameter entity is deleted.</td>
-<td valign="top" headers="d0e23 ">Any external parameter entity references to it will automatically be
-deleted.</td>
-</tr>
-<tr><td valign="top" headers="d0e21 ">A notation is deleted.</td>
-<td valign="top" headers="d0e23 ">All references to the notation will be removed.</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tremvelm.html" title="If you have created elements, attributes, entities, notations, and comments you no longer need, you can delete any of them.">Deleting elements, attributes, entities, notations, and comments</a><br />
-</p>
-</div>
-		<p>
-		(C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
-		</p> 
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tchgelm.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tchgelm.html
deleted file mode 100644
index 9f9d6fa..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tchgelm.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="../org.eclipse.wst.doc.user/common.css" />
-<title>Editing an element's content model</title>
-</head>
-<body id="tchgelm"><a name="tchgelm"><!-- --></a>
-
-<h1 class="topictitle1">Editing an element's content model</h1>
-<div><p>An element's content model represents any data that can be contained
-inside or within the content of an element (that is, between the start and
-end tags of an element in an XML file). Editing an element's content model
-enables you to determine exactly what the element can (and cannot) contain.</p><div class="skipspace"><p>There are four kinds of content models: <i>element content</i>,
- <i>mixed content</i>, <i>EMPTY content</i> and <i>ANY content</i></p>
-<p>In
-the <i>element content</i> content model an element can only contain other
-child elements. In the <i>mixed content</i> content model, an element can
-contain both character data (text that is not parsed by the XML parser) and
-other child elements. In the <i>EMPTY content</i> content model, an element
-cannot contain any other elements or text. In the <i>ANY content</i> content
-model, the element can literally contain anything - other elements, in any
-number, and text.</p>
-<p>In the DTD editor, you can create elements with any
-of these content models. When you create an element in the DTD editor, a child
-element with an EMPTY content model is automatically created.</p>
-<p>The following
-instructions were written for the Resource perspective, but they will also
-work in many other perspectives. </p>
-<p>To edit an element's content
-model, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>In the Outline view, expand the parent element you want to work
-with.</span></li>
-<li class="skipspace"><span>Select the first child of the expanded parent element.</span> This
-is the element's content model.</li>
-<li class="skipspace"><span>In the Design view, you change its <span class="uicontrol">Content type</span> to</span><ul><li><span class="uicontrol">ANY</span></li>
-<li>(#PCDATA)</li>
-<li>Another element</li>
-<li><span class="uicontrol">Children Content</span> or  <span class="uicontrol">Mixed Content</span>.</li>
-</ul>
- Once you select either <span class="uicontrol">Children Content</span> or  <span class="uicontrol">Mixed
-Content</span> you will have a group (represented by a group node - <img src="../images/XSDSequence.gif" /> if you select  <span class="uicontrol">Children Content</span> and <img src="../images/XSDChoice.gif" /> if you select  <span class="uicontrol">Mixed Content</span>),
-which you can use to create a group of child elements under the parent element.
-A child element will automatically be created under the group node. For information
-on editing a group, refer to the related information.<p><b>Note</b>: If you
-intend to have mixed content, the value of the first element in your group
-must be (#PCDATA) (consequently, if you select <span class="uicontrol">Mixed Content</span>,
-two child elements will automatically be created, the first one having a value
-of (#PCDATA).</p>
-  </li>
-<li class="skipspace"><span>If you do not want the parent element to contain anything, leave
-its <span class="uicontrol">Content type</span> as <span class="uicontrol">EMPTY</span>.</span></li>
-<li class="skipspace"><span>Select the appropriate <b>Occurrence</b> option to indicate how
-often the element can occur in an XML file.</span> This option is not
-available if you select ANY, (#PCDATA), EMPTY, or another element.</li>
-<li class="skipspace"><span>To add another existing element to a group as a child, right-click
-the group node, click <span class="uicontrol">Add Element to Content Model</span> and
-specify its name.</span></li>
-<li class="skipspace"><span>To add a group to the content model, right-click the group node
-and click <span class="uicontrol">Add Group to Content Model</span>.</span> For
-information on editing a group, refer to the link below.</li>
-</ol>
-<div class="skipspace"></div>
-</div>
-
-<div>
-<blockquote>
-<div class="ulchildlink"><b><a href="../topics/tedtgnde.html">Editing a group node</a></b><br />
-If your element has either element content or mixed content, its content model is represented by a group node. You can add children elements or another group to a group node, and specify how often, and in what manner a group of elements will be available in an XML file associated with your DTD.</div>
-</blockquote>
-
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tcretelm.html" title="You can use element declarations in DTDs to define the elements that may occur in an XML document. Element declarations can specify that an element can contain other elements, that it can contain anything at all, or that it must be empty.">Creating elements</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretattr.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretattr.html
deleted file mode 100644
index ea409e5..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretattr.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating attributes and attribute lists</title>
-</head>
-<body id="creatingattributes"><a name="creatingattributes"><!-- --></a>
-
-<h1 class="topictitle1">Creating attributes and attribute lists</h1>
-<div><p>You can use an attribute to describe an element or provide information
-about it. Attribute lists enable you to group together all related attributes
-for an element. </p><div class="skipspace"><p>All elements must have their attributes listed in an attribute
-list <img src="../images/attribute_list.gif" />. If you add an attribute <img src="../images/attribute.gif" /> to an element that does not
-already have an attribute list, an attribute list will be created for the
-element with a new attribute inserted in it.</p>
-<p>To create an attribute,
-follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>In the Outline view, right-click the element you want to work with
-and click <span class="uicontrol">Add Attribute</span>.</span>  An attribute list
-will be created for your element if one does not already exist. </li>
-<li class="skipspace"><span>Select the attribute you just created. </span></li>
-<li class="skipspace"><span>In the Properties view, type the name of the attribute in the <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>From the <span class="uicontrol">Type</span> list, select the attribute's
-type. </span></li>
-<li class="skipspace"><span>From <span class="uicontrol">Usage</span> list, select the default usage
-of the attribute.</span> It determines how the attribute can be used.</li>
-<li class="skipspace"><span>If you selected <span class="uicontrol">#FIXED</span> or <span class="uicontrol">Default</span> as
-the default usage of the attribute, you must enter a value in the <span class="uicontrol">Default
-value</span> field.</span></li>
-</ol>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tremvelm.html" title="If you have created elements, attributes, entities, notations, and comments you no longer need, you can delete any of them.">Deleting elements, attributes, entities, notations, and comments</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretcomm.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretcomm.html
deleted file mode 100644
index 5e70def..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretcomm.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating a comment</title>
-</head>
-<body id="creatingacomment"><a name="creatingacomment"><!-- --></a>
-
-<h1 class="topictitle1">Creating a comment</h1>
-<div><p>Comments can be used to provide information about a document, such
-as the author's name, or the date it was last modified. Comments are visible
-to anyone reading the DTD, but are ignored by the XML parser.</p><div class="skipspace">To create a comment, follow these steps:</div>
-<ol><li><span>Open your DTD in the DTD editor.</span></li>
-<li><span>In the Outline view, right-click the DTD <img src="../images/nDTDFile.gif" alt="Image of the DTD icon" /> and select <span class="uicontrol">Add Comment</span>.</span></li>
-<li><span>In the Properties view, type your comment.</span></li>
-</ol>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tedtdtd.html" title="You can edit DTD files in both the Outline view and the Source view. Modifying the content of a DTD determines what can be used in any XML file that is associated with it.">Editing DTDs</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tremvelm.html" title="If you have created elements, attributes, entities, notations, and comments you no longer need, you can delete any of them.">Deleting elements, attributes, entities, notations, and comments</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html
deleted file mode 100644
index 1ae1924..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating a new document type definition (DTD)</title>
-</head>
-<body id="tcretdtd"><a name="tcretdtd"><!-- --></a>
-
-<h1 class="topictitle1">Creating DTDs</h1>
-<div><p>A document type definition (DTD) contains a set of rules that can
-be used to validate an XML file. After you have created a DTD, you can edit
-it, adding declarations that define elements, attributes, entities, and notations,
-and how they can be used for any XML files that reference the DTD file.</p><div class="skipspace"><p></p>
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives. </p>
-<p>Follow
-these steps to create a new DTD:</p>
-</div>
-<ol><li class="skipspace"><span>If necessary, create a project to contain the DTD.</span></li>
-<li class="skipspace"><span>In the workbench, select  <span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Other</span> &gt; <span class="uicontrol">XML</span> &gt; <span class="uicontrol"> DTD</span></span> and click  <span class="uicontrol">Next</span>. </span> If you cannot see the <span class="uicontrol">XML</span> option, select the <span class="uicontrol">Show
-All Wizards</span> check box. </li>
-<li class="skipspace"><span>If you are prompted to enable XML Development capabilities, click <span class="uicontrol">OK</span>.</span></li>
-<li class="skipspace"><span>Select the project or folder that will contain the DTD.</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">File name</span> field, type the name of
-the DTD, for example <kbd class="userinput">MyDTD.dtd</kbd>.</span> The
-name of your DTD file must end with the extension <kbd class="userinput">.dtd</kbd></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-<div class="skipspace"><p>The DTD appears in the Navigator view and automatically, by default,
-opens in the DTD editor. In the DTD editor, you can add elements, attributes,
-notations, entities, and comments to the DTD. If you close the file, and want
-to later re-open it in the DTD editor, double-click it in the
-Navigator view.</p>
-</div>
-</div>
-
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cdtdedit.html" title="After you have created or imported a DTD, you can open it in the DTD editor (by double-clicking it in the Navigator view), a tool for viewing and editing DTDs. You can use the DTD editor to perform a variety of tasks such as creating, editing, and deleting DTD elements, attributes, entities, notations, and comments">DTD editor</a><br />
-<a href="../topics/cdtdover.html" title="A document type definition (DTD) provides you with the means to validate XML files against a set of rules. When you create a DTD file, you can specify rules that control the structure of any XML files that reference the DTD file.">Document type definitions (DTDs) - overview</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tedtdtd.html" title="You can edit DTD files in both the Outline view and the Source view. Modifying the content of a DTD determines what can be used in any XML file that is associated with it.">Editing DTDs</a><br />
-<a href="../topics/tgenxmls.html" title="Generating an XML schema from a DTD file enables you to create an XML schema that is automatically populated with elements and attributes from your DTD file. This can save you time if you want to use an XML schema rather than a DTD file to validate your XML file, but you want to use the rules already set up in your DTD file.">Generating XML schemas from DTD files</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretelm.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretelm.html
deleted file mode 100644
index fdbcdea..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretelm.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating elements</title>
-</head>
-<body id="tcretelm"><a name="tcretelm"><!-- --></a>
-
-<h1 class="topictitle1">Creating elements</h1>
-<div><p>You can use element declarations in DTDs to define the elements
-that may occur in an XML document. Element declarations can specify that an
-element can contain other elements, that it can contain anything at all, or
-that it must be empty.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p><b>Creating
-elements</b></p>
-<p>To create an element, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>In the Outline view, right-click the DTD <img src="../images/nDTDFile.gif" alt="Image of the DTD icon" /> and click  <span class="uicontrol">Add Element</span>.</span></li>
-<li class="skipspace"><span>In the Properties view, type the new name of the element in the <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>When you create an element in the DTD editor, a child element that
-is EMPTY is automatically created.</span><ol type="a"><li class="skipspace"><span>Select the EMPTY child element and, in the Properties view,
-change its <span class="uicontrol">Content type</span> to ANY, (#PCDATA), or another
-element.</span> If you do not want the parent element to contain anything,
-leave its content model type as EMPTY. </li>
-<li class="skipspace"><span>If you want your parent element to contain more than one child
-element (or mixed content), select <span class="uicontrol">Children Content</span> or <span class="uicontrol">Mixed
-Content</span> from the <span class="uicontrol">Content type</span> list.</span> Once you select either of these, you will have a group (represented
-by a group node - <img src="../images/XSDSequence.gif" /> if you select
-Children Content and <img src="../images/XSDChoice.gif" /> if you select
-Mixed Content), which you can use to create a group of child elements under
-the parent element. A child element will automatically be created under
-the group node. For information on editing a group, refer to the related information.
- </li>
-</ol>
-</li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab
-if you want to provide any information about this element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description of the element.</li>
-</ol>
-<div class="skipspace"><p><b>Note</b>: If you intend to have mixed content, the value of
-the first element in your group must be (#PCDATA) (consequently, if you select <span class="uicontrol">Mixed
-Content</span>, two child elements will automatically be created, the
-first one having a value of (#PCDATA)). As well, a group should not contain
-an EMPTY or ANY element. EMPTY or ANY elements are not legally allowed as
-nested entities.</p>
-</div>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcretattr.html" title="You can use an attribute to describe an element or provide information about it. Attribute lists enable you to group together all related attributes for an element.">Creating attributes and attribute lists</a><br />
-<a href="../topics/tchgelm.html" title="An element's content model represents any data that can be contained inside or within the content of an element (that is, between the start and end tags of an element in an XML file). Editing an element's content model enables you to determine exactly what the element can (and cannot) contain.">Editing an element's content model</a><br />
-<a href="../topics/tedtgnde.html" title="If your element has either element content or mixed content, its content model is represented by a group node. You can add children elements or another group to a group node, and specify how often, and in what manner a group of elements will be available in an XML file associated with your DTD.">Editing a group node</a><br />
-<a href="../topics/tremvelm.html" title="If you have created elements, attributes, entities, notations, and comments you no longer need, you can delete any of them.">Deleting elements, attributes, entities, notations, and comments</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretent.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretent.html
deleted file mode 100644
index a499df7..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretent.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating entities</title>
-</head>
-<body id="tcretent"><a name="tcretent"><!-- --></a>
-
-<h1 class="topictitle1">Creating entities</h1>
-<div><p>An entity is a shortcut used to represent complex strings or symbols
-that would otherwise be impossible, difficult or repetitive to include by
-hand. </p><div class="skipspace"><p>For example, you need to place a copyright notification (for example, <var class="varname">Copyright
-2005. MyCompany publishing</var>.) at the end of every page of a book.
-Instead of writing it every time, you could create an entity that represents
-this text: <samp class="codeph">&lt;!ENTITY copyright "Copyright 2005. MyCompany publishing."&gt;</samp> where <samp class="codeph">copyright</samp> is
-the name of the entity and <samp class="codeph">"Copyright 2004. MyCompany publishing"</samp> is
-the text that the <samp class="codeph">copyright</samp> entity represents.</p>
-<p>To create
-an entity, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>In the Outline view, right-click the DTD <img src="../images/nDTDFile.gif" alt="Image of the DTD icon" /> and click <span class="uicontrol">Add Entity </span>.</span></li>
-<li class="skipspace"><span>In the Properties view, type the new name of the entity in the <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>From the <span class="uicontrol">Entity Type</span> list, select <span class="uicontrol">General</span> or <span class="uicontrol">Parameter</span>. </span> General entities are used in XML files, whereas parameter entities are
-used only in the DTD and do not have any use in an XML file.</li>
-<li class="skipspace"><span>Select the <span class="uicontrol">External</span> check box if you
-want to declare your entity as an external entity. An external entity references
-an external document or data.</span></li>
-<li class="skipspace"><span>If you did make the entity external, the following fields appear:</span><ul><li><span class="uicontrol">Public ID</span> (Optional). Type the path of the
-DTD you want to reference. You can then use the resources in the file you
-are referencing.</li>
-<li><span class="uicontrol">System ID</span>. Type the path of the external data
-or document you want to reference, or browse for it. You can then use the
-resources in the file you are referencing.</li>
-</ul>
- <p>You only need to specify the <span class="uicontrol">Public ID</span> or
-the <span class="uicontrol">System ID</span>, not both. If, in your DTD, you want
-to use any of the resources (such as elements or attributes) contained in
-the document you have referenced, you must make this entity a <span class="uicontrol">Parameter</span> entity,
-and "expand" the entity by creating an external parameter entity reference
-(right-click the DTD <img src="../images/nDTDFile.gif" alt="Image of the DTD icon" />,
-click  <span class="uicontrol">Add Parameter Entity Reference</span>, and select the
-entity you just created). </p>
-</li>
-<li class="skipspace"><span>If you did not make the entity external, you can specify the entity
-value in the <span class="uicontrol">Entity value</span> field. </span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this entity.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description of the entity.</li>
-</ol>
-<div class="skipspace">The follow links explain different ways you can reuse entities:</div>
-</div>
-
-<div>
-<blockquote>
-<div class="ulchildlink"><b><a href="../topics/trusintp.html">Reusing internal parameter entities in an attribute name or type</a></b><br />
-Reusing parameter entities in attributes can save you a lot of time. If you have several elements using the exact same attribute, you only have to input the information once (into an entity).  </div>
-<div class="ulchildlink"><b><a href="../topics/trusents.html">Reusing the value of one entity in another entity</a></b><br />
-Reusing the value of an entity in another entity can save you time in several ways. For example, if your value is long and complicated, it is much faster to simply reuse an entity than manually type in your value each time. As well, if the value changes, you only have to change it in one location.</div>
-<div class="ulchildlink"><b><a href="../topics/trusextp.html">Reusing external parameter entities in an element's content model</a></b><br />
-Using an entity in a content model can save you time if you want to have the same information in several content models. You can create a DTD that references another DTD and then declares an element whose content model refers to a parameter entity created in another DTD.</div>
-</blockquote>
-
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tedtdtd.html" title="You can edit DTD files in both the Outline view and the Source view. Modifying the content of a DTD determines what can be used in any XML file that is associated with it.">Editing DTDs</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tremvelm.html" title="If you have created elements, attributes, entities, notations, and comments you no longer need, you can delete any of them.">Deleting elements, attributes, entities, notations, and comments</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretnot.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretnot.html
deleted file mode 100644
index 7e567fe..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretnot.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating notations </title>
-</head>
-<body id="creatingnotations"><a name="creatingnotations"><!-- --></a>
-
-<h1 class="topictitle1">Creating notations </h1>
-<div><p>Notations are means of associating a binary description with an
-entity or attribute. The most common uses of notations are to include familiar
-types of binary references, such as GIFs and JPGs, in an XML file.</p><div class="skipspace"><p>For example, you are making a catalogue of your clothing and want
-to include an image of one of your shirts. You would have to create a notation
-similar to this one: <samp class="codeph">&lt;!NOTATION myshirt SYSTEM "GIF"&gt;</samp> which
-defines a notation for a GIF image.</p>
-<p>To create a notation, follow these
-steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>In the Outline view, right-click the DTD <img src="../images/nDTDFile.gif" alt="Image of the DTD icon" /> and select  <span class="uicontrol">Add Notation </span>. </span></li>
-<li class="skipspace"><span>In the Properties view, type the name of the notation in the <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>(Optional) In the <span class="uicontrol">Public ID</span> field, type
-any information you want to supply to the user or application. For example,
-a description of what the notation refers to.</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">System ID</span> field, type any information
-to be passed along to the application dealing with the binary data. For example,
-a URL.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this notation.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description of the notation
-contents.</li>
-</ol>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tedtdtd.html" title="You can edit DTD files in both the Outline view and the Source view. Modifying the content of a DTD determines what can be used in any XML file that is associated with it.">Editing DTDs</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tremvelm.html" title="If you have created elements, attributes, entities, notations, and comments you no longer need, you can delete any of them.">Deleting elements, attributes, entities, notations, and comments</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtdtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtdtd.html
deleted file mode 100644
index 1594834..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtdtd.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing DTDs</title>
-</head>
-<body id="tedtdtd"><a name="tedtdtd"><!-- --></a>
-
-<h1 class="topictitle1">Editing DTDs</h1>
-<div><p>You can edit DTD files in both the Outline view and the Source
-view. Modifying the content of a DTD determines what can be used in any XML
-file that is associated with it.</p><div class="skipspace"><p>You can edit DTDs in the following ways:</p>
-<ul><li>Create or remove elements, attributes, entities, notations, and comments</li>
-<li>Edit an element's content model</li>
-<li>Edit a group</li>
-<li>Reuse entities</li>
-</ul>
-<p><b>Editing in the Outline view</b></p>
-<p>The Outline view will show
-you all the items in your DTD as you add them. In this view, you can both
-create and delete DTD nodes. </p>
-<p>The following instructions were written
-for the Resource perspective, but they will also work in many other perspectives.
-To edit a DTD in the Outline view, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Create a new DTD or double-click an existing DTD in the Navigator
-view.</span> It will automatically open in the DTD editor.</li>
-<li class="skipspace"><span>In the Outline view, right-click the DTD <img src="../images/nDTDFile.gif" alt="Image of the DTD file" /> and select the node you want to add to it.</span></li>
-<li class="skipspace"><span>In the Properties view, edit the fields for the node as appropriate.</span></li>
-</ol>
-<div class="skipspace"><p>The DTD editor has a built-in mechanism to handle referential integrity
-issues. When you delete or edit certain components, clean up will automatically
-occur. Refer to the related reference section for more information.</p>
-<p><b>Editing
-in the Source view</b></p>
-<p> You can edit the source code for your DTD in
-the Source view manually.</p>
-<p>The following instructions were written for
-the Resource perspective, but they will also work in many other perspectives.
-To edit a DTD in the Source view, follow these steps:</p>
-<ol><li>Create a new DTD or double-click an existing DTD in the Navigator view.
-It will automatically open in the DTD editor.</li>
-<li>Select the source code you want to edit - you can edit existing nodes
-or create new ones.</li>
-<li>Your changes to the DTD will automatically be reflected in the Outline
-and Properties views. If you have created any errors in your code while editing
-in the Source view, they will appear in the Problems view when you save or
-validate the file.</li>
-<li>The DTD editor has a built-in mechanism to handle referential integrity
-issues, however, this mechanism only works if you delete items using the Outline
-view or edit them in the Properties view. If you delete or edit items using
-the Source view, clean up will not automatically occur; instead you will receive
-error messages in the Problems view if you validate or save the file.</li>
-</ol>
-<p><b>Sorting nodes in the Outline view</b></p>
-<p>By default, DTD nodes
-appear in the Outline view in the order you added them to the DTD. </p>
-<p>If
-you want to sort the DTD nodes alphabetically, click the <span class="uicontrol">Sort
-items alphabetically</span> button  <img src="../images/sort.gif" />. </p>
-<p>You
-can also group the DTD nodes into logical groups - notations, entities, elements,
-and other. Click the <span class="uicontrol">Group items logically</span> button <img src="../images/organize_dtd_logically.gif" /> to sort the DTD nodes into logical
-groups.</p>
-<p>The following links contain information on how you can edit
-DTD files:</p>
-</div>
-</div>
-
-<div>
-<blockquote>
-<div class="ulchildlink"><b><a href="../topics/tcretelm.html">Creating elements</a></b><br />
-You can use element declarations in DTDs to define the elements that may occur in an XML document. Element declarations can specify that an element can contain other elements, that it can contain anything at all, or that it must be empty.</div>
-<div class="ulchildlink"><b><a href="../topics/tcretent.html">Creating entities</a></b><br />
-An entity is a shortcut used to represent complex strings or symbols that would otherwise be impossible, difficult or repetitive to include by hand.</div>
-<div class="ulchildlink"><b><a href="../topics/tcretnot.html">Creating notations</a></b><br />
-Notations are means of associating a binary description with an entity or attribute. The most common uses of notations are to include familiar types of binary references, such as GIFs and JPGs, in an XML file.</div>
-<div class="ulchildlink"><b><a href="../topics/tcretcomm.html">Creating a comment</a></b><br />
-Comments can be used to provide information about a document, such as the author's name, or the date it was last modified. Comments are visible to anyone reading the DTD, but are ignored by the XML parser.</div>
-<div class="ulchildlink"><b><a href="../topics/tremvelm.html">Deleting elements, attributes, entities, notations, and comments</a></b><br />
-If you have created elements, attributes, entities, notations, and comments you no longer need, you can delete any of them.</div>
-</blockquote>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cdtdedit.html" title="After you have created or imported a DTD, you can open it in the DTD editor (by double-clicking it in the Navigator view), a tool for viewing and editing DTDs. You can use the DTD editor to perform a variety of tasks such as creating, editing, and deleting DTD elements, attributes, entities, notations, and comments">DTD editor</a><br />
-<a href="../topics/cdtdover.html" title="A document type definition (DTD) provides you with the means to validate XML files against a set of rules. When you create a DTD file, you can specify rules that control the structure of any XML files that reference the DTD file.">Document type definitions (DTDs) - overview</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcretdtd.html" title="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.">Creating DTDs</a><br />
-<a href="../topics/timptdtd.html" title="If you want to work with DTD files that you created outside of the product, you can import them into the workbench and open them in the DTD editor. The DTD editor provides you with a structured view of the DTD.">Importing DTDs</a><br />
-</p>
-<p><b class="relrefhd">Related reference</b><br />
-<a href="../topics/rrefint.html" title="The DTD editor has a built-in mechanism to handle referential integrity issues. When you delete or rename certain nodes, clean up for any nodes affected will automatically occur.">Referential integrity in the DTD editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtgnde.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtgnde.html
deleted file mode 100644
index 6a85f7c..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtgnde.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing a group node</title>
-</head>
-<body id="tedtgnde"><a name="tedtgnde"><!-- --></a>
-
-<h1 class="topictitle1">Editing a group node</h1>
-<div><p>If your element has either element content or mixed content, its
-content model is represented by a group node. You can add children elements
-or another group to a group node, and specify how often, and
-in what manner a group of elements will be available in an XML file associated
-with your DTD.</p><div class="skipspace"><p></p>
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives. </p>
-<p>To
-edit a group node, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>In the Outline view, expand the tree of the element you want to
-work with.</span></li>
-<li class="skipspace"><span>Click the group node you want to work with.</span></li>
-<li class="skipspace"><span>In the Design view, select <span class="uicontrol">Sequence</span> or <span class="uicontrol">Choice</span> from
-the <span class="uicontrol">Model Group</span> list.</span> This specifies whether
-the group of elements are sorted in sequence or are available as a choice
-in an XML file </li>
-<li class="skipspace"><span>Select the appropriate option from the <span class="uicontrol">Occurrence</span> list
-to indicate how often the group of elements can occur in an XML file associated
-with this DTD. </span></li>
-<li class="skipspace"><span>To add another existing element to a group as a child, right-click
-the group node, click  <span class="uicontrol">Add Element to Content Model</span>,
-and specify its name.</span></li>
-<li class="skipspace"><span>You can also add a group to an existing group node, by right-clicking
-the group note and clicking <span class="uicontrol">Add Group to Content Model</span></span></li>
-</ol>
-<div class="skipspace"><p> <b>Note:</b>The <span class="uicontrol">Occurrence</span> option for the
-group node only specifies how often the entire group of elements can occur
-in an XML file. For each child element contained in the group, you can also
-specify how often it can occur (that is, how often a child element can occur
-is completely separate from how the often the group that contains it can occur).</p>
-<p>  <b>Tip:</b>:
-To change the order of elements listed below a group node, simply click the
-element you want to move and drag it to the location you want it in.</p>
-</div>
-<div class="skipspace"><p><b>Creating a group node that contains a list of small pets</b></p>
-<p>The
-following steps show you how to create a group node that contains a list of
-small pets and explains how the choices you select affect how your group node
-(and the elements it contains) can be used in any XML files based on your
-DTD file:</p>
-<ol><li>Create a new DTD called <kbd class="userinput">Pets.dtd</kbd> and open it in
-the DTD editor.</li>
-<li>In the Outline view, right-click your DTD file, and create a new element <kbd class="userinput">SmallPets</kbd>.
-Also create three more elements - <kbd class="userinput">Cats</kbd>,<kbd class="userinput">Dogs</kbd>,
-and.<kbd class="userinput">Fish</kbd></li>
-<li>Expand <span class="uicontrol">SmallPets</span> and select the <span class="uicontrol">EMPTY</span> content
-model.  Select <span class="uicontrol">Mixed Content</span> from the <span class="uicontrol">Content
-type</span> list.  This means your <span class="uicontrol">SmallPets</span> element
-can contain both other elements and character data.</li>
-<li>Your content model is now represented by a group node  <img src="../images/XSDChoice.gif" />.
-A #PCDATA element (for character data) and new child element are automatically
-created below it.  Select the  <span class="uicontrol">newChild</span> and select
- <span class="uicontrol">Dogs</span> in the <span class="uicontrol">Name</span> list.</li>
-<li>Right-click the group node and click  <span class="uicontrol">Add Element to Content
-Model</span>. Select the new child node and  select <span class="uicontrol">Cats</span> in
-the  <span class="uicontrol">Name</span> list.</li>
-<li>Repeat the previous step and select <span class="uicontrol">Fish</span> in the <span class="uicontrol">Name</span> list.</li>
-<li>Now that you have created your list of small pets, you have to decide
-if you want users to be able to select all of them or just one of them in
-an XML file based on this Pets.dtd file. For example, you create a new XML
-file called <kbd class="userinput">Pets.xml</kbd> based on this DTD, and you create
-a <kbd class="userinput">SmallPets</kbd> element in it.  If you selected <span class="uicontrol">Sequence</span> as
-the model group in the DTD file, then you can have all of the small pets ( <span class="uicontrol">Cats</span>,
- <span class="uicontrol">Dogs</span> and  <span class="uicontrol">Fish</span>) in your  <span class="uicontrol">SmallPets</span> element
-in the <span class="uicontrol">Pets.xml</span> file. If, however, you selected <span class="uicontrol">Choice</span> as
-the connector type, you can only have one animal listed in your  <span class="uicontrol">SmallPets</span> element
-in the  <span class="uicontrol">Pets.xml</span> file. You can have  <span class="uicontrol">Cats</span> or
- <span class="uicontrol">Dogs</span> or  <span class="uicontrol">Fish</span>, but you can
-only have one at a time.</li>
-<li>Now you have to decide how often this group of elements (the list of small
-pets) can occur in an XML file associated with this DTD.  You can specify
-that it must appear only once ( <span class="uicontrol">Just once</span>), that it
-must appear one or more times ( <span class="uicontrol">One or more</span>), that
-it does not have to appear at all ( <span class="uicontrol">Optional</span>) or that
-it might not be used at all or might be used any number of times ( <span class="uicontrol">Zero
-or more</span>).  <span class="uicontrol">Note</span>: You can also specify how
-often each child element can occur. How often a child element can occur is
-completely separate from how the often the group that contains it can occur.
-So, for example, you can specify that the  <span class="uicontrol">SmallPets</span> group
-can occur  <span class="uicontrol">Just once</span>, but the Cats element can appear
-several times (to do this, select the <span class="uicontrol">Cats</span> element
-and click  <span class="uicontrol">One or more</span>).</li>
-<li>The order in which you specify child elements in a group affects how they
-can be used in any instances of the parent element in an XML file. For example,
-if, in your DTD file, you had specified this: <samp class="codeph">&lt;!ELEMENT SmallPets
-(Dogs+ , Cats+ , Fish)+&gt;</samp>, any instances of<span class="uicontrol">SmallPets</span> in
-your  <span class="uicontrol">Pets.xml</span> file must contain one or more instances
-of  <span class="uicontrol">Dogs</span> followed by one or more instances of  <span class="uicontrol">Cats</span>,
-followed by just one occurrence of  <span class="uicontrol">Fish</span>. You could
-never have an occurrence of  <span class="uicontrol">Fish</span> after  <span class="uicontrol">Dogs</span> or <span class="uicontrol">Cats</span> before <span class="uicontrol">Dogs</span>. </li>
-<li>You can also add a group to an existing group node. Select the node, right-click
-it and click  <span class="uicontrol">Add Group to Content Model</span>.  You
-might want to add a group node, if you decided you wanted to sort the animals
-by breed into separate groups.  </li>
-</ol>
-</div>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tchgelm.html" title="An element's content model represents any data that can be contained inside or within the content of an element (that is, between the start and end tags of an element in an XML file). Editing an element's content model enables you to determine exactly what the element can (and cannot) contain.">Editing an element's content model</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tgenxmls.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tgenxmls.html
deleted file mode 100644
index 7187e24..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tgenxmls.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Generating XML schemas from DTD files</title>
-</head>
-<body id="tgenxmls"><a name="tgenxmls"><!-- --></a>
-
-<h1 class="topictitle1">Generating XML schemas from DTD files</h1>
-<div><p>Generating an XML schema from a DTD file enables you to create
-an XML schema that is automatically populated with elements and attributes
-from your DTD file. This can save you time if you want to use an XML schema
-rather than a DTD file to validate your XML file, but you want to use the
-rules already set up in your DTD file.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To generate
-an XML schema file from a DTD file, follow these steps:</p>
-</div>
-<ol><li><span>In the Navigator view, right-click your DTD and click <span class="menucascade"><span class="uicontrol">Generate</span> &gt; <span class="uicontrol"> XML Schema</span></span>.</span></li>
-<li><span>Select the project or folder that will contain the schema. </span></li>
-<li><span>Accept the default name or type a new one and click <span class="uicontrol">Next</span>.</span></li>
-<li><span>If you want to create an XML schema that will contain your DTD
-file and any DTD files it references, click the <span class="uicontrol">Create one XML
-schema that includes all the DTD files</span> radio button.</span></li>
-<li><span>Otherwise, if you want to create an individual schema for your
-DTD file and each DTD file it references, click the <span class="uicontrol">Create an XML
-schema for each DTD file</span> radio button.</span></li>
-<li><span>Click  <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-<div class="skipspace"><p>Your schemas appears in the Navigator view. They will have the
-same name as the DTD file they were generated from (if you accepted the default
-value in the <span class="uicontrol">File name</span> field when you generated the
-XML schema). </p>
-<p>Any entities that were in your DTD file will not be in
-the XML schema (as entities are not supported in XML schemas). However,
-any elements or attributes that referred to an entity will carry over that
-value to an XML schema.</p>
-</div>
-<div class="skipspace"><p>For example, you have a DTD called "Legal" that contains an entity
-called "Copyright". The value of the entity is "Copyright 2004. MyCompany
-Publishing" . In your DTD, you have an element called "MyCopyright", which
-refers to the entity Copyright. After you create the XML schema, the Copyright
-entity will not appear in the XML schema, however, its value is carried over
-(that is, MyCopyright will have the value: Copyright 2004. MyCompany Publishing
-).</p>
-<p>All elements and attributes that existed in your DTD file will exist
-in the XML schema file.</p>
-<p>Elements in your DTD with a content model of
-(#PCDATA) (and no attributes) appear empty in the XML schema editor. They
-are marked as having <span class="uicontrol">Built-in simple types</span> of <samp class="codeph">string</samp>.
-That is, a DTD element with a value of (#PCDATA) will map to an XML schema
-element with an XML schema primitive type <samp class="codeph">string</samp>.</p>
-<div class="note"><span class="notetitle">Note: </span>When
-you generate an XML schema from a DTD file that contains Hebrew or Arabic
-elements, certain element names might be encoded with their equivalent hexadecimal
-Hebrew and Arabic encoding values. To avoid this problem, change the encoding
-attribute of the original DTD or XML schema file to UTF-8 before performing
-the generation:  That is, the XML declaration should be: <samp class="codeph">&lt;?xml
-version="1.0" encoding="UTF-8"?&gt;</samp> The list of affected encoding values
-is:  ISO-8859-8-I, ISO-8859-8,  Windows-1256, and ISO-8859-6.</div>
-</div>
-</div>
-
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcretdtd.html" title="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.">Creating DTDs</a><br />
-</p>
-<b>Related information</b><br /><a href="../../org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html">Editing XML schemas</a><br />
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html
deleted file mode 100644
index 9252ea6..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Importing DTDs</title>
-</head>
-<body id="timptdtd"><a name="timptdtd"><!-- --></a>
-
-<h1 class="topictitle1">Importing DTDs</h1>
-<div><p>If you want to work with DTD files that you created outside of
-the product, you can import them into the workbench and open them in the DTD
-editor. The DTD editor provides you with a structured view of
-the DTD.</p><div class="skipspace"><p>To import a DTD into the workbench, follow these steps:</p>
-</div>
-<ol><li><span>Click <span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">Import</span></span>.</span></li>
-<li><span>Select the import source and click <span class="uicontrol">Next</span>.</span></li>
-<li><span>Fill in the fields in the <span class="uicontrol">Import</span> wizard
-as necessary.</span></li>
-<li><span>When you are finished, click <span class="uicontrol">Finish</span>.</span></li>
-<li><span>Select the DTD file in the Navigator view and double-click it to
-open it in the DTD editor.</span></li>
-</ol>
-<div class="skipspace"><p>After you have imported a DTD file into the workbench and opened
-it in the DTD editor, you can edit it.</p>
-</div>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tedtdtd.html" title="You can edit DTD files in both the Outline view and the Source view. Modifying the content of a DTD determines what can be used in any XML file that is associated with it.">Editing DTDs</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tremvelm.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tremvelm.html
deleted file mode 100644
index 903c8bf..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tremvelm.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Deleting elements, attributes, entities, notations, and comments</title>
-</head>
-<body id="tremvelm"><a name="tremvelm"><!-- --></a>
-
-<h1 class="topictitle1">Deleting elements, attributes, entities, notations, and comments</h1>
-<div><p>If you have created elements, attributes, entities, notations,
-and comments you no longer need, you can delete any of them. </p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To delete
-an element, attribute, entity, notation or comment:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>In the Outline view, click the element, attribute, entity, notation,
-or comment you want to delete.</span> If you want to delete more
-than one item, hold down the<span class="uicontrol">Ctrl</span> key while you select
-items.</li>
-<li class="skipspace"><span>Right-click the item (or one of the items if you have selected
-more than one), and, from its pop-up menu, click <span class="uicontrol">Delete</span>.</span></li>
-</ol>
-<div class="skipspace"><p>You can "undo" the deletion of an item. To do so, right-click any
-element, attribute, entity, notation, or comment and click <span class="uicontrol">Undo
-Delete</span>.  You must do this before you close the editor, otherwise,
-your items will no longer exist on the system and you will have to recreate
-them if you want them again.</p>
-<p>The DTD editor has a built-in mechanism
-to handle referential integrity issues. When you delete or rename certain
-nodes, clean up will automatically occur. </p>
-</div>
-</div>
-
-<div>
-<blockquote>
-<div class="ulchildlink"><b><a href="../topics/rrefint.html">Referential integrity in the DTD editor</a></b><br />
-The DTD editor has a built-in mechanism to handle referential integrity issues. When you delete or rename certain nodes, clean up for any nodes affected will automatically occur.</div>
-</blockquote>
-
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tedtdtd.html" title="You can edit DTD files in both the Outline view and the Source view. Modifying the content of a DTD determines what can be used in any XML file that is associated with it.">Editing DTDs</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcretattr.html" title="You can use an attribute to describe an element or provide information about it. Attribute lists enable you to group together all related attributes for an element.">Creating attributes and attribute lists</a><br />
-<a href="../topics/tcretcomm.html" title="Comments can be used to provide information about a document, such as the author's name, or the date it was last modified. Comments are visible to anyone reading the DTD, but are ignored by the XML parser.">Creating a comment</a><br />
-<a href="../topics/tcretent.html" title="An entity is a shortcut used to represent complex strings or symbols that would otherwise be impossible, difficult or repetitive to include by hand.">Creating entities</a><br />
-<a href="../topics/tcretnot.html" title="Notations are means of associating a binary description with an entity or attribute. The most common uses of notations are to include familiar types of binary references, such as GIFs and JPGs, in an XML file.">Creating notations</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusents.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusents.html
deleted file mode 100644
index 57c612b..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusents.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Reusing the value of one entity in another entity</title>
-</head>
-<body id="trusents"><a name="trusents"><!-- --></a>
-
-<h1 class="topictitle1">Reusing the value of one entity in another entity</h1>
-<div><p>Reusing the value of an entity in another entity can save you time
-in several ways. For example, if your value is long and complicated, it is
-much faster to simply reuse an entity than manually type in your value each
-time. As well, if the value changes, you only have to change it in one location.</p><div class="skipspace"><p>The following instructions were written for the
-Resource perspective, but they will also work in many other perspectives. </p>
-<p>You
-can create an entity that reuses another entity. To do so, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>Create an entity.</span> <ol type="a"><li><span>Type a name for the entity and select <span class="uicontrol">Parameter</span> from
-the <span class="uicontrol">Entity type</span> list.</span></li>
-<li><span>Type the value of the entity in the <span class="uicontrol">Entity Value</span> field.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>Create another entity.</span><ol type="a"><li><span>Type a name and select <span class="uicontrol">General</span> from the <span class="uicontrol">Entity
-type</span> list.</span></li>
-<li><span>In the <span class="uicontrol">Entity Value</span> field, type a reference
-to the first parameter entities' value (that is, type %<var class="varname">parmentityname</var>;)</span></li>
-</ol>
-</li>
-</ol>
-<div class="skipspace"><p>You now have two entities with the exact same value. </p>
-</div>
-<div class="skipspace">The following sample shows how you might create an entity that reuses
-the value of another entity.<p>You need to place a copyright at the end of
-every page of a book. On even pages, you need to put "Copyright 2003" and
-on odd pages, you need to put "Copyright 2003. MyCompany Publishing." First
-you will declare an entity with the simpler value and then create an entity
-with the more complicated value.</p>
-<ol><li>Open your DTD in the DTD editor.</li>
-<li>Create an entity. In the <span class="uicontrol">Name</span> field, type <kbd class="userinput">CopyrightDate</kbd>.
-Select <span class="uicontrol">Parameter</span> from the <span class="uicontrol">Entity type</span> list.
-In the <span class="uicontrol">Entity Value</span>, type <kbd class="userinput">Copyright 2003</kbd>.</li>
-<li>Create another entity. In the <span class="uicontrol">Name</span> field, type <kbd class="userinput">CompanyCopyright</kbd>.
-Select <span class="uicontrol">General</span> from the <span class="uicontrol">Entity type</span> list.
-In the<span class="uicontrol">Entity Value</span> field, type <kbd class="userinput">%CopyrightDate;
-MyCompany Publishing</kbd>.</li>
-</ol>
-<p>Now, if you need to change the copyright date, you only need to do
-so in one place, not two.</p>
-<p> <b>Note</b>: Since you had to make the CopyrightDate
-entity a <span class="uicontrol">Parameter</span> entity in order to be able to reference
-it in the CompanyCopyright entity, you cannot use it in an XML file.
-You would have to create a third entity called <kbd class="userinput">XMLCopyrightDate</kbd> with
-a value of <kbd class="userinput">%CopyrightDate;</kbd> and use it instead in the
-XML file.</p>
-<p>To use the entity in an XML document, you must use the ampersand <kbd class="userinput">&amp;</kbd> followed
-by the name of the entity, and then end with the semi-colon <kbd class="userinput">;</kbd>.
-So, in an XML document, if you were working with an even page, you would need
-to put this:</p>
-<p><kbd class="userinput">&amp;XMLCopyrightDate; </kbd></p>
-<p> to
-call the XMLCopyrightDate entity.  Remember, you cannot call the CopyrightDate
-entity because you had to make it a <span class="uicontrol">Parameter</span> entity
-in order to be able to reference it in the CompanyCopyright entity.</p>
-<p>If
-you were working with an odd page, you would need to put this:</p>
-<p><kbd class="userinput">&amp;CompanyCopyright; </kbd></p>
-<p> to
-call the CompanyCopyright  entity.</p>
-</div>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tcretent.html" title="An entity is a shortcut used to represent complex strings or symbols that would otherwise be impossible, difficult or repetitive to include by hand.">Creating entities</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/trusintp.html" title="Reusing parameter entities in attributes can save you a lot of time. If you have several elements using the exact same attribute, you only have to input the information once (into an entity).  ">Reusing internal parameter entities in an attribute name or type</a><br />
-<a href="../topics/trusextp.html" title="Using an entity in a content model can save you time if you want to have the same information in several content models. You can create a DTD that references another DTD and then declares an element whose content model refers to a parameter entity created in another DTD.">Reusing external parameter entities in an element's content model</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusextp.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusextp.html
deleted file mode 100644
index 41df9bd..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusextp.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Reusing external parameter entities in an element's content model</title>
-</head>
-<body id="trusextp"><a name="trusextp"><!-- --></a>
-
-<h1 class="topictitle1">Reusing external parameter entities in an element's content model</h1>
-<div><p>Using an entity in a content model can save you time if you want
-to have the same information in several content models. You can create a DTD
-that references another DTD and then declares an element whose content model
-refers to a parameter entity created in another DTD. </p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To create
-a DTD that reuses an external parameter entity in an element's content model,
-follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Create a new DTD.</span> If you want to work with an existing
-DTD, open your DTD in the DTD editor.</li>
-<li class="skipspace"><span>Create an entity (for example, <kbd class="userinput">MyEntity</kbd>).</span></li>
-<li class="skipspace"><span>Select <span class="uicontrol">Parameter</span> from the <span class="uicontrol">Entity
-type</span> list, and type a value for the entity in the <span class="uicontrol">Entity
-value</span> field. </span></li>
-<li class="skipspace"><span>Save your DTD file.</span></li>
-<li class="skipspace"><span>Create another DTD.</span></li>
-<li class="skipspace"><span>Create another entity (for example, <kbd class="userinput">MySecondEntity</kbd>). </span></li>
-<li class="skipspace"><span>Select <span class="uicontrol">Parameter</span> from the <span class="uicontrol">Entity
-type</span> list and select the <span class="uicontrol">External</span> check
-box to declare this as an external entity.</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">System ID</span> field, type the path of
-the DTD (or click the <span class="uicontrol">More</span> button to browse for a file)
-you created in step 1 . The path is relative to the workspace root.</span></li>
-<li class="skipspace"><span>(Optional) Type a value in the <span class="uicontrol">Public ID</span> field.</span></li>
-<li class="skipspace"><span>In the Outline view, right-click the DTD and click <span class="uicontrol">Add
-Parameter Entity Reference</span> to add a reference to the entity you
-created in step 6 (for example, <kbd class="userinput">MySecondEntity</kbd>).</span></li>
-<li class="skipspace"><span>Add an element.</span></li>
-<li class="skipspace"><span>Change the content type for this element from EMPTY to the
-value you specified in step 2 (for example,<kbd class="userinput">MyEntity</kbd>).</span> Note how you can select the value you specified in step 2 in the list
-for the content element. This is because you included the first DTD that you
-created in an earlier step.</li>
-</ol>
-<div class="skipspace"><p>You now have a DTD that references another DTD and declares an
-element whose content model refers to a parameter entity created in the other
-DTD. </p>
-</div>
-<div class="skipspace"><p>The following sample shows how you might reuse external parameter
-entities in an element's content model.</p>
-<p>You are making a list of everything
-you have in both your work office and your home office. You have a computer
-in each office and you do not want to write out a list of each part of your
-computer more than once.</p>
-<ol><li>Create a new DTD called <kbd class="userinput">WorkOffice.dtd.</kbd>.</li>
-<li>Create the following four elements: <kbd class="userinput">Monitor</kbd>,<kbd class="userinput">Keyboard</kbd>, <kbd class="userinput">Mouse</kbd>,
-and <kbd class="userinput">Hard_Drive</kbd>. Make the value of each element <span class="uicontrol">(#PCDATA)</span>.</li>
-<li>Add an entity called <kbd class="userinput">WorkComp</kbd>. Select <span class="uicontrol">Parameter</span> as
-the <span class="uicontrol">Entity type</span>. In the <span class="uicontrol">Value</span> field,
-type: <kbd class="userinput">(Monitor, Keyboard, Mouse, Hard_Drive)</kbd>. Click
- <span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol"> Save</span></span></li>
-<li>Create another DTD called <kbd class="userinput">HomeOffice.dtd</kbd></li>
-<li>Add an entity called <kbd class="userinput">HomeComp</kbd> to your HomeOffice.dtd
-. Select <span class="uicontrol">Parameter</span> as the <span class="uicontrol">Entity type</span> and
-click the <span class="uicontrol">External</span> check box to declare this as an
-external entity. In the <span class="uicontrol">System ID</span> field, type the path
-(or click the <span class="uicontrol">More</span> button to browse for the file) of <span class="uicontrol">WorkOffice.dtd</span>.
-The path is relative to the workspace root.</li>
-<li>(Optional) Type a value in the  <span class="uicontrol">Public ID</span> field.</li>
-<li>In the Outline view, right-click the DTD and select <span class="uicontrol">Add Parameter
-Entity Reference</span> to add the entity you created earlier (that is,
-%HomeComp;).</li>
-<li>Add an element called <kbd class="userinput">MyHomeComp</kbd>. Change the content
-model for MyHomeComp from <span class="uicontrol">EMPTY</span> to  <b>Work Office:
-%WorkComp;</b>. The value of MyHomeComp is now: <b>Monitor Keyboard Mouse
-Hard_Drive</b>.  Note how you can select the value you specified in step
-4 in the <span class="uicontrol">Content type</span> list for the content element.
-This is because you included the first DTD you created in an earlier step.</li>
-</ol>
-</div>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tcretent.html" title="An entity is a shortcut used to represent complex strings or symbols that would otherwise be impossible, difficult or repetitive to include by hand.">Creating entities</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/trusents.html" title="Reusing the value of an entity in another entity can save you time in several ways. For example, if your value is long and complicated, it is much faster to simply reuse an entity than manually type in your value each time. As well, if the value changes, you only have to change it in one location.">Reusing the value of one entity in another entity</a><br />
-<a href="../topics/trusintp.html" title="Reusing parameter entities in attributes can save you a lot of time. If you have several elements using the exact same attribute, you only have to input the information once (into an entity).  ">Reusing internal parameter entities in an attribute name or type</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusintp.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusintp.html
deleted file mode 100644
index 20ac729..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusintp.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Reusing internal parameter entities in an attribute name or type</title>
-</head>
-<body id="trusintp"><a name="trusintp"><!-- --></a>
-
-<h1 class="topictitle1">Reusing internal parameter entities in an attribute name or type</h1>
-<div><p>Reusing parameter entities in attributes can save you a lot of
-time. If you have several elements using the exact same attribute, you only
-have to input the information once (into an entity).  </p><div class="skipspace"><p></p>
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives. </p>
-<p>You
-can create a DTD that reuses internal parameter entities in attributes. To
-reuse internal parameter entities in attributes, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>In the workbench, create a new DTD.</span></li>
-<li class="skipspace"><span>Add a new entity to the DTD you just created.</span></li>
-<li class="skipspace"><span>Select <span class="uicontrol">Parameter</span> from the <span class="uicontrol">Entity
-type</span> list, and type a value in the <span class="uicontrol">Entity Value</span> field.</span></li>
-<li class="skipspace"><span>Create an element and add an attribute to it. </span></li>
-<li class="skipspace"><span>If you want to reuse the entity in an attribute name, in the <span class="uicontrol">Name</span> field
-for the attribute, type the name of the entity (that is, %NewEntity;) then
-in the <span class="uicontrol">Type</span> field, select the type for the attribute.</span> <b>Tip</b>: If you want to use an entity to replace an entire attribute
-definition, select <span class="uicontrol">(none)</span> from the <span class="uicontrol">Type</span> list.</li>
-<li class="skipspace"><span>If you want to reuse the entity as the type of an attribute, type
-the name of the attribute, and, in the <span class="uicontrol">Type</span> field,
-click the name of the entity you created in step 2.</span></li>
-<li class="skipspace"><span>Repeat steps 4 and 5 or 4 and 6 as applicable.</span></li>
-</ol>
-<div class="skipspace">You now have two attributes with the same name or type.</div>
-<div class="skipspace"><p> The following sample shows how you might reuse internal parameter
-entities in an attribute type.</p>
-<p>You are making a list of office supplies,
-and all your supplies have Part and Stock attributes.</p>
-<ol><li>Create a new DTD called <kbd class="userinput">OfficeSupplies.dtd</kbd> .</li>
-<li>Add an entity called <kbd class="userinput">PartStock</kbd>. Select <span class="uicontrol">Parameter</span> from
-the <span class="uicontrol">Entity type</span> list. In the <span class="uicontrol">Entity Value</span> field,
-type <kbd class="userinput">Part ID #REQUIRED Stock CDATA #IMPLIED</kbd>.</li>
-<li>Add three new elements to OfficeSupplies.dtd:  <kbd class="userinput">pen</kbd>, <kbd class="userinput">paper</kbd>,
-and  <kbd class="userinput">pencils</kbd>. Make the value of each element <span class="uicontrol">(#PCDATA)</span>.</li>
-<li>Right-click <span class="uicontrol">pen</span> and click <span class="uicontrol">Add Attribute</span>.
-In the <span class="uicontrol">Name</span> field for the attribute, type <kbd class="userinput">ID_Numbers</kbd>.
-In the  <span class="uicontrol">Type</span> field, click <span class="uicontrol"> %PartStock;</span>.</li>
-<li>Repeat step 4 for <span class="uicontrol">paper</span> and <span class="uicontrol">pencils.</span></li>
-</ol>
-<p>You now have three elements with the same attribute. </p>
-</div>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tcretent.html" title="An entity is a shortcut used to represent complex strings or symbols that would otherwise be impossible, difficult or repetitive to include by hand.">Creating entities</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/trusents.html" title="Reusing the value of an entity in another entity can save you time in several ways. For example, if your value is long and complicated, it is much faster to simply reuse an entity than manually type in your value each time. As well, if the value changes, you only have to change it in one location.">Reusing the value of one entity in another entity</a><br />
-<a href="../topics/trusextp.html" title="Using an entity in a content model can save you time if you want to have the same information in several content models. You can create a DTD that references another DTD and then declares an element whose content model refers to a parameter entity created in another DTD.">Reusing external parameter entities in an element's content model</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html
deleted file mode 100644
index 508ba39..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Validating DTDs</title>
-</head>
-<body id="tvaldtd"><a name="tvaldtd"><!-- --></a>
-
-<h1 class="topictitle1">Validating DTDs</h1>
-<div><p>Validating a DTD file lets you verify that it is well formed and
-does not contain any errors.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To validate
-a DTD, follow these steps:</p>
-</div>
-<div class="p"><span>In the Navigator view, right-click the DTD and click <span class="menucascade"><span class="uicontrol">Validate DTD File</span></span>.</span></div>
-<div class="skipspace">A dialog opens, indicating if the DTD file was successfully validated
-or not. If the file is invalid, any errors will appear in the Problems view.
- <p><b>Note</b>: If you receive an error message indicating
-that the Problems view is full, you can increase the number of error messages
-allowed by selecting <span class="menucascade"><span class="uicontrol">Properties</span> &gt; <span class="uicontrol">Validation</span></span> from the project's pop-up menu and specifying the maximum number
-of error messages allowed. You might have to select the <span class="uicontrol">Override
-validation preferences</span> check box in order to enable the <span class="uicontrol">Maximum
-number of validation messages</span> field</p>
-<p>You can set up project's
-properties so that different types of project resources are automatically
-validated when you save them. From a project's pop-up menu select  <span class="uicontrol">Properties</span>,
-then select <span class="uicontrol">Validation</span>. Any validators you can run
-against your project will be listed in the Validation page. </p>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.html.ui.infopop/.project b/docs/org.eclipse.wst.html.ui.infopop/.project
deleted file mode 100644
index 05aa1b4..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.html.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts.xml b/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts.xml
deleted file mode 100644
index 8b8dc10..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<contexts>
-<context id="misc0170">
-<description>Use this dialog to edit the Web content settings for a Web project. You can specify the default document type, CSS profile, and target device. The public ID and system ID are populated automatically. To restore the defaults, click <b>Restore Defaults</b>.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="webx0030">
-<description>This page lets you specify the line delimiter and the text encoding that will be used when you create, save, or load an HTML file.
-
-Various development platforms use different line delimiters to indicate the start of a new line. Select the operating system that corresponds to your development or deployment platform.
-<b>Note:</b> This delimiter will not automatically be added to any documents that currently exist. It will be added only to documents that you create after you select the line delimiter type and click <b>Apply</b>, or to existing files that you open and then resave after you select the line delimiter type and click <b>Apply</b>.
-
-The encoding attribute is used to specify the default character encoding set that is used when either creating HTML files or loading your HTML files into the editor.  Changing the creating files encoding causes any new HTML files that are created from scratch to use the selected encoding.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0031">
-<description>This page lets you specify the formatting, content assist, and capitalization style that will be used when you edit an HTML file.
-
-Enter a maximum width in the <b>Line width</b> field to specify the line width to break a line to fit onto more than one line when the document is formatted.
-
-Select <b>Split multiple attributes each on a new line</b> to start every attribute on a new line when the document is formatted. Attributes will return to the same margin as the previous line.
-
-Select <b>Indent using tabs</b> if you want to use tab characters (\t) as the standard formatting indentation.
-
-If you prefer to use spaces, select <b>Indent using spaces</b>.
-
-You can also specify the <b>Indentation size</b> which is the number of tabs or space characters used for formatting indentation.
-
-Select <b>Clear all blank lines</b> to remove blank lines when the document is formatted.
-
-To apply these formatting styles, select the <b>Format Document</b> menu item.
-
-If the <b>Automatically make suggestions</b> check box is selected, you can specify that certain characters will cause the content assist list to pop up automatically. Specify these characters in the <b>Prompt when these characters are inserted</b> field.
-
-Select the Uppercase or Lowercase radio button to determine the case for tag and attribute names that are inserted into the document when using content assist or code generation.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0032">
-<description>This page lets you customize the syntax highlighting that the HTML editor does when you are editing a file.
-
-The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
-
-The <b>Foreground</b> and <b>Background</b> push buttons open <b>Color</b> dialog boxes that allow you to specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
-
-Click the <b>Restore Default</b> push button to set the highlighting styles back to their default values.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0033">
-<description>This page lets you create new and edit existing templates that will be used when you edit an HTML file.
-</description>
-<topic label="Adding and removing HTML templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html"/>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="xmlm1100">
-<description>Cleanup options enable you to update a document so that it is well-formed and formatted.
-
-The following cleanup options let you select radio buttons to choose the type of cleanup to be performed:
-- <b>Tag name case for HTML</b>: Unless set to <b>As-is</b>, changes the case of all tags in a file for easier visual parsing and consistency.
-- <b>Attribute name case for HTML</b>: Unless set to <b>As-is</b>, changes the case of all attributes in a file for easier visual parsing and consistency.
-
-The following cleanup options can be set to on or off, so that you can limit the type of cleanup performed:
-- <b>Insert required attributes</b>: Inserts an missing attributes that are required by the tag to make the element or document well-formed.
-- <b>Insert missing tags</b>: Completes any missing tags (such as adding an end tag) necessary to make the element or document well-formed.
-- <b>Quote attribute values</b>: Appropriately adds double- or single-quotes before and after attribute values if they are missing.
-- <b>Format source</b>: Formats the document just as the <b>Format Document</b> context menu option does, immediately after performing any other specified <b>Cleanup</b> options.
-- <b>Convert line delimiters to</b>: Converts all line delimiters in the file to the selected operating system's type.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts2.xml b/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts2.xml
deleted file mode 100644
index b614187..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<contexts>
-<context id="htmlsource_source_HelpId">
-<description>The HTML source page editor lets you edit a file that is coded in the Hypertext Markup Language or in XHTML. The editor provides many text editing features, such as content assist, user-defined templates, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-<topic label="Adding and removing HTML templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html"/>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.html.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 9db441f..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: HTML editor infopops
-Bundle-SymbolicName: org.eclipse.wst.html.ui.infopop; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.html.ui.infopop/about.html b/docs/org.eclipse.wst.html.ui.infopop/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.html.ui.infopop/build.properties b/docs/org.eclipse.wst.html.ui.infopop/build.properties
deleted file mode 100644
index 6dcb86b..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = plugin.xml,\
-               about.html,\
-               EditorHtmlContexts.xml,\
-               META-INF/,\
-               EditorHtmlContexts2.xml
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.html.ui.infopop/plugin.xml b/docs/org.eclipse.wst.html.ui.infopop/plugin.xml
deleted file mode 100644
index ca695c5..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-       <contexts file="EditorHtmlContexts.xml" plugin ="org.eclipse.wst.html.ui"/>
-       <contexts file="EditorHtmlContexts2.xml" plugin ="org.eclipse.wst.html.core"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/.project b/docs/org.eclipse.wst.sse.doc.user/.project
deleted file mode 100644
index e2d6406..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.sse.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 43fd2a3..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Structured text editor and snippets documentation
-Bundle-SymbolicName: org.eclipse.wst.sse.doc.user; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.sse.doc.user/about.html b/docs/org.eclipse.wst.sse.doc.user/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/build.properties b/docs/org.eclipse.wst.sse.doc.user/build.properties
deleted file mode 100644
index 52caaf4..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = about.html,\
-               images/,\
-               plugin.xml,\
-               sse_toc.xml,\
-               topics/,\
-               META-INF/
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/ncontass.gif b/docs/org.eclipse.wst.sse.doc.user/images/ncontass.gif
deleted file mode 100644
index d82014f..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/ncontass.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/njscdast.gif b/docs/org.eclipse.wst.sse.doc.user/images/njscdast.gif
deleted file mode 100644
index 41a141c..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/njscdast.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/nlinux.gif b/docs/org.eclipse.wst.sse.doc.user/images/nlinux.gif
deleted file mode 100644
index 7c135cf..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/nlinux.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/nmacscrp.gif b/docs/org.eclipse.wst.sse.doc.user/images/nmacscrp.gif
deleted file mode 100644
index 54a6371..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/nmacscrp.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/nquest.gif b/docs/org.eclipse.wst.sse.doc.user/images/nquest.gif
deleted file mode 100644
index 3faa1e2..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/nquest.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/plugin.xml b/docs/org.eclipse.wst.sse.doc.user/plugin.xml
deleted file mode 100644
index 6c83bbd..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<!-- ===================================================== -->
-<!-- This is the plug-in for declaring the help pages      -->
-<!-- for the structured text editors (source editors).     -->
-<!-- ===================================================== -->
-
-<plugin>
-
-    <extension point="org.eclipse.help.toc">
-      <toc file="sse_toc.xml">
-      </toc>
-   </extension>
-
-</plugin>
diff --git a/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml b/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml
deleted file mode 100644
index c92d56e..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<toc label="Structured text editors" topics="topics/csrcedt004.html">
-      <topic label="Editing text coded in markup languages " href="topics/tsrcedt000.html">
-         <topic label="Setting preferences for structured text editors" href="topics/tsrcedt025.html">
-            <topic label="Setting annotation preferences for markup languages" href="topics/tsrcedt001.html"/>
-         </topic>
-         <topic label="Getting content assistance in structured text editors" href="topics/tsrcedt005.html">
-            <topic label="Content assist" href="topics/csrcedt006.html"/>
-            <topic label="Making content assist work for JSP files" href="topics/tsrcedt023.html"/>
-         </topic>
-         <topic label="Searching or finding text within a file" href="topics/tsrcedt007.html"/>
-         <topic label="Adding and removing markup language templates - overview" href="topics/tsrcedt027.html">
-            <topic label="Adding and removing HTML templates" href="topics/tsrcedt024.html"/>
-            <topic label="Adding and removing JSP templates" href="topics/tsrcedt028.html"/>
-            <topic label="Adding and removing XML templates" href="topics/tsrcedt029.html"/>
-         </topic>
-         <topic label="Editing with snippets - overview" href="topics/tsrcedt026.html">
-            <topic label="Snippets view" href="topics/csrcedt001.html"/>
-            <topic label="Adding snippets drawers" href="topics/tsrcedt014.html"/>
-            <topic label="Adding items to snippets drawers" href="topics/tsrcedt015.html"/>
-            <topic label="Editing snippet items" href="topics/tsrcedt022.html"/>
-            <topic label="Deleting or hiding snippet items or drawers" href="topics/tsrcedt016.html"/>
-         </topic>
-      </topic>
-</toc>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.html b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.html
deleted file mode 100644
index 9fea938..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Snippets view</title>
-</head>
-<body id="csrcedt001"><a name="csrcedt001"><!-- --></a>
-
-<h1 class="topictitle1">Snippets view</h1>
-<div><p>This documentation gives an overview of the Snippets view.</p><p>The Snippets view lets you catalog and organize reusable programming objects,
-such as HTML tagging, JavaScript™, and JSP code, along with files
-and custom JSP tags. The view can be extended based on additional objects
-that you define and include.</p>
-<p>To view or collapse the objects in a specific drawer, click the drawer
-name.</p>
-<div class="p">The Snippets view has the following features: <ul><li>Drag-and-drop to various source editing pages: You can drag items from
-the view into the active editor and the text will be dropped into the document
-at the cursor location </li>
-<li>Double-click support: You can double-click on an item and have it inserted
-at the current cursor position in the active editor </li>
-<li>User-defined drawers and items: You can define, edit, and remove items
-from view drawers as desired.</li>
-<li>Plug-in-defined drawers and items: Plug-in developers can contribute a
-default list of items to their own drawers.</li>
-<li>Variables in insertions: By default, items will be edited using a dialog
-and, when inserted, you will be prompted for values for each of the variables.</li>
-<li>Customization: You can select which drawers and items are shown in the
-Snippets view.</li>
-<li>Custom insertion: Plug-in developers can customize the behavior of items
-so that when they are dropped during a drag-and-drop action, both the text
-that is inserted and the insertion location are strictly defined.</li>
-</ul>
-</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a><br />
-<a href="tsrcedt014.html" title="This documentation explains how to customize the Snippets view by adding a new drawer.">Adding snippets drawers</a><br />
-<a href="tsrcedt015.html" title="This documentation describes how to add a new item to a drawer in the Snippets view.">Adding items to snippets drawers</a><br />
-<a href="tsrcedt022.html" title="This documentation describes how to modify the template code that is in an item in a drawer in the Snippets view.">Editing snippet items</a><br />
-<a href="tsrcedt016.html" title="This documentation describes how to delete or hide drawers and items in the Snippets view.">Deleting or hiding snippet items or
-drawers</a><br />
-<!-- <a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages such as HTML or XML.">Editing text coded in markup languages - overview</a>--><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.html b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.html
deleted file mode 100644
index 3df15e8..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Structured text editors for markup languages</title>
-</head>
-<body id="csrcedt004"><a name="csrcedt004"><!-- --></a>
-
-<h1 class="topictitle1">Structured text editors for markup languages</h1>
-<div><p><span class="q">"Structured text editor"</span> is any of several text editors that
-you can use to edit various markup languages such as HTML, JavaScript, or
-XML.</p><p>The structured text editor is represented by various editors that you can
-use to edit files coded with markup tags:</p>
-
-<div class="skipspace"><table cellpadding="4" cellspacing="0" summary="" frame="border" border="1" rules="all"><thead align="left"><tr><th valign="top" id="d0e29">File type</th>
-<th valign="top" id="d0e31">Editor</th>
-<th valign="top" id="d0e33">Content assist?</th>
-</tr>
-</thead>
-<tbody><tr><td valign="top" headers="d0e29 ">Cascading style sheet</td>
-<td valign="top" headers="d0e31 ">CSS source page editor</td>
-<td valign="top" headers="d0e33 ">Yes</td>
-</tr>
-<tr><td valign="top" headers="d0e29 ">Deployment descriptor (web.xml)</td>
-<td valign="top" headers="d0e31 ">Source tab of deployment descriptor editor</td>
-<td valign="top" headers="d0e33 ">Yes</td>
-</tr>
-<tr><td valign="top" headers="d0e29 ">Document type definitions</td>
-<td valign="top" headers="d0e31 ">DTD source page editor</td>
-<td valign="top" headers="d0e33 ">No</td>
-</tr>
-<tr><td valign="top" headers="d0e29 ">HTML</td>
-<td valign="top" headers="d0e31 ">HTML source page editor</td>
-<td valign="top" headers="d0e33 ">Yes</td>
-</tr>
-<tr><td valign="top" headers="d0e29 ">JavaScript™</td>
-<td valign="top" headers="d0e31 ">JavaScript source page editor or source
-tab of JavaScript editor</td>
-<td valign="top" headers="d0e33 ">Yes</td>
-</tr>
-<tr><td valign="top" headers="d0e29 ">JSP</td>
-<td valign="top" headers="d0e31 ">JSP source page editor</td>
-<td valign="top" headers="d0e33 ">Yes</td>
-</tr>
-<tr><td valign="top" headers="d0e29 ">XML</td>
-<td valign="top" headers="d0e31 ">XML source page editor or Source tab of XML editor</td>
-<td valign="top" headers="d0e33 ">Yes</td>
-</tr>
-<tr><td valign="top" headers="d0e29 ">XSD (schema)</td>
-<td valign="top" headers="d0e31 ">Source tab of XML schema editor</td>
-<td valign="top" headers="d0e33 ">Yes</td>
-</tr>
-</tbody>
-</table>
-</div>
-<p>You can access the structured text editor by right-clicking on a relevant
-file name in Navigator or Package Explorer view and then clicking <span class="uicontrol">Open
-With</span> and selecting the editor mentioned above.</p>
-<p>The structured text editor provides a consistent interface regardless of
-the markup language with which it is associated. It provides capabilities
-such as find and replace, undo, redo, a spelling checker, and coding assistance
-(unless otherwise noted). It also highlights syntax in different colors. Following
-is a brief description of some of the structured text editor's capabilities:</p>
-<dl><dt class="bold">syntax highlighting</dt>
-<dd>Each keyword type and syntax type is highlighted differently, enabling
-you to easily find a certain kind of keyword for editing. For example, in
-HTML, element names, attribute names, attribute values, and comments have
-different colors; in JavaScript, function and variable names,
-quoted text strings, and comments have different colors.</dd>
-<dt class="bold">unlimited undo and redo</dt>
-<dd>These options allow you to incrementally undo and redo every change made
-to a file for the entire editing session. For text, changes are incremented
-one character or set of selected characters at a time.</dd>
-<dt class="bold">content assist</dt>
-<dd>Content assist helps you to insert JavaScript functions, HTML tags, or other
-keywords. Choices available in the content assist list are based on functions
-defined by the syntax of the language in which the file is coded.</dd>
-<dt class="bold">user-defined templates and snippets</dt>
-<dd>By using the Snippets view, you can access user-defined code snippets
-and (for all code types except JavaScript) templates to help you quickly
-add regularly used text strings.</dd>
-<dt class="bold">function selection</dt>
-<dd>Based on the location of your cursor, the function or tag selection indicator
-highlights the line numbers that include a function or tag in the vertical
-ruler on the left area of the Source page.</dd>
-<dt class="bold">pop-up menu options</dt>
-<dd>These are the same editing options available in the workbench <span class="uicontrol">Edit</span> menu.</dd>
-</dl>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt006.html" title="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion.">Content assist</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages such as HTML or XML.">Editing text coded in markup languages - overview</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.html b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.html
deleted file mode 100644
index 19e97f3..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Content assist</title>
-</head>
-<body id="csrcedt006"><a name="csrcedt006"><!-- --></a>
-
-<h1 class="topictitle1">Content assist</h1>
-<div><p>Content assist helps you insert or finish a tag or function or
-finish a line of code in a structured text editor. The placement of the cursor
-in the source file provides the context for the content assist to offer suggestions
-for completion.</p><p>Most of the structured text editors have content assist. For a list of
-editors that have content assist, see <a href="csrcedt004.html">Structured
-text editors for markup languages</a>. For information on how to get content
-assistance, see <a href="tsrcedt005.html">Getting content assistance
-in structured text editors</a></p>
-<p>The sections below describe specifics of HTML content assist, JavaScript™ content
-assist, and JSP content assist.</p>
-<div class="skipspace"><h4 class="sectiontitle">HTML content assist</h4><p>HTML is flexible in that some
-HTML elements allow end tags to be optionally omitted, such as <samp class="codeph">P</samp>, <samp class="codeph">DT</samp>, <samp class="codeph">DD</samp>, <samp class="codeph">LI</samp>, <samp class="codeph">THEAD</samp>, <samp class="codeph">TR</samp>, <samp class="codeph">TD</samp>, <samp class="codeph">TH</samp>,
-and so on. Other HTML elements that are defined to have no content may require
-the end tag always be omitted, such as <samp class="codeph">BR</samp>, <samp class="codeph">HR</samp>, <samp class="codeph">LINK</samp>, <samp class="codeph">META</samp>,
-and <samp class="codeph">IMG</samp>. This flexibility makes the content assist function
-within the HTML source page editor less precise than it might be with a more
-rigidly constrained markup language.</p>
-<p>HTML content assist is most beneficial
-when you need to complete a tag name, add an attribute name-value pair within
-a start tag, or select from an enumerated list of attribute values.</p>
-<p>Although
-content assist only shows attribute names that have not already been specified
-in a start tag, it does not take into account grammar constraints for tags.
-For example, the <samp class="codeph">HEAD</samp> element in HTML only permits zero or
-one occurrences of a <samp class="codeph">TITLE</samp> tag in its content. If you prompt
-for content assist within a <samp class="codeph">HEAD</samp> content that already contains
-a <samp class="codeph">TITLE</samp> tag, content assist will still show <samp class="codeph">TITLE</samp> in
-its proposal list.</p>
-<p>However, if an attribute is required according to
-the DTD/Schema, that attribute will show up at the top of the list, with a
-yellow circle indicator on its icon.</p>
-<p>If your cursor is in a position
-where content assist is available, a pop-up list of available choices is displayed.
-The list is based on the context. For example, if you use content assist directly
-after an opening paragraph tag (<samp class="codeph">&lt;p&gt;</samp>) , the first item
-in the content assist list will be the corresponding closing paragraph (<samp class="codeph">&lt;/p&gt;</samp>)
-tag.</p>
-<p>The content assist list displays all available tags for the current
-cursor position, including templates. The picture below shows the default
-content assist list for a paragraph tag example:<br /><img src="../images/ncontass.gif" alt="HTML Content assist" /><br /></p>
-<p>Tag proposals are listed
-alphabetically. If you type a <samp class="codeph">&lt;</samp> (to begin a new tag) before
-prompting for content assist, and begin typing the first one or two letters
-of the tag that you want to add, the proposal list automatically refreshes
-to reflect proposals that match the pattern you have typed. If you do not
-type a <samp class="codeph">&lt;</samp> before prompting for content assist, you can
-click within the proposal list and then type the letter that the tag begins
-with, to reduce (somewhat) the amount of scrolling to locate the desired tag.</p>
-<p>As
-you type the first one or two letters of the attribute names or enumerated
-attribute values that you want to add to a tag, the list automatically refreshes
-to reflect proposals that match the pattern you have typed.</p>
-<div class="restriction"><span class="restrictiontitle">Restriction: </span><img src="../images/nlinux.gif" alt="For Linux." /> When using Linux (Motif or
-GTK) and a DBCS locale, double-clicking on the content assist list can sometimes
-cause the Java™ VM to terminate. Instead of double-clicking on
-the list, use the arrows and Enter keys to make the selection from the list.</div>
-</div>
-<div class="skipspace"><h4 class="sectiontitle">JavaScript content assist</h4><p>Items
-in the JavaScript content assist list are preceded by an Internet
-Explorer icon, a Netscape icon, or both, to indicate whether specific JavaScript objects,
-methods, or functions are supported by one or both browsers. If the Internet
-Explorer icon is present, it indicates that the object, method, or function
-is supported by Internet Explorer Version 5.0 or higher.  If the Netscape
-icon is present, it indicates that the object, method, or function is supported
-by Netscape Navigator Version 4.7 or higher. A question mark icon (<img src="../images/nquest.gif" alt="Question mark icon" />)
-in place of one of the browser icons indicates that it is unknown whether
-the browser supports the object, method, or function.</p>
-<p>The picture below
-shows the default content assist list within a JavaScript file:<br /><img src="../images/njscdast.gif" alt="JavaScript content assist" /><br /></p>
-<p>Code
-proposals are listed alphabetically. If you type a <samp class="codeph">. </samp> (include
-the space) before prompting for content assist, and begin typing the first
-one or two letters of the code that you want to add, the proposal list automatically
-refreshes to reflect proposals that match the pattern you have typed, to reduce
-(somewhat) the amount of scrolling to locate the desired code.</p>
-</div>
-<div class="skipspace"><h4 class="sectiontitle">JSP content assist</h4><p>You have many options for embedding Java and
-HTML code in your JSP pages by using content assist.</p>
-<p>All of the JSP
-tags are included both in the template list and in XML format (for example, <samp class="codeph">&lt;jsp:expression&gt;</samp>).
-To add JSP scriptlet tags, for example, move the cursor to the appropriate
-position in the file and press Ctrl+Space to use content assist. Select <img src="../images/nmacscrp.gif" alt="JSP scriptlet content assist" /> from
-the proposal list to insert <samp class="codeph">&lt;% %&gt;</samp>  in the document.</p>
-<div class="p">Scriptlets
-are inserted in a tag <samp class="codeph">&lt;% %&gt;</samp>. For example: <pre>&lt;% System.currentTimeMillis() %&gt;</pre>
-</div>
-<p>This
-example will evaluate the Java statement to get the current time
-in milliseconds.</p>
-<div class="p">To have the result of the statement inserted in the
-file, put an equals sign (=) in the front of the statement. For example: <pre>&lt;b&gt;This is the time : &lt;%= System.currentTimeMillis()%&gt;&lt;/b&gt;</pre>
-</div>
-<div class="p">When you are within a scriptlet you are writing pure Java code.
-Therefore, content assist works exactly the same as it does for the Java editor.
-For example, if you request content assist after <samp class="codeph">System</samp>,
-content assist displays a list of methods. <div class="note"><span class="notetitle">Note: </span>Java content assist works only in a Web
-project, because it requires a buildpath to find the appropriate Java classes.</div>
-</div>
-<div class="p">There
-are also special tags such as useBean. For example: <pre>&lt;jsp:useBean id="useBean" class="java.lang.String"/&gt;</pre>
-</div>
-<p>The
-useBean tag enables you to create a bean called <samp class="codeph">aString</samp> of
-type <samp class="codeph">String</samp>. Then when you use content assist, this is recognized
-as a declared variable. For example, if you use content assist after <samp class="codeph">aString</samp>,
-as follows:</p>
-<div class="p"> <pre>&lt;% aString. %&gt; </pre>
-the content assist
-list shows available methods. This is because <samp class="codeph">aString</samp> has
-been declared as a bean of type String.</div>
-<div class="p">If you use content assist after
-the <samp class="codeph">a</samp>, as follows: <pre>&lt;% a %&gt; </pre>
-content
-assist knows that <samp class="codeph">aString</samp> exists, and it is shown in the
-content assist list.</div>
-</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt005.html" title="To get help in adding markup to a file, you can use content assist in a structured text editor. Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor.">Getting content assistance in structured
-text editors</a><br />
-<a href="tsrcedt024.html" title="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing HTML templates</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html
deleted file mode 100644
index 29029fe..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing text coded in markup languages - overview</title>
-</head>
-<body id="tsrcedt000"><a name="tsrcedt000"><!-- --></a>
-
-<h1 class="topictitle1">Editing text coded in markup languages - overview</h1>
-<div><p>You can edit text coded in markup languages with a <dfn class="term">structured
-text editor</dfn>. This is a generic term for several editors that you can
-use to edit any of several markup languages such as HTML or XML.</p><div class="skipspace">In addition to basic editing tasks such as adding, modifying, and
-deleting text, you can perform the following tasks:</div>
-<ul><li><span><a href="tsrcedt025.html">Set preferences for structured
-text editors</a></span></li>
-<li><span><a href="tsrcedt005.html">Get content assistance
-in structured text editors</a></span></li>
-<li><span><a href="tsrcedt007.html">Search or find text within
-a file</a></span></li>
-<li><span><a href="tsrcedt010.html">Check spelling</a></span></li>
-<li><span><a href="tsrcedt027.html">Add or remove markup language
-templates</a></span></li>
-<li><span><a href="tsrcedt026.html">Edit with snippets</a></span></li>
-</ul>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a><br />
-<a href="csrcedt006.html" title="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion.">Content assist</a><br />
-<a href="csrcedt001.html" title="This documentation gives an overview of the Snippets view.">Snippets view</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt025.html" title="">Setting preferences for structured text editors</a><br />
-<a href="tsrcedt005.html" title="To get help in adding markup to a file, you can use content assist in a structured text editor. Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor.">Getting content assistance in structured text editors</a><br />
-<a href="tsrcedt007.html" title="">Searching or finding text within a file</a><br />
-<a href="tsrcedt010.html" title="This documentation describes how to check spelling in a structured text editor.">Checking spelling</a><br />
-<a href="tsrcedt027.html" title="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing markup language templates - overview</a><br />
-<a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.html
deleted file mode 100644
index fb63bd2..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Setting annotation preferences for markup languages</title>
-</head>
-<body id="tsrcedt001"><a name="tsrcedt001"><!-- --></a>
-
-<h1 class="topictitle1">Setting annotation preferences for markup languages</h1>
-<div><p>This documentation describes how to set <dfn class="term">annotation preferences</dfn> for
-Web and XML files. The annotation preferences include whether to analyze the
-syntactic validity of your file while you are typing and what colors to use
-to highlight errors, warnings, tasks, search results, bookmarks, and other
-text.</p><div class="skipspace"> <p>By default, when you edit in a structured text editor, your source
-code is validated as you type it in. Like other Eclipse-based editors, the
-structured text editors for markup languages flag warnings and errors in the
-source code in the editor area. The warnings and errors also show up in the
-Tasks view when you save the file.</p>
-<div class="note"><span class="notetitle">Note: </span>Highlighting is fully dynamic
-with the exception of search results. Search results are highlighted based
-upon what has been saved to disk.</div>
-<div class="tip"><span class="tiptitle">Tip: </span>You can improve a
-structured text editor's performance by turning off the real-time validation.</div>
-<p>To
-set annotation preferences, complete the following steps:</p>
- </div>
-<ol><li class="skipspace"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span></span>.</span> A Preferences window appears.</li>
-<li class="skipspace"><span>In the Preferences window, click <span class="menucascade"><span class="uicontrol">Workbench</span> &gt; <span class="uicontrol">Editors</span></span>.</span></li>
-<li class="skipspace"><span>Select one of the following options:</span><ul><li>To turn off real-time syntax validation, click <span class="uicontrol">Structured
-Text Editor</span> and uncheck the <span class="uicontrol">Analyze annotations while
-typing</span> box.</li>
-<li>To control other annotation settings, click <span class="uicontrol">Annotations</span> and
-select your annotation preferences.</li>
-</ul>
-</li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span> to save your preferences and close
-the page.</span></li>
-</ol>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt025.html" title="">Setting preferences for structured
-text editors</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html
deleted file mode 100644
index 9c3751b..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Getting content assistance in structured text editors</title>
-</head>
-<body id="tsrcedt005">
-
-<h1 class="topictitle1">Getting content assistance in structured text editors</h1>
-<div><p>To get help in adding markup to a file, you can use content assist
-in a structured text editor. Content assist helps you insert or finish a tag
-or function or finish a line of code in a structured text editor.</p><div class="skipspace">Content assist also enables you to select and insert templates in
-structured text editors. The placement of the cursor in the source file provides
-the context for the content assist to offer suggestions for completion.</div>
-<div class="p"><span></span> You can request content assist in either of the following
-two ways:<ul><li>From the <span class="uicontrol">Edit</span> menu, select <span class="uicontrol">Content
-Assist</span></li>
-<li>Press Ctrl+Space</li>
-</ul>
- <div class="p">In addition, you can set a preference that causes content assist
-to pop up automatically when certain characters are typed, such as <samp class="codeph">.</samp> in
-the case of JavaScript™ or <samp class="codeph">&lt;</samp> in the case of
-HTML and XML. To set this preference, select <span class="uicontrol">Preferences</span> from
-the <span class="uicontrol">Window</span> menu, and then select <span class="uicontrol">Web and
-XML Files</span>, followed by one of the following sequences:<ul><li><span class="menucascade"><span class="uicontrol">HTML Files</span> &gt; <span class="uicontrol">HTML Source</span></span></li>
-<li><span class="menucascade"><span class="uicontrol">JavaScript Files</span> &gt; <span class="uicontrol">JavaScript
-Source</span></span></li>
-<li><span class="menucascade"><span class="uicontrol">XML Files</span> &gt; <span class="uicontrol">XML Source</span></span></li>
-</ul>
-In the <span class="uicontrol">Content assist</span> group box, select the <span class="uicontrol">Automatically
-make suggestions</span> check box, and supply any additional characters
-that should trigger content assist.</div>
-<p>If your cursor is in a position
-where content assist is available, a pop-up list of all available choices
-is displayed. For each of these choices, a brief description of the code is
-provided.</p>
-</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt006.html" title="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion.">Content assist</a><br />
-<a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt023.html" title="Having the proper files defined in the Java build class path is essential for content assist to work properly in JSP files. It is also essential for the links builder to be able to correctly resolve links to servlets or Java beans in JSP and HTML files.">Making content assist work for JSP
-files</a><br />
-<a href="tsrcedt027.html" title="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing markup language
-templates - overview</a><br />
-<a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages such as HTML or XML.">Editing text coded in markup languages
-- overview</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.html
deleted file mode 100644
index d3ace4a..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Searching or finding text within a file</title>
-</head>
-<body id="tsrcedt007">
-
-<h1 class="topictitle1">Searching or finding text within a file</h1>
-<div><div class="p"><div class="tip"><span class="tiptitle">Tip: </span>Before you do a Search operation in a structured
-text editor, save the file you are searching. The search function works from
-the most recently saved version of the file rather than from the contents
-that you see in the editor area. You do not need to save your file before
-you do a Find/Replace operation. </div>
-</div>
-<div class="skipspace">Each structured text editor provides two ways to locate a text string
-in the file you are editing and optionally replace it with another string: <dl><dt class="bold">Find/Replace</dt>
-<dd>Lets you locate text in the file currently being edited.</dd>
-<dt class="bold">Search</dt>
-<dd>Lets you locate text in files that have been saved to your workspace.</dd>
-</dl>
-<p>To locate and optionally replace text, select one of the
-following menu paths:</p>
-</div>
-<div class="p"><span><span class="menucascade"><span class="uicontrol">Edit</span> &gt; <span class="uicontrol">Find/Replace</span></span> (or <span class="uicontrol">Ctrl+F</span>)</span> This option is
-self-explanatory.</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages such as HTML or XML.">Editing text coded in
-markup languages - overview</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.html
deleted file mode 100644
index cddfca2..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Checking spelling</title>
-</head>
-<body id="tsrcedt010"><a name="tsrcedt010"><!-- --></a>
-
-<h1 class="topictitle1">Checking spelling</h1>
-<div><p>This documentation describes how to check spelling in a structured
-text editor.</p><div class="skipspace"> <p>The structured text editors for markup languages (accessed from
-the Project Explorer's pop-up menu or by clicking the Source tab in certain
-editors) provide a spell checking feature.</p>
-<p>To check spelling in an HTML,
-XML, or other file that uses a structured markup language:</p>
- </div>
-<ol><li><span>(Optional) To select the dictionary that will be used, click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Spell
-Check</span></span>.</span></li>
-<li><span>Open in a  structured text editor the file whose spelling you want
-to check.</span></li>
-<li><span>Start the spelling checker by clicking <span class="menucascade"><span class="uicontrol">Edit</span> &gt; <span class="uicontrol">Spell Check</span></span>.</span></li>
-<li><span>Type a new spelling into the <span class="uicontrol">Change to</span> field,
-or select one of the available options. Click the <span class="uicontrol">Change</span> button
-to change the current instance of the word in the current document. Click
-the <span class="uicontrol">Change All</span> button to change all instances of the
-word in the current document. You can also click the <span class="uicontrol">Add</span> button
-to add the currently selected spelling to your dictionary.</span></li>
-<li><span>Use the controls in the Spell Check dialog box to ignore, change,
-or add terms to the current dictionary. (To remove a word after it has been
-added to the dictionary, click the <span class="uicontrol">Dictionary</span> push
-button.)</span></li>
-</ol>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages such as HTML or XML.">Editing text coded in markup languages
-- overview</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html
deleted file mode 100644
index ce5a037..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding snippets drawers</title>
-</head>
-<body id="tsrcedt014"><a name="tsrcedt014"><!-- --></a>
-
-<h1 class="topictitle1">Adding snippets drawers</h1>
-<div><p>This documentation explains how to customize the Snippets view
-by adding a new drawer.</p><div class="skipspace">To add a new drawer to the Snippets view:</div>
-<ol><li><span>Right-click anywhere in the Snippets view and select <span class="uicontrol">Customize</span> from
-the pop-up menu.</span></li>
-<li><span>Click <span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">New Drawer</span></span> and type the name of the new drawer in the <span class="uicontrol">Name</span> field.</span></li>
-<li><span>Optionally, type a description in the <span class="uicontrol">Description</span> field.</span></li>
-<li><span>Select the drawer's behavior by checking check boxes as appropriate.
-The check boxes are as follows:</span>
-<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="skipspace">
-<thead><tr><td><b>Option</b></td><td><b>Description</b></td></tr></thead>
-<tbody>
-<tr><td align="left" valign="top" id="d0e43"><b>Hide</b></td>
-<td align="left" valign="top" headers="d0e43">Do not display the drawer.</td>
-</tr>
-<tr><td align="left" valign="top" id="d0e48"><b>Open drawer at start-up</b></td>
-<td align="left" valign="top" headers="d0e48">At start-up, display
-the drawer's items.</td>
-</tr>
-<tr><td align="left" valign="top" id="d0e53"><b>Pin drawer open at start-up</b></td>
-<td align="left" valign="top" headers="d0e53">Keep the drawer
-open.</td>
-</tr>
-</tbody></table>
-</li>
-<li><span>Click <span class="uicontrol">OK</span>. The new drawer will be added to
-the list of drawers in the Snippets view.</span></li>
-</ol>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt001.html" title="This documentation gives an overview of the Snippets view.">Snippets view</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a><br />
-<a href="tsrcedt015.html" title="This documentation describes how to add a new item to a drawer in the Snippets view.">Adding items to snippets drawers</a><br />
-<a href="tsrcedt022.html" title="This documentation describes how to modify the template code that is in an item in a drawer in the Snippets view.">Editing snippet items</a><br />
-<a href="tsrcedt016.html" title="This documentation describes how to delete or hide drawers and items in the Snippets view.">Deleting or hiding snippet items or
-drawers</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html
deleted file mode 100644
index 9f04898..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding items to snippets drawers</title>
-</head>
-<body id="tsrcedt015"><a name="tsrcedt015"><!-- --></a>
-
-<h1 class="topictitle1">Adding items to snippets drawers</h1>
-<div><p>This documentation describes how to add a new item to a drawer
-in the Snippets view.</p><div class="skipspace"> To add new items to an existing snippets drawer:</div>
-<ol><li class="skipspace"><span>Do one of the following choices:</span> 
-<div class="skipspace"><table cellpadding="4" cellspacing="0" summary="" frame="hsides" border="1" rules="rows"><thead align="left"><tr><th valign="top" id="d0e24">To start with this:</th>
-<th valign="top" id="d0e26">Do this:</th>
-</tr>
-</thead>
-<tbody><tr><td valign="top" headers="d0e24 ">An empty item that you can edit</td>
-<td valign="top" headers="d0e26 ">Right-click anywhere in an existing drawer, select <span class="uicontrol">Customize</span>,
-and click <span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">New Item</span></span>.</td>
-</tr>
-<tr><td valign="top" headers="d0e24 ">Existing text pasted into a new item in an existing
-drawer</td>
-<td valign="top" headers="d0e26 ">Copy or cut text to the clipboard. In the Snippets view,
-right-click anywhere in an existing drawer and click <span class="uicontrol">Paste</span>.</td>
-</tr>
-<tr><td valign="top" headers="d0e24 ">Existing text pasted into a new item in a new or existing
-drawer</td>
-<td valign="top" headers="d0e26 ">Select the text, right-click, click <span class="uicontrol">Add to
-Snippets</span>, specify the name of the drawer in the Snippets view
-to which you want to add the item, and click <span class="uicontrol">OK</span>.</td>
-</tr>
-</tbody>
-</table>
-</div>
- A <span class="wintitle">Customize Palette</span> window
-appears.</li>
-<li class="skipspace"><span>Type a name for the new item, and, optionally, provide a description.</span> The value that you type in the <span class="uicontrol">Name</span> field
-will appear next to the item's icon in the Snippets view.</li>
-<li class="skipspace"><span>To include in the <span class="uicontrol">Template Pattern</span> field
-a variable that you have already defined, click <span class="uicontrol">Insert Variable
-Placeholder</span>. </span> A variable placeholder is a marker that,
-when tagging is inserted into the active file, will be replaced by the value
-that is entered into the <span class="uicontrol">Insert Template:</span><var class="varname">Item_name</var> dialog
-at insertion time. Clicking the <span class="uicontrol">Insert Variable Placeholder</span> button
-or typing Ctrl+Space activates a pop-up in the text area that prompts you
-with the correct sequences to create a marker for the variable. For
-example, if you create two variables named <var class="varname">uri</var> and <var class="varname">prefix</var>,
-and create variable placeholders for both, the template pattern might look
-like this:<pre>&lt;%@ taglib uri="${uri}" prefix="${prefix}" %&gt;</pre>
-</li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span>.</span></li>
-</ol>
-<div class="skipspace">The new item will be added to the list of items in the appropriate
-drawer.</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt001.html" title="This documentation gives an overview of the Snippets view.">Snippets view</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a><br />
-<a href="tsrcedt014.html" title="This documentation explains how to customize the Snippets view by adding a new drawer.">Adding snippets drawers</a><br />
-<a href="tsrcedt022.html" title="This documentation describes how to modify the template code that is in an item in a drawer in the Snippets view.">Editing snippet items</a><br />
-<a href="tsrcedt016.html" title="This documentation describes how to delete or hide drawers and items in the Snippets view.">Deleting or hiding snippet items or
-drawers</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html
deleted file mode 100644
index 29935d7..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Deleting or hiding snippet items or drawers</title>
-</head>
-<body id="tsrcedt016"><a name="tsrcedt016"><!-- --></a>
-
-<h1 class="topictitle1">Deleting or hiding snippet items or drawers</h1>
-<div><p>This documentation describes how to delete or hide drawers and
-items in the Snippets view.</p><div class="skipspace">You can hide any drawer or item that shows up in the Snippets view.
-If the drawer or item is user-defined, you can delete it permanently. To delete
-or hide a drawer or item, complete the following steps:</div>
-<ol><li><span>Select the item or drawer that you want to remove.</span></li>
-<li><span>Right-click and select <span class="uicontrol">Customize</span> from the
-pop-up menu.</span></li>
-<li><span>Select the item or drawer and click <span class="uicontrol">Delete</span> or <span class="uicontrol">Hide</span>.</span></li>
-<li><span>Click <span class="uicontrol">OK</span>. The item or drawer will be deleted
-or hidden from the Snippets view.</span></li>
-</ol>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt001.html" title="This documentation gives an overview of the Snippets view.">Snippets view</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a><br />
-<a href="tsrcedt014.html" title="This documentation explains how to customize the Snippets view by adding a new drawer.">Adding snippets drawers</a><br />
-<a href="tsrcedt015.html" title="This documentation describes how to add a new item to a drawer in the Snippets view.">Adding items to snippets drawers</a><br />
-<a href="tsrcedt022.html" title="This documentation describes how to modify the template code that is in an item in a drawer in the Snippets view.">Editing snippet items</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html
deleted file mode 100644
index ac5ceee..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing snippet items</title>
-</head>
-<body id="tsrcedt022"><a name="tsrcedt022"><!-- --></a>
-
-<h1 class="topictitle1">Editing snippet items</h1>
-<div><p>This documentation describes how to modify the template code that
-is in an item in a drawer in the Snippets view.</p><div class="skipspace"> To modify an existing item in a Snippets drawer, complete the steps
-listed below. If you have just completed the task <a href="tsrcedt015.html">Adding an item to a snippets drawer</a> and the <span class="wintitle">Customize
-Palette</span> window is still open, you can skip steps 1 and 2.</div>
-<ol><li class="skipspace"><span>In the Snippets view, right-click the name of the item that you
-want to modify, and select <span class="uicontrol">Customize</span>.</span></li>
-<li class="skipspace"><span>Optionally, type a new name and a new description for the item.</span></li>
-<li class="skipspace"><span>To declare a variable, click <span class="uicontrol">New</span> and type
-the variable's name, description, and default value.</span></li>
-<li class="skipspace"><span>To edit an existing variable, type over the existing values.</span></li>
-<li class="skipspace"><span>To edit the <span class="uicontrol">Template Pattern</span> field, type
-into the field, cut and paste into the field, or, if you have defined one
-or more variables, click the <span class="uicontrol">Insert Variable Placeholder</span> button,
-and double-click the name of the variable that you want to insert.</span> For
-example, if you have declare variables named <var class="varname">uri</var> and <var class="varname">prefix</var>,
-clicking the button brings up a menu that contains those names. Double-clicking <var class="varname">uri</var> inserts <samp class="codeph">${uri}</samp>,
-as in the following example:<pre>&lt;%@ taglib uri="${uri}" prefix="${prefix}" %&gt;</pre>
- Later, when you insert the snippet into a file, <samp class="codeph">${uri}</samp> and <samp class="codeph">${prefix}</samp> are
-each converted to the default value declared in the Variables table. Users
-can replace the default values in the <span class="uicontrol">Insert Template:</span><var class="varname">Item_name</var> dialog
-at insertion time.</li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span>.</span></li>
-</ol>
-<div class="skipspace">The modified item will be added to the list of items in the appropriate
-drawer.</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt001.html" title="This documentation gives an overview of the Snippets view.">Snippets view</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a><br />
-<a href="tsrcedt014.html" title="This documentation explains how to customize the Snippets view by adding a new drawer.">Adding snippets drawers</a><br />
-<a href="tsrcedt015.html" title="This documentation describes how to add a new item to a drawer in the Snippets view.">Adding items to snippets drawers</a><br />
-<a href="tsrcedt016.html" title="This documentation describes how to delete or hide drawers and items in the Snippets view.">Deleting or hiding snippet items or
-drawers</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html
deleted file mode 100644
index 3f93df8..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Making content assist work for JSP files</title>
-</head>
-<body id="tsrcedt023"><a name="tsrcedt023"><!-- --></a>
-
-<h1 class="topictitle1">Making content assist work for JSP files</h1>
-<div><p>Having the proper files defined in the Java™ build class path is essential for
-content assist to work properly in JSP files. It is also essential for the
-links builder to be able to correctly resolve links to servlets or Java beans
-in JSP and HTML files.</p><div class="skipspace">To make content assist work for JSP files:</div>
-<ol><li class="skipspace"><span>To determine whether the build path is correct, select <span class="uicontrol">Properties</span> from
-the project's pop-up menu. </span></li>
-<li class="skipspace"><span>Select <span class="uicontrol">Java Build Path</span>, and then the <span class="uicontrol">Libraries</span> page. </span> You should see the following files:<ul><li>j2ee.jar</li>
-<li>rt.jar </li>
-<li>servlet.jar</li>
-<li>webcontainer.jar</li>
-</ul>
-</li>
-<li class="skipspace"><span>If they are not present, add them as External JAR files. You may
-have your own versions of these files, depending on the level of JDK or Servlet
-API for which you are developing.</span></li>
-<li class="skipspace"><span>If your Web applications reference other JARs, you can place them
-in the build path as follows:</span><ol type="a"><li><span>Use the <span class="uicontrol">Add JARs</span> button on the Library
-page. You must ensure that the JAR file is available to the server by properly
-configuring the server.</span></li>
-<li><span>Add the JARs to the <span class="filepath">WEB-INF/lib</span> directory.
-They will be automatically added to the build path and deployed to the server
-in as part of the project WAR.</span></li>
-</ol>
-</li>
-</ol>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt006.html" title="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion.">Content assist</a><br />
-<a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt005.html" title="To get help in adding markup to a file, you can use content assist in a structured text editor. Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor.">Getting content assistance in structured
-text editors</a><br />
-<a href="tsrcedt028.html" title="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing JSP templates</a><br />
-<a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages such as HTML or XML.">Editing text coded in markup languages
-- overview</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html
deleted file mode 100644
index b140ed1..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding and removing HTML templates</title>
-</head>
-<body id="tsrcedt024">
-
-<h1 class="topictitle1">Adding and removing HTML templates</h1>
-<div><p>HTML content assist provides several templates, or chunks of predefined
-code, that you can insert into a file. You can use the default templates as
-provided, customize the default templates, or create your own templates.</p><div class="skipspace"> <p>For example, you may work on a group of HTML pages that should
-all contain a table with a specific appearance. Create a template that contains
-the tags for that table, including the appropriate attributes and attribute
-values for each tag. (You can copy and paste the tags from a structured text
-editor into the template's <span class="uicontrol">Pattern</span> field.) Then select
-the name of the template from a content assist proposal list whenever you
-want to insert your custom table into an HTML or XHTML file.</p>
-<p>To add
-a new HTML template, complete the following steps:</p>
- </div>
-<ol><li class="skipspace"><span>From the <span class="uicontrol">Window</span> menu, select <span class="uicontrol">Preferences</span>.</span></li>
-<li class="skipspace"><span>In the Preferences page, select <span class="menucascade"><span class="uicontrol">Web and
-XML</span> &gt; <span class="uicontrol">HTML Files</span> &gt; <span class="uicontrol">HTML Templates</span></span>.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">New</span>. </span></li>
-<li class="skipspace"><span>Enter the new template name (a text string) and a brief description
-of the template.</span></li>
-<li class="skipspace"><span>Using the <span class="uicontrol">Context</span> drop-down list, specify
-the context in which the template is available in the proposal list when content
-assist is requested.</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">Pattern</span> field, enter the appropriate
-tags, attributes, or attribute values (the content of the template) to be
-inserted by content assist.</span></li>
-<li class="skipspace"><span>If you want to insert a variable, click the <span class="uicontrol">Variable</span> button
-and select the variable to be inserted.</span> For example, the <var class="varname">word_selection</var> variable
-indicates the word that is selected at the beginning of template insertion,
-and the <var class="varname">cursor</var> variable determines where the cursor will
-be after the template is inserted in the HTML document.</li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span> to save the new template.</span></li>
-</ol>
-<div class="skipspace"><p>You can edit, remove, import, or export a template by using the
-same Preferences page. If you have modified a default template, you can restore
-it to its default value. You can also restore a removed template if you have
-not exited from the workbench since it was removed.</p>
-<p>If you have a template
-that you do not want to remove but you no longer want the template to appear
-in the content assist list, go to the Templates preferences page and uncheck
-its check box.</p>
-</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt027.html" title="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing markup language
-templates - overview</a><br />
-<a href="tsrcedt028.html" title="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing JSP templates</a><br />
-<a href="tsrcedt029.html" title="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You can use the default template as provided, customize that template, or create your own templates.">Adding and removing XML templates</a><br />
-<a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages such as HTML or XML.">Editing text coded in markup languages
-- overview</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html
deleted file mode 100644
index 9bc1844..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Setting preferences for structured text editors</title>
-</head>
-<body id="tsrcedt025">
-
-<h1 class="topictitle1">Setting preferences for structured text editors</h1>
-<div><div class="skipspace">You can customize your working environment by specifying preferences
-for the structured text editor.</div>
-<ol><li class="skipspace"><span>In the main menu, click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span></span>.</span></li>
-<li class="skipspace"><span>Select one of the choices that are shown in the following table:</span>
-<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="skipspace">
-<tbody>
-<tr><th align="left" valign="bottom" id="d0e29" width="25%">Item</th>
-<th align="left" valign="bottom" id="d0e31" width="75%">Menu path</th>
-</tr>
-<tr><td align="left" valign="top" id="d0e34" headers="d0e29"><b>Annotation settings</b></td>
-<td align="left" valign="top" headers="d0e31 d0e34"><span class="menucascade"><span class="uicontrol">Workbench</span> &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Annotations</span></span></td>
-</tr>
-<tr><td align="left" valign="top" id="d0e45" headers="d0e29"><b>Character encoding</b></td>
-<td align="left" valign="top" headers="d0e31 d0e45"><span class="uicontrol">Web and XML</span>,
-then one of the following choices: <span class="uicontrol">CSS Files</span>, <span class="uicontrol">HTML
-Files</span>, <span class="uicontrol">JSP Files</span>, <span class="uicontrol">XML Files</span></td>
-</tr>
-<tr><td align="left" valign="top" id="d0e63" headers="d0e29"><b>Content assist: HTML</b></td>
-<td align="left" valign="top" headers="d0e31 d0e63"><span class="menucascade"><span class="uicontrol">Web
-and XML</span> &gt; <span class="uicontrol">HTML Files</span> &gt; <span class="uicontrol">HTML Source</span></span></td>
-</tr>
-<tr><td align="left" valign="top" id="d0e74" headers="d0e29"><b>Content assist: JavaScript</b></td>
-<td align="left" valign="top" headers="d0e31 d0e74"><span class="menucascade"><span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">JavaScript Files</span> &gt; <span class="uicontrol">JavaScript Source</span></span></td>
-</tr>
-<tr><td align="left" valign="top" id="d0e85" headers="d0e29"><b>Content assist: XML</b></td>
-<td align="left" valign="top" headers="d0e31 d0e85"><span class="menucascade"><span class="uicontrol">Web
-and XML</span> &gt; <span class="uicontrol">XML Files</span> &gt; <span class="uicontrol">XML Source</span></span></td>
-</tr>
-<tr><td align="left" valign="top" id="d0e96" headers="d0e29"><b>Editor appearance</b></td>
-<td align="left" valign="top" headers="d0e31 d0e96"><span class="menucascade"><span class="uicontrol">Workbench</span> &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span> &gt; <span class="uicontrol">Appearance</span></span></td>
-</tr>
-<tr><td align="left" valign="top" id="d0e109" headers="d0e29"><b>Editor font</b></td>
-<td align="left" valign="top" headers="d0e31 d0e109"><span class="menucascade"><span class="uicontrol">Workbench</span> &gt; <span class="uicontrol">Colors and Fonts</span> &gt; <span class="uicontrol">Structured Text Editor</span></span></td>
-</tr>
-<tr><td align="left" valign="top" id="d0e120" headers="d0e29"><b>Editor navigation</b></td>
-<td align="left" valign="top" headers="d0e31 d0e120"><span class="menucascade"><span class="uicontrol">Workbench</span> &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span> &gt; <span class="uicontrol">Navigation</span></span></td>
-</tr>
-<tr><td align="left" valign="top" id="d0e133" headers="d0e29"><b>File-type-specific settings</b></td>
-<td align="left" valign="top" headers="d0e31 d0e133"><span class="uicontrol">Web
-and XML</span>, then navigate to the file type and particular setting</td>
-</tr>
-<tr><td align="left" valign="top" id="d0e140" headers="d0e29"><b>Hover help</b></td>
-<td align="left" valign="top" headers="d0e31 d0e140"><span class="menucascade"><span class="uicontrol">Workbench</span> &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span> &gt; <span class="uicontrol">Hovers</span></span></td>
-</tr>
-<tr><td align="left" valign="top" id="d0e153" headers="d0e29"><b>Key bindings</b></td>
-<td align="left" valign="top" headers="d0e31 d0e153"><span class="menucascade"><span class="uicontrol">Workbench</span> &gt; <span class="uicontrol">Keys</span> &gt; <span class="uicontrol">Keyboard Shortcuts</span></span> then
-in the <span class="uicontrol">Category</span> field specify <span class="uicontrol">Source</span></td>
-</tr>
-<tr><td align="left" valign="top" id="d0e170" headers="d0e29"><b>Spell checking</b></td>
-<td align="left" valign="top" headers="d0e31 d0e170"><span class="uicontrol">Spell Check</span></td>
-</tr>
-<tr><td align="left" valign="top" id="d0e176" headers="d0e29"><b>Syntax checking</b></td>
-<td align="left" valign="top" headers="d0e31 d0e176"><span class="menucascade"><span class="uicontrol">Workbench</span> &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span> &gt; <span class="uicontrol">Appearance</span></span> then check or uncheck the <span class="uicontrol">Analyze
-annotations while typing</span> box.</td>
-</tr>
-</tbody></table>
- <div class="note"><span class="notetitle">Note: </span>You cannot set <span class="uicontrol">Web and XML</span> preferences
-unless the Core XML Support capability (<span class="menucascade"><span class="uicontrol">Workbench</span> &gt; <span class="uicontrol">Capabilities</span></span>) is enabled, and you cannot
-set preferences for DTD files unless the XML Development capability is enabled.</div>
-</li>
-</ol>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt001.html" title="This documentation describes how to set annotation preferences for Web and XML files. The annotation preferences include whether to analyze the syntactic validity of your file while you are typing and what colors to use to highlight errors, warnings, tasks, search results, bookmarks, and other text.">Setting annotation preferences for
-markup languages</a><br />
-<a href="tsrcedt010.html" title="This documentation describes how to check spelling in a structured text editor.">Checking spelling</a><br />
-<a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages such as HTML or XML.">Editing text coded in markup languages
-- overview</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.html
deleted file mode 100644
index c61f1d7..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing with snippets - overview</title>
-</head>
-<body id="tsrcedt026"><a name="tsrcedt026"><!-- --></a>
-
-<h1 class="topictitle1">Editing with snippets - overview</h1>
-<div><p>The Snippets view lets you catalog and organize reusable programming
-objects, such as HTML tagging, JavaScript™, and JSP code, along with files
-and custom JSP tags. The view can be extended based on additional objects
-that you define and include.</p><div class="skipspace">In the Snippets view you can perform the following tasks:</div>
-<ul><li><span>Add snippets drawers</span></li>
-<li><span>Add items to snippets drawers</span></li>
-<li><span>Edit snippet items</span></li>
-<li><span>Delete or hide snippet items or drawers</span></li>
-</ul>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt001.html" title="This documentation gives an overview of the Snippets view.">Snippets view</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt014.html" title="This documentation explains how to customize the Snippets view by adding a new drawer.">Adding snippets drawers</a><br />
-<a href="tsrcedt015.html" title="This documentation describes how to add a new item to a drawer in the Snippets view.">Adding items to snippets drawers</a><br />
-<a href="tsrcedt022.html" title="This documentation describes how to modify the template code that is in an item in a drawer in the Snippets view.">Editing snippet items</a><br />
-<a href="tsrcedt016.html" title="This documentation describes how to delete or hide drawers and items in the Snippets view.">Deleting or hiding snippet items or
-drawers</a><br />
-<a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages such as HTML or XML.">Editing text coded in markup languages
-- overview</a><br />
-<a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages such as HTML or XML.">Editing text coded in markup languages - overview</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.html
deleted file mode 100644
index c35845c..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding and removing markup language templates - overview</title>
-</head>
-<body id="tsrcedt027"><a name="tsrcedt027"><!-- --></a>
-
-<h1 class="topictitle1">Adding and removing markup language templates - overview</h1>
-<div><p>Content assist provides templates, or chunks of predefined code,
-that you can insert into a file. You can use the default templates as provided,
-customize the default templates, or create your own templates.</p><div class="skipspace">Templates are available for the following markup languages:<ul><li>HTML or XHTML</li>
-<li>JSP</li>
-<li>XML</li>
-</ul>
-</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt024.html" title="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing HTML templates</a><br />
-<a href="tsrcedt028.html" title="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing JSP templates</a><br />
-<a href="tsrcedt029.html" title="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You can use the default template as provided, customize that template, or create your own templates.">Adding and removing XML templates</a><br />
-<a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages such as HTML or XML.">Editing text coded in markup languages
-- overview</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html
deleted file mode 100644
index 3e18537..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding and removing JSP templates</title>
-</head>
-<body id="tsrcedt028"><a name="tsrcedt028"><!-- --></a>
-
-<h1 class="topictitle1">Adding and removing JSP templates</h1>
-<div><p>JSP content assist provides several templates, or chunks of predefined
-code, that you can insert into a file. You can use the default templates as
-provided, customize the default templates, or create your own templates.</p><div class="skipspace"> <p>For example, you may work on a group of JSP pages that should
-all contain a table with a specific appearance. Create a template that contains
-the tags for that table, including the appropriate attributes and attribute
-values for each tag. (You can copy and paste the tags from a structured text
-editor into the template's <span class="uicontrol">Pattern</span> field.) Then select
-the name of the template from a content assist proposal list whenever you
-want to insert your custom table into a JSP file.</p>
-<p>To add a new JSP template,
-complete the following steps:</p>
- </div>
-<ol><li class="skipspace"><span>From the <span class="uicontrol">Window</span> menu, select <span class="uicontrol">Preferences</span>.</span></li>
-<li class="skipspace"><span>In the Preferences page, select <span class="menucascade"><span class="uicontrol">Web and
-XML</span> &gt; <span class="uicontrol">JSP Files</span> &gt; <span class="uicontrol">JSP Templates</span></span>.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">New</span>. </span></li>
-<li class="skipspace"><span>Enter the new template name (a text string) and a brief description
-of the template.</span></li>
-<li class="skipspace"><span>Using the <span class="uicontrol">Context</span> drop-down list, specify
-the context in which the template is available in the proposal list when content
-assist is requested.</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">Pattern</span> field, enter the appropriate
-tags, attributes, or attribute values (the content of the template) to be
-inserted by content assist.</span></li>
-<li class="skipspace"><span>If you want to insert a variable, click the <span class="uicontrol">Variable</span> button
-and select the variable to be inserted.</span> For example, the <var class="varname">word_selection</var> variable
-indicates the word that is selected at the beginning of template insertion,
-and the <var class="varname">cursor</var> variable determines where the cursor will
-be after the template is inserted in the HTML document.</li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span> to save the new template.</span></li>
-</ol>
-<div class="skipspace"><p>You can edit, remove, import, or export a template by using the
-same Preferences page. If you have modified a default template, you can restore
-it to its default value. You can also restore a removed template if you have
-not exited from the workbench since it was removed.</p>
-<p>If you have a template
-that you do not want to remove but you no longer want the template to appear
-in the content assist list, go to the Templates preferences page and uncheck
-its check box.</p>
-</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt027.html" title="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing markup language
-templates - overview</a><br />
-<a href="tsrcedt024.html" title="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing HTML templates</a><br />
-<a href="tsrcedt029.html" title="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You can use the default template as provided, customize that template, or create your own templates.">Adding and removing XML templates</a><br />
-<a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages such as HTML or XML.">Editing text coded in markup languages
-- overview</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html
deleted file mode 100644
index 4f7e8b3..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding and removing XML templates</title>
-</head>
-<body id="tsrcedt027"><a name="tsrcedt027"><!-- --></a>
-
-<h1 class="topictitle1">Adding and removing XML templates</h1>
-<div><p>XML content assist provides a comment template, a chunk of predefined
-code that you can insert into a file. You can use the default template as
-provided, customize that template, or create your own templates.</p><div class="skipspace"> <p>For example, you may work on a group of XML pages that should
-all contain a table with a specific appearance. Create a template that contains
-the tags for that table, including the appropriate attributes and attribute
-values for each tag. (You can copy and paste the tags from a structured text
-editor into the template's <span class="uicontrol">Pattern</span> field.) Then select
-the name of the template from a content assist proposal list whenever you
-want to insert your custom table into an XML file.</p>
-<p>To add a new XML
-template, complete the following steps: </p>
- </div>
-<ol><li class="skipspace"><span>From the <span class="uicontrol">Window</span> menu, select <span class="uicontrol">Preferences</span>.</span></li>
-<li class="skipspace"><span>In the Preferences page, select <span class="menucascade"><span class="uicontrol">Web and
-XML</span> &gt; <span class="uicontrol">XML Files</span> &gt; <span class="uicontrol">XML Templates</span></span>.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">New</span>. </span></li>
-<li class="skipspace"><span>Enter the new template name (a text string) and a brief description
-of the template.</span></li>
-<li class="skipspace"><span>Using the <span class="uicontrol">Context</span> drop-down list, specify
-the context in which the template is available in the proposal list when content
-assist is requested.</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">Pattern</span> field, enter the appropriate
-tags, attributes, or attribute values (the content of the template) to be
-inserted by content assist.</span></li>
-<li class="skipspace"><span>If you want to insert a variable, click the <span class="uicontrol">Variable</span> button
-and select the variable to be inserted.</span> For example, the <var class="varname">word_selection</var> variable
-indicates the word that is selected at the beginning of template insertion,
-and the <var class="varname">cursor</var> variable determines where the cursor will
-be after the template is inserted in the XML document.</li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span> to save the new template.</span></li>
-</ol>
-<div class="skipspace"><p>You can edit, remove, import, or export a template by using the
-same Preferences page. If you have modified a default template, you can restore
-it to its default value. You can also restore a removed template if you have
-not exited from the workbench since it was removed.</p>
-<p>If you have a template
-that you do not want to remove but you no longer want the template to appear
-in the content assist list, go to the Templates preferences page and uncheck
-its check box.</p>
-</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tsrcedt027.html" title="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing markup language
-templates - overview</a><br />
-<a href="tsrcedt024.html" title="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing HTML templates</a><br />
-<a href="tsrcedt028.html" title="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing JSP templates</a><br />
-<a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages such as HTML or XML.">Editing text coded in markup languages
-- overview</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/.project b/docs/org.eclipse.wst.sse.ui.infopop/.project
deleted file mode 100644
index 2d9cc84..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.sse.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/EditorContexts.xml b/docs/org.eclipse.wst.sse.ui.infopop/EditorContexts.xml
deleted file mode 100644
index faccfb3..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/EditorContexts.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-
-<context id="sted0001">
-<description>This page lets you customize the appearance of the structured text editors.
-When the <b>Highlight matching brackets</b> option is selected, whenever the cursor is next to a bracket or curly braces, its opening or closing counter part is highlighted.
-Select the <b>Report problems as you type</b> check box to update validity annotations (temporary annotations, such as missing required attributes based on a DTD, that go away when the editor is closed, or the problem is fixed) as the user types.
-In the <b>Appearance color options</b> table, you can adjust various editor appearance features.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="sted0003">
-<description>This page lets you customize hover text in the structured text editors.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclispe.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xmlm1010">
-<description>Content assist helps you to finish tags or lines of code and insert templates. Depending on the source markup language, the choices that are available in the content assist list are based on tags defined by DTD and schema files, tag library descriptors, or content model standard that is specified for the file being edited. HTML content assist choices are based on the W3C HTML 4.01 content model.
-
-If your cursor is in a position where content assist is available, a pop-up list of available choices is displayed. The content assist list displays all available completions for the current cursor position, including templates. Content assist is also available by pressing Ctrl+Space.
-</description>
-<topic label="Content assist" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt006.html"/>
-<topic label="Getting content assistance in structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xmlm1030">
-<description>Select this option to format an entire document. Formatting restores element and attribute indentation and positioning, which may have been offset during editing, to see nesting hierarchies and relationships more clearly in the file. Edit the appropriate Preferences pages to make changes in specific formatting behavior.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xmlm1040">
-<description>Select this option to format selected elements. Formatting restores element and attribute indentation and positioning, which may have been offset during editing, to see nesting hierarchies and relationships more clearly in the file.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xmlm1070">
-<description>Select this option to open the <b>Properties</b> view, which displays properties relevant to the current element if any exist.
-</description>
-<topic label="Properties view" href="../org.eclipse.platform.doc.user/concepts/cpropview.htm"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xmlm2000">
-<description>This structured text editor lets you edit a text file that is coded in a markup language. The editor provides many text editing features, such as content assist, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting. For a more specific list of editing features, see the first link below.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="webx0000">
-<description>This page lets you customize task tag discovery in the structured text editors.
-</description>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.sse.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index b06bb4f..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SSE infopops
-Bundle-SymbolicName: org.eclipse.wst.sse.ui.infopop; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/about.html b/docs/org.eclipse.wst.sse.ui.infopop/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/build.properties b/docs/org.eclipse.wst.sse.ui.infopop/build.properties
deleted file mode 100644
index ac9ba16..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = EditorContexts.xml,\
-               about.html,\
-               plugin.xml,\
-               META-INF/
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml b/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml
deleted file mode 100644
index 79c6bb3..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-       <contexts file="EditorContexts.xml" plugin ="org.eclipse.wst.sse.ui"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/.project b/docs/org.eclipse.wst.webtools.doc.user/.project
deleted file mode 100644
index bd5b157..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.webtools.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.webtools.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.webtools.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 551055b..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Web tools documentation
-Bundle-SymbolicName: org.eclipse.wst.webtools.doc.user; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.webtools.doc.user/about.html b/docs/org.eclipse.wst.webtools.doc.user/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/build.properties b/docs/org.eclipse.wst.webtools.doc.user/build.properties
deleted file mode 100644
index bb5cca9..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\
-               webtools_toc.xml,\
-               about.html,\
-               images/,\
-               topics/,\
-               META-INF/
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/fixit.gif b/docs/org.eclipse.wst.webtools.doc.user/images/fixit.gif
deleted file mode 100644
index ffafc3d..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/fixit.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/grptype.gif b/docs/org.eclipse.wst.webtools.doc.user/images/grptype.gif
deleted file mode 100644
index 46d245f..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/grptype.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/menubutton.gif b/docs/org.eclipse.wst.webtools.doc.user/images/menubutton.gif
deleted file mode 100644
index 7ef1a62..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/menubutton.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nlinux.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nlinux.gif
deleted file mode 100644
index 7c135cf..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nlinux.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nshowerr.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nshowerr.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nshowerr.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwarning.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwarning.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwarning.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwin.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwin.gif
deleted file mode 100644
index 895f9ca..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwin.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkbrk.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkbrk.gif
deleted file mode 100644
index 6321433..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkbrk.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkcss.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkcss.gif
deleted file mode 100644
index 1a0caf6..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkcss.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr-l.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr-l.gif
deleted file mode 100644
index 9c73b6a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr-l.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr.gif
deleted file mode 100644
index f3c6261..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkind.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkind.gif
deleted file mode 100644
index 943f756..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkind.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkmal.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkmal.gif
deleted file mode 100644
index 889c47f..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkmal.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnknum.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnknum.gif
deleted file mode 100644
index f324a63..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnknum.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkotr.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkotr.gif
deleted file mode 100644
index f596591..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkotr.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkque.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkque.gif
deleted file mode 100644
index 345f939..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkque.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnktsk.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnktsk.gif
deleted file mode 100644
index 9cd47ee..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnktsk.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/skipit.gif b/docs/org.eclipse.wst.webtools.doc.user/images/skipit.gif
deleted file mode 100644
index 55f5b1b..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/skipit.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/viewlink.gif b/docs/org.eclipse.wst.webtools.doc.user/images/viewlink.gif
deleted file mode 100644
index 407b051..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/viewlink.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/plugin.xml b/docs/org.eclipse.wst.webtools.doc.user/plugin.xml
deleted file mode 100644
index d7e149f..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/plugin.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<?eclipse version="3.0"?> 
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-   <plugin> 
-       <extension point="org.eclipse.help.toc">
-         	<toc file="webtools_toc.xml" /> 
-         	   </extension>  
-         	   </plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.html
deleted file mode 100644
index 47003ea..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Static Web projects</title>
-</head>
-<body id="ccstatic"><a name="ccstatic"><!-- --></a>
-
-<h1 class="topictitle1">Static Web projects</h1>
-<div><p>If you  want to create a content-based Web application that does not contain
-
-any dynamic content  (such as servlets, JSP files, filters, and associated
-
-metadata) you might prefer to create a static Web project, as opposed to a <a href="ccwebprj.html">dynamic Web project</a>.</p>
-<div class="p">Static Web projects have the following characteristics:  <ul><li>a Web content folder (called WebContent) for all publishable resources,
-
-You can change the name of this folder from the project's pop-up menu.</li>
-<li>a Theme folder, the suggested directory for storing cascading style sheets
-
-and other style-related objects.</li>
-<li>the ability to define folders outside of the Web content folder, for storing
-
-intermediate files, such as MIF files</li>
-<li>a conversion path from a static Web project to a dynamic Web project.
-
-If you decide to <a href="../../org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.html">convert</a> the project, it will be a fully-valid dynamic
-
-Web project. </li>
-</ul>
-</div>
-<div class="p">In addition, your project will still have the following features (which
-
-are common to both static and dynamic Web projects ) : <ul><li>HTML syntax validation</li>
-<li>a broken link fix-up wizard</li>
-<li>a Web site navigation tool</li>
-<li>a new server type, the Static Web server, which makes it easy to publish
-
-static Web projects
-</li>
-</ul>
- </div>
-<p>The folder that a static Web project is published to is modifiable, so
-
-that when you set the publishing "root" value (called a <i>context root</i>),
-
-such as <samp class="codeph">/web1</samp>, for a static project, everything in the Web
-
-content folder will be published to the <span class="filepath">web1</span> folder under
-
-the Web server's doc root. This enables you to group Web resources on a Web
-
-server in folders that correspond to Web projects in the workbench. When projects
-
-defined in this way are ready for production, you can publish specific projects
-
-directly to the doc root by changing the value to <samp class="codeph">/</samp> and all
-
-publishing, link fixing, and browsing will update automatically.</p>
-<div class="p">Aliases can also be used to specify a context root value. For example,
-
-suppose that there is an alias that is defined on the target Web server, as
-
-follows: <pre>Alias /scripts/ "/var/www/scripts"</pre>
-In this
-
-example, in which the current static Web project will contain common JavaScript™ files,
-
-you can set the context root value to be <span>"scripts"</span>.  In order for
-
-the resources in the static Web project to be published to the correct location
-
-on the Web server, you must add this Alias mapping to the server tools instance
-
-of the static Web server, as follows.  <ol><li>From the Server view, double-click on the static Web server configuration
-
-to open the server configuration editor.<div class="note"><span class="notetitle">Note: </span>This assumes that you've already
-
-defined the static Web server.</div>
-</li>
-<li>Click the <span class="uicontrol">Configuration</span> editor tab.</li>
-<li>Scroll down to the <span class="uicontrol">Alias Path Mapping</span> section,
-
-and add the new Alias mapping.</li>
-</ol>
-Now that <span>"scripts"</span> is defined as an Alias, the Web content in
-
-the static Web project will be published to the mapped path, <span class="filepath">/var/www/scripts</span>.</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwtover.html" title="">Web application overview</a><br />
-<a href="cwebdevelopmenttools.html" title="">Web development tools</a><br />
-<a href="ccwebprj.html" title="">Dynamic Web projects and applications</a><br />
-<a href="cwwarovr.html" title="">Web archive (WAR) files</a><br />
-</p>
-<!--<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../../com.ibm.etools.publishing.server.rwd.doc/topics/tstatsrv.html">Publishing static Web projects to a static Web publishing
-
-server</a><br />
-</p>-->
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebper.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebper.html
deleted file mode 100644
index 8040d7e..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebper.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>The Web perspective</title>
-</head>
-<body id="ccwebper"><a name="ccwebper"><!-- --></a>
-
-<h1 class="topictitle1">The Web perspective</h1>
-<p>The Web perspective combines views and editors that assist you with Web
-
-application development. This is the perspective in which you typically edit
-
-Web project resources, such as HTML and JSP files, and deployment descriptors.</p>
-<p>The following are some of the views that are helpful when developing Web
-
-applications in the Web perspective.</p>
-<dl>
-<dt class="bold">Colors</dt>
-<dd>Allows you to apply colors from a palette (or custom colors) to selected
-objects in the editing area.</dd>
-<dt class="bold">Gallery</dt>
-<dd>Contains a variety of catalogs of reusable files that can be applied to
-Web pages. The file types available include images, wallpaper, sound
-files, and style sheet files.</dd>
-<dt class="bold">Page Data</dt>
-<dd>Allows you manage data from a variety of sources such as JavaBeans™,
-and Web Services, which can be configured and dropped onto a JSP page.</dd>
-<dt class="bold">Palette</dt>
-<dd>Contains expandable drawers of drag and drop objects. Allows you to drag
-objects, such as tables or form buttons, onto the Design or Source page.</dd>
-<dt class="bold">Problems</dt>
-<dd>Shows list of errors, warnings, and information about an operation. For
-example, if there are errors when validating the code in an HTML file, the
-errors will appear in this list. </dd>
-<dt class="bold">Properties</dt>
-<dd>Provides tabbed pages that allow you to update properties for tags selected
-in files open in the active Web editor. Changes to property value text fields
-are reflected in the edited file immediately when cursor focus is changed,
-or when you press the Enter key. In addition, changes to any of the controls
-in the Properties view are immediately reflected in the edited file.</dd>
-<dt class="bold">Quick Edit</dt>
-<dd>Allows you to edit small bits of code, including adding and editing actions
-assigned to tags. You can drag and drop items from the Snippets view into
-the Quick Edit view.</dd>
-<dt class="bold">Servers</dt>
-<dd>Lists servers defined for the project and their status.</dd>
-<dt class="bold">Snippets</dt>
-<dd>Contains expandable drawers of drag and drop code snippets. For instance,
-you can add JavaScript™ macros that become part of the user interface
-(UI), like a script to display the date and time when the page was last updated.
-If you are working in a JSP file, you can add common JSP code. You can drag
-and drop code snippets into the Design and Source pages, as well as the Quick
-Edit view.</dd>
-<dt class="bold">Styles</dt>
-<dd>Provides guided editing for cascading style sheets and individual style
-definitions for HTML elements.</dd>
-<dt class="bold">Tasks</dt>
-<dd>Shows a list of "to do" items that you create and to which you assign priorities. To create a task, right click in the list and select <b>Add Task</b> from the pop-up menu. 
-</dd>
-<dt class="bold">Thumbnails</dt>
-<dd>Shows thumbnails of the images in the selected project, folder, or file.
-When used with the Gallery view, thumbnail also displays the contents of a selected folder.
-You can drag and drop from this view into the Project Explorer view.</dd>
-</dl>
-<p>There are other views in this perspective that you might find useful. To
-
-add more views, select <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Show
-
-View</span></span> from the menu bar. You can close, resize, or
-
-move any of the views.</p>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwtover.html" title="Web application overview">Web application overview</a><br />
-<a href="cwwedtvw.html" title="Workbench integration with Web editors">Workbench integration with Web editors</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="twedtwbx.html">Configuring Web applications using the Web deployment descriptor editor</a><br />
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.html
deleted file mode 100644
index cceca0b..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Dynamic Web projects and applications</title>
-</head>
-<body id="ccwebprj"><a name="ccwebprj"><!-- --></a>
-
-<h1 class="topictitle1">Dynamic Web projects and applications</h1>
-<div><p>There are two types of Web projects: dynamic and <a href="ccstatic.html">static</a>. Dynamic web projects can contain
-
-dynamic J2EE resources such as servlets, JSP files, filters, and associated
-
-metadata, in addition to static resources such as images and HTML files. Static
-
-web projects only contains static resources. When you create Web projects,
-
-you can include cascading style sheets and JSP tag libraries (for dynamic
-
-Web projects), so that you can begin development with a richer set of project
-
-resources.</p>
-<p>Dynamic Web projects are always imbedded in Enterprise Application projects.
-
-The wizard that you use to create a dynamic Web project will also create an
-
-Enterprise Application (EAR) project if it does not already exist. The wizard
-
-will also update the <span class="filepath">application.xml</span> deployment descriptor
-
-of the specified Enterprise Application project to define the Web project
-
-as a module element. If you are importing a WAR file rather than creating
-
-a dynamic Web project new, the WAR Import wizard requires that you specify
-
-a Web project, which already requires an EAR project. </p>
-<p>J2EE conventions may represent extra overhead if you only want to create
-
-a static, content-based Web application, which contains no dynamic files,
-
-such as JSP files or servlets. In this case, when you need only the most basic
-
-Web project, you might want to use the <i>static</i> Web project type (see <a href="ccstatic.html">Static Web projects</a>). Note that static Web projects
-
-can  be converted to dynamic Web projects by selecting <b>Convert to a Dynamic
-
-Web Project</b>, from the Project menu.</p>
-<p>The J2EE model, and more specifically, the <cite>Sun Microsystems Java™ Servlet
-
-2.3 Specification</cite>, defines a Web application directory structure that
-
-specifies the location of Web content files, class files, class paths, deployment
-
-descriptors, and supporting metadata. The Web project hierarchy mirrors that
-
-of the Web application created from a project. In the workbench, you can use
-
-the <span>New Web Project</span> wizard to create a new Web project.</p>
-<div class="p">The main project folder contains all development objects related to a Web
-
-application. The Web content folder contains the elements of the project necessary
-
-to create a Web application. This folder structure maps to the Web application
-
-archive (WAR) structure defined by Sun Microsystems.. The following default
-
-elements are located in the Web project folder hierarchy: <div class="note"><span class="notetitle">Note: </span>In the Project
-
-Explorer view, Web projects are filtered into folder nodes to customize the
-
-display of Web resources for easy management during development. For information
-
-on the filtered structure, see <a href="../../org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html">Project Explorer view</a>.</div>
-<dl><dt class="bold">Web Deployment Descriptor</dt>
-<dd>The standard Web application deployment descriptor (the <span class="filepath">web.xml</span> file).</dd>
-<dt class="bold">JavaSource</dt>
-<dd>Contains the project's Java source code for classes, beans, and
-
-servlets. When these resources are added to a Web project, they are automatically
-
-compiled and the generated files are added to the WEB-INF/classes directory.
-
-The contents of the source directory are not packaged in WAR files unless
-
-an option is specified when a WAR file is created. <div class="note"><span class="notetitle">Note: </span>Though the default
-
-name given to the folder is JavaSources, you can change the name through the
-
-Project Explorer view or through the Preferences page available by selecting <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Web
-
-Tools</span> &gt; <span class="uicontrol">New J2EE Project</span></span>.</div>
-</dd>
-<dt class="bold">imported_classes folder</dt>
-<dd>This folder may be created during a WAR import, and contains class files
-
-that do not have accompanying source.  The <span class="uicontrol">imported_classes</span> folder
-
-is a Java classes
-
-folder; Java classes folders can also be created using the
-
-Web project <span class="uicontrol">Java Build Path</span> properties page.</dd>
-<dt class="bold">WebContent folder</dt>
-<dd>The mandatory location of all Web resources, including HTML, JSP, graphic
-
-files, and so on. If the files are not placed in this directory (or in a subdirectory
-
-structure under this directory), the files will not be available when the
-
-application is executed on a server. The Web content folder represents the
-
-contents of the WAR file that will be deployed to the server. Any files not
-
-under the Web content folder are considered development-time resources (for
-
-example, .java files, .sql files, and .mif files), and are not deployed when
-
-the project is unit tested or published. <div class="note"><span class="notetitle">Note: </span>Though the default name given
-
-to the folder is <span class="filepath">WebContent</span>, you can change the name
-
- in the Project Explorer by right-clicking the folder and selecting <span class="uicontrol">Rename</span> or
-
-from the Web page of the project's Properties dialog. In a dynamic Web project,
-
-changing the folder name will update the Java build output directory. You can change
-
-the preference for the default folder name to be applied when creating new
-
-Web projects by selecting <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Web Tools</span> &gt; <span class="uicontrol">New J2EE Project</span></span>.</div>
-</dd>
-<dt class="bold">META-INF</dt>
-<dd>This directory contains the <span class="filepath">MANIFEST.MF</span> file, which
-
-is used to map class paths for dependent JAR files that exist in other projects
-
-in the same Enterprise Application project. An entry in this file will update
-
-the run-time project class path and Java build settings to include the referenced
-
-JAR files.</dd>
-<dt class="bold">theme</dt>
-<dd>The suggested directory for cascading style sheets and other style-related
-
-objects.</dd>
-<dt class="bold">WEB-INF</dt>
-<dd>Based on the <cite>Sun Microsystems Java Servlet 2.3 Specification</cite>,
-
-this directory contains the supporting Web resources for a Web application,
-
-including the <span class="filepath">web.xml</span> file and the classes and lib directories.</dd>
-<dt class="bold">/classes</dt>
-<dd>This directory is for servlets, utility classes, and the Java compiler
-
-output directory. The classes in this directory are used by the application
-
-class loader to load the classes. Folders in this directory will map package
-
-and class names, as in: <samp class="codeph">/WEB-INF/classes/com/mycorp/servlets/MyServlet.class</samp>.<p>Do
-
-not place any .class files directly into this directory. The .class files
-
-are placed in this directory automatically when the Java compiler compiles
-
-Java source files that are in the <span class="filepath">Java Resources</span> directory.
-
-Any files placed directly in this directory will be deleted by the Java compiler
-
-when it runs.</p>
-</dd>
-<dt class="bold">/lib</dt>
-<dd>The supporting JAR files that your Web application references. Any classes
-
-in .jar files placed in this directory will be available for your Web application</dd>
-<dt class="bold">Libraries</dt>
-<dd>The supporting JAR files that your Web application references. This folder
-
-mirrors the content of the lib folder. In addition, Web Library Projects,
-
-which are "virtual" JAR files that do not physically reside in the Web project,
-
-but are associated with Java projects elsewhere in your workspace,
-
-are included in this folder. They are packaged with your project when you
-
-export the application's WAR file.</dd>
-</dl>
- <div class="note"><span class="notetitle">Note: </span>A library entry on the Java build path will remain there unless
-
-the actual JAR file is deleted from the WEB-INF/lib folder. If you remove
-
-a library path entry but not the JAR file, the library entry will be re-added
-
-to the path automatically.</div>
-</div>
-<div class="p"><b>Related concepts</b>  <p><a href="ccwtover.html">Web application overview</a><br />
-<br />
-<a href="cwebdevelopmenttools.html">Web development tools</a><br />
-<br />
-<a href="ccstatic.html">Static Web projects</a><br />
-<br />
-<a href="cwwarovr.html">Web archive (WAR) files</a></p>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html
deleted file mode 100644
index 84a034c..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Project Explorer view and Web development</title>
-</head>
-<body id="ccwebvw"><a name="ccwebvw"><!-- --></a>
-
-<h1 class="topictitle1">Project Explorer view and Web development</h1>
-<div><div class="skipspace"><div class="p">The Project Explorer view is the default view in the Web perspective.
-
-This view provides the following notable features: <ul><li>VCM (version control management) information can be toggled on and off
-
-from the Preferences page (<span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Workbench</span> &gt; <span class="uicontrol">Label decorations</span></span>)</li>
-<li><img src="../images/nwin.gif" alt="For Windows" /> You
-
-can drag and drop files from Windows<sup>®</sup> Explorer or the desktop into the
-
-Navigator view.</li>
-<li>View filtering is supported by selecting <span><span class="uicontrol">Filters</span></span> from
-
-the Navigator view <span><span class="uicontrol">Menu</span></span> button. Resources
-
-can be filtered by name, project type or working set. Files beginning with
-
-a period are filtered out by default.</li>
-<li>The status line shows the full path of the selected resource.</li>
-<li>Dragging a .java file from the Navigator view into a JSP file will insert
-
-a usebean tag, the same behavior that is exhibited when a .class file is dragged
-
-into a JSP file.</li>
-<li>Errors and warnings on resources (including Java™, HTML/JSP, and Links Builder errors
-
-and warnings) are indicated with a red error <img src="../images/nshowerr.gif" alt="Error icon" /> or yellow warning <img src="../images/nwarning.gif" alt="Warning icon" /> next to the resource with the error,
-
-as well as the parent containers up to the project. This applies for all project
-
-types, not only Web projects.</li>
-<li>Items available from the <span><span class="uicontrol">New</span></span> cascading
-
-menu in the project pop-up menu are context sensitive.  All menus will have <span><span class="uicontrol">Project</span></span> and <span><span class="uicontrol">Other</span></span> options.</li>
-<li>All projects are automatically grouped by type. To see this
-
-view of your projects, click on the <b>Group Project by Type</b> icon <img src="../images/grptype.gif" alt="Group Project by Type Icon" />. </li>
-</ul>
-</div>
-</div>
-<div class="skipspace"><h4 class="sectiontitle">Organization of the Project Explorer view</h4><p>The Project
-
-Explorer view shows a custom view of a dynamic Web project. By default, dynamic
-
-web projects appear under a top-level category called Dynamic Web Projects.
-
-The following are some of the notable top-level objects that appear beneath
-
-the project node (based on default folder names).</p>
-
-<p><b>Web Diagram</b> - A Web
-
-application diagram, is a file that helps you visualize and change
-
-the flow of a Web application.
-
-This file and associated wizard enables you to construct a diagram of a Web
-
-application by clicking on objects in a palette.</p>
-<p><b>Web Deployment Descriptor</b> -
-
-This file corresponds to the WebContent/WEB-INF/web.xml file, which is used
-
-to specify deployment information for modules created in the Web development
-
-environment. You can edit this file using the <a href="ccwebxml.html">Web
-
-deployment descriptor editor</a>, or you can select <span><span class="uicontrol">Open
-
-With</span></span> from its pop-up menu to open the file with a different
-
-editor. </p>
-<p>Underneath the Deployment Descriptor are placeholders object
-
-that are reserved for the creation of Servlets, Servlet Mappings, Filters,
-
-Filter Mappings, References, Security (constraints and roles) and Listeners.
-
-You can create instances of these objects by right clicking on an object and
-
-selecting <b>New</b> from the pop-up menu.</p>
-<div class="p"><b>JavaSource</b> - This
-
-node displays Java resources within the project. If the project contains
-
-a single Java source folder, the packages and classes (for example,
-
-servlets, beans) within the source folder will be shown directly beneath the
-
-JavaSource folder node. If the project contains multiple source folders, each
-
-source folder will appear beneath the JavaSource folder and can be expanded
-
-to show their packages and classes. <div class="note"><span class="notetitle">Note: </span>Though the default name given
-
-to the folder is JavaSource, you can change the name in the Preferences page
-
-by selecting <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Web Tools</span> &gt; <span class="uicontrol">New J2EE Project</span></span>.</div>
-<ul><li><b>Libraries</b> - This folder contains the library JAR files defined
-
-in the project properties. Three types of JAR files are shown: <ol><li>JAR files included in the project's WebContent/WEB-INF/lib directory</li>
-<li>JAR files external to the project, such as j2ee.jar and rt.jar</li>
-<li>Project libraries, which are special references to a Java project</li>
-</ol>
-<p>When a Web project is exported, a JAR file is automatically created
-
-from the Java project to be used by the Web application during
-
-runtime. Libraries are shown in classpath order. By default, only the JAR
-
-files contained within the project are shown. You can also display external
-
-JARs and project libraries by selecting <span><span class="uicontrol">Show Referenced Libraries</span></span> from
-
-the Navigator view's <span><span class="uicontrol">Menu</span></span> button <img src="../images/menubutton.gif" alt="Menu button" />.</p>
-</li>
-<li><b>imported_classes folder</b> - This folder can be created during a WAR
-
-import, and contains class files that do not have accompanying source.  The <span class="uicontrol">imported_classes</span> folder
-
-is a Java classes
-
-folder; Java classes folders can also be created using the
-
-Web project <span><span class="uicontrol">Java Build Path</span></span> properties page.<p><img src="../images/nwin.gif" alt="For Windows" /> You can drag
-
-and drop class files from the Windows Explorer or desktop to the <span class="uicontrol">imported_classes</span> folder
-
-in the Navigator view.</p>
-</li>
-</ul>
-</div>
-<div class="p"><b>Web content folder</b> - This folder contains items to be published
-
-to the server. By default, this folder will be named <b>WebContent</b> for
-
-newly created static and dynamic Web projects. <div class="note"><span class="notetitle">Note: </span>You can change the name
-
-in the Web page of the project's Properties dialog. In a dynamic Web project,
-
-changing the folder name will update the Java build output directory. You can change
-
-the preference for the default folder name to be applied when creating new
-
-Web projects by selecting <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Web Tools</span> &gt; <span class="uicontrol">New J2EE Project</span></span>. </div>
-<ul><li><b>META-INF</b> - This directory contains the <span class="filepath">MANIFEST.MF</span> file,
-
-which is used to map class paths for dependent JAR files that exist in other
-
-projects in the same Enterprise Application project. An entry in this file
-
-will update the run-time project class path and Java build settings to include the referenced
-
-JAR files.</li>
-</ul>
-<ul><li><b>Theme</b> - The suggested directory for cascading style sheets and
-
-other style-related objects.</li>
-<li><b>WEB-INF</b> - The directory where supporting Web resources for a Web
-
-application are kept (for example: .xmi files, .xml files, and web.xml.) Note
-
-that double-clicking on the web.xml file has the same effect as double-clicking
-
-on the Deployment Descriptor: it opens the Web Deployment Descriptor editor.</li>
-</ul>
- </div>
- </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebxml.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebxml.html
deleted file mode 100644
index 1d312cb..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebxml.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>The Web deployment descriptor editor</title>
-</head>
-<body id="ccwebxml"><a name="ccwebxml"><!-- --></a>
-
-<h1 class="topictitle1">The Web deployment descriptor editor</h1>
-<div><p>The Web deployment descriptor editor lets you specify deployment information
-
-for modules created in the Web development environment. The information appears
-
-in the web.xml file. Note that you use the Web deployment descriptor to set
-
-deployment descriptor attributes. You do not use it to manipulate Web resource
-
-content. </p>
-<p>The web.xml file for a Web project provides information necessary for deploying
-
-a Web application module. It is used in building a WAR file from a project.
-
-Whenever you create a new Web project, a minimal web.xml file is automatically
-
-created in WEB-INF under the project's Web content folder.</p>
-<div class="p">The Web deployment descriptor editor is dynamic and includes many tabbed
-
-pages (views) that represent various properties and settings in the deployment
-
-descriptor. For example, you can click the Servlets tab to display the Servlets
-
-page, in which you can add or remove servlets and JSPs that are used in the
-
-Web application. The Web deployment descriptor editor includes the following
-
-tabbed pages:  <ul><li><b>Overview</b> - provides a quick summary of the contents in the Web
-
-deployment descriptor and lets you add, remove, or change the contents.<p></p>
-<p></p>
-</li>
-<li><b>Servlets</b> - lets you create a new servlet, add an existing servlet
-
-or JSP file to the deployment descriptor, or remove the selected servlet of
-
-JSP file from the deployment descriptor.<p></p>
-</li>
-<li><b>Filters</b> - lets you create a new filter, add an existing filter
-
-to the deployment descriptor, or remove the selected filter from the deployment
-
-descriptor.<p></p>
-</li>
-<li><b>Security</b> - lets you define security roles and security constraints.<p></p>
-</li>
-<li><b>References</b> - lets you add or remove references to the deployment
-
-descriptor. The following are the types of references you can define on this
-
-page:  <ul><li>EJB reference - create a reference to an enterprise bean.<p></p>
-</li>
-<li>Service reference - create a reference to a Web service</li>
-<li>Resource reference - create a reference to an external resource</li>
-<li>Resource Environment reference - create a reference to administered objects.</li>
-<li>JSP Tag Library</li>
-</ul>
-<p></p>
-</li>
-<li><b>WS Handler</b> - lets you add and configure handlers for a selected
-
-port component. This includes specifying a handler description and display
-
-name, specifying implementation details, adding initial parameters, and adding
-
-SOAP headers. <p></p>
-</li>
-<li><b>Pages</b> - lets you add or remove welcome and error pages to the deployment
-
-descriptor. Also allows you to define the login-config element and add exception
-
-types to error pages.<p></p>
-</li>
-<li><b>Variables</b> - lets you add or remove listeners, environment variables,
-
-tag lib references, context parameters and MIME Mappings.<p></p>
-</li>
-<li><b>WS Extensions</b> and <b>WS Bindings</b> - These pages, which appear
-
-only if you have created a Web service, let you configure extension and binding
-
-information for the Web service.<p></p>
-</li>
-<li><b>Extensions</b> - lets you specify settings for WebSphere<sup>®</sup> extensions
-
-(such as enabling reloading). Other settings include MIME filters, JSP attributes,
-
-file serving attributes, invoker attributes, and servlet caching configurations. <p></p>
-</li>
-<li><b>Source</b> - lets you edit the web.xml source directly.<p></p>
-</li>
-</ul>
-</div>
-<div class="p">Although you can edit web.xml directly, we recommend that you edit the
-
-multiple tabbed pages in the Web Deployment Descriptor editor. As you specify
-
-deployment information in these tabbed pages, the editor automatically incorporates
-
-the appropriate XML tagging in web.xml (or in the appropriate .xmi file). <p></p>
-</div>
-<div class="p">In addition to the configuration information in the web.xml file, other
-
-deployment descriptors in a Web project include the following information: <ul><li>Binding information -  information is required by the application server
-
-to bind the deployment information specified in the application to a specific
-
-instance. For example, it may map a logical name of an external dependency
-
-or resource to the actual physical JNDI name of the resource. It also may
-
-map security role information to a set of groups or users.<p></p>
-</li>
-<li>IBM<sup>®</sup> binding
-
-and extensions information (ibm-web-bnd.xmi and ibm-web-ext.xmi files) - additions
-
-to the standard descriptors for J2EE applications, Web applications, and enterprise
-
-beans. The extensions enable Enterprise Edition or legacy (older) systems
-
-to work in the current WebSphere Application Server environment.
-
-They are also used to specify application behavior that is vendor-specific,
-
-undefined in a current specification, or expected to be included in a future
-
-specification. <p></p>
-</li>
-</ul>
-If you import a WAR file into an existing Web project, you
-
-can include the deployment descriptor files included in the WAR file as the
-
-Web project's new deployment descriptor. Any specific deployment information
-
-already defined in these files is used when deploying the updated Web application.</div>
-<p>The web.xml file can be updated automatically to reflect changes to your
-
-Web project. For instance, when you use the New Servlet wizard to create a
-
-new servlet in a Web project, the wizard places the appropriate servlet entry
-
-into the web.xml file.</p>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="cwebprojects.html">Web projects</a><br />
-<a href="ccwtover.html">Web application overview</a><br />
-<a href="cwservbn.html">Servlets</a><br />
-<a href="cpdjsps.html">JavaServer Pages (JSP) technology</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="twedtwbx.html" title="">Configuring Web applications using the Web deployment descriptor editor</a><br />
-<a href="twsrvwiz.html" title="">Creating servlets</a><br />
-<a href="twimpwar.html" title="">Importing Web archive (WAR) files</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwtover.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwtover.html
deleted file mode 100644
index 7572e09..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwtover.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Web application overview</title>
-</head>
-<body id="ccwtover"><a name="ccwtover"><!-- --></a>
-
-<h1 class="topictitle1">Web application overview</h1>
-<p>The Web development environment provides the tools
-
-you need to develop Web applications as defined in the <cite>Sun Microsystems Java™ Servlet
-
-2.3 Specification</cite> and the <cite>Sun Microsystems JSP 1.2 Specification</cite>.
-
-Web applications can be simple (consisting of only static Web pages) or they
-
-can be more advanced and include JavaServer Pages (JSP) files and Java servlets.
-
-These resources, along with an XML <a href="../org.eclipse.wst.webtools.doc.user/topics/twedtwbx.html">deployment descriptor</a> (<span class="filepath">web.xml</span>) and other <a href="cwebresources.html"> Web resources</a>, are contained within a Web project during development.
-
-When you are ready to publish the Web application to the Web, you deploy the
-
-Web project to the server in the form of a Web archive (WAR) file . The end
-
-user can then view the Web application as a Web site from a URL.</p>
-<div class="skipspace"><h4 class="sectiontitle">Development Phases</h4>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cjarpl.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cjarpl.html
deleted file mode 100644
index 8850a90..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cjarpl.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>JAR file placement</title>
-</head>
-<body id="cjarpl"><a name="cjarpl"><!-- --></a>
-
-<h1 class="topictitle1">JAR file placement</h1>
-<div><p>If your JAR file is only used in a single Web application, always put the
-
-JAR file in the Web project's WebContent/WEB-INF/lib folder. The JAR files
-
-in this folder are automatically added to the Java™ build path, and will not require any
-
-further setup when moved to a different server. </p>
-<p>If the JAR file is used by multiple modules within the same application,
-
-place the JAR file in the enterprise application,  then use the Java JAR
-
-Dependencies feature to set up the manifest files and the Java build
-
-class paths. The Java JAR Dependencies Properties page of an EJB or
-
-Web project is used to identify which JARs in the enterprise application the
-
-EJB or Web project (respectively) uses. You can access the Java JAR
-
-Dependencies by selecting Properties from the pop-up menu of an EJB or Web
-
-project. </p>
-<p>If the JAR file requires access to any J2EE or WebSphere<sup>®</sup> classes,
-
-or to any other JAR files that have been added to ws.ext.dirs, it must also
-
-be placed on the ws.ext.dirs property. The ws.ext.dirs property is used for
-
-all JAR files that require access to the J2EE JAR files or WebSphere's internal
-
-classes. If there are hard dependencies on the JAR file, you must update the Java build
-
-path of each project that uses the JAR file.  Any changes you want to make
-
-to ws.ext.dirs can be made using the server editor. </p>
-<p>It is not recommended to put the JAR file on the global class path. Using
-
-one of the global class paths makes your application vulnerable to changes
-
-made to the classes on which you depend. If you have added the JAR file to
-
-the global class path or ws.ext.dirs properties you will have to publish the
-
-JAR file separately from your application, then you will have to set up the
-
-server class path again if you move to a different server.</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cpagedataview.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cpagedataview.html
deleted file mode 100644
index ca1eb45..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cpagedataview.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Page Data view</title>
-</head>
-<body id="cpagedataview"><a name="cpagedataview"><!-- --></a>
-
-<h1 class="topictitle1">Page Data view</h1>
-<div><p>The Page Data view provides access to data objects in JSP files.</p><div class="p">The Page Data view allows you to add, modify, or delete data objects in
-JSP files. The types of data objects are listed below. 
-<ul><li>Standard scripting variables that are available to all JSP files: 
-<ul><li><samp class="codeph">applicationScope</samp> that allows you to add and modify attributes
-in the application object</li>
-<li><samp class="codeph">param</samp> that allows you to add and modify attributes to
-be used in the page object</li>
-<li><samp class="codeph">requestScope</samp> that allows you to add and modify attributes
-in the request object</li>
-<li><samp class="codeph">sessionScope</samp> that allows you to add and modify attributes
-in the session object</li>
-</ul>
-</li>
-</ul>
-</div>
-<p>The Page Data view is, by default, shown in the bottom left corner of the
-workbench. It shares a pane with several other views including the Outline
-view, the Client Data view, and the Thumbnails view. </p>
-<div class="p">You can add, delete, or modify data objects in a JSP file using the Page
-Data view. To create and modify a data object: <ol><li>In the Page Data view, right click and select <span class="uicontrol">New</span>.</li>
-<li>Select the type of object you want to create. An appropriate wizard opens,
-depending on the type of object selected.</li>
-<li>Fill in the fields of the wizard and select <span class="uicontrol">OK</span>.
-The new object appears in the Page Data view. You will need to expand the
-appropriate section of the Page Data view to see the new object.</li>
-<li>Highlight the object in the Page Data view. The actions that are available
-to the data objects include the following:<ul><li>Drag the object directly onto the JSP file. This generates the appropriate
-controls in the JSP file. </li>
-<li>Right-click and select <span class="uicontrol">Insert New Controls</span>. This
-has the same effect as dragging the object onto the JSP file.</li>
-<li>Right-click and select <span class="uicontrol">Delete</span> to remove the data
-object from the Page Data view. This action does not delete existing data
-object from the JSP file.</li>
-<li>Right-click and select <span class="uicontrol">Configure</span> to modify the
-attributes of the data object in the Page Data view. This action does not
-change the existing data objects in the JSP file.</li>
-</ul>
-</li>
-</ol>
-</div>
-</div>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../../org.eclipse.platform.doc.user/concepts/concepts-5.htm">Views</a><br />
-<a href="cpdjsps.html">JavaServer Pages (JSP) technology</a><br />
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cpalette.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cpalette.html
deleted file mode 100644
index 238e3e4..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cpalette.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Palette view </title>
-</head>
-<body id="cpalette"><a name="cpalette"><!-- --></a>
-
-<h1 class="topictitle1">Palette view </h1>
-<div><p>The Palette view (<b>Window &gt; Show View &gt; Other &gt; Basic &gt; Palette</b>) contains a palette with a series of <i>drawers</i>. Each drawer contain items that you can drag and drop into the active
-
-editor.  The drawers and their contents vary depending on the active editor. </p>
-<p>To customize the Palette view,  right-click
-
-within the Palette view, select <b>Customize</b> and then add or hide the items you want to see. Additionally, you can increase the size of the icons in the palette by right-clicking within the palette and selecting <b>Use Large Icons</b>).</p>
-</div>
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="tpalette1.html" title="">Using the Web palette</a><br />
-<a href="tpalette2.html" title="">Customizing the Web palette</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html
deleted file mode 100644
index 2b43af2..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>JavaServer Pages (JSP) technology</title>
-</head>
-<body id="cpdjsps"><a name="cpdjsps"><!-- --></a>
-
-<h1 class="topictitle1">JavaServer Pages (JSP) technology</h1>
-<div><p>The JavaServer Pages technology enables you to generate dynamic web content,
-
-such as HTML, DHTML, XHTML, and XML files, to include in a Web application.
-
-JSP files are one way to implement server-side dynamic
-
-page content. JSP files allow a Web server, such as WebSphere<sup>®</sup> Application
-
-Server or Apache Tomcat, to add content dynamically to your HTML pages before
-
-they are sent to a requesting browser.</p>
-<p>When you deploy a JSP file to a Web server that provides a servlet engine,
-
-it is preprocessed into a servlet that runs on the Web server. This is in
-
-contrast with client-side JavaScript™ (within <samp class="codeph">&lt;SCRIPT&gt;</samp> tags),
-
-which is run in a browser. A JSP page is ideal for tasks that are better suited
-
-to execution on the server, such as accessing databases or calling Enterprise Java™ beans.</p>
-<p>You can create and edit a JSP file in the HTML editor
-
-by adding your own text and images using HTML, JSP tagging, or JavaScript,
-
-including Java source code inside of scriptlet tags. Typically,
-
-JSP files have the file extension .jsp. Additionally, the JSP specification
-
-suggests that JSP fragment files should have file extension .jspf. If this
-
-convention is not followed, the JSP validator will treat JSP fragments as
-
-regular standalone JSP files, and compilation errors might be reported.</p>
-<p>The <cite>Sun Microsystems JSP 1.2 Specification</cite> provides the ability
-
-to create custom JSP tags. Custom tags simplify complex actions and 
-
-provide developers with greater control over page content. Custom tags are
-
-collected into a library (taglib). A tag library descriptor file (taglib.tld)
-
-is an XML document that provides information about the tag library, including
-
-the taglib short name, library description, and tag descriptions. Refer to
-
-the <cite>Sun Microsystems JSP 1.2 Specification</cite> for more details.</p>
-<p>To use JSP 1.2 custom taglibs, you can import the tag library .tld and
-
-.jar files into your project to use them, or associate them as Web Library
-
-projects. You can also reference a TLD file by using a URI.</p>
-</div>
-<div>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tjcrejsp.html">Creating JSP files</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebdevelopmenttools.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebdevelopmenttools.html
deleted file mode 100644
index 255b1f1..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebdevelopmenttools.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Web development tools</title>
-</head>
-<body id="cwebdevelopmenttools"><a name="cwebdevelopmenttools"><!-- --></a>
-
-<h1 class="topictitle1">Web development tools</h1>
-<div><p>The Web development tools enable you to create Web applications
-
-that range from simple static sites to dynamic Web applications that use the latest Web technologies.</p>
-<p>The Web perspective contains a selection of views and editors that are
-customized to be most useful to a Web developer.</p>
-<ul>
-<li>
-The editors include standard source editors with <a href="../../org.eclipe.wst.sse.doc.user/topics/tsrcedt005.html">content assist</a> features.
-
- To extend
-
-these pages, you can include form elements, Java™ applets, embedded scripts, dynamic
-
-controls, and <a href="cpdjsps.html"> JavaServer Pages</a> (JSP)
-
-tags.<p></p>
-</li>
-
-<li> <a href="../../org.eclipse.wst.webtools.doc.user/topics/ccwebxml.html"> Web Deployment Descriptor Editor</a> helps you define any of the deployment
-
-information that can exist in the Web application deployment descriptor included
-
-in a WAR file. Pages in this graphical editor provide controls to set numerous
-
-Web application parameters associated with servlets, filters, life-cycle listeners,
-
-mime mappings, parameters, references, security, and other general deployment
-
-settings. The Web deployment descriptor editor also enables you to configure WebSphere<sup>®</sup> Application
-
-Server-specific bindings and extensions. </li>
-</ul>
- </div>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwebper.html" title="">The Web perspective</a><br />
-<a href="ccwebxml.html">Web Deployment Descriptor Editor</a><br />
-<a href="cwwarovr.html" title="">Web archive (WAR) files</a><br />
-<a href="ccwebprj.html" title="">Dynamic Web projects and applications</a><br />
-<a href="ccstatic.html" title="">Static Web projects</a><br />
-<a href="cwebprojects.html" title="">Web projects</a><br />
-<a href="cwebpagedesign.html" title="">Web page design</a><br />
-<a href="cwebtechnologies.html" title="">Web technologies</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="twcreprj.html">Creating a dynamic Web project</a><br />
-<a href="twcresta.html">Creating a static Web project</a><br />
-<a href="tjcrejsp.html">Creating JavaServer Pages (JSP) files</a><br />
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.html
deleted file mode 100644
index 3dbd84d..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Web page design</title>
-</head>
-<body id="cwebpagedesign"><a name="cwebpagedesign"><!-- --></a>
-
-<h1 class="topictitle1">Web page design</h1>
-<div><p>Web pages are an integral part of every Web application. Each Web page
-should serve to help achieve the overall goal of the entire Web site.</p>
-<p> There are many types of Web pages, ranging from simple HTML pages that
-contain no dynamic elements, to advanced Java-based pages that make use of
-servlets, scripts, forms, or data access components.</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.html
deleted file mode 100644
index cea9aba..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Web projects</title>
-</head>
-<body id="cwebprojects"><a name="cwebprojects"><!-- --></a>
-
-<h1 class="topictitle1">Web projects</h1>
-<div><p>Web projects hold all of the Web resources that
-
-are created and used when developing your Web application. The first step
-
-to creating or importing a Web application is to create either a static or
-
-a dynamic Web project. Static Web projects are meant to contain only simple
-
-Web site resources, such as HTML files. Dynamic Web projects are used to structure
-
-Web applications that will use more complicated, dynamic Web technologies,
-
-such as JavaServer Pages files, and possibly data access resources.</p>
-<p>Though the Web project is structured on your file system in compliance
-
-with the J2EE Web application standard for deployment purposes, the Project
-
-Explorer view is designed to show the most convenient display of project resources
-
-for use while you are actually developing the Web application. When you are
-
-finished developing your Web application, you use the Web project to deploy
-
-the correct resources to the server. These resources will be packaged in a
-
-file called a Web archive, or WAR file.</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebresources.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebresources.html
deleted file mode 100644
index 48ef8ab..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebresources.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Web resources</title>
-</head>
-<body id="cwebresources"><a name="cwebresources"><!-- --></a>
-
-<h1 class="topictitle1">Web resources</h1>
-<div><p>In most cases, all of the resources that you need to create for your Web
-
-application are developed during Web site or Web page design; however, there
-
-are additional resources that you may need to include in your Web project
-
-if you are using more advanced Web technologies in your application.</p>
-<p>These Web resources are not typical Web page files, and are often not the
-
-resources that you consider part of the final Web site. For example, tag libraries
-
-and Java™ resources,
-
-such as JAR files, are resources you might need to include in your Web project.
-</p>
-<p>In fact, even the WAR file itself could be considered a Web resource, if
-
-you consider importing or exporting the resource.</p>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="cwebpagedesign.html" title="">Web page design</a><br />
-<a href="cwwarovr.html" title="">Web archive (WAR) files</a><br />
-<a href="cpdjsps.html" title="">JavaServer Pages (JSP) technology</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebtechnologies.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebtechnologies.html
deleted file mode 100644
index c6f59de..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebtechnologies.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Web technologies</title>
-</head>
-<body id="cwebtechnologies"><a name="cwebtechnologies"><!-- --></a>
-
-<h1 class="topictitle1">Web technologies</h1>
-<div><p>Many simple technologies, such as text-based markup languages, enable you
-
-to easily create simple Web pages.</p>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwebprj.html" title="">Dynamic Web projects and applications</a><br />
-<a href="ccstatic.html" title="">Static Web projects</a><br />
-<a href="cpdjsps.html" title="">JavaServer Pages (JSP) technology</a><br />
-<a href="cwebprojects.html" title="">Web projects</a><br />
-<a href="cwebdevelopmenttools.html" title="">Web development tools</a><br />
-<a href="cwebpagedesign.html" title="">Web page design</a><br />
-<a href="cwwedtvw.html" title="">Workbench integration with Web editors</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="twcreprj.html">Creating a dynamic Web project</a><br />
-<a href="twcresta.html">Creating a static Web project</a><br />
-<a href="tjcrejsp.html">Creating JavaServer Pages (JSP) files</a><br />
-<a href="twsrvwiz.html">Creating Servlets</a><br />
-<a href="twedtwbx.html">Configuring Web applications using the Web deployment descriptor
-editor</a><br />
-<a href="tjcrehtm.html">Creating HTML or XHTML files</a><br />
-</p>
-</div>	
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwlnkvew.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwlnkvew.html
deleted file mode 100644
index 2ef6826..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwlnkvew.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Links view</title>
-</head>
-<body id="cwlnkvew"><a name="cwlnkvew"><!-- --></a>
-
-<h1 class="topictitle1">Links view</h1>
-<div><p>The Links view (<span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Show
-
-View</span> &gt; <span class="uicontrol">Links</span></span> or clicking on
-
-the <img src="../images/viewlink.gif" alt="Links Icon" /> icon
-
-in the Web perspective) shows the files in your projects, the
-
-links between them and the characteristics of those links. This view helps
-
-you distinguish between different types of links, shows you the number of
-
-links to target files and indicates where documents have broken links or links
-
-to external files.</p>
-<p>The Links view is like the Project Explorer view in that you can open files
-
-by double-clicking on the file icons it displays. Similarly, the Project Explorer
-
-view shows you a file system hierarchical view of your project and the Links
-
-view shows you the hierarchical relationship of your files, based on the links
-
-between them.</p>
-<p>When files contain links to other files, they can be described as having
-
-parent-child relationships. When a file is in focus in the Links view, you
-
-can see the hierarchical relationships between it and the files to which it
-
-links. You can look at the parents (the files to the left) that contain links
-
-to the file in focus and the children (the files to the right) that are the
-
-targets of the links.</p>
-<div class="p">Hypertext links in HTML files are displayed as arrows between the files
-
-in the Links view. Hypertext links can be divided into different types. The
-
-following are examples of the most common kinds of links: <dl><dt class="bold"><img src="../images/nwlnkbrk.gif" alt="Broken link" /></dt>
-<dd>The arrow with two lines through it indicates that the link is broken
-
-or that the link is to a file outside the WebContent folder.<div class="note"><span class="notetitle">Note: </span> Broken
-
-links are also displayed in the Problems View and are indicated by the <img src="../images/nwlnktsk.gif" alt="Task list problem" /> icon
-
-in the first column.)    </div>
-<p>The <img src="../images/nwlnkcss.gif" alt="Cascading stylesheet" /> icon indicates that the link
-
-is to a cascading stylesheet.</p>
-</dd>
-<dt class="bold"><img src="../images/nwlnknum.gif" alt="Number of links" /> </dt>
-<dd>The arrow with a number on it indicates the number of times the file in
-
-focus links to the file to which it points. <p> The <img src="../images/nwlnkgr.gif" alt="Graphic icon" /> or <img src="../images/nwlnkgr-l.gif" alt="Graphic icon" /> icons indicate that the link is to
-
-a graphic. Links to graphics are sometimes referred to as an embedded links
-
-because they are rendered as part of the same HTTP request (appear on the
-
-same page).</p>
-</dd>
-<dt class="bold"><img src="../images/nwlnkque.gif" alt="Unknown link" /> </dt>
-<dd>The arrow with a question mark on it indicates that the validity of the
-
-link cannot be verified. <p>The <img src="../images/nwlnkind.gif" alt="Industry standard link" /> icon indicates that the link is one of a number of industry
-
-standard link types. The <img src="../images/nwlnkmal.gif" alt="Mailto icon" /> icon indicates that the link is to a mailing address.
-
-Links to file types that are not recognized are represented by the <img src="../images/nwlnkotr.gif" alt="File link" /> icon.</p>
-</dd>
-</dl>
-</div>
-</div>
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="tjlnkrfr.html" title="">Refreshing the Links view</a><br />
-<a href="tjlnknav.html">Viewing and navigating links</a><br />
-<a href="twlnkfix.html" title="">Fixing broken links using the Fixup link references wizard</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.html
deleted file mode 100644
index 306dacd..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Servlets</title>
-</head>
-<body id="cwservbn"><a name="cwservbn"><!-- --></a>
-
-<h1 class="topictitle1">Servlets</h1>
-<div><p>Servlets are server-side Java™ programs that use the <cite>Sun Microsystems Java Servlet
-
-API</cite> and its associated classes and methods, as defined in the <cite>Sun
-
-Microsystems Java Servlet 2.3 Specification</cite>. These Java programs
-
-extend the functionality of a Web server by generating dynamic content and
-
-responding to Web client requests. When a browser sends a request to the server,
-
-the server can send the request information to a servlet, so that the servlet
-
-can construct the response that is sent back to the browser.</p>
-<p>Just as applets run on a Web browser and extend the browser's capabilities,
-
-servlets run on a Java-enabled Web server, such as the WebSphere<sup>®</sup> Application
-
-Server and extend the server's capabilities. Because of their flexibility
-
-and scalability, servlets are commonly used to enable businesses to connect
-
-databases to the Web.</p>
-<div class="p">Although a servlet can be a completely self-contained program, you can
-
-split application development into two portions:  <ul><li>The business logic (content generation), which governs the relationship
-
-between input, processing, and output</li>
-<li>The presentation logic (content presentation, or graphic design rules),
-
-which determines how information is presented to the user</li>
-</ul>
-Using this paradigm, you may choose to have business logic handled by Java beans,
-
-the presentation logic handled by JavaServer Pages (JSP) or HTML files, and
-
-the HTTP protocol handled by a servlet. <div class="note"><span class="notetitle">Note: </span>JSP files can be used to manage
-
-both the presentation and business logic for a Web application. JSP files
-
-use structured markup for presentation, and supply servlet model behavior
-
-at run time.</div>
-</div>
-<p>You can develop, debug, and deploy servlets, set breakpoints within servlet objects, and step through
-
-code to make changes that are dynamically folded into the running servlet
-
-on a running server, without having to restart each time.</p>
-<p>For more information about servlets, refer to the <cite>Sun Microsystems Java Servlet
-
-2.3 Specification</cite> at <samp class="codeph">java.sun.com/products/servlet/download.html</samp>.</p>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwtover.html" title="">Web application overview</a><br />
-<a href="cwebdevelopmenttools.html" title="">Web development tools</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="twsrvwiz.html">Creating Servlets</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html
deleted file mode 100644
index 51a16b5..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Web tools features</title>
-</head>
-<body id="cwtfeatures"><a name="cwtfeatures"><!-- --></a>
-
-<h1 class="topictitle1">Web tools features</h1>
-<div><p>The integrated Web development
-
-environment makes it easy to cooperatively create, assemble, publish, deploy
-
-and maintain dynamic, interactive Web applications.</p><div class="p">The Web development environment provides the following high-level capabilities:
-
- <ul><li>Dynamic Web project creation, using the J2EE-defined hierarchy, or a static
-
-version that reduces project overhead when dynamic elements are not required.
-
- Static Web projects can later be converted to dynamic Web projects.</li>
-<li>Creation and editing of a Web application deployment descriptor (<span class="filepath">web.xml</span>)
-
- file</li>
-<li>JSP and HTML file creation, validation, editing, and debugging</li>
-<li>JavaScript™ editing and validation</li>
-<li>Custom JSP tags (tag library) support, based on the <cite>Sun Microsystems
-
- JSP 1.2 Specification</cite></li>
-<li>An extensible view, called the Snippets view, which allows users to catalog
-
- and organize reusable programming objects, such as HTML, JavaScript,
-
- and JSP markup, along with files and custom tags, that can be embedded in
-
- existing files</li>
-<li>Dynamic tag help (content assist) , which displays tag usage and attribute
-
-information for  HTML, JSP, and JavaScript tags based on cursor location
-
- in the Source page. (You invoke Content Assist by pressing (Ctrl+Spacebar)
-
-)</li>
-<li>Quick Edit view that allows you to edit specific pieces of code in context,
-
- including add actions and events</li>
-<li>Palette view to reuse components, including HTML, JSP, JavaScript,
-
- site parts, and more</li>
-<li>Attributes editing available in its own view</li>
-<li>Cascading style sheet (CSS) editing support</li>
-<li>HTTP/FTP import</li>
-<li>FTP export (simple resource copy) to a server</li>
-<li>WAR file import, export, and validation (Now includes even more file types).</li>
-<li>Link parsing, validation, and management, which includes converting links,
-
- flagging broken links, and fixing up links as linked resources are moved
-
-or  renamed</li>
-<li>Servlet creation, which employs the Servlet Wizard to create new servlets
-
- and add servlet mappings to the Web deployment descriptor files</li>
-<li>Integration with the WebSphere<sup>®</sup> test environment</li>
-<li>Publishing support for multiple Web server types</li>
-<li>Wizards for Listener and Filter classes</li>
-</ul>
-</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="cwebdevelopmenttools.html" title="">Web development tools</a><br />
-<a href="ccwebprj.html" title="">Dynamic Web projects and applications</a><br />
-<a href="ccstatic.html" title="">Static Web projects</a><br />
-<a href="cpdjsps.html" title="">JavaServer Pages (JSP) technology</a><br />
-<a href="cwebpagedesign.html" title="">Web page design</a><br />
-<a href="cwebtechnologies.html" title="">Web technologies</a><br />
-<a href="cwwarovr.html" title="">Web archive (WAR) files</a><br />
-<a href="cwwedtvw.html" title="">Workbench integration with Web editors</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="twcreprj.html">Creating a dynamic Web project</a><br />
-<a href="tjcrejsp.html">Creating JavaServer Pages (JSP) files</a><br />
-<a href="twsrvwiz.html">Creating servlets</a><br />
-<a href="tpalette1.html">Using the palette</a><br />
-<a href="twplib.html">Adding Web library projects</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.html
deleted file mode 100644
index 0082f37..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Web archive (WAR) files</title>
-</head>
-<body id="cwwarovr"><a name="cwwarovr"><!-- --></a>
-
-<h1 class="topictitle1">Web archive (WAR) files</h1>
-<div><p>A Web application is a group of HTML pages, JSP pages, servlets, resources and source
-
-file, which can be managed as a single unit. A Web archive (WAR) file is a
-
-packaged Web application. WAR files can be used to import a Web application
-
-into a Web server.</p>
-<p>In addition to project resources, the WAR file includes a Web deployment
-
-descriptor file. The Web deployment descriptor is an XML file that contains
-
-deployment information, MIME types, session configuration details, and other
-
-settings for a Web application. The Web deployment descriptor file (<span class="filepath">web.xml</span>)
-
-provides information about the WAR file is shared with the developers, assemblers,
-
-and deployers in a J2EE environment.</p>
-<div class="p">The Web development environment provides facilities for importing and exporting
-
-WAR files, using the following wizards: <ul><li><span>Import Resources from a WAR File</span>, which requires that you to
-
-specify a Web project. You can use existing projects or create them as you
-
-use the wizard.</li>
-<li><span>Export Resources to a WAR File</span>, which requires only an export
-
-location and some optional settings</li>
-</ul>
-</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwtover.html" title="">Web application overview</a><br />
-<a href="cwebdevelopmenttools.html" title="">Web development tools</a><br />
-<a href="ccwebprj.html" title="">Dynamic Web projects and applications</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="twimpwar.html">Importing Web archive (WAR) files</a><br />
-<a href="twcrewar.html">Exporting Web archive (WAR) files</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html
deleted file mode 100644
index d8eb299..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Workbench integration with Web editors</title>
-</head>
-<body id="cwwedtvw"><a name="cwwedtvw"><!-- --></a>
-
-<h1 class="topictitle1">Workbench integration with Web editors</h1>
-<div><p>There are several editors for use in various contexts
-
-for various file types. To edit a file using its default editor, double-click
-
-on the file name in the Project Explorer view, or right-click on the file
-
-and select <span class="uicontrol">Open</span>. The editor that is last used to open
-
-a file becomes the default for that particular file. To edit the file with
-
-a different editor, right-click on the file and select <span class="uicontrol">Open With</span> to
-
-choose from a list of available editors.</p>
-<p>In the workbench, you can associate file-name extensions for different
-
-types of resources with various editors. A resource extension can have more
-
-than one editor associated with it; the last editor used for a particular
-
-extension type is indicated by a black dot before it in the <span class="uicontrol">Open
-
-With</span> pop-up menu. You can associate extensions that are known
-
-to the workbench with additional editors, by using the <b>File Associations</b> preferences
-
-page, accessed by selecting <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Workbench</span> &gt; <span class="uicontrol">File Associations</span></span>.</p>
-<div class="p">The Properties view provides general capabilities that are advantageous
-
-to Web editor users. <dl><dt class="bold">Properties view</dt>
-<dd>The Properties view (<span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Show
-
-View</span> &gt; <span class="uicontrol">Properties</span></span>) contains
-
-a list of attributes and editable attribute values. For example, when you
-
-select an image tag <span class="uicontrol">img</span> , the width and height values
-
-appear for editing. In addition, any other attributes allowed by the standard
-
-specified in the DOCTYPE for the file (such as the HTML 4.0.1 DTD) are listed.
-
-When you click the value column of a property, you can select from among the
-
-list of available attribute values. <p>The pop-up menu in the Properties view
-
-enables you to undo, cut, copy, paste, delete, and select all. The options
-
-that are available at a given time depends on where the cursor is located
-
-when you right-click to display the pop-up menu. To see the pop-up menu that
-
-contains undo, cut, and so on, the property value field must be active. (This
-
-is accomplished by selecting the property and then selecting its value.) Otherwise,
-
-the pop-up menu will contain different options.</p>
- <p>Use the <span class="uicontrol">Restore
-
-Default Value</span> button to change any value back to the default setting.</p>
- <p>After
-
-you are in the Properties view, you can modify other property values for specific
-
-tags. To edit another tag using the Properties view, move the cursor within
-
-the editing area of the Source page or Design page to the tag you want to
-
-edit. The appropriate properties and values are displayed in the Properties
-
-view.</p>
-</dd>
-</dl>
-</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwtover.html" title="">Web application overview</a><br />
-<a href="ccwebper.html" title="">The Web perspective</a><br />
-<a href="cwebdevelopmenttools.html" title="">Web development tools</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tcexpftp.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tcexpftp.html
deleted file mode 100644
index a4e3675..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tcexpftp.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Exporting resources over FTP</title>
-</head>
-<body id="tcexpftp"><a name="tcexpftp"><!-- --></a>
-
-<h1 class="topictitle1">Exporting resources over FTP</h1>
-<div><div class="skipspace"> <p>You can export a Web project to a URL using the <span>Export resources
-
-to an FTP Server</span> wizard.</p>
-<p>To export project resources to an FTP
-
-server, do the following: </p>
- </div>
-<ol><li class="skipspace"><span>Select <span><span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">Export</span></span></span>.</span></li>
-<li class="skipspace"><span>In the Export dialog, either double click on <span>FTP</span> or select <span>FTP</span> and
-
-click <span>Next</span>. </span></li>
-<li class="skipspace"><span>In the <b>Folder</b> field, specify the name of the folder that
-
-contains the files you are exporting.</span></li>
-<li class="skipspace"><span>In the <b>FTP host</b> field, enter the FTP server URL. This should
-
-include the domain name and starting directory for the starting URL..</span></li>
-<li class="skipspace"><span>In the <b>FTP Folder</b> field, enter a name of the project or
-
-folder that you want to export the files to.</span></li>
-<li class="skipspace"><span>Select one or more FTP export options.</span>  Select <b>Use
-
-PASV Mode</b>, to enable a client (rather than the FTP server) to initiate
-
-the transfer operation, which enables transfers through firewalls that allow
-
-outgoing network connections only. If you select the <b>Use Firewall </b>option
-
-and select the <b>Settings</b> push button, you will be prompted to define
-
-setting for a socks server or an FTP proxy server. If you select the <b>FTP
-
-Proxy</b> radio button, you must choose one of the available firewall types.</li>
-<li class="skipspace"><strong>Optional: </strong><span>Supply an FTP connection timeout value, in
-
-milliseconds.</span></li>
-<li class="skipspace"><span>Click <span>Next</span> to supply FTP server login information.</span></li>
-<li class="skipspace"><span>Click <span>Finish</span> to initiate the export.</span></li>
-<li class="skipspace"><span>When the export is complete, verify the resulting directory structure
-
-and file data integrity.</span></li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tcreatetag.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tcreatetag.html
deleted file mode 100644
index 6f2fa4f..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tcreatetag.html
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating a custom tag library</title>
-</head>
-<body>
-
-<div class="nested0" id="tcreatetag"><a name="tcreatetag"><!-- --></a><h1 class="topictitle1">Creating a custom tag library</h1>
-<div><div class="skipspace"> <p>The steps involved in creating a custom tag library are best
-
-illustrated by example. The following example shows you the steps for creating
-
-a new tag library called <i>sslCheck</i>. This library  uses Secure Socket
-
- Layer (SSL) for securing your Web site. SSL allows a secure connection between
-
- your Web browser and a Web server, and the <i>sslCheck</i> tag provides a
-
-flexible way of using secure connections. The tag can be used in any JSP script,
-
-including Java™ and JavaScript™. </p>
- <p>The following simple
-
-tag implementation checks the protocol used, then redirects the user to the
-
-secure page or to an error page, depending on the  parameterization of the
-
-tag (explained later). This secure connection implementation only works for
-
-JSP pages (server-side dynamically running pages), and not for HTML (static)
-
-pages. </p>
- <div class="p">Two files must be created for the new tag:<ul><li><i>sslCheck.java</i> - the Java implementation of the tag</li>
-<li><i>sslCheck.tld</i> - the taglib definition for the new tag</li>
-</ul>
-</div>
- </div>
-</div>
-</div>
-<div class="nested0" id="task"><a name="task"><!-- --></a><h1 class="topictitle1">Create sslCheck .java</h1>
-<div><div class="skipspace">From the Java perspective: </div>
-<ol><li class="skipspace"><span>Select <span class="uicontrol">YourApp</span>.</span></li>
-<li class="skipspace"><span>Select <span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Class</span></span>.  Type the following in the New Java Class
-
-window: </span> <ul><li><span class="uicontrol">Package:</span> org.eclipse.entry.security </li>
-<li><span class="uicontrol">Name:</span> sslCheck</li>
-<li><span class="uicontrol">Superclass:</span> java.lang.Object</li>
-</ul>
-</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span>.</span> The source
-
-file will open automatically. </li>
-<li class="skipspace"><span>Delete the automatic code and replace it with the following code:</span> <pre>package org.eclipse.entry.security;
-
- import java.io.*;
-
- import javax.servlet.http.*;
-
- import javax.servlet.jsp.*;
-
- import javax.servlet.jsp.tagext.TagSupport;
-
-
-
-public class sslCheck extends TagSupport {
-
-
-
-  private String errorpage=null;
-
-
-
-  public void setErrorpage(String errorpage) {
-
-     this.errorpage=errorpage;
-
-   }
-
-
-
-  public int doStartTag() throws JspException {
-
-     try {
-
-      HttpServletRequest request=(HttpServletRequest)pageContext.getRequest();
-
-       HttpServletResponse response=(HttpServletResponse)pageContext.getResponse();
-
-       if(request.getScheme().indexOf("https")==-1) {
-
-         if(errorpage!=null) {
-
-           // redirect to the error page
-
-           response.sendRedirect(errorpage);
-
-         } else {
-
-           // redirect to the page using ssl
-
-           String jumpURL="https://"+request.getServerName()+request.getRequestURI();
-
-           if(request.getQueryString()!=null) jumpURL+="?"+request.getQueryString();
-
-           response.sendRedirect(jumpURL);
-
-         }
-
-         return SKIP_PAGE;
-
-       }
-
-     } catch (IOException ioe) {
-
-       throw new JspTagException("sslcheck tag failed");
-
-     }
-
-    return EVAL_BODY_INCLUDE;
-
-   }
-
-
-
-  public int doEndTag() {
-
-     return EVAL_PAGE;
-
-   }
-
- } </pre>
-</li>
-<li class="skipspace"><span>Save and close the file.</span></li>
-</ol>
-</div>
-</div>
-<div class="nested0" id="task2"><a name="task2"><!-- --></a><h1 class="topictitle1">Create sslCheck.tld</h1>
-<div><div class="skipspace">The tag must be defined in a TLD file. To create the TLD file from
-
-the Web perspective: </div>
-<ol><li class="skipspace"><span>Select <span class="uicontrol">YourApp</span>.</span></li>
-<li class="skipspace"><span>Select the Web module <span class="uicontrol">WEB-INF</span>.</span></li>
-<li class="skipspace"><span>Right-click the <span class="uicontrol">WEB-INF/tlds</span> folder.</span></li>
-<li class="skipspace"><span>Select <span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">File</span></span>.</span></li>
-<li class="skipspace"><span>Name the file <kbd class="userinput">sslCheck.tld</kbd>.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span>.</span> The source
-
-file will open automatically. Delete the automatic code and replace it with
-
-the following code:  <pre>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-
-  &lt;taglib&gt;
-
-    &lt;tlibversion&gt;1.0&lt;/tlibversion&gt;
-
-    &lt;shortname&gt;sslchk&lt;/shortname&gt;
-
-    &lt;info&gt;Tag library for checking SSL&lt;/info&gt;
-
-    &lt;tag&gt;
-
-      &lt;name&gt;sslcheck&lt;/name&gt;
-
-      &lt;tagclass&gt;org.eclipse.entry.security.sslCheck&lt;/tagclass&gt;
-
-      &lt;bodycontent&gt;empty&lt;/bodycontent&gt;
-
-      &lt;attribute&gt;
-
-        &lt;name&gt;errorpage&lt;/name&gt;
-
-        &lt;required&gt;false&lt;/required&gt;
-
-        &lt;rtexprvalue&gt;true&lt;/rtexprvalue&gt;
-
-      &lt;/attribute&gt;
-
-    &lt;/tag&gt;
-
-  &lt;/taglib&gt;</pre>
-</li>
-<li class="skipspace"><span>Save and close the file.</span></li>
-</ol>
-</div>
-</div>
-<div class="nested0" id="task3"><a name="task3"><!-- --></a><h1 class="topictitle1">Using the tag</h1>
-<div><div class="skipspace">Before the <i>sslcheck</i> tag can be used, the following taglib
-
-reference must be made.</div>
-<ol><li class="skipspace"><span>Place the following taglib definition on the first line of the
-
-JSP source file:</span> <pre>&lt;%@ taglib uri="/WEB-INF/tlds/sslCheck.tld" prefix="sslchk" %&gt;</pre>
-</li>
-<li class="skipspace"><span>Immediately after the taglib definition, place one of the following
-
-SSL checking tag in the code. You  can use the tag with or without the <samp class="codeph">errorpage</samp> attribute.</span>
-<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="skipspace">
-<tbody>
-<tr><th align="left" valign="bottom" id="d0e182">Option</th>
-<th align="left" valign="bottom" id="d0e184">Description</th>
-</tr>
-<tr><td align="left" valign="top" id="d0e187" headers="d0e182"><b><samp class="codeph">&lt;sslchk:sslcheck errorpage="error_page"/&gt;</samp></b></td>
-<td align="left" valign="top" headers="d0e184 d0e187">When the request goes to the JSP and it is not using SSL, the page
-
-defined with the <samp class="codeph">errorpage</samp> attribute will be displayed. You
-
-must create the error page with the error messages before you start using
-
-the application.</td>
-</tr>
-<tr><td align="left" valign="top" id="d0e196" headers="d0e182"><b><samp class="codeph">&lt;sslchk:sslcheck/&gt;</samp></b></td>
-<td align="left" valign="top" headers="d0e184 d0e196">Using
-
-the tag without the <span>errorpage</span> attribute will redirect the page immediately
-
-to the same location but using a secure connection. </td>
-</tr>
-</tbody></table>
-</li>
-<li class="skipspace"><span>Save and close the file.</span></li>
-</ol>
-</div>
-</div>
-<div class="nested0" id="task4"><a name="task4"><!-- --></a><h1 class="topictitle1">Set up the SSL transport</h1>
-<div><div class="skipspace">If you are deploying to a WebSphere<sup>®</sup> V5 or V5.1 server, you need to set
-
-up the SSL transport for the test application server before you can test the
-
-SSL connection in the development environment.  To set up the SSL transport,
-
-complete the following steps:</div>
-<ol><li class="skipspace"><span>From the from the J2EE perspective, open the test server configuration
-
-(WebSphere Administrative
-
-Domain) for the document distribution application.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Ports</span> tab.</span></li>
-<li class="skipspace"><span>Click on <span class="uicontrol">Add</span> next to the HTTP transport
-
-list. Supply the following values:</span> <ul><li><span class="uicontrol">Host name:</span> <kbd class="userinput">*</kbd> (asterisk)</li>
-<li><span class="uicontrol">Port:</span> <kbd class="userinput">443</kbd></li>
-</ul>
-</li>
-<li class="skipspace"><span>Check the <span class="uicontrol">Enable SSL</span> check box.</span></li>
-<li class="skipspace"><span>Check the <span class="uicontrol">External</span> check box.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span>.</span></li>
-<li class="skipspace"><span>Save and close the file.</span></li>
-</ol>
-<div class="skipspace">SSL transport is now set for the test application server and you can
-
-test SSL connection in the development environment. The embedded HTTP server
-
-is using a dummy SSL server certificate for the test server. If you want to
-
-change the certificate, use the iKeyman utility. The dummy SSL server certificate
-
-is located in the following location:<pre>&lt;install directory&gt;\eclipse\plugins\org.eclipse.jst.websphere.runtime\etc\DummyServerKeyFile.jks</pre>
-<kbd class="userinput">WebAS</kbd> is the password for the JKS file.</div>
-</div>
-</div>
-<div class="nested0" id="task5"><a name="task5"><!-- --></a><h1 class="topictitle1">Test the tag</h1>
-<div><ol><li class="skipspace"><span>Open the file <span class="filepath">login/login.jsp</span> and click the
-
-Source tab.</span></li>
-<li class="skipspace"><span>Place the following lines at the top of the file: </span> <pre>&lt;%@ taglib uri="/WEB-INF/tlds/sslCheck.tld" prefix="sslchk" %&gt;
-
-&lt;sslchk:sslcheck/&gt;</pre>
-</li>
-<li class="skipspace"><span>Save the file.</span></li>
-<li class="skipspace"><span>Start the application, and then log in.</span></li>
-</ol>
-<div class="skipspace">The browser will notify you that the site is accessed using a secure
-
-connection. If the application is using frames, and one or more of the frames
-
-is using secure connection, the location in the browser will remain <span>"http"</span> and
-
-will not change to <span>"https"</span> .</div>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/teimpclass.html b/docs/org.eclipse.wst.webtools.doc.user/topics/teimpclass.html
deleted file mode 100644
index 66f1122..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/teimpclass.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Importing class files to Web projects</title>
-</head>
-<body id="teimpclass"><a name="teimpclass"><!-- --></a>
-
-<h1 class="topictitle1">Importing class files to Web projects</h1>
-<div><div class="skipspace"> <p>You can use the Import wizard to add .class files to a Web project.
-
-With the wizard, you can import the class files from the directory system
-
-or from a JAR file or ZIP file. After you choose the class files that you
-
-want to import, the wizard creates an <span class="uicontrol">imported_classes</span> folder,
-
-imports the specified class files to that folder, and adds the folder to the
-
-default classpath. You can navigate the <span class="uicontrol">imported_classes</span> folder
-
-in the Project Explorer view.</p>
-<p><img src="../images/nwin.gif" alt="For Windows" /> You can drag and drop class files from the Windows<sup>®</sup> Explorer
-
-or desktop to the <span class="uicontrol">imported_classes</span> folder in the Project
-
-Navigator view.</p>
-<p>To import class files to a Web project using the wizard:</p>
-</div>
-<ol><li><span>Right-click your Web project and select <span class="menucascade"><span class="uicontrol">Import</span> &gt; <span class="uicontrol">Import Class Files ...</span></span> from the pop-up menu. The Import wizard opens.</span></li>
-<li><span>Specify whether you want to <span class="uicontrol">Import from directory</span> or <span class="uicontrol">Import
-
-from ZIP or JAR</span> and click <span class="uicontrol">Next</span>.</span></li>
-<li><span>Depending on whether you are importing from a directory or JAR
-
-file or ZIP file, in the <span class="uicontrol">Source</span> field enter the full
-
-path of the directory, ZIP file, or JAR file that contains the .class files
-
-that you want to import. You can click the <span class="uicontrol">Browse</span> button
-
-to locate the directory or file on your system.</span></li>
-<li><span>Select the class files that you want to import.</span></li>
-<li><strong>Optional: </strong><span>If you have previously imported class files
-
-and do not want to be warned about overwriting resources with the same names,
-
-select <span class="uicontrol">Overwrite existing resources without warning</span>.</span></li>
-<li><span>Click <span class="uicontrol">Finish</span>. The wizard imports the .class
-
-files to the <span class="uicontrol">imported_classes</span> folder.</span></li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjchgxdt.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjchgxdt.html
deleted file mode 100644
index bc58f9a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjchgxdt.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Specifying an implicit document type for an HTML, XHTML, or JSP fragment</title>
-</head>
-<body id="tjchgxdt"><a name="tjchgxdt"><!-- --></a>
-
-<h1 class="topictitle1">Specifying an implicit document type for an HTML, XHTML, or JSP fragment</h1>
-<div><div class="skipspace"> <p>An <i>implicit</i> document type is used for content assist (CTRL+Spacebar),
-
-the Properties view, and other editing contexts when no DOCTYPE declaration
-
-is specified in an HTML, XHTML, or JSP file. Typically, this feature is used
-
-for a fragment (partial document) that can be included in other pages using
-
-JSP include or server-side include.</p>
-<p>To assign an implicit document type
-
-to an HTML, XHTML, or JSP fragment, do the following: </p>
- </div>
-<ol><li class="skipspace"><span>From the Project Explorer view, select the HTML, XHTML, or JSP
-
-fragment.</span></li>
-<li class="skipspace"><span>Select <span><span class="uicontrol">Properties</span></span> from the file's
-
-pop-up menu.</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">Web Content Settings</span> page, select
-
-the desired DOCTYPE from the <span><span class="uicontrol">Document type</span></span> drop-down
-
-list.</span> <p>The <span><span class="uicontrol">Properties</span></span> dialog
-
-for Web projects also includes an <span><span class="uicontrol">Web Content Settings</span></span> page,
-
-where you can specify project-default HTML document type. This setting will
-
-be used if no DOCTYPE declaration is specified in the file, and no default
-
-document type is specified in the <span><span class="uicontrol">Web Content Settings</span></span> page
-
-on the <span><span class="uicontrol">Properties</span></span> dialog for the file.</p>
-</li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.html
deleted file mode 100644
index a47a6dd..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating HTML and XHTML files and framesets</title>
-</head>
-<body id="tjcrehtm"><a name="tjcrehtm"><!-- --></a>
-
-<h1 class="topictitle1">Creating HTML and XHTML files and framesets</h1>
-<div>You can use the New HTML File wizard to create HTML and XHTML
-
-files and framesets. You can also use this wizard to create compact HTML and
-
-WML 1.3 files<div class="note"><span class="notetitle">Note: </span>You can also create a WML file by selecting <span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Other</span> &gt; <span class="uicontrol">Web</span> &gt; <span class="uicontrol">WML file</span></span></div>
-To
-
-create an HTML file using the wizard, complete the following steps:</div>
-<ol><li class="skipspace"><span>Open the <span class="uicontrol">Web</span> Perspective.</span></li>
-<li class="skipspace"><span>Select <span><span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">HTML/XHTML File</span></span></span> to open the wizard.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Browse</span> to select the folder in which
-
-your want to create the file.</span> <p><b>Important</b>: Make sure you
-
-choose a folder in or under the WebContent folder of the Web project. This
-
-ensures that the file is available for validation, publishing, and deployment.
-
- </p>
- <p>Tip: As a shortcut, you can also start the wizard by right clicking
-
-on your destination folder and selecting <span><span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">HTML/XHTML File</span></span></span> from the pop-up
-
-menu. This automatically primes the wizard with the folder information. </p>
-  </li>
-<li class="skipspace"><span>Type a name for your new file.</span></li>
-<li class="skipspace"><span>Select HTML in the <span><span class="uicontrol">Markup Language</span></span> drop-down
-
-list.</span>  Note that you can also create other file types by selecting
-
-choices from this list.</li>
-<li class="skipspace"><span>You have several options for proceeding: </span> <p>    - If
-
-you want to accept the defaults associated with a new HTML file, make sure <b>Create
-
-from page template</b> is <u>unchecked</u>.  </p>
-     <p> - If you want to
-
-apply a page template to your new file, select <b>Create from page template</b> and
-
-click <span class="uicontrol">Next</span>. A window appears in which you can select
-
-a page template. If you want to use one of the sample templates provided,
-
-select <span class="uicontrol">Sample page template</span> and then choose one of
-
-the templates shown in the <span class="uicontrol">Thumbnail</span> box. If you want
-
-to use a template of your own, select <span class="uicontrol">User-defined page template</span> and
-
-then click <span class="uicontrol">Browse</span> to select the template from the file
-
-system.  </p>
-  <p> - If you do not want to use a page template, but want to
-
-specify or customize the file options, select the <span class="uicontrol">Configure advanced
-
-options</span> check box and click <span class="uicontrol">Next</span>. </p>
-  </li>
-<li class="skipspace"><span>If you are configuring advanced options, select the appropriate
-
-encoding value to add to the file's HTML declaration from the <span><span class="uicontrol">Encoding</span></span> drop-down
-
-list. </span> The default is the value set in the <span><span class="uicontrol">HTML
-
-Files</span></span> preferences page, which is accessed by selecting <span><span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span></span></span>,
-
-and then expanding the <span><span class="uicontrol">Web and XML Files</span></span> preferences. </li>
-<li class="skipspace"><span>Ensure that the proper content type is selected in the <span><span class="uicontrol">Content
-
-Type</span></span> drop-down list. </span> The default is <b>text/html</b>.</li>
-<li class="skipspace"><span>Select the <span class="uicontrol">Document Type</span> that you wish to
-
-associate with the HTML or XHTML file. </span> The default for an HTML
-
-file is <span class="uicontrol">HTML 4.01 Transitional</span>; the default for an
-
-XHTML file is <span class="uicontrol">XHTML 1.1</span>.</li>
-<li class="skipspace"><span>Specify a cascading style sheet (CSS) file to be referenced by
-
-the new HTML or XHTML file. </span> <p>Typically, CSS files are located
-
-in the theme folder under the Web content folder. You can use <span class="uicontrol">Add</span> to
-
-choose a style sheet from the file system. Use <span class="uicontrol">Remove</span> to
-
-delete a style sheet from the list, or use the arrow buttons to rearrange
-
-the order in which the file references the style sheets.  </p>
-<p>If a style
-
-sheet is already associated with the project in which you are creating the
-
-new file, that style sheet is the default.</p>
-</li>
-<li class="skipspace"><span>Click <span><span class="uicontrol">Finish</span></span> to create the file
-
-in the project that you have selected.</span> </li>
-</ol>
-<div>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../../org.eclipse.wst.webtoolscore.doc.user/topics/tjdetags.html">Creating and editing Web pages - overview</a><br />
-</p>
-</div>		
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html
deleted file mode 100644
index cc930c6..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating JavaServer Pages (JSP) files</title>
-</head>
-<body id="tjcrejsp"><a name="tjcrejsp"><!-- --></a>
-
-<h1 class="topictitle1">Creating JavaServer Pages (JSP) files</h1>
-<div><div class="skipspace"> <p>You can create and edit a JSP file,
-HTML file, or JSP tagging. This includes placing Java™ source code inside of scriptlet tags.
-</p>
- <div class="p">Most types of JSP files can be
-created using the New JSP File wizard.
- </div>
-To create a basic JSP file using the JSP file wizard, complete the
-following steps: </div>
-<ol><li class="skipspace"><span>Create a dynamic Web project if you have not already done so.</span></li>
-<li class="skipspace"><span>Open the <b>Web</b> perspective.</span></li>
-<li class="skipspace"><span>Select the Web project, and then select <span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">JSP File</span></span>.</span> The New JSP File window appears.</li>
-<li class="skipspace"><span>Select the <b>Browse</b> button and select an appropriate container
-for the file from the list of project folders (and subfolders). </span> <p>The
-folder that you choose should be under the Web content folder of a dynamic
-Web project. If a JSP file is <i>not</i> under this folder, then it will not
-be included in the WAR file that is deployed to the server. In addition, link
-validation will not encompass files that are not under the Web content folder.</p>
-</li>
-<li class="skipspace"><span>Type a file name into the appropriate field.</span></li>
-<li class="skipspace"><span>Ensure that the appropriate option is displayed in the <span class="uicontrol">Markup
-language</span> drop-down list. </span> Note that the option you
-choose will determine the model of JSP that appears in the <b>Model</b> pull-down
-list.<p>In addition, if you select the <span class="uicontrol">Create as JSP fragment</span> check
-box, this file will be created as a fragment that can be added to another
-JSP file. Other JSP files can include JSP fragments using a JSP include directive.
-Creating a fragment causes the resulting file to end in a .jspf or .jsf extension.
-You will not be prompted for DOCTYPE information, because a fragment cannot
-stand alone as a Web page, and it would invalidate any JSP file that included
-it.</p>
- <p>Also, depending on the markup language you select, you can select
-the <span class="uicontrol">Use XML style syntax</span> option to create a JSP file
-that adheres to XML style tagging.</p>
-</li>
-<li class="skipspace"><span> You have several options for proceeding: (Note that the windows
-that appear in this wizard are determined by the options that you select) </span><ul><li>To accept the defaults associated with a new JSP file, select <span class="uicontrol">None</span> in
-the <span class="uicontrol">Model</span> drop-down list, and  then select <span class="uicontrol">Finish</span>. </li>
-<li> To use one of the sample templates provided, select <span class="uicontrol">Create
-from page template</span>, and then select <b>Next</b>. (Note that this
-is only available for HTML and XHTML markup languages.) If you choose this
-option, a window appears in which you can choose a sample template or a user-defined
-template.</li>
-<li>If you want to specify or customize the file options, select the <span class="uicontrol">Configure
-advanced options</span> check box and click <span class="uicontrol">Next</span>.</li>
-</ul>
-</li>
-<li class="skipspace"><span> Click the <span class="uicontrol">Add</span> button to locate a Tag Library
-Descriptor (TLD) file or a JAR file that contains a TLD file to add tag libraries
-from a variety of sources.</span> <p>Tag library Universal Resource Identifier
-(URIs) can be located in one of the following places:</p>
-<ul><li>Defined in the web.xml file</li>
-<li>Within a JAR file located in the project lib directory that contains /META-INF/taglib.tld</li>
-<li>Within a JAR file external to the project</li>
-<li>In a "loose" TLD anywhere in the project</li>
-</ul>
-<ol type="a"><li class="skipspace"><span>In the <span class="uicontrol">Select a tag library</span> dialog, either
-select one of the available tag libraries, or click the <span class="uicontrol">Import</span> button
-to locate and add a tag library to the list, and then select it.</span> The
-dialog will automatically populate the informational fields that describe
-the tag library and its contents. You must specify a <span class="uicontrol">Prefix</span> value.</li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span> to add the tag library.</span> Note that if the selected TLD files hasn't been registered in
-the web.xml file, it will be added automatically.</li>
-</ol>
-</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="skipspace"><span>If you want to select an encoding type, deselect the <span class="uicontrol">Use
-workbench encoding</span> check box to select a new encoding attribute.
-Select the appropriate encoding value to add to the file's HTML declaration
-from the <span class="uicontrol">Encoding</span> drop-down list.</span> The default
-is the value set in the <span class="uicontrol">HTML Files</span> preferences page,
-which is accessed by selecting <span class="uicontrol">Window &gt; Preferences</span>,
-and then expanding the <span class="uicontrol">Web and XML Files</span> preferences.</li>
-<li class="skipspace"><span>Ensure that the proper content type is selected in the <span class="uicontrol">Content
-Type</span> drop-down list. The default depends on the markup language.</span></li>
-<li class="skipspace"><span>Select the <span class="uicontrol">Document Type</span> that you wish to
-associate with the JSP file. The default depends on the markup language.</span></li>
-<li class="skipspace"><span>Specify a cascading style sheet (CSS) file to be referenced by
-the new JSP file. Typically, CSS files are located in the theme folder under
-the Web content folder. You can use <b>Add</b> to choose a style sheet from
-the file system. Use <b>Remove</b> to delete a style sheet from the list,
-or use the arrow buttons to rearrange the order in which the file references
-the style sheets. If a style sheet is already associated with the project
-in which you are creating the new file, that style sheet is the default.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next</span> to select specific method stubs
-and add deployment information to the Web project's web.xml file. </span> <p>Select
-any appropriate method stubs to be created in the servlet that is deployed
-for this JSP file.</p>
-<p>If you select the <span class="uicontrol">Add to web.xml</span> check
-box, the JSP file, along with its display name, and any URL mappings and initialization
-parameters associated with the JSP file will be automatically included in
-the Web project deployment descriptor file. Note that the <span class="uicontrol">File
-Name</span> value provided in the first page of the wizard is automatically
-mapped to the <span class="uicontrol">Servlet Name</span> value on this page, as well
-the <span class="uicontrol">URL Pattern</span> mappings. These mappings are not updated
-if you change the original value in the <span class="uicontrol">File Name</span> field.</p>
-</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span> to create the file in the project
-that you have selected.</span></li>
-</ol>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="../../org.eclipse.wst.webtoolscore.doc.user/topics/cpdjsps.html">JavaServer Pages (JSP) technology </a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="twcreprj.html" title="">Creating a dynamic Web project</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrewml.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrewml.html
deleted file mode 100644
index b32dbfc..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrewml.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating a WML or cHTML file</title>
-</head>
-<body id="tjcrewml"><a name="tjcrewml"><!-- --></a>
-
-<h1 class="topictitle1">Creating a WML or cHTML file</h1>
-<p>To create a new WML or CHTML file, complete the following steps:</p>
-<ol><li class="skipspace"><span>From the Web perspective, select <span><span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Other</span> &gt; <span class="uicontrol">Web</span> &gt; <span class="uicontrol">WML File</span></span></span>. </span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next</span> to open the wizard.</span> <p><b>Note</b>:
-you can also start this wizard by starting the <a href="tjcrehtm.html">New HTML File Wizard</a> and selecting WML from the Markup
-Language pull-down.</p>
-</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Browse</span> to select the folder in which
-you want to create the file. </span> <p> Make sure you choose a folder
-under the WebContent folder of the Web project. This ensures that the file
-is available for validation, publishing, and deployment.</p>
-</li>
-<li class="skipspace"><span>Type a name for your new file.</span></li>
-<li class="skipspace"><span>Ensure that either the <span class="uicontrol">WML 1.3</span> or <span class="uicontrol">Compact
-HTML</span> option is displayed in the <span><span class="uicontrol">Markup Language</span></span> drop-down
-list.</span></li>
-<li class="skipspace"><span>You have two options for proceeding: </span><ul><li>If you want to accept the defaults associated with a new WML or cHTML
-file, select <span class="uicontrol">Finish</span>. By default, you will generate
-a blank WML or cHTML page.</li>
-<li>If you want to specify or customize the file options, select the <b>Configure
-advanced options</b> check box and click <b>Next</b>. </li>
-</ul>
-</li>
-<li class="skipspace"><span>Select the appropriate encoding value to add to the file's WML
-or cHTML declaration from the <span class="uicontrol">Encoding</span> list button.
-WML files use HTML settings. The default is the value set in the <span class="uicontrol">HTML
-Files</span> preferences page, which is accessed by selecting <span class="uicontrol">Window
-&gt; Preferences</span>, and then expanding the <span class="uicontrol">Web and XML Files</span> preferences.</span></li>
-<li class="skipspace"><span>Ensure that the proper content type is selected in the <span class="uicontrol">Content
-Type</span> drop-down list. </span> The default for a WML file is <span class="uicontrol">text/vnd.wap.wml</span>;
-the default for a cHTML file is <span class="uicontrol">text/html</span>.</li>
-<li class="skipspace"><span>Select the <span class="uicontrol">Document Type</span> that you wish to
-associate with the WML or cHTML file. </span> <p>The default for a WML
-file is <span class="uicontrol">WML 1.3</span>; the default for a cHTML file is <span class="uicontrol">Compact
-HTML 1.0 Draft</span></p>.
-</li>
-<li class="skipspace"><span>Click <span><span class="uicontrol">Finish</span></span> to create the file
-in the project that you have selected.</span></li>
-</ol>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjdetags.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjdetags.html
deleted file mode 100644
index 8aed39b..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjdetags.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating and editing Web pages - overview</title>
-</head>
-<body id="tjdetags"><a name="tjdetags"><!-- --></a>
-
-<h1 class="topictitle1">Creating and editing Web pages - overview</h1>
-<div><div class="skipspace">
-<p>To
-
-aid in Web site development and editing, there is local
-
-tag hover help for all supported tag sets, as well as <a href="../../org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html">content assist</a> (Ctrl+Spacebar), a tool that helps you
-
-insert or finish a tag or function or finish a line of code in a structured
-
-text editor.</p>
-
-<p><img src="../images/nwin.gif" alt="For Windows" /> You
-
-can toggle among three modes to visually design pages, work with HTML, JavaScript or
-
-JSP content, and preview your pages. To help you create the visual impact
-
-you want on your Web sites, the editor includes its own library of reusable
-
-graphics and two graphic programs for creating, editing, and animating image
-
-files. </p>
-<p><img src="../images/nlinux.gif" alt="For Linux" /> You
-
-can toggle between two modes to visually design pages or work with HTML, JavaScript or
-
-JSP content. To help you create the visual impact you want on
-
-your Web sites, the editor includes its own library of reusable graphics and
-
-a graphic program for creating, editing, and animating image files.</p>
-<div class="note"><span class="notetitle">Note: </span>Use
-
-either uppercase or lowercase alphanumeric characters consistently when naming
-
-HTML files and embedded files (such as image files) used in your Web pages,
-
-because some server operating systems are case sensitive. Do not use spaces
-
-or special characters such as exclamation points or question marks in file
-
-names.</div>
- </div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwtover.html" title="">Web application overview</a><br />
-<a href="ccwebper.html" title="">The Web perspective</a><br />
-<a href="cwwedtvw.html" title="">Workbench integration with Web editors</a><br />
-<a href="cwebdevelopmenttools.html" title="">Web development tools</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tjcrehtm.html">Creating HTML and XHTML files and framesets</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjlnknav.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjlnknav.html
deleted file mode 100644
index 804d001..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjlnknav.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Viewing and navigating links</title>
-</head>
-<body id="tjlnknav"><a name="tjlnknav"><!-- --></a>
-
-<h1 class="topictitle1">Viewing and navigating links</h1>
-<div><div class="skipspace"> <p>To view links between files in a project:</p>
- </div>
-<ol><li class="skipspace"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Show
-
-view</span> &gt; <span class="uicontrol">Links</span></span> </span></li>
-<li class="skipspace"><span>In the Project Explorer view, click the file for which you want
-
-to view links.</span></li>
-<li class="skipspace"><span>To navigate through the Links view, you have the following options: </span> <ul><li>Click the plus (+) and minus (-) signs that are displayed preceding the
-
-file icons. The + indicates that there are more links to display. To change
-
-your view of the link relationships: <ul><li>Click the + sign in front of an icon to expand the link hierarchy</li>
-<li>Click the - to collapse the link hierarchy</li>
-<li>To change the focus of the Links view, right-click on the file you want
-
-to have focus and click <span class="uicontrol">Become new center</span>.</li>
-</ul>
-</li>
-<li>Using the arrow keys, you can navigate from the currently selected link.
-
-The right or left keys automatically expand a link if it can be expanded.
-
- Also, navigating left and right using the arrow keys follows the path of
-
-any expanded links in the direction you are navigating; if there are no expanded
-
-links, then the (vertical) middle link is selected.  </li>
-<li>Since the view does not scroll automatically to show the currently selected
-
-link, you can scroll the view using either CTRL+<i>arrowkey</i> to scroll
-
-the view up, down, left or right, or the Page Up and Page Down keys to scroll
-
-the view up and down.</li>
-</ul>
-</li>
-<li class="skipspace"><span>You can create links between files in different projects. </span> If you give focus to a file in a different project, the Links view 
-
-changes so that only files and links in that project are shown. Files that
-
-are not in a project displayed in the Project Explorer are not shown in the
-
-Links view.</li>
-<li class="skipspace"><span>To view a list of broken links or links to files outside your project,
-
-in the Web perspective click the <span class="uicontrol">Problems</span> tab.</span> <p>Broken links are marked with a <img src="../images/nwlnktsk.gif" alt="Broken Link Icon" />. To place your cursor on the
-
-line of the source file where the broken link is specified, double-click the
-
-broken link element in the Problems list.</p>
- <div class="p"> <b>Note:</b> To
-
-increase the number of broken link messages that can be displayed, complete
-
-the following steps:<ol><li>Click  <span class="menucascade"><span class="uicontrol">Windows</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Web Tools</span> &gt; <span class="uicontrol">Links</span> &gt; <span class="uicontrol">Validation
-
-and Refactoring</span></span> and increase the number in the <b>Maximum
-
-number of links validation messages on a project</b> field.</li>
-<li> In the Problems view, display the filter dialog, and either un-check
-
-the <b>Limit visible items to</b> check box or enter the same link number
-
-you specified in the previous step.</li>
-</ol>
-</div>
-</li>
-</ol>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="cwlnkvew.html" title="">Links view</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tjlnkrfr.html" title="">Refreshing the Links view</a><br />
-<a href="twlnkfix.html" title="">Fixing broken links using the Fixup link references wizard</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjlnkrfr.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjlnkrfr.html
deleted file mode 100644
index d21f469..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjlnkrfr.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Refreshing the Links view</title>
-</head>
-<body id="tjlnkrfr"><a name="tjlnkrfr"><!-- --></a>
-
-<h1 class="topictitle1">Refreshing the Links view</h1>
-<div><div class="skipspace"> <p>To view updates in the Links view:</p>
- </div>
-<ol><li><span>Ensure that you have saved changes to all of the files you want
-
-to view links between.</span></li>
-<li><span>Select the <span class="uicontrol">Links</span> tab or open the Links view.</span></li>
-<li><span>In the Project Explorer view, click on the file you want to have
-
-center focus in the Links view.</span></li>
-</ol>
-<div class="skipspace"><p>Updates, such as changes of link attributes, renaming of files
-
-and new links are displayed in the Links view.</p>
-</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="cwlnkvew.html" title="">Links view</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tjlnknav.html">Viewing and navigating links</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.html
deleted file mode 100644
index 16e63ef..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-</head>
-<body id="tjprefs"><a name="tjprefs"><!-- --></a>
-
-<h1 class="topictitle1">Defining HTML file preferences</h1>
-<div><div class="skipspace"> <p>To define general HTML file preferences, complete the following
-
-steps:</p>
-</div>
-<ol><li class="skipspace"><span>From the <span class="uicontrol">Window</span> menu, select <span class="uicontrol">Preferences</span>.</span></li>
-<li class="skipspace"><span>In the Preferences window, select <span class="menucascade"><span class="uicontrol">Web and
-
-XML</span> &gt; <span class="uicontrol">HTML Files</span></span>.</span></li>
-<li class="skipspace"><span>Specify the following settings related to saving an HTML source
-
-page. The defaults are recommended and should only be modified when there
-
-is a specific reason to do so. </span> <dl><dt class="bold">Line delimiter</dt>
-<dd>Specify the appropriate EOL character for your environment. The default
-
-is <span class="uicontrol">No translation</span>.</dd>
-<dt class="bold">Add this suffix</dt>
-<dd>Specify a default suffix for files that you save. The default is <kbd class="userinput">html</kbd>.</dd>
-<dt class="bold">Encoding, IANA, (Use workbench default)</dt>
-<dd>Specify the default encoding (code page) for files that you create. The
-
-default is the Workbench's encoding preference. </dd>
-<dt class="bold">Insert DOCTYPE declaration</dt>
-<dd>Optionally, you can automatically add a DOCTYPE declaration to HTML files.
-
-The default DOCTYPE is determined when you create an HTML file or a JSP file
-
-using a wizard. If you add the DOCTYPE declaration, you
-
-should include at least a Public ID specification, and, optionally, a System
-
-ID.</dd>
-<dt class="bold">Insert GENERATOR with META tag</dt>
-<dd>Optionally, select the check box to specify GENERATOR in a META tag in
-
-the HTML file header.</dd>
-<dt class="bold">Loading files</dt>
-<dd>Specify the default encoding (code page) for files that you open. The
-
-default is the Workbench's encoding preference. Deselect the <span class="uicontrol">Use
-
-workbench default</span> check box to select another encoding.   <div class="note"><span class="notetitle">Note: </span>Encoding
-
-detection (when loading files) is performed in the following order:   <ul><li>Locate the encoding name embedded in the document.</li>
-<li>When no encoding is embedded in the document, an automatic encoding detector
-
-attempts to determine encoding used in the document.</li>
-<li>If the encoding still cannot be determined, the encoding defined in the <span class="uicontrol">Encoding</span> field
-
-is used.</li>
-</ul>
- </div>
- </dd>
-</dl>
- </li>
-<li class="skipspace"><span>Click <span class="uicontrol">Apply</span> then <span class="uicontrol">OK</span> to
-
-save your changes.</span></li>
-</ol>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwebper.html" title="">The Web perspective</a><br />
-<a href="cwwedtvw.html" title="">Workbench integration with Web editors</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjxhtcnv.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjxhtcnv.html
deleted file mode 100644
index 70e2873..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjxhtcnv.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Converting HTML files to XHTML files</title>
-</head>
-<body id="tjxhtcnv"><a name="tjxhtcnv"><!-- --></a>
-
-<h1 class="topictitle1">Converting HTML files to XHTML files</h1>
-<div><div class="skipspace"> The Extensible HyperText Markup Language (XHTML), a set of document
-
-types that rework the HTML code using XML, is the successor of HTML. To take
-
-advantage of the specifications that have been developed for XHTML, you can
-
-convert existing HTML pages to XHTML pages.<p>To convert an existing HTML
-
-file to an XHTML file, complete the following steps: </p>
-</div>
-<ol><li class="skipspace"><span>Select <span><span class="menucascade"><span class="uicontrol">Tools</span> &gt; <span class="uicontrol">Convert
-
-to XHTML</span></span></span>.</span></li>
-<li class="skipspace"><span>Typically, you should accept the <span><span class="uicontrol">Insert XML declaration</span></span> check
-
-box default in the <span><span class="uicontrol">Convert to XHTML</span></span> dialog
-
-box. In addition, you should select the appropriate <span><span class="uicontrol">XHTML document
-
-type</span></span> from the list box.</span></li>
-<li class="skipspace"><span>Click <span><span class="uicontrol">OK</span></span>.</span> <p> A new
-
-XHTML file <u>replaces</u> the converted HTML file, though the file extension
-
-does not change. You can open the newly created XHTML file in the Source page
-
-to verify that the appropriate XML declaration and document type value are
-
-reflected.</p>
-</li>
-<li class="skipspace"><span>The <span class="uicontrol">Convert to XHTML</span> dialog is also available
-
-for existing <i>XHTML</i> files, because it may be applicable in the following
-
-cases: </span>   <ul><li>It can be used to change DOCTYPE declaration from one XHTML DTD to another;
-
-for example, from XHTML 1.0 Transitional to XHTML Basic 1.0.</li>
-<li>It can be used to clean up tags that don't conform to XHTML standards,
-
- such as upper case tags in an existing XHTML file.</li>
-</ul>
-</li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tpalette1.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tpalette1.html
deleted file mode 100644
index 91a6109..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tpalette1.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Using the Web palette</title>
-</head>
-<body id="tpalette1"><a name="tpalette1"><!-- --></a>
-
-<h1 class="topictitle1">Using the Web palette</h1>
-<div><div class="skipspace">The Web tools palette lets you quickly drag items from the palette
-onto the JSP or HTML file you are editing. To begin using the palette:</div>
-<ol><li class="skipspace"><span>If the palette does not open, click <b>Window
--&gt; Show View -&gt; Other -&gt; Basic -&gt; Palette</b>.</span></li>
-<li class="skipspace"><span>Click one of the drawers in the Palette view.</span>  The
-drawer expands and displays a list of items that you can drag and drop onto
-the page. For example, if you are editing a JSP file and you click the JSP
-Tags drawer, you will be able to drag Beans, Expressions, and Scriptlets onto
-the page. If you click the HTML drawer, you can drag Images, Bulleted Lists,
-and Tables on to the page. (You can <a href="../../org.eclipse.wst.webtools.doc.user/topics/tpalette2.html">customize</a> the items that appear in a drawer.)<p> Note
-that the type of JSP file you are editing determines the drawers that appear
-in the palette.</p>
-</li>
-<li class="skipspace"><span>Drag an item from a drawer to the desired place in the JSP or HTML
-file. (You can also click a location on the page, and then click on an item
-in the drawer.) Make sure that you drag and drop appropriate items onto a
-page. For example, if you are creating a static HTML page, you should not
-drop JSP items onto the page.</span></li>
-</ol>
-<div class="skipspace">Once the item appears on the page, you can usually set attributes
-for it in the <b>Properties</b> view. You might also be prompted to set attributes
-when you drop the item.<p>By default, if you have one drawer
-open and you open another drawer, the first drawer will stay open provided
-that all items in the second drawer can be displayed. If not, one of the existing
-drawers will close. If you want to always keep a drawer open, you can click
-the Pin icon in the title bar for that drawer. </p>
-</div>
-</div>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="cpalette.html" title="Palette view"></a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tpalette2.html" title="Customizing the Web palette"></a><br />
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tpalette2.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tpalette2.html
deleted file mode 100644
index b600612..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tpalette2.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Customizing the Web palette</title>
-</head>
-<body id="tpalette2"><a name="tpalette2"><!-- --></a>
-
-<h1 class="topictitle1">Customizing the Web palette</h1>
-<p>The Web tools palette lets you drag an item from a drawer in the
-palette view and drop the item to the JSP or HTML file that you are editing.
-To customize the palette, complete the following steps:</p>
-<ol>
-<li class="skipspace">If the palette is not open, click 
-<span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Show View</span>  
-&gt; <span class="uicontrol">Other</span> &gt; <span class="uicontrol">Basic</span> &gt;  
-<span class="uicontrol">Palette</span></span>.</li>
-<li class="skipspace"><span>Right-click inside a drawer in the Palette view to display the
-pop-up menu. From this menu, you can select <b>Layout</b>, <b>Use Large Icons</b>, <b>Context</b>, <b>Customize</b>,
-and <b>Settings</b>.</span></li>
-<li class="skipspace"><span>Select <b>Layout</b> to adjust the following options</span>  
-<ul>
-<li><b>Columns</b> - the number of columns depends on the width of the particular
-view </li>
-<li><b>List</b> - items appear with minimal description</li>
-<li><b>Icons only</b> - each item appears as an icon with no text</li>
-<li><b>Details</b> - descriptions of each item are included</li>
-</ul>
-</li>
-<li class="skipspace"><span>Select <b>Use Large Icons</b> to increase the size of the items
-that appear in each drawer.</span></li>
-<li class="skipspace"><span>Select <b>Context</b> to determine which drawers appear.</span>  By default, the drawers that appear are automatically determined based
-on the type of file you are editing. For example, HTML context contains drawers
-appropriate for HTML pages. To display other types of drawers, select a different
-context. You should use caution when selecting a context, as the type of objects
-you add to the page may not be appropriate for the given page type. </li>
-<li class="skipspace"><span>Select  <b>Customize</b> to change the items (and their attributes)
- that appear in a drawer. Customize enables you to perform any of the following
-actions:</span>  <ul><li>Move or delete items within the drawer. Use caution when deleting an item
-because you cannot add it back.</li>
-<li>Change the names and descriptions of items within the drawer</li>
-<li>Specify a default drawer to be opened when the Palette view first appears</li>
-<li>Hide items within a drawer</li>
-<li>Change attributes for an item within a drawer</li>
-<li>Add separators</li>
-</ul>
- </li>
-<li class="skipspace"><span>Select <b>Settings</b> to change the following:</span>  
-<ul><li>Font settings</li>
-<li>Layout settings</li>
-<li>Drawer options, such as whether to close a drawer when another is opened</li>
-</ul>
-</li>
-</ol>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="cpalette.html" title="">Palette view</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tpalette1.html" title="">Using the Web palette</a><br />
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tservertarget.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tservertarget.html
deleted file mode 100644
index 1496466..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tservertarget.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Server targeting for Web applications</title>
-</head>
-<body id="tservertarget"><a name="tservertarget"><!-- --></a>
-
-<h1 class="topictitle1">Server targeting for Web applications</h1>
-<div><p>To support different J2EE application servers, the J2EE tooling allows
-
-you to target a specific server during your Enterprise Application (EAR) project
-
-development. In most cases, a Web project must target the same server as the
-
-EAR project in order to deploy the Web application to the server properly. </p>
-<p>After you have a Web project created, you can modify the target server
-
-using the project's properties dialog. To do this, right-click on the project
-
-in the Project Explorer view, and select <span class="menucascade"><span class="uicontrol">Properties</span> &gt; <span class="uicontrol">Server</span></span>.</p>
-<p>For more information on J2EE server targeting, see <a href="../../org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html">Specifying target servers for J2EE projects</a></p>
-</div>
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="twcreprj.html">Creating a dynamic Web project</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.html
deleted file mode 100644
index 8a8273e..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating a dynamic Web project</title>
-</head>
-<body id="twcreprj"><a name="twcreprj"><!-- --></a>
-
-<h1 class="topictitle1">Creating a dynamic Web project</h1>
-<div><div class="skipspace"> <p>You create and maintain the resources for your Web applications
-
-in Web projects. Unlike with <a href="twcresta.html">static</a> Web projects, dynamic Web projects
- enable you to create resources such as JavaServer Pages and servlets.</p>
-<p>To create a new dynamic Web project, complete the following steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open the Web perspective and select <span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Dynamic Web Project</span></span>.</span> The <span class="uicontrol">New Dynamic Web Project</span> wizard starts.</li>
-<li class="skipspace"><span>Type a name for your Web project.</span> <p></p>
-</li>
-<li class="skipspace"><span>Accept the default value in the <span class="uicontrol">Project location</span> field
-
-(this is where your project is stored in your file system), or click <span class="uicontrol">Browse</span> to
-
-choose a location from the file system. Then click the <b>Show Advanced</b> button
-
-if the advanced options are not already displayed.</span> <p></p>
-</li>
-<li class="skipspace"><span>Select the servlet version number.</span> The servlet version
-
-determines the server level on which you can run your applications. Any new servlets and JSP files that you expect to create
-
-should adhere to the latest servlet specification level available. (Previous
-
-specification levels are offered to accommodate any legacy dynamic elements
-
-that you expect to import into the project). <div class="p"><b>Notes:</b> <ul><li>The servlet version determines the choice of target servers that appear
-
-in the drop-down list.</li>
-<li>The following servlet versions correspond to the following J2EE levels:
-
-  <ul><li>version 2.2 - J2EE 1.2</li>
-<li>version 2.3 - J2EE 1.3</li>
-<li>version 2.4 - J2EE 1.4</li>
-</ul>
- </li>
-<li>Note that you can upgrade your servlet version using the <a href="../../org.eclipse.jst.j2eeapp.doc.user/topics/tjmigrate.html">J2EE Migration Wizard</a> but you can't go revert to an earlier
-
-level.</li>
-</ul>
-</div>
-</li>
-<li class="skipspace"><span>Select a target server from the drop-down list or create a new
-
-target server by selecting the <span class="uicontrol">New</span> button</span></li>
-<li class="skipspace"><span>A new or existing Enterprise Application project (EAR Project)
-
-must be associated with your new Web project to facilitate deployment. If
-
-you want to override the default settings for the Enterprise Application project,
-
-click <span class="uicontrol">New</span>, and make your changes. When your Web project
-
-is created at the end of the wizard, the new Enterprise Application  project
-
-is also created with the name specified in the EAR project field. Note that
-
-the default is the name of the web project appended with EAR (unless the ear
-
-project was selected when you opened the wizard.) If you want to use an existing
-
-Enterprise Application project, select the project from the <span class="uicontrol">EAR
-
-project</span> drop down list.</span> <p> If you want to add a Web
-
-project as a module to another Enterprise Application project in the future,
-
-you can open the <a href="../../org.eclipse.jst.j2eeapp.doc.user/topics/cjapped.html">application deployment descriptor editor</a> for the Enterprise
-
-Application project and select the <span><span class="uicontrol">Add</span></span> option
-
-in the <span><span class="uicontrol">Module</span></span> page.</p>
-</li>
-<li class="skipspace"><span> Specify a context root. (The context root is the Web application
-
-root, which is the top-level directory of your application when it is deployed
-
-to the Web server). You can change the context root after you create a project
-
-using the project <span><span class="uicontrol">Properties</span></span> dialog, which
-
-you access from the project's pop-up menu. The context root can also be used
-
-by the links builder to ensure that your links remain ready to publish as
-
-you move and rename files inside your project.</span></li>
-<li class="skipspace"><span>To add support for annotated Java classes, select the appropriate
-
-check box.</span></li>
-<li class="skipspace"><span> To specify or customize the project options, select the <span class="uicontrol">Next</span> check
-
-box .</span></li>
-<li class="skipspace"><span>Select one or more of the <span><span class="uicontrol">Web Project features</span></span>.
-
-The box on the right displays a description of each feature as you select
-
-it on the left. </span> The default features are, <b>Default style sheet</b> (CSS
-
-file) and  <a href="../../org.eclipse.wst.web.diagram.doc.user/topics/twebdia020.html"> web diagram</a>. Accepting the default style sheet creates
-
-a default CSS file called Master.css, which is used for any HTML and JSP files
-
-included in the project.<ul>
-</ul>
-</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="skipspace"><span>Select <span class="uicontrol">Use a default Page Template for the Web Site</span> if
-
-you want your entire Web site to share a common page template. If you want
-
-to use one of the sample templates provided, select <span class="uicontrol">Sample Template</span> and
-
-then choose one of the templates shown in the <span class="uicontrol">Thumbnail</span> box.
-
-If you want to use a template of your own, select <span class="uicontrol">User-defined
-
-Template</span> and then click <span class="uicontrol">Browse</span> to select
-
-the template from the file system. The selected template is copied into your project for use when creating web pages. </span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span>. The wizard creates a new project that reflects the
-
-J2EE folder structure that specifies the location of web content files, class
-
-files, class paths, the deployment descriptor, and supporting metadata. </span></li>
-</ol>
-<div class="skipspace"><p>You can now begin creating or importing content for your Web project
-
-using  Web resource editors, the New File wizards, or the Import wizards available from
-
-the <span class="uicontrol">File</span> menu.</p>
-</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwebprj.html">Dynamic Web projects and applications</a><br />
-<a href="ccstatic.html">Static Web projects</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tjcrehtm.html" title="">Creating HTML or XHTML files</a><br />
-<a href="tjcrejsp.html" title="">Creating JSP files</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.html
deleted file mode 100644
index e1710cb..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating a static Web project</title>
-</head>
-<body id="twcresta"><a name="twcresta"><!-- --></a>
-
-<h1 class="topictitle1">Creating a static Web project</h1>
-<div><p> In the workbench, you create and maintain resources for Web applications
-
-in Web projects. If you want to create a static, content-based Web application
-
-that contains no dynamic elements, such as JSP files or servlets, use the <span><span class="uicontrol">New
-
-Static Web Project</span></span> wizard. If you later decide that you want
-
-to add dynamic elements to this project, you can <a href="twpcnvrt.html">convert the project to a dynamic Web project</a>.</p>
-<p> Note
-
-that static web projects will not run in the provided WebSphere<sup>®</sup> test environments,
-
-but these projects can be previewed in a browser directly from the workspace.
-
- </p>
-<p>To create a new static Web project, open the Web perspective and complete
-
-the following steps:</p>
-</div>
-<ol><li class="skipspace"><span>Select <span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Static Web Project</span></span>. </span> <p>The <span class="uicontrol">New
-
-Static Web Project</span> wizard appears.</p>
-</li>
-<li class="skipspace"><span>Provide a name for the Web project.</span> <p></p>
-</li>
-<li class="skipspace"><span>Accept the default value in the <span class="uicontrol">Project location</span> field
-
-(this is where your project is stored in your file system), or click <span class="uicontrol">Browse</span> to
-
-choose a location from the file system.</span>
-</li>
-<li class="skipspace"><span>You have two options to proceed: </span> <ul><li>If you want to accept the defaults associated with a static Web project,
-select <span class="uicontrol">Finish</span> .</li>
-<li>If you want to specify or customize the project options, select <span class="uicontrol">Next</span>.
-The following step assumes you have chosen this option.</li>
-</ul>
- </li>
-<li class="skipspace"><span>Select one or more of the <span class="uicontrol">Web Project features</span>. </span> <p>The default selects the <span class="uicontrol">Default style sheet (CSS)</span> check
-box, which creates a default CSS file (called Master.css) for the project.</p>
-</li>
-<li class="skipspace"><span>Select <b>Next</b>, and then select <span class="uicontrol">Use a default Page
-
-Template for the Web Site</span> if you want your entire Web site to
-
-share a common page template.</span> <p>If you want to use one of the
-
-sample templates provided, select <b>Sample Page Template</b> and then choose
-
-one of the templates shown in the <b>Thumbnail</b> box. If you want to use
-
-a template of your own, select <b>User-defined Page Template</b> and then
-
-click <b>Browse</b> to select the template from the file system. </p>
-</li>
-<li class="skipspace"><span>Click <b>Finish</b>. The wizard creates an empty project containing
-
-the appropriate folder structure, which you can see in the Project Explorer.</span></li>
-</ol>
-<div class="skipspace"><p>You can now begin creating or importing content for your Web project
-
-using Web resource editors, the
-
-New File wizards, or the Import wizards available from the <span class="uicontrol">File</span> menu.</p>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccstatic.html">Static Web Projects</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../../org.eclipse.wst.publishing.server.ui.doc.user/topics/tstatsrv.html">Publishing static Web projects to a static Web publishing
-server</a><br />
-</p>
-</div>	
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcrewar.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twcrewar.html
deleted file mode 100644
index a490ee7..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcrewar.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Exporting Web Archive (WAR) files</title>
-</head>
-<body id="twcrewar"><a name="twcrewar"><!-- --></a>
-
-<h1 class="topictitle1">Exporting Web Archive (WAR) files</h1>
-<div><div class="skipspace"> <p> A Web archive (WAR) file is a packaged Web application that
-
-can be exported to test, publish, and deploy the resources developed within
-
-a Web project.</p>
-<p> <b>Note</b>: if you want to work with an existing workbench
-
-Web project or share Web projects, we highly recommend that you use the <a href="../../org.eclipse.jst.j2eeapp.doc.user/topics/tjsharing.html"> Project
-
-Interchange</a> feature, as this feature preserves all your metadata.  </p>
-<p>To
-
-export a WAR file from a Web project, do the following: </p>
-</div>
-<ol><li class="skipspace"><span>Right click on a Web project folder and select <b>Export</b> from
-
-the pop-up menu. Then select<b> WAR file</b> in the Export window and then
-
-select <b>Next</b>.</span></li>
-<li class="skipspace"><span>Specify the Web project you want to export (this field is primed
-
-if you used the pop-up menu to open the wizard), and specify a location for
-
-the new WAR file</span></li>
-<li class="skipspace"><strong>Optional: </strong><span>Optionally, supply WAR export <span>Options</span>,
-
-such as whether or not to include Java™ source files in the WAR, and whether
-
-to overwrite any existing resources during the export process. </span> Source
-
-files are not usually included in a WAR file, because they are not necessary
-
-for the server to run the web application.</li>
-<li class="skipspace"><span>Click <span><span class="uicontrol">Finish</span></span>.</span></li>
-</ol>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="cwwarovr.html">Web archive (WAR) files</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcvsr.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twcvsr.html
deleted file mode 100644
index a8e5644..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcvsr.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Setting CVS repository defaults</title>
-</head>
-<body id="twcvsr"><a name="twcvsr"><!-- --></a>
-
-<h1 class="topictitle1">Setting CVS repository defaults</h1>
-<div><div class="skipspace"> <p>When you use a CVS repository during team development, you might
-
-want to use the following setup to ensure that the CVS versioning
-
-support ignores the project's build output folder:</p>
- </div>
-<ol><li class="skipspace"><span>Create a file called .cvsignore in your project's <span class="filepath">WebContent/WEB-INF</span> folder.</span></li>
-<li class="skipspace"><span>In this file, add a line with the name of the build output folder
-
-(for example, <samp class="codeph">classes</samp>).</span> <p>Currently, you have
-
-the option of creating this file automatically (as a feature) when using the
-
-New Dynamic Web Project wizard.</p>
-<p>When you synchronize with a CVS team
-
-stream, the output folder will be ignored.</p>
-</li>
-<li class="skipspace"><span>In addition, you should turn off the <span><span class="uicontrol">Prune empty
-
-directories</span></span> option. Select <span><span class="menucascade"><span class="uicontrol">Windows</span> &gt; <span class="uicontrol">Preferences</span></span></span>, switch to the <span><span class="menucascade"><span class="uicontrol">Team</span> &gt; <span class="uicontrol">CVS</span></span></span> properties
-
-page, and ensure that the <span><span class="uicontrol">Prune empty directories</span></span> check
-
-box is not checked.</span> <p>If this option is enabled and your Web project's
-
-source directory is empty, it will be deleted when the project is added to
-
-your workspace from a CVS repository, causing a Java™ build error.</p>
-</li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twedrmerr.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twedrmerr.html
deleted file mode 100644
index 6c4640f..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twedrmerr.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding or removing an error page from a Web application</title>
-</head>
-<body id="twedrmerr"><a name="twedrmerr"><!-- --></a>
-
-<h1 class="topictitle1">Adding or removing an error page from a Web application</h1>
-<div><div class="skipspace">Error pages are pages that you configure to display in response to
-
-specific HTTP error codes. To add or remove an error page from a Web application,
-
-you must add or remove the error page from the web.xml file. To do this using
-
-the Web deployment descriptor editor, complete the following steps:<p></p>
-</div>
-<ol><li><span>Open the Web perspective and display the Project Explorer.</span></li>
-<li><span>Expand your project and double click on the Deployment Descriptor
-
-icon. The Web deployment descriptor window appears.</span></li>
-<li><span>Select the <b>Pages</b> tab, and in the Error Pages section, select
-
-the <b>Add</b> button to add an error file. To remove an error file, select
-
-the file and then select the <b>Remove</b> button.</span></li>
-</ol>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwebxml.html" title="">The Web deployment descriptor editor</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="twedtwbx.html" title="">Configuring Web applications using the Web deployment descriptor editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbx.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbx.html
deleted file mode 100644
index d005b3e..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbx.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Configuring Web applications using the Web deployment descriptor editor</title>
-</head>
-<body id="twedtwbx"><a name="twedtwbx"><!-- --></a>
-
-<h1 class="topictitle1">Configuring Web applications using the Web deployment descriptor editor</h1>
-<div><div class="skipspace"> <p>When you create a Web project, the New Web Project wizard places
-
- a web.xml file in the project's WEB-INF directory. This file is used to specify
-
-deployment information for modules created in the Web development environment
-
-To open the web.xml file,  double-click it (or double-click the Deployment
-
-Descriptor icon in the Project  Explorer view). The Web deployment descriptor
-
-editor opens in the editing  pane.</p>
-  <p>It is recommended that you use
-
-the tabbed pages (views) to construct  the deployment descriptor for your
-
-Web application. Even though the Web deployment  descriptor editor does provides
-
-a source page of the web.xml file (from the <span>Source</span> tab),  using the
-
-tabbed pages is easier and introduces fewer errors. As you make changes on
-
-these tabbed pages, the web.xml file is updated automatically.  For instance,
-
-when you use the New Servlet wizard to create a servlet in a  Web project,
-
-the appropriate servlet entry is automatically inserted into  the web.xml
-
-file.</p>
-  <p>In addition to the configuration information in  the web.xml
-
-file, you can also use this editor to edit other deployment descriptors  in
-
-the Web project, including information on bindings and IBM<sup>®</sup> extensions (ibm-web-bnd.xmi
-
- and ibm-web-ext.xmi files).</p>
-<p>To edit the deployment descriptor, click
-
- the tabbed pages to locate attributes that you wish to add, edit or remove.
-
- In addition, the sections in the Overview page contain links to existing
-
-elements of the deployment descriptor. Click the links to open the appropriate
-
-editor  page to make updates or additions.</p>
- </div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwebxml.html" title="">The Web deployment descriptor editor</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="twedtwbx1.html" title="">Working in the Overview page</a><br />
-<a href="twedtwbx2.html" title="">Working in the Servlets page</a><br />
-<a href="twedtwbxf.html" title="">Working in the Filters Page</a><br />
-<a href="twedtwbx3.html" title="">Working in the Security page</a><br />
-<a href="twedtwbx4.html" title="">Working in the References Page</a><br />
-<!-- <a href="twedtwbxwsh.html" title="">Working in the WS Handler page</a><br />-->
-<a href="twedtwbxp.html" title="">Working in the Pages page</a><br />
-<a href="twedtwbxv.html" title="">Working in the Variables Page</a><br />
-<!-- <a href="twedtwbxwse.html" title="">Working in the WS Extensions Page</a><br />
-<a href="twedtwbxwsb.html" title="">Working in the WS Binding Page</a><br />-->
-<a href="twedtwbxe.html" title="">Working in the Extensions Page</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbx1.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbx1.html
deleted file mode 100644
index 665a656..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbx1.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-</head>
-<body id="twedtwbx1"><a name="twedtwbx1"><!-- --></a>
-
-<h1 class="topictitle1">Working in the Overview page</h1>
-<div><div class="skipspace">In the <b>Overview</b> page of the <a href="ccwebxml.html">Web
-deployment descriptor editor</a>, you can get a quick summary of the contents
-of the Web deployment descriptor in addition to adjusting various settings. <p>To
-work in the <b> Overview</b> page, complete the following steps:</p>
-</div>
-<ol><li><span>Open a Web project in the Project Explorer.</span></li>
-<li><span>Double-click the Web project's <b>Web Deployment Descriptor</b> file
-in the Project Explorer. The Web deployment descriptor editor opens.</span></li>
-<li><span>Click the <b>Overview</b> tab to open the <b>Overview</b> page.</span></li>
-<li><span>You can edit settings in the following sections of the <b>Overview</b> page:
-(You may also want to open this page to view the settings.) </span><ul><li>General Information - lets you view and edit general information,
-including the display name, description (not displayed to end users), and
-client session time out (in minutes).</li>
-<li>Servlets and JSPs - lets you view the servlets and JSPs used in the
-application.</li>
-<li>Filters - lets you view filters used in the application.</li>
-<li>Pages - lets you view welcome pages used in the application.</li>
-<li>Mime type - lets you view file extensions that are mapped to mime
-types.</li>
-<li>Security - lets you view the security roles and their constraints
-defined for the Web application.</li>
-<li>Icons - lets you view, change, or add icons representing the Web application.</li>
-<li>Usage - list the enterprise applications that are using this Web module.</li>
-<li>Web Library projects - lets you view, add, or remove references to
-JAR files mapped to Java™ projects.</li>
-<li>Listeners - lets you view listeners used in the application.</li>
-<li>References - lets you view resources that the Web application references. </li>
-<li>Environment Variables - lets you view environment variables that are
-relevant to the Web application.</li>
-<li>Context Parameters - lets you view the context initialization parameters
-that apply to all the servlets in the Web application.</li>
-</ul>
-</li>
-</ol>
-</div>
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="twedtwbx.html" title="">Configuring Web applications using the Web deployment descriptor editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbx2.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbx2.html
deleted file mode 100644
index f15dd76..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbx2.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-</head>
-<body id="twedtwbx2"><a name="twedtwbx2"><!-- --></a>
-
-<h1 class="topictitle1">Working in the Servlets page</h1>
-<div><div class="skipspace">In the <b>Servlets</b> page of the <a href="ccwebxml.html">Web
-
- deployment descriptor editor</a>, you can add an existing servlet or JSP
-
- file to the deployment descriptor or remove the selected servlet of JSP file
-
- from the deployment descriptor.<p>To work in the <b>Servlets</b> page, complete
-
- the following steps:</p>
-</div>
-<ol><li><span>Open a Web project in the Project Explorer.</span></li>
-<li><span>Double-click the Web project's <b> Deployment Descriptor</b> file
-
- in the Project Explorer. The Web deployment descriptor editor opens.</span></li>
-<li><span>Click the<b> Servlets</b> tab to open the <b>Servlets</b> page.</span></li>
-<li><span>You can edit settings in the following sections of the <b>Servlets</b> page: </span><ul><li>Servlets and JSPs - list servlets and JSPs used in this application.
-
- You can add or remove servlets and JSPs from the list.</li>
-<li>Details - lists details about the selected servlet or JSP. Details
-
- listed include the servlet class (canonical name), the display name (a short
-
- name for display purposes), and a description.</li>
-<li>URL Mappings - lists URLs mapped to the selected servlet. </li>
-<li>Initialization - lists the initialization parameters that are configured
-
- for the selected servlet or JSP file</li>
-<li>Load on Startup- enables you to specify the details of a servlet's
-
- load-on-startup element, including load order.</li>
-<li>Security role references - list the security roles referenced in the
-
- Web application and lets you edit the security roles that are authorized
-
-to  access the servlet. You can add or remove security roles. If you add a
-
-security  role reference, you specify the role reference name, the role link,
-
-and a  description.</li>
-<li>Run as - lists details of the selected servlet's run-as
-
-element.</li>
-<li>Icons - lets you view or change icons (small or large) used to represent
-
- the selected servlet or JSP file.</li>
-<li>WebSphere<sup>®</sup> Extensions
-
- - list and lets you change the details of the Servlet Extension for the selected
-
- servlet. You can add a new extension by clicking <b>Add</b>. The Add Markup
-
- Language entry wizard appears. Also, depending on the Servlet Version of
-
-the  project you are working with, you can specify global and local transaction
-
- settings.</li>
-</ul>
-</li>
-</ol>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwebxml.html" title="">The Web deployment descriptor editor</a><br />
-<!--<a href="../../com.ibm.etools.wrd.annotation.doc/topics/coverview.html">Annotation-based programming overview</a>--><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="twedtwbx.html" title="">Configuring Web applications using the Web deployment descriptor editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbx3.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbx3.html
deleted file mode 100644
index f494a47..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbx3.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Working in the Security page</title>
-</head>
-<body id="twedtwbx3"><a name="twedtwbx3"><!-- --></a>
-
-<h1 class="topictitle1">Working in the Security page</h1>
-<div><div class="skipspace">In the <b>Security</b> page of the <a href="ccwebxml.html">Web
-
-deployment descriptor editor</a>, you can add or remove the names of each defined security role.<p>To work
-
-in the <b>Security</b> page, complete the following steps:</p>
-</div>
-<ol><li><span>Open a Web project in the Project Explorer.</span></li>
-<li><span>Double-click the Web project's <b> Deployment Descriptor</b> file
-
-in the Project Explorer. The Web deployment descriptor editor opens.</span></li>
-<li><span>Click the<b> Security</b> tab to open the <b>Security</b> page.</span></li>
-<li><span>The <b>Security</b> page has the following two sections: </span><ul><li><b>Security Roles</b> - lists and lets you add or remove the security
-
-roles defined for this Web application as well as provide a description of
-
-each role.</li>
-<li><b>Security Constraints</b> - lets you add or remove security constraints
-
-for specific security roles as well as add descriptions of each security constraint.
-
-In addition, you can add or remove Web resources and their HTTP methods, define
-
-the security roles who are authorized to access the Web resources, and specify
-
-user data constraints on user data: (None, Integral, or Confidential.) None
-
-means that the application requires no transport guarantees. Integral means data
-
-cannot be changed in transit between client and server. Confidential means
-
-data content cannot be observed while it is in transit. These data contraints usually require the
-
-use of SSL.</li>
-</ul>
-</li>
-</ol>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwebxml.html" title="">The Web deployment descriptor editor</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../org.eclipse.jst.j2eeapp.doc.user/topics/tjaddsr.html">Defining security roles for enterprise applications</a><br />
-<a href="twedtwbx.html" title="">Configuring Web applications using the Web deployment descriptor editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbx4.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbx4.html
deleted file mode 100644
index 0c7249c..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbx4.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Working in the References Page</title>
-</head>
-<body id="twedtwbx4"><a name="twedtwbx4"><!-- --></a>
-
-<h1 class="topictitle1">Working in the References Page</h1>
-<div><div class="skipspace">In the <b>References</b> page of the <a href="ccwebxml.html">Web
- deployment descriptor editor</a>, you can add or remove references to:
-  <ul><li>an EJB (Enterprise Java™ Bean) </li>
-<li>a Web service </li>
-<li>an external resource </li>
-<li>a message destination </li>
-<li>an administered object</li>
-</ul>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxe.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxe.html
deleted file mode 100644
index 7e7e0d3..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxe.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Working in the Extensions Page</title>
-</head>
-<body id="twedtwbxe"><a name="twedtwbxe"><!-- --></a>
-
-<h1 class="topictitle1">Working in the Extensions Page</h1>
-<div><div class="skipspace">In the <b>Extensions</b> page of the <a href="ccwebxml.html">Web
-
-deployment descriptor editor</a>, you can:  <ul><li>modify various general settings. For example, you can specify whether <ul><li>reloading is enabled</li>
-<li>file serving is enabled</li>
-<li>directory browsing is enabled</li>
-<li>to serve servlets by classname</li>
-<li>precompile JSPs</li>
-<li>automatic request coding is enabled</li>
-<li>automatic response coding is enabled</li>
-<li>automatic filter loading is enabled</li>
-</ul>
-</li>
-<li>add or remove MIME filters</li>
-<li>add or remove JSP attributes</li>
-<li>add or remove file serving attributes</li>
-<li>add or remove invoker attributes</li>
-<li>add, remove or edit servlet caching configurations</li>
-</ul>
- </div>
-</div>
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="twedtwbx.html" title="">Configuring Web applications using the Web deployment descriptor editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxf.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxf.html
deleted file mode 100644
index 0f01dad..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxf.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Working in the Filters Page</title>
-</head>
-<body id="twedtwbxf"><a name="twedtwbxf"><!-- --></a>
-
-<h1 class="topictitle1">Working in the Filters Page</h1>
-<div><div class="skipspace">In the <b>Filters</b> page of the <a href="ccwebxml.html">Web
-
-deployment descriptor editor</a>, you can add or remove :   <ul><li>filters</li>
-<li>filter mappings </li>
-<li>filter mappings to servlet </li>
-<li>filter initialization parameters</li>
-</ul>
-<p>You can also use this page to specify icons for your application.</p>
- </div>
-</div>
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="twedtwbx.html" title="">Configuring Web applications using the Web deployment descriptor editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxp.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxp.html
deleted file mode 100644
index 64550cc..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxp.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Working in the Pages page</title>
-</head>
-<body id="twedtwbxp"><a name="twedtwbxp"><!-- --></a>
-
-<h1 class="topictitle1">Working in the Pages page</h1>
-<div><div class="skipspace">In the <b>Pages</b> page of the <a href="ccwebxml.html">Web
-
-deployment descriptor editor</a>, you can :   <ul><li>Remove an existing or add a new welcome file</li>
-<li>Specify login configuration values</li>
-<li>Remove an existing or create a new error code error page</li>
-<li>Remove an existing or create a new exception type error page</li>
-</ul>
- <p></p>
- </div>
-</div>
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="twedtwbx.html" title="">Configuring Web applications using the Web deployment descriptor editor</a><br />
-<a href="twedrmerr.html" title="">Adding or removing an error page from a Web application</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxv.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxv.html
deleted file mode 100644
index bc3c7c7..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxv.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Working in the Variables Page</title>
-</head>
-<body id="twedtwbxv"><a name="twedtwbxv"><!-- --></a>
-
-<h1 class="topictitle1">Working in the Variables Page</h1>
-<div><div class="skipspace">In the <b>Variables</b> page of the <a href="ccwebxml.html">Web
-
-deployment descriptor editor</a>, you can add or remove:   <ul><li>environment variables</li>
-<li>tag lib references</li>
-<li>message destinations </li>
-<li>context parameters</li>
-<li>MIME Mappings</li>
-<li>local encoding mappings</li>
-<li>JSP property groups</li>
-</ul>
-<p></p>
- </div>
-</div>
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="twedtwbx.html" title="">Configuring Web applications using the Web deployment descriptor editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxwsb.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxwsb.html
deleted file mode 100644
index 4195534..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxwsb.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Working in the WS Binding Page</title>
-</head>
-<body id="twedtwbxwsb"><a name="twedtwbxwsb"><!-- --></a>
-
-<h1 class="topictitle1">Working in the WS Binding Page</h1>
-<div><div class="skipspace">The Web Service Client Binding Extension page appears in the <a href="ccwebxml.html">Web
-
-deployment descriptor editor</a>, only when you have already defined a web service. You can use this page to:   <ul><li>add or remove a web service to a client binding</li>
-<li>view service reference details, including the deployed WSDL file</li>
-<li>add or remove a port qualified name binding</li>
-<li>specify setting for the selected port qualified name binding</li>
-<li>add or remove default mappings</li>
-<li>add or remove parameters for the selected service reference</li>
-<li>modify the security configuration for generating request messages</li>
-<li>modify the security configuration for consuming response messages</li>
-<li>add or remove parameters of the selected port qualified name binding</li>
-</ul>
- </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxwse.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxwse.html
deleted file mode 100644
index f18ac24..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxwse.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Working in the WS Extensions Page</title>
-</head>
-<body id="twedtwbxwse"><a name="twedtwbxwse"><!-- --></a>
-
-<h1 class="topictitle1">Working in the WS Extensions Page</h1>
-<div><div class="skipspace">The Web Service Client Security Extension page appears in the <a href="ccwebxml.html">Web
-
-deployment descriptor editor</a>, only when you have already defined a web service. You can use this page to: 
-
-<ul><li>Add, edit, or remove a service reference</li>
-<li>Add, edit or remove a port Qname binding</li>
-<li>Add, edit or remove the default mappings for a selected service</li>
-<li>Modify the Request Generator configuration for the Selected Port Qname Binding, including integrity, confidentiality and security settings.</li>
-<li>Modify timestamp and other information</li>
-</ul>
- </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxwsh.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxwsh.html
deleted file mode 100644
index 0e4faf7..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twedtwbxwsh.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Working in the WS Handler page</title>
-</head>
-<body id="twedtwbxh"><a name="twedtwbxh"><!-- --></a>
-
-<h1 class="topictitle1">Working in the WS Handler page</h1>
-<div><div class="skipspace">In the <b>WS Handler</b> page of the <a href="ccwebxml.html">Web
-
-deployment descriptor editor</a>, you can :   <ul><li>remove an existing or create a new web service handler</li>
-<li>view overview and implementation details for a selected handler</li>
-<li>choose an icon for a selected handler</li>
-<li>remove existing or create initial parameters for a selected handler</li>
-<li>add or remove SOAP headers for a selected handler</li>
-</ul>
- <p></p>
- </div>
-</div>
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="twedtwbx.html" title="">Configuring Web applications using the Web deployment descriptor editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twfltrwz.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twfltrwz.html
deleted file mode 100644
index 0387fe9..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twfltrwz.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating a new filter class</title>
-</head>
-<body id="twfltrwz"><a name="twfltrwz"><!-- --></a>
-
-<h1 class="topictitle1">Creating a new filter class</h1>
-<div><div class="skipspace"> <p> The Filter wizard enables you to create Java™ filter
-
-classes for various J2EE filter types, such as authentication filters, encryption
-
-filters, and data compression filters.</p>
-<p>To create a filter class, do
-
-the following: </p>
-</div>
-<ol><li class="skipspace"><span>Open the Filter wizard. To do this:</span><ol type="a"><li><span>Open the Web perspective and display the Project Explorer view.</span></li>
-<li><span>Expand the project in which you want to create the filter</span></li>
-<li><span>Expand the deployment descriptor icon</span></li>
-<li><span>Right click on the <b>Filters</b> icon.</span></li>
-<li><span>Select <span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">Filter</span></span> from the pop-up menu.</span></li>
-</ol>
-  The <span class="uicontrol">Create Filter</span> wizard appears.  </li>
-<li class="skipspace"><span>Type a name and description for the filter. Notice that the name
-
-that you type in the <b>Name</b> field is used to create a URL Mapping for
-
-the filter. Optionally add initialization parameters or an alternative URL
-
-mapping, and then select <b>Next</b>.</span></li>
-<li class="skipspace"><span>Specify the folder where the filter class will be placed. (You
-
-should place the filter in the Java source folder) Also specify the package
-
-that the class will belong to (it is added into a default package if you do
-
-not specify one), and the class name of the filter. </span></li>
-<li class="skipspace"><span>Specify a superclass for the filter class. A filter created by
-
-this wizard can have any class that has Object in its hierarchy as its superclass.
-
-Click <span class="uicontrol">Browse</span> to choose from the available superclasses.
-
-When finished select <b>Next</b>.</span></li>
-<li class="skipspace"><span>Select a modifier to specify whether your filter class is public,
-
-abstract, or final. (Classes cannot be both abstract and final.)</span></li>
-<li class="skipspace"><span>The javax.servlet.Filter is provided as the default <span><span class="uicontrol">Interface</span></span>.
-
-You do not have to implement the Filter interface if you subclass a class
-
-that implements Filter, or if you implement an interface which has Filter
-
-in its hierarchy. </span> <p>You can also add additional interfaces to
-
-implement. Click <span><span class="uicontrol">Add</span></span> to open the <span><span class="uicontrol">Interface
-
-Selection</span></span> dialog. In this dialog, as you type the name of
-
-the interface that you are interested in adding in the <span><span class="uicontrol">Choose
-
-interfaces</span></span> field, the list of available interfaces listed
-
-in the <span><span class="uicontrol">Matching types</span></span> list box updates dynamically
-
-to display only the interfaces that match the pattern. Select an interface
-
-to see the <span><span class="uicontrol">Qualifier</span></span> and click <span><span class="uicontrol">Add</span></span>.
-
-Click <span><span class="uicontrol">OK</span></span> when you are finished. The qualifier
-
-that you chose appears in the Interfaces dialog.</p>
-</li>
-<li class="skipspace"><span>Choose which method stub you want to create.</span> <p>The <span><span class="uicontrol">Inherited
-
-abstract methods</span></span> option adds stubs for inherited abstract
-
-methods, and that must be implemented (unless you intend to create an abstract
-
-class). Because the init(), destroy(), and doFilter() methods are all defined
-
-in the javax.servlet.Filter interface, stubs for these methods are automatically
-
-generated for each new filter class.</p>
-</li>
-<li class="skipspace"><span>Click <span><span class="uicontrol">Finish</span></span>.</span></li>
-</ol>
-<div class="skipspace">The filter that you created appears under the Filters icon.</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwebxml.html" title="">The Web deployment descriptor editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twimpwar.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twimpwar.html
deleted file mode 100644
index 00fa837..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twimpwar.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Importing Web archive (WAR) files</title>
-</head>
-<body id="twimpwar"><a name="twimpwar"><!-- --></a>
-
-<h1 class="topictitle1">Importing Web archive (WAR) files</h1>
-<div><p>A Web Archive (WAR) file is a portable, packaged Web application
-
-that you can import into your workspace. </p>
- 
-<p> Before importing a WAR file, you should first
-
-determine if the WAR file contains needed Java™ source files. When importing a WAR
-
-file into an existing Web project, the imported Web deployment descriptor
-
-files are either not changed or overwritten by the ones included in the imported
-
-WAR file, based on your response to the prompt that is provided.  In either
-
-case, this action does <i>not</i> represent a merging of the two sets of deployment
-
-descriptors.  </p>
-  <p>To import the Web project resources in a WAR file into
-
-your workspace, complete the following steps:</p>
-</div>
-<ol><li class="skipspace"><span>Select <span><span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">Import</span></span></span>.</span></li>
-<li class="skipspace"><span> In the Import dialog, select <span><span class="uicontrol">WAR file</span></span> and
-
-then click <span><span class="uicontrol">Next</span></span>. </span></li>
-<li class="skipspace"><span>Locate the WAR file that you want to import using the <span><span class="uicontrol">Browse</span></span> button.</span></li>
-<li class="skipspace"><span> The wizard assumes you want to create a new Web project with the
-
-same name as the WAR file. If you accept this choice, the project will be
-
-created with the same servlet version as specified by the WAR file and in
-
-the same location. If you want to override these settings, you can click <b>New</b> and
-
-specify your new settings in the Dynamic Web Project wizard.</span>  <p>If
-
-you want to import the WAR file into an existing Web project, you can select
-
-the project from the Web project drop-down list. Note that if you select an
-
-existing project, you must decide whether you want to select the setting to <b>overwrite
-
-existing resources without warning</b></p>
-</li>
-<li class="skipspace"><span>Click <span><span class="uicontrol">Finish</span></span> to populate the Web
-
-project.</span></li>
-</ol>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="../../org.eclipse.wst.webtools.doc.user/topics/cwwarovr.html">Web archive (WAR) files</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twimpweb.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twimpweb.html
deleted file mode 100644
index cba6bc3..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twimpweb.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Importing existing Web resources using HTTP or FTP</title>
-</head>
-<body id="twimpweb"><a name="twimpweb"><!-- --></a>
-
-<h1 class="topictitle1">Importing existing Web resources using HTTP or FTP</h1>
-<div><div class="skipspace"> <p>You can import existing Web resources
-
-using wizards that invoke HTTP or FTP. These import wizards automate the transfer
-
-of complete Web sites into Web projects by:</p>
-<ul><li>Enabling you to continue development of your Web applications while importing
-
-your Web resources.</li>
-<li>Prompting you for information that helps you find and navigate through
-
-the Web site</li>
-<li>Providing you with options for limiting the scope of the import and eliminating
-
-pages that you do not want to import</li>
-</ul>
-<p>These import wizards also support the import capabilities for Web
-
-servers that are equipped with firewalls. Both HTTP and FTP import support
-
-Proxies while FTP import supports SOCKS.</p>
-<p>To use the HTTP or FTP
-
-import wizards, you must designate an existing project in which
-
-to import the files. You will be able to view all the files from the imported
-
-Web site within the selected project folder.</p>
-<p>The HTTP import uses the
-
-HTTP protocol to crawl through the Web site based on an initial URL that you
-
-provide. The import action uses the URL to retrieve any HTML content available
-
-and also parses for HTTP links. The process repeats until it parses content
-
-and links that are referenced to other web pages that are encountered within
-
-the web site. HTTP import cannot parse pages that contain servlets or programs
-
-that are executed when a form is posted or embedded in JavaServer Pages (JSPs). </p>
-<p>The
-
-files transferred to your project represent a logical snapshot of the Web
-
-site's URL. This means that your Web project is populated with files that
-
-are acquired by the HTML response of the serving site. This also means that
-
-it is not necessary that the physical resources on the serving site will be
-
-copied to your project. For example, an HTTP request for a JSP page will return
-
-a rendered HTML response, not the JSP page itself. It is recommended that
-
-you use HTTP import for static pages and for sites that do not have FTP access.</p>
-<p>To
-
-import existing Web resources into the Web project using HTTP, perform the
-
-following steps:</p>
-</div>
-<ol><li class="skipspace"><span>Create a new project where you wish to import Web resources using
-
-the <span class="uicontrol">New Web Project</span> wizard.</span></li>
-<li class="skipspace"><span>If you intend to use an existing project, select the project in
-
-the Project Explorer view.</span></li>
-<li class="skipspace"><span>Select <span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">Import</span></span>. </span></li>
-<li class="skipspace"><span>In the Import dialog, select <span class="uicontrol">HTTP</span> and click <span class="uicontrol">Next</span>.</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">Specify the destination folder and the resources
-
-to import</span> page, type the requisite project information. </span> <ul><li><span class="uicontrol">Folder</span> - The imported files are placed in the default
-
-location (the Web content folder). You can click the <span class="uicontrol">Browse</span> button
-
-to change the location for the imported files for your project</li>
-<li><b>URL</b> - Type in the HTTP URL in the <span class="uicontrol">URL</span> field.
-
-The URL should include the domain name and starting directory for the URL/initial
-
-web-page.  <ul><li>If you enter a directory URL without a start page (for example, www.domain.net/Sports/),
-
-the default file name will be used when the web server returns HTML content
-
-(for example, if you do not specify a default, index.html is used.). </li>
-<li>HTTP crawling may create files that do not exist on the original server.
-
-For example, an HTTP reference to a directory may cause a Web server to respond
-
-with HTML content that describes the directory. The HTTP crawler saves this
-
-response as index.html</li>
-<li>If you enter just a domain name (for example, www.domain.net), the Import
-
-wizard will try to find a default page in the document root directory. </li>
-</ul>
-If you click the <span class="uicontrol">Advanced</span> button, you have the
-
-option of specifying a proxy connection in the Advanced Settings dialog box.
-
-If you select the <span class="uicontrol">Use a proxy server</span> check box, you
-
-will have the option of selecting a SOCKS or HTTP proxy, and supplying the
-
-corresponding server and port values. </li>
-<li><b>Depth limit while following HTTP links </b>- You can limit the scope
-
-of import that follows links by selecting the appropriate radio button provided.
-
- <ul><li><span class="uicontrol">No limit</span>- This option will allow the HTTP import
-
-to parse through all pages within the domain. </li>
-<li><span class="uicontrol">Limit to</span>- This option determines the depth limit
-
-of link levels that are crawled. For example, if you choose 1, all web pages
-
-within one link (level 1) from the page that it is being imported from will
-
-be navigated. If you limit it to 2, then all level 1 links and the ones linked
-
-directly to level 1 web pages will be imported. <p>For example, one might
-
-specify a crawl depth of 2 and an initial URL http://host/initialLevel/index.html
-
-. If index.html has a reference to http://host/initialLevel/L2/L3/index2.html
-
-, then index2.html, which is at level 3, is filtered out and its content will
-
-not be parsed for follow on crawling. </p>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next</span> for more options, or <span class="uicontrol">Finish</span> to
-
-import the Web site. </span></li>
-<li class="skipspace"><span>If you select <b>Next</b>, in the <b>Specify appropriate import
-
-options</b> page, select among the choices provided.  </span> <ul><li><span class="uicontrol">Convert Links to document relative</span> - If you select
-
-this option, links within HTML files are updated in a document-relative fashion,
-
-rather than creating absolute links based on their new location in a file
-
-system.  </li>
-<li><span class="uicontrol">Overwrite existing resources without warning</span> -
-
-If you select this option, existing workbench files in your project will be
-
-overwritten. If this option is not selected, files imported will not be overwritten.
-
-There is no prompting for selectively over-writing files.  </li>
-<li><span class="uicontrol">Do not follow links to files in parent folders of the starting
-
-URL</span> - If you select this option, you will prevent the FTP import
-
-to crawl resources above the initial provided URL. For example, if the initial
-
-URL is http://host/l1/l2/index.html and a link within the page references
-
-http://host/index.html, this option will determine whether the linked resource
-
-should be included in the import. If you do not have this option checked,
-
-you run the risk to crawl very large sites, and importing huge volumes of
-
-files unnecessarily.</li>
-<li><span class="uicontrol">Connection timeout</span> - This option determines the
-
-HTTP connection timeout value. It is measured, in milliseconds. Connection
-
-timeouts are a way of specifying how long you would prefer to wait for a message
-
-from the server before giving up.</li>
-</ul>
-</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span> to import the Web site with
-
-options. </span></li>
-<li class="skipspace"><span>Verify the resulting directory structure and file data integrity
-
-in the newly-populated project or folder. </span></li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twlnkcnvt.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twlnkcnvt.html
deleted file mode 100644
index 12d2728..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twlnkcnvt.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Converting link structure</title>
-</head>
-<body id="twlnkcnvt"><a name="twlnkcnvt"><!-- --></a>
-
-<h1 class="topictitle1">Converting link structure</h1>
-<div><div class="skipspace"> <p>The link conversion utility allows you to convert the path structure
-
-of all of the links in a selected resource. </p>
- <div class="p">For example, suppose you
-
-want to change your relative links in an HTML file so that the links are relative
-
-to the document root. By choosing the <b>Document root relative</b> conversion
-
-option, links that were relative to the current directory, for example:<p> &lt;a href="c-dataimpt.html"&gt;Data Imports&lt;/a&gt;</p>
- would be changed so that they were relative to the document root, which
-
-in this example is the project directory:<p>&lt;a href="/my_dynamic_project/guide/c-dataimpt.html"&gt;Data Imports&lt;/a&gt;</p>
-</div>
-<p>To
-
-convert your the link structure, complete the following steps:.</p>
-</div>
-<ol><li><span>Right-click a resource (a project, folder, or file) from the <span class="uicontrol">Project
-
-Navigator</span> view.</span></li>
-<li><span>Select <span class="menucascade"><span class="uicontrol">Link Utilities</span> &gt; <span class="uicontrol">Convert
-
-Links</span></span>; the Convert Links dialog opens.</span></li>
-<li><span>Select one of the radio buttons to choose a link structure: <span class="uicontrol">Document
-
-relative</span> or <span class="uicontrol">Document root relative</span>.</span></li>
-<li><span>Click <span class="uicontrol">Convert</span></span></li>
-</ol>
-<div class="skipspace"><p>All of the links in the selected resource will be updated to reflect
-
-the chosen path structure.</p>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twlnkfix.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twlnkfix.html
deleted file mode 100644
index 3ada8de..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twlnkfix.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Fixing broken links using the Fixup link references wizard</title>
-</head>
-<body id="twlnkfix"><a name="twlnkfix"><!-- --></a>
-
-<h1 class="topictitle1">Fixing broken links using the Fixup link references wizard</h1>
-<div><div class="skipspace"> <p>You can fix broken links by double clicking on the broken link
-entries in the Problems view and manually correcting the errors, however, to fix a large number of broken
-links, you can use the Fixup Link References wizard. This wizard is especially
-adept at fixing errors that occur if you move a file that is the target
-of links to a different folder.</p>
-<p>To fix links using the Fixup Link References
-wizard, complete the following steps:</p>
-</div>
-<ol><li class="skipspace"><span>Right-click a resource (a project, folder, or file) from the  <a href="ccwebvw.html">Project Explorer</a> view.</span></li>
-<li class="skipspace"><span>Select <span class="menucascade"><span class="uicontrol">Link Utilities</span> &gt; <span class="uicontrol">Fix
-Broken Links</span></span> from the pop-up menu; the Fixup Link
-References wizard opens.</span> The wizard populates the table with
-the broken links, the suggested fixed link (if it can determine this information),
-and the location of the broken link. Each link is designated by the wizard
-to either be fixed or skipped, as indicated by the Fix icon (<img src="../images/fixit.gif" alt="Fix Icon" />) or the Skip icon (<img src="../images/skipit.gif" alt="Skip Icon" />)<p></p>
-To change a designation,
-highlight the link and click on the <b>Fix</b> button or the <b>Skip</b> button.
-The icon in front of the link changes based on your choice. You can also designate
-your choice by clicking directly on the icons. Note that there <u>must</u> be
-data in the <b>Fixed Link</b> field before you can change these designations.
-Each time you change a designation, the counter at the bottom keeps track
-of how many link are selected to be fixed or skipped.</li>
-<li class="skipspace"><span>You can change how the links are structured by selecting one of
-the following styles from the pull-down menu: <span class="uicontrol">Use existing style</span>, <span class="uicontrol">Use
-document relative links</span>, <span class="uicontrol">Use document root relative
-links</span>. The <span class="uicontrol">Fixed Link</span> column is updated
-to reflect the structure selection.</span></li>
-<li class="skipspace"><span>You can check the <span class="uicontrol">Group links that go to the same destination</span> check
-box to group all of the broken links that point to the same location into
-one row in the table.</span>  Any change you make to a grouped row are
-applied to all instances of that broken link.</li>
-<li class="skipspace"><span>Ensure the link text in the <span class="uicontrol">Fixed Link</span> field
-for each link is accurate.</span> <p>When deciding how to fix a broken
-link, it can be useful to look at the <span class="uicontrol">Context</span> box,
-which displays the source where the broken link is located. If you select
-a different broken link in the table, the <span class="uicontrol">Context</span> view
-is refreshed with the source surrounding the selected broken link. Note that
-you cannot enter or change text in the <b>Context</b> box. box.</p>
-<p>If the
-wizard cannot suggest a way to fix the broken link,  you can manually enter
-the text in the <b>Fixed Link</b> field by clicking in the field. You can
-also locate a link by clicking the <span class="uicontrol">Suggestions</span> button
-and navigating to the correct link.</p>
-<ul><li>If you click on the <b>Suggestions</b> button, select one of the entries
-in the <span class="uicontrol">Suggestions</span><b></b> field to populate the <span class="uicontrol">Fixed
-Link</span> field. (Links to resources within the current project are
-listed above suggestions to links to resources in external projects.)  Note
-that all suggestions are structured with paths relative to the document root;
-however, the <span class="uicontrol">Fixed Link</span> field in the Fixup Link Reference
-wizard will be populated according to the structure you designate.</li>
-<li>Alternately, click <b>Browse</b> to locate the location of the link
-target manually. You can browse for a <span class="uicontrol">File</span>, <span class="uicontrol">Servlet</span>,
-or <span class="uicontrol">Class</span>. </li>
-</ul>
- <p>Click <span class="uicontrol">OK</span> when you are satisfied with the new
-link. </p>
- The <b>Fixed Link</b> field is populated in the
-table in the Fixup Link Reference wizard.</li>
-<li class="skipspace"><span>When you are satisfied with your selections and the fixed link
-values, click <span class="uicontrol">Fixup Links</span>. </span> The links
-are all updated to reflect the values in the <span class="uicontrol">Fixed Link</span> column,
-and the wizard closes.</li>
-</ol>
-<div class="skipspace"><p>Another useful feature when fixing broken links is the ability
-to sort the broken links by location. Clicking the <span class="uicontrol">Found in Page</span> heading
-sorts the rows by their location. This may be useful if you want to correct
-broken links based on their page location.</p>
-</div>
-</div>
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="twlnkmgt.html" title="Managing links - overview"></a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twlnkmgt.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twlnkmgt.html
deleted file mode 100644
index 931346e..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twlnkmgt.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title> Managing links - overview</title>
-</head>
-<body id="twlnkmgt"><a name="twlnkmgt"><!-- --></a>
-
-<h1 class="topictitle1"> Managing links - overview</h1>
-<div><div class="skipspace"> <div class="p">There are several ways to manage links within and between Web
-
-projects and external files. You can manage the links manually or you can
-
-set preferences to control how links are managed when you edit, test, or publish
-
-a project. You can specify <ul><li> how default link paths are set</li>
-<li> how links to external files are handled when they are inserted</li>
-<li> how links are handled when you save a file</li>
-<li> how links to a file are handled when the file is renamed.</li>
-</ul>
- </div>
-<p>To specify the default settings for all Web projects, select <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Web
-
-Tools</span> &gt; <span class="uicontrol">Links</span></span></p>
-<div class="p">The initial
-
-default settings are as follows: <ul><li>When you save a file containing link paths beginning with file://, the
-
-path is set relative to the document's local directory. <p>You can change
-
-the default preference so that link paths are relative to the linked document's
-
-root directory. The document root directory (or context root) is the top-level
-
-directory of the Web site when it is deployed to a server.</p>
-</li>
-<li>When you insert links to inaccessible files outside of your project (such
-
-as those in a project that are not in the same EAR), other than HTML or JSP
-
-files, you can specify how you want those linked files to be handled so that
-
-all of the files are available when you publish your project. You can choose
-
-to have the files copied to the project, or change links to the files to a
-
-default relative link path. <p>You can also turn off either or both of these
-
-preferences.</p>
-</li>
-<li>When you save a file, externally linked files (other than HTML and JSPs)
-
-are copied into the current project.  <p>You can change the default so that
-
-instead of having the files copied locally when you save your project, a broken
-
-links dialog is displayed.</p>
-</li>
-<li>When you move or rename a file, links to the file are automatically updated
-
-to reflect the change, and a confirmation window is displayed before any automatic
-
-changes are made. In addition, any links within a file that are moved are
-
-also updated.   <p>You can turn off either or both of these preferences. </p>
-</li>
-</ul>
- </div>
-  <p> <b>Important:</b> Files <u>must</u> be in the WebContent folder
-
-for link validation to work correctly; links between files that are not in
-
-the WebContent folder will be deemed external or broken. </p>
- <p> Broken links
-
-are displayed in the Problems list and are indicated by the <img src="../images/nwlnktsk.gif" alt="Task list problem" /> icon in the first column. </p>
- <p>When
-
-you select a preference that automatically copies files to your directory
-
-or displays the Broken links dialog, files that cannot contain links are copied
-
-or listed in the Broken links dialog. (One exception is CSS files, which can
-
-contain links to HTML and JSP files.)</p>
-<p>HTML and JSP files
-
-are not automatically copied because they are likely to contain links to other
-
-external files. Copying them to a local directory likely would create more
-
-broken links.</p>
-<p>If you need to link to other HTML files or JSP file outside
-
-of your project, you can reference them by mapping a drive to the system and
-
-directory where they are stored. Then set your Default Link Path preference
-
-to <span class="uicontrol">Relative to the Document Root Directory</span>. This way
-
-you can reference files that are already on your Web server without having
-
-the files locally. </p>
-</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="cwlnkvew.html" title="">Links view</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-
-<a href="tjlnkrfr.html" title="">Refreshing the Links view</a><br />
-<a href="twlnkfix.html" title="">Fixing broken links using the Fixup link references wizard</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twlstnwz.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twlstnwz.html
deleted file mode 100644
index 99ace50..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twlstnwz.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating a new listener class</title>
-</head>
-<body id="twlstnwz"><a name="twlstnwz"><!-- --></a>
-
-<h1 class="topictitle1">Creating a new listener class</h1>
-<div><div class="skipspace"> <p> The Life-cycle Listener wizard enables you to create Java™ listener
-
-classes for various J2EE listener types related to servlet context and session
-
-events and attributes.</p>
-<p>To create a listener class, do the following: </p>
- </div>
-<ol><li class="skipspace"><span>Open the Life-cycle Listener wizard. To do this, open the Web
-
-perspective and from the Project Explorer, expand the project (that you have
-
-created), and expand the deployment descriptor icon. Then right click on the <b>Listener</b> icon,
-
-and select <span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">Life-cycle Listener</span></span> from the pop-up menu.</span>  The <span class="uicontrol">Create
-
-Listener</span> wizard appears.</li>
-<li class="skipspace"><span>Specify a listener class. To use an existing class, select the
-
-appropriate check box and then use the <b>Browse</b> button to locate the
-
-class. Otherwise, select <b>Next</b>.</span></li>
-<li class="skipspace"><span>Supply the following information: </span>   <ul><li>The folder where the listener class will be placed</li>
-<li>The Java package that the class will belong to (it is added into a default
-
-package if you do not specify one)</li>
-<li>The class name of the listener. <div class="note"><span class="notetitle">Note: </span>You should place the listener in
-
-the Java source
-
-folder.</div>
-</li>
-<li>The  superclass for the listener class. A listener created by this wizard
-
-can have Object, or any class that has Object in its hierarchy, as its superclass.
-
-Click <span class="uicontrol">Browse</span> to choose from the available superclasses.</li>
-</ul>
- </li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="skipspace"><span>Select a modifier to specify whether your listener classes are
-
-public, abstract, or final. (Classes cannot be both abstract and final.)</span></li>
-<li class="skipspace"><span>You can also add additional interfaces to implement in addition
-
-to the default interfaces. Click <span><span class="uicontrol">Add</span></span> to open
-
-the <span><span class="uicontrol">Interface Selection</span></span> dialog. In this dialog,
-
-as you type the name of the interface that you are interested in adding in
-
-the <span><span class="uicontrol">Choose interfaces</span></span> field, the list of available
-
-interfaces listed in the <span><span class="uicontrol">Matching types</span></span> list
-
-box updates dynamically to display only the interfaces that match the pattern.
-
-Choose an interface to see the <span class="uicontrol">Qualifier</span> and click <span class="uicontrol">Add</span>.
-
-Click <span class="uicontrol">OK</span> when you are finished.</span></li>
-<li class="skipspace"><span>Choose which method stub you want to create. </span> The <span><span class="uicontrol">Inherited
-
-abstract methods</span></span> and <span><span class="uicontrol">Constructors from superclass</span></span> options
-
-add stubs for inherited abstract methods and superclass constructors that
-
-must be implemented (unless you intend to create an abstract listener). One
-
-method with the <span class="uicontrol">Inherited abstract methods</span> option must
-
-be created for the class not to be abstract. </li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-<div class="skipspace"><p>The listener class that you created appears under the Listener
-
-icon.</p>
-</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwebxml.html" title="">The Web deployment descriptor editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.html
deleted file mode 100644
index 90960a9..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Converting static Web projects to dynamic Web projects</title>
-</head>
-<body id="twpcnvrt"><a name="twpcnvrt"><!-- --></a>
-
-<h1 class="topictitle1">Converting static Web projects to dynamic Web projects</h1>
-<div><div class="skipspace"> <p> If you want to add dynamic elements to a static web project,
-
-such as Java™ servlets and JSP files, you must convert the project
-
-from a static to a dynamic one. To convert a static Web project to a dynamic
-
-Web project, complete the following steps:</p>
- </div>
-<ol><li class="skipspace"><span>Select the project in the Project Explorer view, and then select <span><span class="uicontrol">Convert
-
-to a Dynamic Web Project</span></span> from the <b>Project</b> menu.</span> This conversion assumes the  project name and location will be the same.
-
-The conversion does not change the CSS file specified in the original static
-
-project, so it will be included in the resulting dynamic Web project. </li>
-<li class="skipspace"><span> Specify the project properties that are available when  <a href="../../org.eclipse.wst.webtools.doc.user/topics/twcreprj.html">Creating
-
-a Dynamic Web project.</a></span></li>
-</ol>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="../../org.eclipse.wst.webtoolscore.doc.user/topics/ccwebprj.html">Dynamic Web projects and applications</a><br />
-<a href="../../org.eclipse.wst.webtoolscore.doc.user/topics/ccstatic.html">Static Web projects</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.html
deleted file mode 100644
index 9a8fa6d..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding Web library projects</title>
-</head>
-<body id="twplib"><a name="twplib"><!-- --></a>
-
-<h1 class="topictitle1">Adding Web library projects</h1>
-<div><div class="skipspace"> <p>Web library projects allow you to associate Java™ projects
-
-with "virtual" JAR files in a Web project's WEB-INF/lib directory. You can
-
-reference JAR files that exist elsewhere in the Enterprise Application project
-
-that contains your Web project, if they are in the Web project's build path,
-
-and avoid the need to explicitly copy these JAR files into the project's lib
-
-folder before you publish the Web application to a server.</p>
-<p>Currently,
-
-Web Library projects are supported only when testing in the WebSphere test
-
-environment or remotely publishing to a WebSphere<sup>®</sup> Application Server. After these
-
-associations are made, you must restart and republish the server for the changes
-
-to take effect.</p>
-<p>To set up these associations, open the Web perspective
-
-and in the Project Explorer view, complete the following steps: </p>
- </div>
-<ol><li class="skipspace"><span>Expand your project and double-click on the Deployment Descriptor.</span> The Web Deployment Descriptor editor appears.</li>
-<li class="skipspace"><span>In the Overview tab, in the <span><span class="uicontrol">Web Library Projects</span></span> section,
-
-select an existing Java project JAR mapping, or click <span><span class="uicontrol">Add</span></span> to
-
-define a new mapping.</span></li>
-<li class="skipspace"><span>In the <span><span class="uicontrol">Add a Library Project</span></span> dialog,
-
-supply the JAR name that you want to associate with the current project, and
-
-use the <span><span class="uicontrol">Browse</span></span> button to locate and select
-
-the project that contains the JAR file.</span></li>
-<li class="skipspace"><span>Click <span><span class="uicontrol">Finish</span></span></span></li>
-</ol>
-<div class="skipspace"><p>A virtual version of the associated JAR file will appear in the
-
-Libraries folder.</p>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twprjset.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twprjset.html
deleted file mode 100644
index 53fb58f..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twprjset.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Setting Web project properties</title>
-</head>
-<body id="twprjset"><a name="twprjset"><!-- --></a>
-
-<h1 class="topictitle1">Setting Web project properties</h1>
-<div><div class="skipspace"> <p>There are many Web project properties that you can set that affect
-
-the phases in the lifecycle of your project and its dependencies on other
-
-Web resources and Web development processes. You might want to verify or update
-
-these properties after you have updated an existing project or have imported
-
-Web resources into a project .</p>
-<p>To view or set Web project properties,
-
-do the following: </p>
- </div>
-<ol><li class="skipspace"><span>Right-click on a Web Project, and from the pop-up menu select <span><span class="uicontrol">Properties</span></span>.</span></li>
-<li class="skipspace"><span>Select a property type in the left pane of the Properties dialog
-
-to view or update properties in the Web project. For each property, you can
-
-apply changes and modify default settings. Based on whether you have a static
-
-or a dynamic Web project, the following property types are available:</span> <dl><dt class="bold">Info</dt>
-<dd>Provides general information about project type, location, and modification
-
-status. </dd>
-<dt class="bold">BeanInfo Path (Dynamic Web project only)</dt>
-<dd>If you select the Enable Beaninfo Introspection on this project, you can
-
-specify the contents and order of Java™ Bean search paths to provide Bean information
-
-relevant to the project. You can add, remove, and reorder (using the <span>Up</span> and <span>Down</span> buttons)
-
-the packages used to include Bean information.</dd>
-<dt class="bold">Builders</dt>
-<dd>Add, remove, or reorder external tools in the build order. When you select <span class="uicontrol">New</span> to
-
-create a new external tool to the list, the New External Tool wizard opens,
-
-so that you can define the new build tool.</dd>
-<dt class="bold">J2EE (Dynamic Web project only)</dt>
-<dd>Identify Web level specification and modify context root and Web content
-
-folder name</dd>
-<dt class="bold">Java Build
-
-Path (Dynamic Web project only)</dt>
-<dd>View or change the information about the Java build path that you supplied when creating
-
-the project using the <span>Create a DynamicWeb Project</span> wizard. Whenever
-
-the Web project is rebuilt, any class files that are created or updated will
-
-be output to the specified output folder. <div class="note"><span class="notetitle">Note: </span>A library entry on the Java build
-
-path will remain there unless the actual JAR file is deleted from the WEB-INF/lib
-
-folder. If you remove a library path entry but not the JAR file, the library
-
-entry will be re-added to the path automatically.</div>
-</dd>
-<dt class="bold">Java Compiler
-
-(Dynamic Web project only)</dt>
-<dd>Define whether to use workspace settings or project setting for compiling Java code,
-
-including settings for Problems, Style, Compliance and Classfiles, and Build
-
-Path.</dd>
-<dt class="bold">Javadoc Location (Dynamic Web project only)</dt>
-<dd>Define a default location (URL) for any Javadoc available to the project.</dd>
-<dt class="bold">Java JAR
-
-Dependencies (Dynamic Web project only)</dt>
-<dd>Define and reorder JAR dependencies for the project. Note that these dependencies
-
-may differ based on a Web project's association with multiple Enterprise application
-
-projects.</dd>
-<dt class="bold">JSP Task Tags</dt>
-<dd>Add, edit, or remove JSP task tags and assign tag priorities. These "to
-
-do" items appear in your Tasks view.</dd>
-<dt class="bold">JSP Compilation</dt>
-<dd>Specify when in the build process a JSP should be set to compile</dd>
-<dt class="bold">JSP Fragment (dynamic Web project only)</dt>
-<dd>Define default encoding, page directive, and content type values for JSP
-
-fragment documents in the web project.</dd>
-<dt class="bold">Links Validation/Refactoring</dt>
-<dd>Define project-level link management and validation settings. These settings
-
-override corresponding settings in the Workbench Preference settings for the
-
-current project.</dd>
-<dt class="bold">Project References</dt>
-<dd>Reference other Web projects that exist on your workbench workspace.</dd>
-<dt class="bold">Server</dt>
-<dd>Select the server instance used to perform necessary development, test,
-
-and publishing functions for the project.</dd>
-<dt class="bold">Validation</dt>
-<dd>Specify which validators should run for the project, and whether validation
-
-should occur automatically when resource updates are written to the project.
-
-The available validators are based on the types of resources in your project.
-
-By default, validators are automatically run when you save resources in a
-
-Web project. If you do not want validators to run automatically when you save
-
-these resources, enable the <span class="uicontrol">Override validation</span> preferences
-
-option and disable the <span class="uicontrol">Run validation automatically when you save
-
-changes to resources</span> option. <div class="note"><span class="notetitle">Note: </span>You can also  disable automatic
-
-validation (and builds) for all projects by disabling <span class="uicontrol">Perform build
-
- automatically on resource modification</span> from the <span class="uicontrol">Workbench</span> properties.
-
-If  you disable automatic builds, you can manually  run a build (and validation)
-
-by selecting  <span class="menucascade"><span class="uicontrol">Project</span> &gt; <span class="uicontrol">Rebuild
-
-project</span></span>.</div>
-</dd>
-<dt class="bold">Web Content Settings</dt>
-<dd>Provide any applicable Web content settings for a Web project. You can
-
-specify the document type, CSS profile, and target device.</dd>
-<dt class="bold">Web Project Features</dt>
-<dd>Select the features you want to be enabled for your Web project, such
-
-as Page Template support.</dd>
-</dl>
-</li>
-<li class="skipspace"><span>When you have completed updates to Web project settings, click <span><span class="uicontrol">OK</span></span> to
-
-save and close the Properties dialog.</span></li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html
deleted file mode 100644
index b005444..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating servlets</title>
-</head>
-<body id="twsrvwiz"><a name="twsrvwiz"><!-- --></a>
-
-<h1 class="topictitle1">Creating servlets</h1>
-<div><div class="skipspace"> <p>The servlet wizard helps you create Java™ servlets by walking you through the
-
-creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The servlets
-
-can run on J2EE-compliant Web
-
-servers.</p>
-<p>To create a servlet using the Servlet wizard, complete the
-
-following steps: </p>
-</div>
-<ol><li class="skipspace"><span>From the Web perspective, expand your  <a href="../../org.eclipse.wst.webtoolscore.doc.user/topics/ccwebprj.html">dynamic project</a> in the Project Explorer view, and expand
-
-the Deployment Descriptor.</span></li>
-<li class="skipspace"><span>Right click on the <b>Servlet</b> icon, and select <span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">Servlet</span></span> from
-
-the pop-up menu.</span>  The <span class="uicontrol">Create Servlet</span> wizard
-
-appears.</li>
-<li class="skipspace"><span>In the <span class="uicontrol">Create a Servlet</span> page, supply the
-
-following: </span><ol type="a"><li class="skipspace"><span>Type the name and description of the servlet.</span> Notice
-
-that the name that you type in the name field is used as the default URL mapping.</li>
-<li class="skipspace"><span>Optionally add or remove initialization parameters and URL mappings.</span></li>
-<li class="skipspace"><span>Optionally choose an existing servlet class. To do this, select
-
-the <b>Use existing servlet class</b> check box, and then select the <b>Browse</b> button. A window
-
-appears in which you can choose an existing servlet or a JSP.</span></li>
-<li class="skipspace"><span>Optionally choose whether you want to generate an annotated
-
-servlet class.</span></li>
-<li class="skipspace"><span>If you selected an existing servlet class, click <b>Finish</b>;
-
-otherwise, select <b>Next.</b></span></li>
-</ol>
-</li>
-<li class="skipspace"><span>Supply the following information:</span><ol type="a"><li class="skipspace"><span>Specify the folder where the servlet class will be placed, the
-
-package that the class will belong to (it is added into a default package
-
-if you do not specify one), and the class name of the servlet. </span></li>
-<li class="skipspace"><span>Specify a superclass for the servlet class.</span> A servlet
-
-created by this wizard can have HttpServlet, or any class that has HttpServlet
-
-in its hierarchy as its superclass. Click <b>Browse</b> to choose from the
-
-available superclasses.</li>
-<li class="skipspace"><span>Click <b>Finish</b> or click <b>Next</b> for more options.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>Select a modifier to specify whether your servlet class is public,
-
-abstract, or final.</span> (Classes cannot be both abstract and final.)<ol type="a"><li class="skipspace"><span> The javax.servlet.Servlet is provided as the default <span class="uicontrol">Interface</span>.
-
-You can also add additional interfaces to implement. Click <span class="uicontrol">Add</span> to
-
-open the <span><span class="uicontrol">Interface Selection</span></span> dialog.</span> <p>In this dialog, as you type the name of the interface that you are
-
-interested in adding in the <span><span class="uicontrol">Choose interfaces</span></span> field,
-
-the list of available interfaces listed in the <span><span class="uicontrol">Matching types</span></span> list
-
-box updates dynamically to display only the interfaces that match the pattern.
-
-Choose an interface to see the <span class="uicontrol">Qualifier</span>, and then
-
-click <span class="uicontrol">Add</span>. Click <span class="uicontrol">OK</span> when you
-
-are finished.</p>
-</li>
-<li class="skipspace"><span>Select any appropriate method stubs to be created in the servlet
-
-file. The stubs created by using the <span class="uicontrol">Inherited abstract methods</span> option
-
-must be implemented if you do not intend to create an abstract servlet. This
-
-is not true for <span class="uicontrol">Constructors from superclass</span>.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span>.</span> The servlet
-
-is generated.</li>
-</ol>
-</li>
-</ol>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="../../org.eclipse.wst.webtoolscore.doc.user/topics/cwservbn.html">Servlets</a><br />
-<a href="ccwebxml.html" title="">The Web deployment descriptor editor</a><br />
-<!-- <a href="../../com.ibm.etools.wrd.annotation.doc/topics/coverview.html">Annotation-based programming overview</a><br />-->
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="twedtwbx.html" title="">Configuring Web applications using the Web deployment descriptor editor</a><br />
-<!-- <a href="../../com.ibm.etools.wrd.annotation.doc/topics/tadding_web_tag.html">Adding Web annotation tags</a><br />-->
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml b/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml
deleted file mode 100644
index 2149116..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<toc label="Web application development" topic="topics/ccwebvw.html">
-<topic label="Web application - overview" href="topics/ccwtover.html"
-		id="wtoverview">
- <topic label="Web resources - overview" href="topics/ccwebdev.html">
- <topic label="The Web perspective" href="topics/ccwebper.html"/>
- <topic label="Web technologies" href="topics/cwebtechnologies.html" >
-      <topic label="Static Web projects" href="topics/ccstatic.html"/>
-      <topic label="Creating a static Web project" href="topics/twcresta.html"/>
-      <topic label="Dynamic Web projects and applications" href="topics/ccwebprj.html"/>
-       <topic label="Creating a dynamic Web project" href="topics/twcreprj.html"/>
-       <topic label="Converting static Web projects to dynamic Web projects" href="topics/twpcnvrt.html"/>
-      <topic label="Flexible projects"/>
-      <topic label="Web archive (WAR) files" href="topics/cwwarovr.html"/>
-      <topic label="Servlets" href="topics/cwservbn.html"/>
-      <topic label="JavaServer Pages (JSP) technology" href="topics/cpdjsps.html"/>
-      <topic label="Page Data view" href="topics/cpagedataview.html"/>
-      <topic label="Web tools features" href="topics/cwtfeatures.html">
-      </topic>
-   </topic>
-   </topic>
-   <topic label="Project Explorer view and Web development" href="topics/ccwebvw.html">
-   <topic label="Web development tools" href="topics/cwebdevelopmenttools.html">
-   <topic label="The Web deployment descriptor editor" href="topics/ccwebxml.html">
-      <topic label="Working in the Overview page" href="topics/twedtwbx1.html"/>
-      <topic label="Working in the Servlets page" href="topics/twedtwbx2.html"/>
-      <topic label="Working in the Filters Page" href="topics/twedtwbxf.html"/>
-      <topic label="Working in the Security page" href="topics/twedtwbx3.html"/>
-      <topic label="Working in the References Page" href="topics/twedtwbx4.html"/>
-      <!-- <topic label="Working in the WS Handler page" href="topics/twedtwbxwsh.html"/>-->
-      <topic label="Working in the Pages page" href="topics/twedtwbxp.html"/>
-      <topic label="Working in the Variables Page" href="topics/twedtwbxv.html"/>
-      <!-- <topic label="Working in the WS Extensions Page" href="topics/twedtwbxwse.html"/>
-      <topic label="Working in the WS Binding Page" href="topics/twedtwbxwsb.html"/>-->
-      <topic label="Working in the Extensions Page" href="topics/twedtwbxe.html"/>
-      </topic>
-   </topic>
-			</topic>
-
-		</topic>
-   <topic label="Workbench integration with Web editors" href="topics/cwwedtvw.html">
-   <topic label="Web application overview" href="topics/ccwtover.html"/>
-   <topic label="JAR file placement" href="topics/cjarpl.html"/>
-   <topic label="Defining HTML file preferences" href="topics/tjprefs.html"/>
-   <topic label="Creating and editing Web pages - overview" href="topics/tjdetags.html"/>
-   <topic label="Creating a custom tag library" href="topics/tcreatetag.html"/>
-   <topic label="Web page design" href="topics/cwebpagedesign.html"/>
-   <topic label="Web projects" href="topics/cwebprojects.html"/>
-   <topic label="Web resources" href="topics/cwebresources.html"/>
-   <topic label="Web technologies" href="topics/cwebtechnologies.html"/>
-   <topic label="Web tools features" href="topics/cwtfeatures.html"/>
-   <topic label="Links view" href="topics/cwlnkvew.html"/>
-   <topic label="Exporting resources over FTP" href="topics/tcexpftp.html"/>
-   <topic label="Importing class files to Web projects" href="topics/teimpclass.html"/>
-   </topic>
-   <topic label="Specifying an implicit document type for an HTML, XHTML, or JSP fragment" href="topics/tjchgxdt.html"/>
-   <topic label="Creating HTML and XHTML files and framesets" href="topics/tjcrehtm.html"/>
-   <topic label="Creating JavaServer Pages (JSP) files" href="topics/tjcrejsp.html"/>
-   <topic label="Creating a WML or cHTML file" href="topics/tjcrewml.html"/>
-   <topic label="Viewing and navigating links" href="topics/tjlnknav.html"/>
-   <topic label="Refreshing the Links view" href="topics/tjlnkrfr.html"/>
-   <topic label="Converting HTML files to XHTML files" href="topics/tjxhtcnv.html"/>
-   <topic label="Creating a dynamic Web project" href="topics/twcreprj.html"/>
-   <topic label="Creating a static Web project" href="topics/twcresta.html"/>
-   <topic label="Exporting Web Archive (WAR) files" href="topics/twcrewar.html"/>
-   <topic label="Setting CVS repository defaults" href="topics/twcvsr.html"/>
-   <topic label="Configuring Web applications using the Web deployment descriptor editor" href="topics/twedtwbx.html"/>
-   <topic label="Creating a new filter class" href="topics/twfltrwz.html"/>
-   <topic label="Importing Web archive (WAR) files" href="topics/twimpwar.html"/>
-   <topic label="Importing existing Web resources using HTTP or FTP" href="topics/twimpweb.html"/>
-   <topic label="Converting link structure" href="topics/twlnkcnvt.html"/>
-   <topic label="Fixing broken links using the Fixup link references wizard" href="topics/twlnkfix.html"/>
-   <topic label="Managing links - overview" href="topics/twlnkmgt.html"/>
-   <topic label="Creating a new listener class" href="topics/twlstnwz.html"/>
-   <topic label="Adding Web library projects" href="topics/twplib.html"/>
-   <topic label="Setting Web project properties" href="topics/twprjset.html"/>
-   <topic label="Creating servlets" href="topics/twsrvwiz.html"/>
-   <topic label="Palette view" href="topics/cpalette.html">
-   <topic label="Using the Web palette" href="topics/tpalette1.html"/>
-   <topic label="Customizing the Web palette" href="topics/tpalette2.html"/>
-   </topic>
-   <topic label="Server targeting for Web applications" href="topics/tservertarget.html"/>
-   <topic label="Adding or removing an error page from a Web application" href="topics/twedrmerr.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/.project b/docs/org.eclipse.wst.xml.ui.infopop/.project
deleted file mode 100644
index 110ff69..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts.xml b/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts.xml
deleted file mode 100644
index 5c6c0fe..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-
-<context id="webx0060">
-<description>This page lets you specify the line delimiter and the text encoding that will be used when you create or save an XML related file.
-
-Various development platforms use different line delimiters to indicate the start of a new line. Select the operating system that corresponds to your development or deployment platform.
-<b>Note:</b> This delimiter will not automatically be added to any documents that currently exist. It will be added only to documents that you create after you select the line delimiter type and click <b>Apply</b>, or to existing files that you open and then resave after you select the line delimiter type and click <b>Apply</b>.
-
-The encoding attribute is used to specify the default character encoding set that is used when creating XML related files (DTDs, XML files, XML schemas).  Changing the encoding causes any new XML related files that are created from scratch to use the selected encoding.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclispe.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0061">
-<description>This page lets you specify the formatting and content assist preferences that will be used when editing an XML file.
-
-Enter a maximum width in the <b>Line width</b> field to specify the line width to break a line to fit onto more than one line when the document is formatted.
-
-Select <b>Split multiple attributes each on a new line</b> to start every attribute on a new line when the document is formatted.
-
-Select <b>Clear all blank lines</b> to remove blank lines when the document is formatted.
-
-Select <b>Indent using tabs</b> if you want to use tab characters (\t) as the standard formatting indentation.
-
-If you prefer to use spaces, select <b>Indent using spaces</b>.
-
-You can also specify the <b>Indentation size</b> which is the number of tabs or space characters used for formatting indentation.
-
-To apply these formatting styles, select the <b>Format Document</b> menu item.
-
-If the <b>Automatically make suggestions</b> check box is selected, you can specify that certain characters will cause the content assist list to pop up automatically. Specify these characters in the <b>Prompt when these characters are inserted</b> field.
-
-If a DTD or Schema (or other model) is not specified for an XML file, selecting <b>Use inferred grammar in absence of DTD/Schema</b> allows the editor to "guess" what elements or attributes are available based on existing content.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0062">
-<description>This page lets you customize the syntax highlighting that the XML editor does when you are editing a file.
-
-The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
-
-The <b>Foreground</b> and <b>Background</b> push buttons open <b>Color</b> dialog boxes that allow you to specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
-
-Click the <b>Restore Default</b> push button to set the highlighting styles back to their default values.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0063">
-<description>
-This page lets you create new and edit existing templates that will be used when editing an XML file.
-
-Click <b>New</b> if you want to create a completely new template. 
-
-Supply a new template <b>Name</b> and <b>Description</b>. The <b>Context</b> for the template is the context in which the template is available in the proposal list when content assist is requested. Specify the <b>Pattern</b> for your template using the appropriate tags, attributes, or attribute values to be inserted by content assist. 
-If you want to insert a variable, click the <b>Insert Variable</b> button and select the variable to be inserted. For example, the word_selection variable indicates the word that is selected at the beginning of template insertion, and the cursor variable determines where the cursor will be after the template is inserted in the document. 
-
-You can edit, remove, import, or export a template by using the same Preferences page. If you have modified a default template, you can restore it to its default value. You can also restore a removed template if you have not exited from the workbench since it was removed. 
-If you have a template that you do not want to remove but you no longer want it to appear in the content assist list, clear its check box in the Templates preferences page.
-</description>
-<topic label="Adding and removing XML templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html"/>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="xmlm1200">
-<description>Cleanup options enable you to update a document so that it is well-formed and consistently formatted.
-
-The following cleanup options can be set to on or off, so that you can limit the type of cleanup performed:
-- <b>Compress empty element tags</b>: Compress element tags with no content to one tag with an end tag delimiter (ie: change &lt;tag&gt;&lt;/tag&gt; to &lt;tag /&gt;).
-- <b>Insert required attributes</b>: Inserts an missing attributes that are required by the tag to make the element or document well-formed.
-- <b>Insert missing tags</b>: Completes any missing tags (such as adding an end tag) necessary to make the element or document well-formed.
-- <b>Quote attribute values</b>: Appropriately adds double- or single-quotes before and after attribute values if they are missing.
-- <b>Format source</b>: Formats the document just as the <b>Format Document</b> context menu option does, immediately after performing any other specified <b>Cleanup</b> options.
-- <b>Convert line delimiters to</b>: Converts all line delimiters in the file to the selected operating system's type.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipe.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xcui0500">
-<!--Edit attribute dialog -->
-<description>Enter the name of the attribute in the <b>Name</b> field. Enter the value of the attribute in the <b>Value</b> field. Click <b>OK</b>. The attribute will be added to the file.</description>
-</context>
-
-<context id="xcui0010">
-<!--Edit DOCTYPE dialog -->
-<description>The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can use the <b>Public ID</b> field to create an association using an XML Catalog entry or the <b>System ID</b> field to create an association using a file in the workbench.</description>
-</context>
-<context id="xcui0030">
-<description>Public ID Text Edit</description>
-</context>
-<context id="xcui0040">
-<description>Public ID Browse Button</description>
-</context>
-<context id="xcui0020">
-<description>Root Element Name Text Edit</description>
-</context>
-<context id="xcui0050">
-<description>System ID Text Edit</description>
-</context>
-<context id="xcui0060">
-<description>System ID Browse Button</description>
-</context>
-
-<context id="xcui0600">
-<!--Edit element dialog -->
-<description>Enter the name of the element in the <b>Element name </b>field. Click <b>OK</b>. The element will be added to the file.</description>
-</context>
-
-<context id="xcui0300">
-<!--Edit processing instructions dialog -->
-<description>A processing instruction is a syntax in XML for passing instructions along to the application using an XML document. The <b>Target</b> field is used to identify the application the instructions belongs to. The <b>Data </b>field contains the instructions.</description>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts2.xml b/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts2.xml
deleted file mode 100644
index 44a483d..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="xml_source_HelpId">
-<description>The XML source page editor lets you edit a file that is coded in the Extensible Markup Language. The editor provides many text editing features, such as content assist, user-defined templates, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-<topic label="Adding and removing XML templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html"/>
-</context>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xml.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index ec9769b..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: XML infopops
-Bundle-SymbolicName: org.eclipse.wst.xml.ui.infopop; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/about.html b/docs/org.eclipse.wst.xml.ui.infopop/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/build.properties b/docs/org.eclipse.wst.xml.ui.infopop/build.properties
deleted file mode 100644
index 9e10328..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = META-INF/,\
-               EditorXmlContexts.xml,\
-               EditorXmlContexts2.xml,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml,\
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/plugin.properties b/docs/org.eclipse.wst.xml.ui.infopop/plugin.properties
deleted file mode 100644
index 1150e9f..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-pluginName = XML infopops
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml b/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml
deleted file mode 100644
index 756d006..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<?eclipse version="3.1"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-       <contexts file="EditorXmlContexts.xml" plugin ="org.eclipse.wst.xml.ui"/>
-       <contexts file="EditorXmlContexts2.xml" plugin ="org.eclipse.core.runtime"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/.project b/docs/org.eclipse.wst.xmleditor.doc.user/.project
deleted file mode 100644
index 2e33af6..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xmleditor.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index e7ce2c8..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.wst.xmleditor.doc.user; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml b/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml
deleted file mode 100644
index 5b3cc6f..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<toc label="Developing XML files" topic="topics/tcretxml.html">
-   <topic label="Working with XML files">
-      <topic label="Creating XML files">
-         <topic label="Creating an XML file from scratch" href="topics/tcretxml.html"/>
-         <topic label="Generating an XML file from a DTD " href="topics/tcrexdtd.html"/>
-         <topic label="Generating an XML file from an XML schema" href="topics/tcrexxsd.html"/>
-      </topic>
-      <topic label="Editing XML files" href="topics/txedttag.html">
-         <topic label="XML editor" href="topics/cwxmledt.html">
-            <topic label="XML editor integration with the workbench" href="topics/cwwedtvw.html"/>
-            <topic label="Defining XML editor preferences" href="topics/txprefs.html">
-               <topic label="Setting source highlighting styles" href="topics/ttaghilt.html"/>
-               <topic label="Working with XML templates" href="topics/twmacro.html"/>
-               <topic label="Specifying line delimiters" href="topics/tedtenc.html">
-                  <topic label="Specifying XML and HTML encodings" href="topics/cxmlenc.html"/>
-               </topic>
-            </topic>
-         </topic>
-         <topic label="Editing in the Design view" href="topics/txedtdes.html">
-            <topic label="Editing your DOCTYPE declaration" href="topics/tedtdoc.html"/>
-            <topic label="Editing your namespace information" href="topics/tedtsch.html"/>
-            <topic label="Editing your XML processing instructions" href="topics/tedtproc.html"/>
-         </topic>
-         <topic label="Editing in the Source view" href="topics/txedtsrc.html">
-            <topic label="Using XML content assist" href="topics/twcdast.html"/>
-         </topic>
-         <topic label="Editing with DTD or XML schema constraints" href="topics/tedtcnst.html"/>
-         <topic label="Using xsi:type" href="topics/txsityp.html"/>
-         <topic label="Extending the content model of an XML document" href="topics/rextctn.html"/>
-      </topic>
-      <topic label="Validating XML files" href="topics/twxvalid.html"/>
-      <topic label="XML file associations with DTDs and XML schemas" href="topics/cxmlcat.html">
-         <topic label="Adding an entry to the XML Catalog" href="topics/txmlcat.html"/>
-         <topic label="Updating XML files with changes made to DTDs and schemas" href="topics/tedtgram.html"/>
-      </topic>
-      <!-- <topic label="Icons used in the XML editor" href="topics/rxmlbicons.html"/>-->
-   </topic>
-</toc>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/about.html b/docs/org.eclipse.wst.xmleditor.doc.user/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/build.properties b/docs/org.eclipse.wst.xmleditor.doc.user/build.properties
deleted file mode 100644
index b2a5023..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = XMLBuildermap_toc.xml,\
-               about.html,\
-               images/,\
-               plugin.properties,\
-               plugin.xml,\
-               topics/,\
-               META-INF/
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/cdatasection.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/cdatasection.gif
deleted file mode 100644
index 6b0872c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/cdatasection.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/collapse_all.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/collapse_all.gif
deleted file mode 100644
index 7dc0de5..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/collapse_all.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/comment_obj.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/comment_obj.gif
deleted file mode 100644
index 28c2ccb..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/comment_obj.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/doctype.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/doctype.gif
deleted file mode 100644
index 3300f82..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/doctype.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/expand_all.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/expand_all.gif
deleted file mode 100644
index 492c14f..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/expand_all.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/nattrib.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/nattrib.gif
deleted file mode 100644
index bea9974..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/nattrib.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/nelem.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/nelem.gif
deleted file mode 100644
index afabdda..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/nelem.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/nrstrval.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/nrstrval.gif
deleted file mode 100644
index 4742b8c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/nrstrval.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/proinst_obj.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/proinst_obj.gif
deleted file mode 100644
index 74436d8..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/proinst_obj.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/rldgrmr.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/rldgrmr.gif
deleted file mode 100644
index 049cac6..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/rldgrmr.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.properties b/docs/org.eclipse.wst.xmleditor.doc.user/plugin.properties
deleted file mode 100644
index 5142a07..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-Plugin.name = XML editor
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml b/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml
deleted file mode 100644
index 6a201a4..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-  <extension point="org.eclipse.help.toc">
-
-   <toc file="XMLBuildermap_toc.xml"/>               
-                 
-
-
-  </extension>
-
-</plugin>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwwedtvw.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwwedtvw.html
deleted file mode 100644
index adb61e8..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwwedtvw.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>XML editor integration with the workbench</title>
-</head>
-<body id="cwwedtvw"><a name="cwwedtvw"><!-- --></a>
-
-<h1 class="topictitle1">XML editor integration with the workbench</h1>
-<div><p>To edit a file using the XML editor, right-click the file in the
-Navigator view, and click <span class="uicontrol">Open With &gt; XML Editor</span>. Because
-the editor that is last used to open a file becomes the default editor for
-that particular file, the XML editor will remain the default
-XML editor for that file unless you explicitly change it.</p><p>The Resource perspective is designed to facilitate XML development, so
-it contains certain views (such as the Outline and Properties view) that are
-advantageous to XML editor users. If, however, you prefer to work in a different
-perspective, that does not provide these views by default, you can add them
-by clicking <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Show View</span></span> and selecting the appropriate view.</p>
-<dl><dt class="bold">Outline view</dt>
-<dd>The Outline view provides a node-level outline, or roadmap of an XML file.
-This view is especially useful for navigating complex documents, because when
-you select an element in the Outline view, the corresponding nodes in the
-Source and Properties views are also identified as the "active" node. In addition,
-the Outline view is synchronized with the workbench Properties view, so that
-the selected element's attributes and their values are displayed in the Properties
-view (but not the Outline view). You can also use the Outline view to insert
-and delete elements.</dd>
-<dt class="bold">Properties view</dt>
-<dd>The  <span class="uicontrol">Property</span> column in the Properties view contains
-a list of attributes, and the <span class="uicontrol">Value</span> column contains
-the editable values of those attributes. Attributes that are already included
-in the selected or "active" tag are displayed with their values. In addition,
-if the document contains a reference to a DTD or schema, then the attributes
-that are allowed for that tag are also displayed. When you select the value
-column of a property, you are provided with an editing option. <p>The pop-up
-menu in the Properties view contains the following options: undo, cut, copy,
-paste, delete, and select all. The options that are available at a given time
-depend on where the cursor is located when the pop-up menu is displayed. To
-see the pop-up menu options, the property value field must be active. (select
-the property, then select its value.)</p>
- <p>Use the  <span class="uicontrol">Restore Default
-Value</span> toolbar button <img src="../images/nrstrval.gif" alt="Image of the Restore default values button" /> to
-change any value back to its default setting.</p>
- <p>Once you are in the Properties
-view, you can modify other property values for specific attributes. To edit
-another tag using the Properties view, you can select the desired node in
-the workbench Outline view, or select an attribute in the Design or Source
-view of the XML editor.</p>
-</dd>
-</dl>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files">XML editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html
deleted file mode 100644
index b25a8bc..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>XML editor</title>
-</head>
-<body id="cwxmledt"><a name="cwxmledt"><!-- --></a>
-
-<h1 class="topictitle1">XML editor</h1>
-<div><p>The XML editor is a tool for creating and viewing XML files</p><p>You can use it to perform a variety of tasks such as the following:</p>
-<ul><li>Create new XML files, either from scratch, existing DTDs, or existing
-XML schemas</li>
-<li>Edit and validate XML files</li>
-<li>Import existing XML files for structured viewing</li>
-<li>Associate XML files with DTDs or XML schemas</li>
-</ul>
-<p>To make the XML editor the default editor for XML files, select <span class="uicontrol">Window
-&gt; Preferences &gt; Workbench &gt; File Associations</span>, then select <span class="uicontrol">*.xml</span> and <span class="uicontrol">XML
-Editor</span> from the Associated Editors list. Click <span class="uicontrol">OK</span>. </p>
-<p>The XML editor has two main views - the Source view and the
-Design view.</p>
-<div class="skipspace"><h4 class="sectiontitle">Source view</h4><p>The Source view enables you to view
-and work directly with a file's source code directly.</p>
-<p>The Source view has many text editing
-features, such as syntax highlighting, unlimited undo/redo, and user-defined
-macros. Another helpful feature is content assist, which uses the information
-in a DTD or schema content model to provide a list of acceptable continuations
-depending on where the cursor is located in an XML file, or what has just
-been typed. The XML editor Source view also includes a "smart" double-clicking
-behavior. If your cursor is placed in an attribute value, one double-click
-selects that value, another double click selects the attribute-value pair,
-and a third double-click selects the entire tag. This makes it easier to copy
-and paste commonly used pieces of XML.</p>
-</div>
-<div class="skipspace"><h4 class="sectiontitle">Design view</h4><p>The XML editor also has a Design view,
-which represents the XML file simultaneously as a table and a tree. This helps
-make navigation and editing easier. Content and attribute values can be edited
-directly in the table cells, while pop-up menus on the tree nodes give alternatives
-that are valid for that location. For example, the  <span class="uicontrol">Add child</span> menu
-item will list only those elements from a DTD or XML schema which would be
-valid children at that point (as long as grammar constraints are on).</p>
-<p>The
-Design view is especially helpful if you are new to XML, or need to do form-oriented
-editing. For example, you could use the Create XML File wizard to create a
-template XML file for a job description form from a job description 
-DTD. After those steps are completed, you would only have to fill in the form
-data using the Design view.</p>
-<p> <b>Note</b>: You can also use the <b>Outline</b> view
-to insert and delete elements.</p>
-</div>
-</div>
-
-<div>
-<blockquote>
-<div class="ulchildlink"><b><a href="../topics/cwwedtvw.html">XML editor integration with the workbench</a></b><br />
-To edit a file using the XML editor, right-click the file in the
-Navigator view, and click <span class="uicontrol">Open With &gt; XML Editor</span>. Because
-the editor that is last used to open a file becomes the default editor for
-that particular file, the XML editor will remain the default
-XML editor for that file unless you explicitly change it.</div>
-<div class="ulchildlink"><b><a href="../topics/txprefs.html">Defining XML editor preferences</a></b><br />
-You can set various preferences for the Source view of the XML editor such as the formatter indentation style, line wrapping rules, and content assist rules.</div>
-</blockquote>
-
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/txedttag.html" title="">Editing XML files</a><br />
-</p>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cxmlcat.html" title="There are two different ways to associate XML files with DTDs or XML schemas.">XML file associations with DTDs and XML schemas</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcretxml.html" title="You can create a new empty XML file, which you can then edit in the XML editor.">Creating an XML file from scratch</a><br />
-<a href="../topics/txedttag.html" title="Editing XML files"></a><br />
-<a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a><br />
-<a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a><br />
-<a href="../topics/twxvalid.html" title="Validating XML files"></a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html
deleted file mode 100644
index 252b1a4..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>XML file associations with DTDs and XML schemas</title>
-</head>
-<body id="cxmlcat"><a name="cxmlcat"><!-- --></a>
-
-<h1 class="topictitle1">XML file associations with DTDs and XML schemas</h1>
-<div><p>There are two different ways to associate XML files with DTDs or
-XML schemas.</p><ol><li>Direct association - The XML file contains either the name of a DTD in
-its doctype declaration (for example, &lt;!DOCTYPE root-element SYSTEM " <var class="varname">dtdfile.dtd</var>"
-&gt;, where  <var class="varname">dtdfile.dtd</var> is the name of the DTD file) or it
-contains the path of an XML schema in the schemaLocation attribute of the
-XML file root element (for example, &lt;xsi:schemaLocation="http://www.ibm.com
- <var class="varname">schema.xsd</var>"&gt;, where  <var class="varname">schema.xsd</var> is
-the name of the XML schema.</li>
-<li>XML Catalog entry  - You can register DTD and XML schema files in
-the XML Catalog and associate them with a  <var class="varname">Key</var> that represents
-them. You can then refer to a DTD or XML schema file  <var class="varname">Key</var> from
-an XML file instead of referring directly to the DTD or XML schema file. An
-XML Catalog entry contains two parts - the Key (which represents the DTD or
-XML schema) and a URI (which contains information about the DTD or XML schema
-location).</li>
-</ol>
-<div class="skipspace"><h4 class="sectiontitle">How an association works </h4><b>Associating an XML
-file with a DTD </b><div class="p">If an XML file is associated with a DTD, a DOCTYPE
-tag such as the following is included in the XML file:<pre>&lt;!DOCTYPE root-name PUBLIC "<var class="varname">InvoiceId</var>" "<var class="varname">C:\mydtds\Invoice.dtd</var>"&gt;</pre>
-</div>
-<p><var class="varname">InvoiceId</var> is the public identifier of
-the DTD file. It is used to associate the XML file with a DTD file (in this
-case, the DTD file is  <var class="varname">Invoice.dtd</var>). If the public identifier
-InvoiceId corresponds to the  <var class="varname">Key</var> of the XML Catalog entry
-for Invoice.dtd, then the  <var class="varname">URI</var> of the XML Catalog entry
-(which contains information about the location of Invoice.dtd) is used to
-locate the DTD. Otherwise, the DOCTYPE's system identifier ( <var class="varname">"C:\mydtds\Invoice.dtd"</var>),
-which refers directly to the file system location of the DTD, is used to locate
-the DTD. </p>
-<p> <b>Note</b>: You can also use a system identifier as
-a Key in an XML Catalog entry. If you use a system identifier as a Key, a
-DOCTYPE tag such as the following is included in an XML file:</p>
-<pre>&lt;!DOCTYPE Root-name SYSTEM "<var class="varname">MyDTD.dtd</var>"&gt; </pre>
-<p>where  <var class="varname">MyDTD.dtd</var> is the system identifier that corresponds
-to the Key of an XML Catalog entry.</p>
-</div>
-<div class="skipspace"><b>Associating an XML file with an XML schema</b><p>If an XML file
-is associated with an XML schema, one or more schema location attributes are
-included in the XML file. The information in the schemaLocation is provided
-as a "hint" to the XML processor. Examples of schemaLocation attributes are
-shown below: </p>
-<div class="p"> <b>Example 1 </b><pre>&lt;purchaseOrder xmlns="http://www.ibm.com"
-xsi:schemaLocation="http://www.ibm.com C:\myschemas\PurchaseOrder.xsd"&gt;
-&lt;shipTo country="US"&gt; 
-...</pre>
-    </div>
-<div class="p"><b>Example 2 </b><pre>&lt;purchaseOrder xmlns="http://www.ibm.com"
-xsi:schemaLocation="http://www.ibm.com PO.xsd"&gt;
-&lt;shipTo country="US"&gt; 
-....</pre>
-  </div>
-<p>In Example 1, the schemaLocation 'hint' ('C:\myschemas\PurchaseOrder.xsd')
-refers directly to the file system location or URI of the XML schema. In this
-case, the schema file will be located by the XML processor directly.</p>
-<p>In
-Example 2, the schemaLocation 'hint' ('PO.xsd') refers to an XML Catalog entry.
-PO.xsd corresponds to the  <var class="varname">Key</var> of the XML Catalog entry
-for PurchaseOrder.xsd, and the URI of the XML Catalog entry (which contains
-information about the location of PurchaseOrder.xsd) will be used to located
-the XML schema.</p>
-<p>In both examples, <samp class="codeph">http://www.ibm.com</samp> in
-the <samp class="codeph">xsi:schemaLocation</samp> tag is a URI that identifies the namespace
-for the XML schema. </p>
-<div class="p">You can also use a namespace as a Key for
-an XML Catalog entry. If you use a namespace as a Key, a schemaLocation tag
-such as the following is included in an XML file:<pre>&lt;purchaseOrder xmlns:="www.ibm.com" 
- xsi:schemaLocation="http://www.ibm.com po/xsd/PurchaseOrder.xsd "&gt;</pre>
-</div>
-<p>The
-schemaLocation attribute points to both the Key and the actual location of
-the schema.</p>
-<p><b>DTD or XML schema resides on a remote server</b></p>
-<p>Several
-functions in the XML editor, such as validation and content assist, require
-the availability of a DTD or an XML schema. The product documentation provides
-usage information for cases when the DTD or XML schema resides on your local
-machine. However, in many cases, the DTD or XML schema may reside on a remote
-server, for example:</p>
-<p><samp class="codeph">&lt;!DOCTYPE Catalog PUBLIC "abc/Catalog"
-"http://xyz.abc.org/dtds/catalog.dtd"&gt;</samp></p>
-<p>Normally, this case
-poses no problem, because the DTD or XML schema can be retrieved from the
-remote server. However, if you are behind a firewall, and do not have a SOCKSified
-system, the workbench currently does not provide a way for you to specify
-a socks server for retrieving a DTD or XML schema. If you are unable to SOCKSify
-your system, the workaround for this problem is to retrieve a copy of the
-DTD or XML schema (using a Web browser, for example) and save that copy on
-your local machine. Then, you can either place a local copy in the same project
-as your XML file, or use the XML Catalog to associate a public identifier
-with the DTD's (local) location.</p>
-<p><b>Note</b>: If you have an XML file
-associated with an XML schema or DTD that is elsewhere in the network, and
-you are working on a machine disconnected from the network, you can follow
-the steps described above if you want to use content assist or validate your
-XML file.  </p>
-</div>
-<div class="skipspace"><h4 class="sectiontitle">Advantages of XML Catalog entry associations</h4><p>If
-you create a direct association between an XML file and an XML schema or DTD
-file, any time you change the location of the schema or DTD you have to track
-down and update all of the referencing XML files with the new location of
-the DTD or schema. If, however, you associate an XML file with an XML schema
-or DTD Key, then, when you change the location of the schema or DTD, you only
-have to update the XML Catalog entry, instead of each individual XML file. </p>
-<p>For
-example, you have a DTD called "Building.dtd", which is associated with five
-XML files - Office.xml, House.xml, Apartment.xml, Bank.xml, and PostOffice.xml.
-You move the DTD file Building.dtd to a new location. If you have a direction
-association between Building.dtd and all the XML files, you will have to update
-the &lt;DOCTTYPE&gt; declaration in each XML file to reflect the new location
-of Building.dtd.  If, however, you have an XML Catalog association, and
-all the XML files just refer to the Key of Building.dtd, then you only have
-to update the URI and all the XML files will point to the new location of
-Building.dtd.</p>
-</div>
-<div class="skipspace"><h4 class="sectiontitle">Updating an entry in the XML Catalog</h4><p>After you have
-updated an entry in the XML Catalog, you may need to refresh the XML editor
-view so that it uses the new information. To do this, click the  <span class="uicontrol">Reload
-Dependencies</span> toolbar button <img src="../images/rldgrmr.gif" /> and
-the view will be updated using the current XML Catalog settings. You only
-need to refresh the XML editor view when you have an XML file open that references
-the XML Catalog entry that was updated.</p>
-<p>For more information, refer
-to the related concepts and tasks below.</p>
-<p>(c) Copyright 2001, World Wide
-Web Consortium (Massachusetts Institute of Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University).</p>
-</div>
-</div>
-
-<div>
-<blockquote>
-<div class="ulchildlink"><b><a href="../topics/txmlcat.html">Adding an entry to the XML Catalog</a></b><br />
-</div>
-<div class="ulchildlink"><b><a href="../topics/tedtgram.html">Updating XML files with changes made to DTDs and schemas</a></b><br />
-If you make changes to a DTD file or XML schema associated with
-an XML file (that is currently open), click <span class="uicontrol">XML &gt; Reload Dependencies</span> to
-update the XML file with these changes.</div>
-</blockquote>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files">XML editor</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a><br />
-<a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing your DOCTYPE declaration</a><br />
-<a href="../topics/txmlcat.html" title="Adding an entry to the XML Catalog"></a><br />
-<a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes.">Updating XML files with changes made to DTDs and schemas</a><br />
-<a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema it is associated with. ">Editing your namespace information</a><br />
-<a href="../topics/tedtproc.html" title="A processing instruction is a syntax in XML for passing instructions along to the application using an XML document.">Editing your XML processing instructions</a><br />
-<a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a><br />
-<a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html
deleted file mode 100644
index a9e9c4d..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>XML and HTML encodings</title>
-</head>
-<body id="cxmlenc"><a name="cxmlenc"><!-- --></a>
-
-<h1 class="topictitle1">XML and HTML encodings</h1>
-<div><p>The HTML and XML editors support the following encodings. The IANA
-name is used in the encoding statement of an XML file, or charset directive
-in an HTML file.</p>
-<div class="skipspace"><table cellpadding="4" cellspacing="0" summary="" frame="border" border="1" rules="all"><thead align="left"><tr><th valign="top" class="firstcol" id="d0e20"> <p><b>XML Encoding (IANA Name)</b></p>
- </th>
-<th valign="top" id="d0e26"> <p><b>Description</b></p>
- </th>
-</tr>
-</thead>
-<tbody><tr><td valign="top" class="firstcol" id="d0e34" headers="d0e20 "> <p>BIG5</p>
- </td>
-<td valign="top" headers="d0e34 d0e26 "> <p>Big5, Traditional Chinese</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e45" headers="d0e20 "> <p>EUC-JP</p>
- </td>
-<td valign="top" headers="d0e45 d0e26 "> <p>EUC encoding, Japanese</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e56" headers="d0e20 "> <p>EUC-KR</p>
- </td>
-<td valign="top" headers="d0e56 d0e26 "> <p>EUC encoding, Korean</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e67" headers="d0e20 "> <p>GB2312</p>
- </td>
-<td valign="top" headers="d0e67 d0e26 "> <p>GBK, Simplified Chinese</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e78" headers="d0e20 ">GB18030</td>
-<td valign="top" headers="d0e78 d0e26 ">National Standard, Chinese</td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e83" headers="d0e20 ">IBM864</td>
-<td valign="top" headers="d0e83 d0e26 ">PC Arabic 
-</td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e88" headers="d0e20 "> <p>ISO-2022-JP</p>
- </td>
-<td valign="top" headers="d0e88 d0e26 "> <p>ISO 2022, Japanese</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e99" headers="d0e20 "> <p>ISO-2022-KR</p>
- </td>
-<td valign="top" headers="d0e99 d0e26 "> <p>ISO 2022, Korean</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e110" headers="d0e20 "> <p>ISO-8859-1</p>
- </td>
-<td valign="top" headers="d0e110 d0e26 "> <p>ISO Latin-1</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e121" headers="d0e20 ">ISO-8859-2</td>
-<td valign="top" headers="d0e121 d0e26 ">Central/East European (Slavic)</td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e126" headers="d0e20 ">ISO-8859-3</td>
-<td valign="top" headers="d0e126 d0e26 ">Southern European</td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e131" headers="d0e20 ">ISO-8859-4</td>
-<td valign="top" headers="d0e131 d0e26 ">ISO 8859-4, Cyrillic</td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e136" headers="d0e20 ">ISO-8859-5</td>
-<td valign="top" headers="d0e136 d0e26 ">ISO 8859-5, Cyrillic</td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e141" headers="d0e20 "> <p>ISO-8859-6</p>
- </td>
-<td valign="top" headers="d0e141 d0e26 ">Arabic (Logical)</td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e152" headers="d0e20 ">ISO-8859-7</td>
-<td valign="top" headers="d0e152 d0e26 ">Greek</td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e157" headers="d0e20 "> <p>ISO-8859-8-I</p>
- </td>
-<td valign="top" headers="d0e157 d0e26 "> <p>Hebrew (Logical)</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e168" headers="d0e20 "> <p>ISO-8859-8</p>
- </td>
-<td valign="top" headers="d0e168 d0e26 "> <p>Hebrew (Visual)</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e179" headers="d0e20 ">ISO-8859-9</td>
-<td valign="top" headers="d0e179 d0e26 ">Turkish</td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e184" headers="d0e20 "> <p>SHIFT_JIS</p>
- </td>
-<td valign="top" headers="d0e184 d0e26 "> <p>Shift-JIS, Japanese</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e195" headers="d0e20 ">TIS-620</td>
-<td valign="top" headers="d0e195 d0e26 ">TISI, Thai</td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e200" headers="d0e20 "> <p>US-ASCII</p>
- </td>
-<td valign="top" headers="d0e200 d0e26 "> <p>US ASCII</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e211" headers="d0e20 "> <p>UTF-8</p>
- </td>
-<td valign="top" headers="d0e211 d0e26 "> <p>ISO 10646/Unicode, one-byte encoding</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e222" headers="d0e20 "> <p>UTF-16</p>
- </td>
-<td valign="top" headers="d0e222 d0e26 "> <p>ISO 10646/Unicode, two-byte encoding</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e233" headers="d0e20 "> <p>UTF-16BE</p>
- </td>
-<td valign="top" headers="d0e233 d0e26 "> <p>Unicode BigEndian</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e244" headers="d0e20 "> <p>UTF-16LE</p>
- </td>
-<td valign="top" headers="d0e244 d0e26 "> <p>Unicode LittleEndian</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e255" headers="d0e20 ">WINDOWS-874</td>
-<td valign="top" headers="d0e255 d0e26 ">Thai, Microsoft<sup>®</sup></td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e262" headers="d0e20 "> <p>WINDOWS-1252</p>
- </td>
-<td valign="top" headers="d0e262 d0e26 "> <p>ISO Latin-1</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e273" headers="d0e20 "> <p>WINDOWS-1255</p>
- </td>
-<td valign="top" headers="d0e273 d0e26 "> <p>Hebrew</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e284" headers="d0e20 "> <p>WINDOWS-1256</p>
- </td>
-<td valign="top" headers="d0e284 d0e26 "> <p>Arabic</p>
- </td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e295" headers="d0e20 ">X-EUC-JP</td>
-<td valign="top" headers="d0e295 d0e26 ">EUC encoding, Japanese (alias for EUC-JP)</td>
-</tr>
-<tr><td valign="top" class="firstcol" id="d0e300" headers="d0e20 ">X-SJIS</td>
-<td valign="top" headers="d0e300 d0e26 ">Shift-JIS, Japanese (alias for SHIFT_JIS)</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.html
deleted file mode 100644
index 0121591..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>XML tools - overview</title>
-</head>
-<body id="cxmltool"><a name="cxmltool"><!-- --></a>
-
-<h1 class="topictitle1">XML tools - overview</h1>
-<div><p>This product provides a comprehensive visual XML development environment.
-The tool set includes components for building DTDs, XML schemas, XML, and
-XSL files.</p><p>The following XML editor tools are available:</p>
-<p>The <b>XML editor</b> is a tool for creating and viewing XML files. You
-can use it to create new XML files, either from scratch, existing DTDs, or
-existing XML schemas. You can also use it to edit XML files, associate them
-with DTDs or schemas, and validate them.</p>
-<p>The <b>DTD editor</b> is a tool for creating and viewing DTDs. Using the
-DTD editor, you can create DTDs, and generate XML schema files.</p>
-<p>The <b>XML schema editor</b> is a tool for creating, viewing, and validating
-XML schemas. You can use the XML schema editor to perform tasks such as creating
-XML schema components, importing and viewing XML schemas, generating relational
-table definitions from XML schemas, and generating Java beans for creating
-XML instances of an XML schema.</p>
-<div class="skipspace">Exercise caution when opening large files with any of the XML editors.
-If the memory limits of the workbench are exceeded, it will abruptly close
-without saving any data (and without warning or error messages). The number
-of elements in an XML file, not its size, is the best indicator of how much
-memory will be required. Memory requirements also depend on what else is open
-in the workbench - in some cases you can open a 15 megabytes file, but in
-other cases a one-megabyte file may cause problems. Therefore, we recommend
-you save all data in the workbench before opening large XML files. This is
-a permanent restriction.</div>
-<div class="skipspace"><p>The
-behavior of the XML parser when encountering an unresolvable URI (for example,
-in a DOCTYPE declaration) is to report a fatal IO error and stop any further
-processing. An unresolved URI is seen neither as a syntactic nor a semantic
-error and as such, the parser does not attempt to handle it. Essentially,
-the document remains unchecked. This is a known problem.</p>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html
deleted file mode 100644
index 2cd4a96..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Extending the content model of an XML document</title>
-</head>
-<body id="rextctn"><a name="rextctn"><!-- --></a>
-
-<h1 class="topictitle1">Extending the content model of an XML document</h1>
-<div><p>You can use the XML schema <samp class="codeph">any</samp> element to extend
-the content model of an XML document.</p><div class="skipspace"><p>For example, you have an XML schema file called Book.xsd which
-contains a complex type called BookType. BookType contains 4 elements (title,
-author, year, and ISBN) and one  <samp class="codeph">any</samp>element. The namespace
-for the <samp class="codeph">any</samp>  element is  <samp class="codeph">##any</samp>. This means
-that in an instance document, you can insert any XML element to extend the
-definition of the BookType. </p>
-<p>You can also provide a more specific
-namespace. For example, you have another schema called My_Book.xsd, which
-contains a complex type called My_BookType. My_BookType contains 4 elements
-(title, author, year, and ISBN) and one  <samp class="codeph">any</samp> element, but
-in this case the namespace for the  BookType element is www.wesley.com. This
-means that in an instance document, you can insert any XML element to extend
-the definition of the BookType, provided that they belong to the namespace
-http://www.wesley.com. </p>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.html
deleted file mode 100644
index 2aa4b59..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Limitations of XML Editor</title>
-</head>
-<body id="rlimitations_slushXML"><a name="rlimitations_slushXML"><!-- --></a>
-
-<h1 class="topictitle1">Limitations of XML Editor</h1>
-<div><p>This section describes known product aspect limitations and workarounds.</p><div class="skipspace" id="rlimitations_slushXML__unresolv_URI"><a name="rlimitations_slushXML__unresolv_URI"><!-- --></a><p>The
-behavior of the XML parser when encountering an unresolvable URI (for example,
-in a DOCTYPE declaration) is to report a fatal IO error and stop any further
-processing. An unresolved URI is seen neither as a syntactic nor a semantic
-error and as such, the parser does not attempt to handle it. Essentially,
-the document remains unchecked. This is a known problem.</p>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html
deleted file mode 100644
index c87997c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating an XML file from scratch</title>
-</head>
-<body id="tcretxml"><a name="tcretxml"><!-- --></a>
-
-<h1 class="topictitle1">Creating an XML file from scratch</h1>
-<div><p>You can create a new empty XML file, which you can then edit in
-the XML editor.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To create an XML
-file from scratch, follow these instructions:</p>
-</div>
-<ol><li class="skipspace"><span>If necessary, create a project to contain the XML file. </span></li>
-<li class="skipspace"><span>In the workbench, click <span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Other</span> &gt; <span class="uicontrol">XML</span> &gt; <span class="uicontrol">XML</span></span>. </span> If you cannot see the <span class="uicontrol">XML</span> option,
-select the <span class="uicontrol">Show All Wizards</span> check box.</li>
-<li class="skipspace"><span>Click  <span class="uicontrol">Next</span>. </span></li>
-<li class="skipspace"><span>Click the  <span class="uicontrol">Create XML file from scratch</span> radio
-button.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next.</span></span></li>
-<li class="skipspace"><span>Select the project or folder that will contain the XML file.</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">File name</span> field, type the name of
-the XML file, for example <kbd class="userinput">MyXMLFile.xml</kbd>. The name of
-your XML file  <var class="varname">must</var> end in <kbd class="userinput">.xml</kbd>.</span></li>
-<li class="skipspace"><span>Click  <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-<div class="skipspace"><p>The XML file appears in the Navigator view and, by default, automatically
-opens in the XML source page editor. The XML source page editor offers limited
-functionality compared to the XML editor, so before editing the file, you
-should close it, then right-click the file in the Navigator view and click <span class="uicontrol">Open
-With &gt; XML Editor</span> to open the file in the XML editor. </p>
-<p>To
-make the XML editor the default editor for XML files, select <span class="uicontrol">Window
-&gt; Preferences &gt; Workbench &gt; File Associations</span>, then select <span class="uicontrol">*.xml</span> and <span class="uicontrol">XML
-Editor</span> from the Associated Editors list. Click <span class="uicontrol">OK</span>. </p>
-</div>
-</div>
-
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files">XML editor</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcrexdtd.html" title="">Generating an XML file from a DTD </a><br />
-<a href="../topics/tcrexxsd.html" title="">Generating an XML file from an XML schema</a><br />
-<a href="../topics/txedttag.html" title="">Editing XML files</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html
deleted file mode 100644
index a55ca56..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Generate an XML file from a DTD</title>
-</head>
-<body id="tcrexdtd"><a name="tcrexdtd"><!-- --></a>
-
-<h1 class="topictitle1">Generating an XML file from a DTD </h1>
-<div><div class="skipspace"><p>You can create an XML file from a DTD file. You can then further
-customize that file in the XML editor. Generating an XML file from a
-DTD can be useful if you want to quickly create an XML file that is based
-on your DTD file.</p>
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives.</p>
-<p>To
-create an XML file from a DTD file follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>In the Navigator view, right-click the DTD file that you want to
-work with.</span></li>
-<li class="skipspace"><span>From its pop-up menu click <span class="menucascade"><span class="uicontrol">Generate</span> &gt; <span class="uicontrol">XML File</span></span>.</span></li>
-<li class="skipspace"><span>Select a project or folder to contain the XML file and type a name
-for it.</span> The name of the file must end in <kbd class="userinput">.xml</kbd>.</li>
-<li class="skipspace"><span>Click  <span class="uicontrol">Next</span>.</span></li>
-<li class="skipspace"><span>Select the <span class="uicontrol">Root element</span> of the XML file.</span> The root element of an XML file is the element that contains all other
-elements in that file. All the elements that you have defined in the DTD will
-be shown in the<span class="uicontrol">Root element</span> list.</li>
-<li class="skipspace"><span>Select from the following content options:  </span><ul><li><span class="uicontrol">Create optional attributes</span> - Both mandatory
-and optional attributes will be generated. </li>
-<li><span class="uicontrol">Create optional elements</span> - Both mandatory and
-optional elements will be generated. </li>
-<li><span class="uicontrol">Create first choice of required choice</span> - 
-The first option of a required choice will be generated in your XML file.</li>
-<li><span class="uicontrol">Fill elements and attributes with data</span> - any
-elements and attributes generated will be filled with sample data.</li>
-</ul>
-  <p>If you do not select any of these options, then only the minimum
-amount of content required for the XML file will be created.</p>
-</li>
-<li class="skipspace"><span>Specify the <span class="uicontrol">Public ID</span> or <span class="uicontrol">System
-ID</span>.</span> You do not need to specify both. If you do, the
-Public ID will be used before the System ID. .</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-<div class="skipspace"><p>The XML file appears in the Navigator view and, by default, automatically
-opens in the XML source page editor. The XML source page editor offers limited
-functionality compared to the XML editor, so before editing the file, you
-should close it, then right-click the file in the Navigator view and click <span class="uicontrol">Open
-With &gt; XML Editor</span> to open the file in the XML editor. </p>
-<p>To
-make the XML editor the default editor for XML files, select <span class="uicontrol">Window
-&gt; Preferences &gt; Workbench &gt; File Associations</span>, then select <span class="uicontrol">*.xml</span> and <span class="uicontrol">XML
-Editor</span> from the Associated Editors list. Click <span class="uicontrol">OK</span>. </p>
-<p>The
-XML file will only contain the selected root element and any elements or attributes
-contained in the root element. You can now add elements, attributes, entities,
-and notations to the XML file, however, they must follow the rules established
-in the DTD that you used to create the XML file.</p>
-</div>
-</div>
-
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files">XML editor</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcretxml.html" title="You can create a new empty XML file, which you can then edit in the XML editor.">Creating an XML file from scratch</a><br />
-<a href="../topics/tcrexxsd.html" title="Generating an XML file from an XML schema"></a><br />
-<a href="../topics/txedttag.html" title="Editing XML files"></a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html
deleted file mode 100644
index b8f8791..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Generating an XML file from an XML schema</title>
-</head>
-<body id="tcrexxsd"><a name="tcrexxsd"><!-- --></a>
-
-<h1 class="topictitle1">Generating an XML file from an XML schema</h1>
-<div><div class="skipspace"><p>You can generate an XML file from an XML schema file. You can
-then further customize that file in the XML editor.</p>
-<p>Generating an XML
-file from an XML schema can be useful if you want to quickly create an XML
-file that is based on your XML schema.</p>
-<p>The following instructions were
-written for the Resource perspective, but they will also work in many other
-perspectives.</p>
-<p>To generate an XML file from a schema file follow these
-steps:</p>
-</div>
-<ol><li class="skipspace"><span>In the Navigator view, right-click the XML schema file that you
-want to work with.</span></li>
-<li class="skipspace"><span>From its pop-up menu click <span class="menucascade"><span class="uicontrol">Generate</span> &gt; <span class="uicontrol">XML File</span></span>.</span></li>
-<li class="skipspace"><span>Select a project or folder to contain the XML file and type a name
-for it.</span> The name of the file must end in<tt class="sysout">.xml.</tt> .</li>
-<li class="skipspace"><span>Click  <span class="uicontrol">Next</span>.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Root element</span> of the XML file.</span> The root element of an XML file is the element that contains all other
-elements in that file. All of the global elements you have defined in the
-XML schema will be included in the Root Element list. If you do not have any
-global elements in your XML schema, you cannot create an XML file from it.</li>
-<li class="skipspace"><span>Select from the following content options:  </span><ul><li><span class="uicontrol">Create optional attributes</span> - Both mandatory
-and optional attributes will be generated</li>
-<li><span class="uicontrol">Create optional elements</span> - Both mandatory and
-optional elements will be generated.</li>
-<li><span class="uicontrol">Create first choice of required choice</span> - 
-The first option of a required choice will be generated in your XML file.</li>
-<li><span class="uicontrol">Fill elements and attributes with data</span> - any
-elements and attributes generated will be filled with sample data.</li>
-</ul>
- If you do not select any of these options, then only the minimum amount
-of content required for the XML file will be created.</li>
-<li class="skipspace"><span>The Namespace information section contains information about the
-target namespace of the XML schema, its prefix, and the schema location.</span> For more information about namespaces and namespace prefixes, refer
-to the Related reference below. </li>
-<li class="skipspace"><span>Select the entry you want to edit and click <span class="uicontrol">Edit</span>. </span></li>
-<li class="skipspace"><span>The value in the <span class="uicontrol">Namespace Name</span> field is
-the target namespace of the XML schema.</span> Your XML file should be
-associated with the same namespace as its XML schema is associated with.</li>
-<li class="skipspace"><span>All qualified elements and attributes in the XML file associated
-with the namespace will be prefixed with the <span class="uicontrol">Prefix</span> value. </span></li>
-<li class="skipspace"><span>The  <span class="uicontrol">Location Hint</span> field contains the location
-of the XML schema.</span></li>
-<li class="skipspace"><span>Click  <span class="uicontrol">OK</span>, then <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-<div class="skipspace"><p>The XML file appears in the Navigator view and, by default, automatically
-opens in the XML source page editor. The XML source page editor offers limited
-functionality compared to the XML editor, so before editing the file, you
-should close it, then right-click the file in the Navigator view and click <span class="uicontrol">Open
-With &gt; XML Editor</span> to open the file in the XML editor. </p>
-<p>To
-make the XML editor the default editor for XML files, select <span class="uicontrol">Window
-&gt; Preferences &gt; Workbench &gt; File Associations</span>, then select <span class="uicontrol">*.xml</span> and <span class="uicontrol">XML
-Editor</span> from the Associated Editors list. Click <span class="uicontrol">OK</span>. </p>
-<p>The
-XML file will contain the selected root element and any elements or attributes
-contained in the root element. It also contains information about the XML
-file namespace and location. You can now add elements and attributes to the
-XML file.</p>
-<p><b>Note:</b> In certain cases, when an XML file is generated
-from a complex XML schema file, the XML file may not be valid. If this occurs,
-you can open the generated file in the XML editor and correct any errors that
-occur. Usually, only a few errors need to be fixed. The following XML schema
-constructs may present problems:</p>
-<ol><li>Restrictions. Sometimes restricted elements are erroneously generated. </li>
-<li>Facets: Default generated data values may not conform to complex facets
-(for example, patterns).</li>
-<li> Abstract elements. abstract elements are sometimes erroneously generated.</li>
-</ol>
-</div>
-</div>
-
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files">XML editor</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcretxml.html" title="You can create a new empty XML file, which you can then edit in the XML editor.">Creating an XML file from scratch</a><br />
-<a href="../topics/tcrexdtd.html" title="Generating an XML file from a DTD"></a><br />
-<a href="../topics/txedttag.html" title="Editing XML files"></a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html
deleted file mode 100644
index 1de0528..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing with DTD or XML schema constraints</title>
-</head>
-<body id="tedtcnst"><a name="tedtcnst"><!-- --></a>
-
-<h1 class="topictitle1">Editing with DTD or XML schema constraints</h1>
-<div><p>In the Design view, when you edit an XML file that has a set of
-constraints (that is, a set of rules) defined by a DTD or an XML schema, you
-can turn the constraints on and off to provide flexibility in the way you
-edit, but still maintain the validity of the document periodically.</p><div class="skipspace"><p> When the constraints are turned on, and you are working in the
-Design view, the XML editor prevents you from inserting elements, attributes,
-or attribute values not permitted by the rules of the XML schema or DTD, and
-from removing necessary or predefined sets of tags and values. In this mode,
-an element's content must be valid to use the XML editor's guided editing
-options.</p>
-<p>You may want to turn the constraints off for an XML file if
-you need more flexibility. For example, you want to try working with elements
-or attributes not permitted by the associated DTD or XML schema, without actually
-removing the association with the DTD or XML schema.</p>
-<p>To turn the constraints
-for an XML file off, click <span class="uicontrol">XML &gt; Turn Grammar Constraints Off</span>.
-After you have turned the constraints off for a file, you can insert or delete
-any element or attribute regardless of the DTD or XML schema rules. You can
-create new elements or attributes that are not in the DTD or schema - these
-Design view prompts will only appear when you have turned constraints off.
-The file may not be valid, however, if you do this. </p>
-<p>The following instructions
-were written for the Resource perspective, but they will also work in many
-other perspectives.</p>
-<p>The following is an example of what you can do if
-you turn the constraints of a DTD off:</p>
-</div>
-<ol><li class="skipspace"><span>Open the XML file in the XML editor (right-click the file in the
-Navigator view and click <span class="uicontrol">Open With &gt; XML Editor</span>). </span></li>
-<li class="skipspace"><span>For example, you have a DTD that specifies that an element requires
-at least one of a specific child element:  </span> <pre>&lt;!ELEMENT parentElement (childElement+)&gt;</pre>
-</li>
-<li class="skipspace"><span>If, in an XML file associated with your DTD, you attempt to remove
-the final child element of the element with the DTD constraints turned on,
-the editor will not allow you to do this, as it will make the document invalid.</span> You can confirm this by using the element's pop-up menu to verify that
-the<span class="uicontrol">Remove</span> option is grayed out.</li>
-<li class="skipspace"><span>To turn the DTD constraints off, click <span class="uicontrol">XML &gt; Turn Grammar
-Constraints Off</span>. </span></li>
-<li class="skipspace"><span>If you attempt to remove the same child element with constraints
-off, the editor will allow you to.</span></li>
-<li class="skipspace"><span>To correct the invalid document, you will have to re-add the necessary
-element, or remove the invalid tagging or value.</span></li>
-</ol>
-<div class="skipspace">If you introduce errors into your files, you must save and validate
-the file in order to see a list of the errors you have introduced. They will
-be listed in the Problems view. After you fix the errors, you must save and
-validate your file again to see if the file is now valid.</div>
-</div>
-
-<div>
-
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cxmlcat.html" title="There are two different ways to associate XML files with DTDs or XML schemas.">XML file associations with DTDs and XML schemas</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing your DOCTYPE declaration</a><br />
-<a href="../topics/txmlcat.html" title="Adding an entry to the XML Catalog"></a><br />
-<a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes.">Updating XML files with changes made to DTDs and schemas</a><br />
-<a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema it is associated with. ">Editing your namespace information</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html
deleted file mode 100644
index e551b54..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing your DOCTYPE declaration</title>
-</head>
-<body id="tedtdoc">
-
-<h1 class="topictitle1">Editing your DOCTYPE declaration</h1>
-<div><p>The DOCTYPE declaration in an XML file is used at the beginning
-of it to associate it with a DTD file. You can edit your DOCTYPE declaration
-to change the DTD file your XML file is associated with.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To edit your DOCTYPE
-declaration, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>In the Design view of the XML editor, right-click <span class="uicontrol">DOCTYPE</span> and
-click <span class="uicontrol">Edit DOCTYPE</span>.</span></li>
-<li class="skipspace"><span>The value in the <span class="uicontrol">Root element mame</span> field
-should match the root element of your XML file exactly.</span> You should
-only edit the value in this field if your root element changes.</li>
-<li class="skipspace"><span>You can select a Public ID for any existing XML Catalog entries
-by clicking <span class="uicontrol">Browse</span>. </span> The value in the <span class="uicontrol">Public
-ID</span> field is the Public Identifier. It is used to associate the
-XML file (using an XML Catalog entry) with a DTD file. For more information
-on XML Catalog entries, refer to the related tasks below.</li>
-<li class="skipspace"><span>The value in the <span class="uicontrol">System ID</span> field is the
-DTD the XML file is associated with. Type the path of the DTD file you want
-the XML file associated with in this field. </span>   <b>Note</b>: When
-the XML file is processed by the XML processor, it will first try to use the
-Public ID to locate the DTD, and if this fails, it will use the System ID
-to find it.</li>
-<li class="skipspace"><span>Click  <span class="uicontrol">OK</span>.</span></li>
-</ol>
-</div>
-
-<div>
-
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cxmlcat.html" title="There are two different ways to associate XML files with DTDs or XML schemas.">XML file associations with DTDs and XML schemas</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a><br />
-<a href="../topics/txmlcat.html" title="Adding an entry to the XML Catalog"></a><br />
-<a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes.">Updating XML files with changes made to DTDs and schemas</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html
deleted file mode 100644
index 0301f7e..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Specifying line delimiters</title>
-</head>
-<body id="tedtenc"><a name="tedtenc"><!-- --></a>
-
-<h1 class="topictitle1">Specifying line delimiters</h1>
-<div><p>Various development platforms use different line delimiters to
-indicate the start of a new line. Select the operating system that applies
-to your development or deployment platform.</p><div class="skipspace"><p>The following instructions were written for the
-XML perspective, but they will also work in many other perspectives.</p>
-<p>To
-specify the line delimiter you want to use:</p>
-</div>
-<ol><li><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Web and XML files</span> &gt; <span class="uicontrol">XML Files</span></span>.</span></li>
-<li><span>From the <span class="uicontrol">Line delimiter</span> field, select the
-operating system that applies to your development or deployment platform. </span></li>
-<li><span>Click  <span class="uicontrol">Apply</span>, then  <span class="uicontrol">OK</span>.</span></li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html
deleted file mode 100644
index 1543d74..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Updating XML files with changes made to DTDs and schemas</title>
-</head>
-<body id="tedtgram"><a name="tedtgram"><!-- --></a>
-
-<h1 class="topictitle1">Updating XML files with changes made to DTDs and schemas</h1>
-<div><p>If you make changes to a DTD file or XML schema associated with
-an XML file (that is currently open), click <span class="uicontrol">XML &gt; Reload Dependencies</span> to
-update the XML file with these changes.</p><div class="skipspace"><p>The changes will be reflected in the guided editing mechanisms
-available in the editor, such as content assist.</p>
-<p>For example, you have
-a DTD file called "Contact.dtd" and an XML file called "Contact.xml" associated
-with it. Contact.dtd contains a root element called  <span class="uicontrol">Contact</span> that
-can contain any of the following children elements:  <span class="uicontrol">Name</span>,
- <span class="uicontrol">PostalAddress</span>,  <span class="uicontrol">Email</span>. If you
-remove the child element  <span class="uicontrol">Email</span> from the DTD, you will
-no longer be able to add an  <span class="uicontrol">Email</span> child element to
-your root element Contact in your Contact.xml file. This change, however,
-will not come into effect until you save your changes in the DTD and click <span class="uicontrol">XML
-&gt; Reload Dependencies</span> in the XML editor. Until you click it, you
-will still be able to add <span class="uicontrol">Email</span> elements to Contact.xml.</p>
-<p>This
-feature is very handy when you are making updates to both DTDs and XML schemas
-and XML files that are associated with DTDs and XML schemas.</p>
-</div>
-</div>
-
-<div>
-
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cxmlcat.html" title="There are two different ways to associate XML files with DTDs or XML schemas.">XML file associations with DTDs and XML schemas</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a><br />
-<a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing your DOCTYPE declaration</a><br />
-<a href="../topics/txmlcat.html" title="Adding an entry to the XML Catalog"></a><br />
-<a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema it is associated with. ">Editing your namespace information</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html
deleted file mode 100644
index 5f6f40d..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing your XML processing instructions</title>
-</head>
-<body id="tedtproc"><a name="tedtproc"><!-- --></a>
-
-<h1 class="topictitle1">Editing your XML processing instructions</h1>
-<div><p>A processing instruction is a syntax in XML for passing instructions
-along to the application using an XML document.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To edit a processing
-instruction, follow these steps:</p>
-</div>
-<ol><li><span>In the Design view of the XML editor, right-click
-your processing instruction, and click <span class="uicontrol">Edit Processing Instruction</span>.</span></li>
-<li><span>The <span class="uicontrol">Target</span> field is used to identify the
-application the instructions belongs to.</span></li>
-<li><span>The <span class="uicontrol">Data</span> field contains the instructions.</span></li>
-<li><span>Click <span class="uicontrol">OK</span>.</span></li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html
deleted file mode 100644
index 4313613..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing your namespace information</title>
-</head>
-<body id="tedtsch"><a name="tedtsch"><!-- --></a>
-
-<h1 class="topictitle1">Editing your namespace information</h1>
-<div><p>Your namespace information is used to provide various information
-about the XML file, such as the XML schema it is associated with. </p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To edit your schema
-information, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>In the Design view of the XML editor, right-click
-your root element and click <span class="uicontrol">Edit Namespaces</span>.</span></li>
-<li class="skipspace"><span>Your XML file may be associated with more than one namespace or
-schema.</span> Select the entry you want to edit and click <span class="uicontrol">Edit</span>.</li>
-<li class="skipspace"><span>The value in the  <span class="uicontrol">Namespace Name</span> field is
-a namespace the XML file is associated with.</span> Your XML file should
-be associated with the same namespace(s) its XML schema is associated with.
-For more information about namespaces, refer to the related reference.</li>
-<li class="skipspace"><span>All qualified elements and attributes in the XML file associated
-with the namespace will be prefixed with the  <span class="uicontrol">Prefix</span> value. </span></li>
-<li class="skipspace"><span>The <span class="uicontrol">Location Hint</span> field contains the location
-of the XML schema the XML file is associated with.</span> An XML Catalog
-Key or a namespace name can be specified in this field.  Click <span class="uicontrol">Browse</span> to
-view all XML schemas in the workbench and XML Catalog. </li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span>, then click <span class="uicontrol">OK</span> again.</span></li>
-</ol>
-<div class="skipspace"><p>If you want to create a new association, click <span class="uicontrol">Add</span> instead
-of <span class="uicontrol">Edit</span>. You can then either click the <span class="uicontrol">Specify
-From Registered Namespace</span> radio button and select the namespace
-declarations you want to add or click the <span class="uicontrol">Specify New Namespace</span> radio
-button and fill in the fields as necessary. </p>
-</div>
-</div>
-
-<div>
-
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cxmlcat.html" title="There are two different ways to associate XML files with DTDs or XML schemas.">XML file associations with DTDs and XML schemas</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a><br />
-<a href="../topics/txmlcat.html" title="Adding an entry to the XML Catalog"></a><br />
-<a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes.">Updating XML files with changes made to DTDs and schemas</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html
deleted file mode 100644
index fd3c5bb..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Setting source highlighting styles</title>
-</head>
-<body id="ttaghilt"><a name="ttaghilt"><!-- --></a>
-
-<h1 class="topictitle1">Setting source highlighting styles</h1>
-<div><p>You can change how the XML source code is displayed in the Source
-view of the XML editor. </p><div class="skipspace"><p>To set highlighting styles for the XML code, follow these steps:</p>
-</div>
-<ol><li><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">XML Files</span> &gt; <span class="uicontrol"> XML
-Styles</span></span>.</span></li>
-<li><span>In the <span class="uicontrol">Content type</span> list, select the source
-tag type that you wish to set a highlighting style for. You can also
-click text in the sample text to specify the source tag type that you wish
-to set a highlighting style for.</span></li>
-<li><span>Click the <span class="uicontrol">Foreground</span> box.</span></li>
-<li><span>Select the color that you want the text of the tag to appear in
-and click <span class="uicontrol">OK</span>.</span></li>
-<li><span>Click the<span class="uicontrol">Background</span> box.</span></li>
-<li><span>Select the color that you want to appear behind the tag and click<span class="uicontrol">OK</span>. </span></li>
-<li><span>Select the <span class="uicontrol">Bold</span> check box if you want to
-make the type bold.</span></li>
-<li><span>Click <span class="uicontrol">Restore Defaults</span> to set
-the highlighting styles back to their default values.</span></li>
-<li><span>Click <span class="uicontrol">OK</span> to save your changes. </span></li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html
deleted file mode 100644
index d9eaeb3..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Using XML content assist</title>
-<script language="JavaScript">
-    function popup_window( url, id, width, height )
-    {
-      popup = window.open( url, id, 'toolbar=no,scrollbars=no,location=no,statusbar=no,menubar=no,resizable=no,width=' + width + ',height=' + height + ',left=,top=' );
-      popup.focus();
-    }
-</script><script language="JavaScript" src="help/liveHelp.js"></script></head>
-<body id="twcdast"><a name="twcdast"><!-- --></a>
-
-<h1 class="topictitle1">Using XML content assist</h1>
-<div><p>You can use content assist to help you finish a tag or line of
-code in the Source view of the XML editor. You can also use content assist
-to insert macros into your XML code. The placement of the cursor in your source
-file provides the context for the content assist to offer suggestions for
-completion.</p><div class="skipspace"><p>You can launch content assist in any of the following ways:</p>
-<ul><li>From the <span class="uicontrol">Edit</span> menu, click <span class="uicontrol">Content Assist</span>,
-or</li>
-<li>Press Ctrl+Space, or</li>
-</ul>
-<p>In addition, you can set up an option that causes content assist to
-pop up automatically when certain characters are typed. To set up this option,
-click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol"> Preferences</span></span> to open the Preferences window, then click <span class="menucascade"><span class="uicontrol">Web
-and XML</span> &gt; <span class="uicontrol">XML Files </span> &gt; <span class="uicontrol">XML Source</span></span> . In the <span class="uicontrol">Content assist</span> group box, select
-the <span class="uicontrol">Automatically make suggestions</span> check box, and supply
-any additional characters that should trigger content assist.</p>
-<p>If your
-cursor is in a position where content assist is available, a pop-up list of
-available choices is displayed when you launch content assist. The list is
-based on the context and whether a DTD or XML schema is associated with the
-XML file being edited. For example, if you have an Address element that can
-contain any of the following children elements: Name, Street, City, Zip Code,
-Country, and Province, if you place your cursor after any of them and launch
-content assist, all of the child elements will be listed in the content assist
-list.</p>
-<p>The content assist list displays all valid tags for the current
-cursor position, including templates. If your grammar constraints are turned
-off, all available tags, not just valid ones are displayed. </p>
-<p> </p>
-<p>As
-you type the first one or two letters of the tag that you want, the list automatically
-refreshes with alphabetized choices that match your input.</p>
-<p><b>Note</b>:
-The list only refreshes as described if you first type <kbd class="userinput">&lt;</kbd> before
-prompting for content assist.</p>
-<p>Scroll down and select the tag that you
-want to use by double-clicking on it. </p>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html
deleted file mode 100644
index 98a950a..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Working with XML templates</title>
-</head>
-<body id="twmacro"><a name="twmacro"><!-- --></a>
-
-<h1 class="topictitle1">Working with XML templates</h1>
-<div><p>XML content assist provides a comment template, a chunk of predefined
-code that you can insert into a file. You can use the default template as
-provided, customize that template, or create your own templates.</p><div class="skipspace">For example, you may work on a group of XML pages that should all
-contain a table with a specific appearance. Create a template that contains
-the tags for that table, including the appropriate attributes and attribute
-values for each tag. (You can copy and paste the tags from a structured text
-editor into the template's Pattern field.) Then select the name of the template
-from a content assist proposal list whenever you want to insert your custom
-table into an XML file.<p>To create a new XML template follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">XML Files</span> &gt; <span class="uicontrol">XML
-Templates</span></span>.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">New</span> if you want to create a completely
-new template.</span></li>
-<li class="skipspace"><span>Supply a new template name and description</span></li>
-<li class="skipspace"><span>Specify the <span class="uicontrol">Context</span> for the template.</span> This is the content in which the template is available in the proposal
-list when content assist is requested. </li>
-<li class="skipspace"><span>Specify the <span class="uicontrol">Pattern</span> for your template using
-the appropriate tags, attributes, or attribute values to be inserted by contente
-assit.</span></li>
-<li class="skipspace"><span>If you want to insert a variable, click the <span class="uicontrol">Variable</span> button
-and select the variable to be inserted. </span>  For example, the word_selection
-variable indicates the word that is selected at the beginning of template
-insertion, and the cursor variable determines where the cursor will be after
-the template is inserted in the HTML document</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
-save your changes.</span></li>
-</ol>
-<div class="skipspace">You can edit, remove, import, or export a template by using the same
-Preferences page. If you have modified a default template, you can restore
-it to its default value. You can also restore a removed template if you have
-not exited from the workbench since it was removed. <p>If you have a template
-that you do not want to remove but you no longer want the template to appear
-in the content assist list, go to the Templates preferences page and templates
-its check box.</p>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html
deleted file mode 100644
index d8840ab..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Validating XML files</title>
-</head>
-<body id="twxvalid"><a name="twxvalid"><!-- --></a>
-
-<h1 class="topictitle1">Validating XML files</h1>
-<div><div class="skipspace"><p>The XML editor will process XML files that are invalid or not
-well-formed. The editor uses heuristics to open a file using the best interpretation
-of the tagging that it can. For example, an element with a missing end tag
-is simply assumed to end at the end of the document. As you make updates to
-a file, the editor incrementally reinterprets your document, changing the
-highlighting, tree view, and so on. Many formation errors are easy to spot
-in the syntax highlighting, so you can easily correct obvious errors on-the-fly.
-However, there will be other cases when it will be beneficial to perform formal
-validation on your documents.</p>
-</div>
-<div class="p"><span>You can validate your file by selecting it in the
-Navigator view, right-clicking it, and clicking <span class="uicontrol">Validate XML file</span>.</span></div>
-<div class="skipspace"><p>Any validation problems are indicated in the Problems view. For
-more details about a problem, right-click on the problem message and click <span class="uicontrol">Show
-Details</span>. </p>
-</div>
-<div class="skipspace"><p>In the Problems view, you can double-click on individual errors,
-and you will be taken to the invalid tag in the file, so that you can make
-corrections. </p>
-<p><b>Note</b>: If you receive an error message indicating
-that the Problems view is full, you can increase the number of error messages
-allowed by selecting <span class="menucascade"><span class="uicontrol">Properties</span> &gt; <span class="uicontrol">Validation</span></span> from the project's pop-up menu and specifying the maximum number
-of error messages allowed. You must select the <span class="uicontrol">Override validation
-preferences</span> check box in order to be able to do this.</p>
-<p>As
-well, you can set up a project's properties so that different types of project
-resources are automatically validated when you save them. From a project's
-pop-up menu select <span class="uicontrol">Properties</span>, then select <span class="uicontrol">Validation</span>.
-Any validators you can run against your  project will be listed in the
-Validation page. </p>
-</div>
-</div>
-
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files">XML editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html
deleted file mode 100644
index 994020f..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing in the Design view</title>
-</head>
-<body id="txedtdes"><a name="txedtdes"><!-- --></a>
-
-<h1 class="topictitle1">Editing in the Design view</h1>
-<div><p>The XML editor has a Design view, which represents the XML file
-simultaneously as a table and a tree. This helps make navigation and editing
-easier. Content and attribute values can be edited directly in the table cells,
-while pop-up menus on the tree elements give alternatives that are valid for
-that particular element.</p><div class="skipspace"><p> For example, the <span class="uicontrol">Add child</span> menu item will
-list only those elements from a DTD or XML schema which would be valid children
-at that point.</p>
-<p>When you have an XML file associated with an XML schema
-or DTD file, certain tags and rules for that file have already been established,
-which is why the Design view can provide prompts (via a pop-up menu) for those
-tags. When you create an XML file that is not associated with an XML schema
-or DTD file, it has no tags or rules associated with it, so the Design view
-cannot provide prompts for specific tags, but it can provide prompts to create
-new elements and attributes.</p>
-<p>For any XML file associated with an XML
-schema or DTD file, you can use the Design view to add any items defined in
-the XML schema or DTD (such as elements and attributes) to the XML file. You
-can also use it to add processing instructions and comments to all XML files. </p>
-<p>For
-more information on the icons used in the Design view, refer to the related
-reference.</p>
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives.</p>
-<p>To
-edit an XML file in the Design view, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open the XML file that you want to work with in the XML editor
-(right-click the file in the Navigator view and click <span class="uicontrol">Open With
-&gt; XML Editor</span>). If necessary, click the <span class="uicontrol">Design</span> tab.</span></li>
-<li class="skipspace"><span>To expand all the items in your XML file, click the <span class="uicontrol">Expand
-All</span> toolbar button  <img src="../images/expand_all.gif" />.</span></li>
-<li class="skipspace"><span>To collapse them, click the <span class="uicontrol">Collapse All</span> toolbar
-button  <img src="../images/collapse_all.gif" />.</span></li>
-<li class="skipspace"><span>Right-click the item that you want to work with.</span> Some
-or all of the following options (as applicable) will be available from the
-pop-up menu that appears. For more information on these options, refer to
-the related tasks:<ul><li> <span class="uicontrol">Add DTD Information</span> - Click this if you want to
-associate the XML file with a DTD</li>
-<li> <span class="uicontrol">Edit DOCTYPE</span> - Click this if you want to edit
-the DOCTYPE declaration.</li>
-<li> <span class="uicontrol">Edit Namespaces</span> - Click this if you want to edit
-the existing namespace information or create a new association with a namespace.</li>
-<li> <span class="uicontrol">Edit Processing Instruction</span> - Click this if you
-want to edit the processing instruction.</li>
-<li> <span class="uicontrol">Remove</span> - Click this if you want to remove the
-item that you have selected from the XML file. This option will not be available
-if the item you want to remove must exist (for example, in your DTD, you have
-declared that "One or more" of the item must always exist in your XML file,
-and the item you have selected is the only one that exists in your XML file).</li>
-<li> <span class="uicontrol">Add Attribute</span> - Click this if you want to add
-an attribute to the element that you selected. Any attributes you are allowed
-to add to the element will be listed. After you have added the attribute to
-the XML file, you can click in the right-hand column to change the value of
-the attribute. If the attribute has set values, they will appear in a list. </li>
-<li> <span class="uicontrol">Add Child</span> - Click this to add another element,
-a comment, or a processing instruction as a child of the parent element.</li>
-<li> <span class="uicontrol">Add Before</span>  - Click this to add a child element,
-comment, or processing instruction that can go before the item you have selected.
-For example, if you have a parent element called "CD Collections" that can
-contain an unlimited amount of children called "CD", you could click a CD
-element and click <span class="menucascade"><span class="uicontrol">Add Before</span> &gt; <span class="uicontrol"> CD</span></span> , as a CD element can go before another CD element.</li>
-<li> <span class="uicontrol">Add After</span> - Click this to add a child element,
-comment, or processing instruction that can go after the item you have selected.
-For example, if you have a parent element called "CD Collections" that can
-contain an unlimited amount of children called "CD", you could click a CD
-element and click  <span class="menucascade"><span class="uicontrol">Add After</span> &gt; <span class="uicontrol"> CD</span></span>, as a CD element can go after another CD element.</li>
-<li> <span class="uicontrol">Replace With</span> - Click this if you want to replace
-one item with another. This option is not available if you turn grammar constraints
-off or if there are no valid alternatives for you to replace the item with.</li>
-</ul>
-</li>
-<li class="skipspace"><span>Click the appropriate option.</span></li>
-</ol>
-<div class="skipspace"><p>Any changes you make in the Design view are also reflected in the
-Source view and the Outline view.</p>
-</div>
-</div>
-
-<div>
-<blockquote>
-<div class="ulchildlink"><b><a href="../topics/tedtdoc.html">Editing your DOCTYPE declaration</a></b><br />
-The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.</div>
-<div class="ulchildlink"><b><a href="../topics/tedtsch.html">Editing your namespace information</a></b><br />
-Your namespace information is used to provide various information about the XML file, such as the XML schema it is associated with. </div>
-<div class="ulchildlink"><b><a href="../topics/tedtproc.html">Editing your XML processing instructions</a></b><br />
-A processing instruction is a syntax in XML for passing instructions along to the application using an XML document.</div>
-</blockquote>
-
-
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files">XML editor</a><br />
-<a href="../topics/cxmlcat.html" title="There are two different ways to associate XML files with DTDs or XML schemas.">XML file associations with DTDs and XML schemas</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html
deleted file mode 100644
index 0e796cb..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing in the Source view</title>
-</head>
-<body id="txedtsrc"><a name="txedtsrc"><!-- --></a>
-
-<h1 class="topictitle1">Editing in the Source view</h1>
-<div><p>You can use the Source view to view and work with a file's source
-code directly.</p><div class="skipspace"><p> The Source view has many text editing features, such as:</p>
-<dl><dt class="bold">Syntax highlighting</dt>
-<dd>Each tag type is highlighted differently, enabling you to easily find
-a certain kind of tag for editing. In addition, syntax highlighting is valuable
-in locating syntax errors. For example, if you begin a comment in the middle
-of the document with <samp class="codeph">&lt;!--</samp> everything until the next <samp class="codeph">--&gt;</samp> is
-considered a comment, and will be highlighted accordingly. The large highlighted
-area will indicate that you need to add <samp class="codeph">--&gt;</samp> to close the
-comment.<p>You can customize the syntax highlighting. Refer to the related
-tasks for more information.</p>
-</dd>
-</dl>
-<dl><dt class="bold">Unlimited undo and redo</dt>
-<dd>These options allow you to incrementally undo and redo every change made
-to a file for the entire editing session. For text, changes are incremented
-one character or set of selected characters at a time.</dd>
-<dt class="bold">Content assist</dt>
-<dd>Content assist helps you finish tags and insert macros. </dd>
-<dt class="bold">Template</dt>
-<dd>You can access templates (using content assist) to help you quickly add
-regularly-used tagging combinations.</dd>
-<dt class="bold">Node selection</dt>
-<dd>Based on the location of your cursor (or selection in the Outline view),
-the node selection indicator highlights the line numbers that include a node
-(for example, an element or attribute), in the vertical ruler in the left
-area of the Source view.</dd>
-<dt class="bold">Pop-up menu options</dt>
-<dd>From the editor's pop-up menu, you have many of the same editing options
-available as you do from the workbench  <b>Edit</b> menu. You can select menu
-options such as: <span class="uicontrol">Cleanup Document,</span> to open the <span class="uicontrol">Cleanup</span> 
-dialog, which contains settings to update a document so that it is well-formed
-and formatted and <span class="uicontrol">Format,</span> which formats either the
-entire document or selected elements.</dd>
-<dt class="bold">"Smart" double clicking</dt>
-<dd>You can use double-click to select attribute values, attribute-value pairs,
-and entire tag sets to quickly update, copy, or remove content.</dd>
-</dl>
-<p>To edit an XML file in the Source view, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open the XML file you want to work with in the XML editor  (right-click
-the file in the Navigator view and click <span class="uicontrol">Open With &gt; XML Editor</span>). </span> You may need to click the <span class="uicontrol">Source</span> tab. Typically,
-all that you will need to do to open the file is to double-click it in the
-Navigator view. If this does not work, right-click it and click <span class="uicontrol">Open
-With &gt; XML Editor</span>.</li>
-<li class="skipspace"><span>Edit the code as necessary, using any of the available features.</span> As you move the cursor within your XML file (or select items from the
-Outline view), the node selection indicator will highlight the line numbers
-that encompass the node (for example, an element or attribute). You can use
-smart double-clicking behavior to select attribute values, attribute-value
-pairs, and entire tag sets to quickly update, copy, or remove content.</li>
-<li class="skipspace"><span>At intervals, you may wish to format individual nodes, or the entire
-XML file to restore element and attribute indentation to see nesting hierarchies
-more clearly in the file.</span></li>
-<li class="skipspace"><span>If desired, validate and save the XML file.</span></li>
-</ol>
-<div class="skipspace"><p>Any changes you make in the Source view are also reflected in the
-Design view and the Outline view.</p>
-</div>
-</div>
-
-<div>
-
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files">XML editor</a><br />
-<a href="../topics/cxmlcat.html" title="There are two different ways to associate XML files with DTDs or XML schemas.">XML file associations with DTDs and XML schemas</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html
deleted file mode 100644
index 97fd11c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing XML files</title>
-</head>
-<body id="txedttag"><a name="txedttag"><!-- --></a>
-
-<h1 class="topictitle1">Editing XML files</h1>
-<div><div class="skipspace"><p>To open an XML file in the XML editor, right-click it in the Navigator
-view and click <span class="menucascade"><span class="uicontrol">Open With</span> &gt; <span class="uicontrol">XML
-Editor</span></span>. To make the XML editor the default editor
-for XML files, select <span class="uicontrol">Window &gt; Preferences &gt; Workbench &gt; File Associations</span>,
-then select <span class="uicontrol">*.xml</span> and <span class="uicontrol">XML Editor</span> from
-the Associated Editors list. Click <span class="uicontrol">OK</span>. </p>
-<p>We
-recommend working in the Resource perspective when you are developing XML
-files.  The views that appear by default in this perspective (such as
-the Outline view) help facilitate XML development.</p>
-<p>The XML editor enables
-you to directly edit XML files.  There are several different views you
-can use to edit your files:</p>
-<ul><li><b>Source view</b> - you can manually insert, edit, and delete elements
-and attributes in the Source view of the XML editor. To facilitate this effort,
-you can use content assist while you are in the Source view.</li>
-<li><b>Design view</b> - you can insert, delete, and edit elements, attributes,
-comments, and processing instructions in this view.</li>
-<li><b>Properties view</b> - you can edit attribute values in this view.</li>
-<li><b>Outline view </b>-  you can insert, delete, and edit elements,
-comments, and processing instructions in this view.</li>
-</ul>
-<p>Often, you may find that you have more than one way to perform a specific
-task. For example, you have an XML file "MySchoolSubjects.xml" associated
-with an XML schema file "SchoolSubjects.xsd" which list all the subjects taught
-in a school. You want to insert a new element "Math" into your file. You can
-do so the following ways:</p>
-<ul><li>In the Outline or Design view, right-click the appropriate parent element
-and select <span class="uicontrol">Math</span> from the <span class="uicontrol">Add Child</span> pop-up
-menu. </li>
-<li>In the Source view, use content assist to help you find the appropriate
-location and code for the <span class="uicontrol">Math</span> element.</li>
-<li>In the Source view, type the code for the <span class="uicontrol">Math</span> element
-in the file.</li>
-</ul>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html
deleted file mode 100644
index 56690a9..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding an entry to the XML Catalog</title>
-</head>
-<body id="txmlcat"><a name="txmlcat"><!-- --></a>
-
-<h1 class="topictitle1">Adding an entry to the XML Catalog</h1>
-<div><div class="skipspace"><p>An XML Catalog entry contains two parts - a Key (which represents
-a DTD or XML schema) and a URI (which contains information about a DTD or
-XML schema's location).  You can place the Key in an XML file. When the
-XML processor encounters it, it will use the XML Catalog entry to find the
-location of the DTD or XML schema associated with the Key.   </p>
-<p>XML
-Catalog entries can be used in various situations. For example, you are working
-on an XML file on your main desktop computer and point its <samp class="codeph">schemaLocation</samp> towards
-a schema called <samp class="codeph">c:\MySchema.xsd</samp>. You then save it to your
-laptop computer so you can work on it later. When you open the file on your
-laptop, however, you encounter a problem - the XML editor cannot find the <samp class="codeph">MySchema.xsd</samp> schema because
-it is actually installed on your D drive. You will have to edit the  <samp class="codeph">schemaLocation</samp>to
-point to <samp class="codeph">d:\MySchema.xsd</samp>. When you have finished editing
-the XML file and are ready to publish it on the Web, you will need to edit
-the URI again so that it points to a resource that is accessible on the Web.
-By now, the problem is obvious. A URI used within an XML file is not as portable
-as you would like it to be. To avoid making frequent changes to your XML document,
-you can use the XML Catalog.</p>
-<p>An XML Catalog entry is used by an XML
-processor when resolving entity references. You can provide rules to the catalog
-to specify how entities should be resolved. If you consider the example above,
-you could specify a rule that redirects an Internet resource reference (for
-example,  <samp class="codeph">"http://www.ibm.com/published-schemas/MySchema.xsd"</samp>)
-so that it points to a resource on the developer's local machine (for example,
- <samp class="codeph">"file:///C:/MySchema.xsd"</samp>). Now, instead of frequently editing
-XML documents to update the URIs (especially when there may be many documents
-in your project), you only need to update a single rule in your XML Catalog.</p>
-<p>More
-information on XML Catalog entries is included in the sample  <a href="aexpledt.html">Exploring
-the XML editor</a>.</p>
-<p>The following instructions were written for the
-XML perspective, but they will also work in many other perspectives.</p>
-<p>To
-add an entry to the XML Catalog, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open the XML file that you want to associate with a DTD or XML
-schema.</span></li>
-<li class="skipspace"><span>Click  <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">XML Catalog</span></span>.</span></li>
-<li class="skipspace"><span>The  <span class="uicontrol">XML Catalog Entries</span> field contains
-a list of any user-defined and plug-in defined catalog entries.</span><ol type="a"><li><span>Select any entry to see details about it in the <span class="uicontrol">Details</span> field. </span></li>
-<li><span>Click <span class="uicontrol">New</span> to create a new catalog entry.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>In the <span class="uicontrol">URI</span> field, type the location of the
-DTD or XML schema. You can only browse for the DTD or XML schema if it
-is located in the workbench.</span></li>
-<li class="skipspace"><span>If you specified a DTD in the <span class="uicontrol">URI</span> field,
-you can select either <span class="uicontrol">Public ID</span> or <span class="uicontrol">System
-ID</span> from the <span class="uicontrol">Key Type</span> field.</span> If
-you select<span class="uicontrol">Public ID,</span> the value you enter in the <span class="uicontrol">Key</span> field
-should be the same as the Public ID in the XML file's DOCTYPE declaration.
-If you select <span class="uicontrol">System ID</span>, the value you enter should
-correspond to the System ID in an XML file's DOCTYPE declaration.</li>
-<li class="skipspace"><span>If you specified an XML schema in the <span class="uicontrol">URI</span> field,
-you can select either <span class="uicontrol">Namespace Name</span> or  <span class="uicontrol">Schema
-Location</span> from the <span class="uicontrol">Key Type</span> field.</span> If the schema defines a target namespace, it will automatically appear
-in the<span class="uicontrol">Key</span> field. Otherwise, you can enter the schema
-location in the <span class="uicontrol">Key</span> field.</li>
-<li class="skipspace"><span>Select the <span class="uicontrol">Specify alternative Web address</span> check
-box if you want to be able to specify an alternate Web address for the resource.</span> This Web address is used when an XML instance is generated from this
-catalog entry.   <b>Note</b>: This option is only available if you select <span class="uicontrol">Public
-ID</span> (for a DTD) or  <span class="uicontrol">Namespace Name</span> (for
-a schema) in the  <span class="uicontrol">Key type</span> field.</li>
-<li class="skipspace"><span>Click  <span class="uicontrol">OK</span>.</span></li>
-<li class="skipspace"><span>Click  <span class="uicontrol">Advanced</span> if you want to import or
-export any XML Catalog settings.</span></li>
-<li class="skipspace"><span>Click  <span class="uicontrol">Export</span> if you want to persist the
-XML Catalog information. Only your user specified entries will be exported.</span><ol type="a"><li class="skipspace"><span>You will be prompted to select a project and provide a file
-name to store your catalog entries in an .xmlcatalog file, which can be opened
-from the Navigator view.</span> Snce your catalog entries are stored in
-an .xmlcatalog file, you can check them in and out and share them like any
-other project resource.</li>
-<li class="skipspace"><span> Click<span class="uicontrol">OK</span>.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>Click  <span class="uicontrol">Import</span> if you want to import an .xmlcatalog
-file.  You will be prompted to select the file you want to import.</span><ol type="a"><li><span>When you import a .xmlcatalog file, any entries in it will be
-loaded into the XML Catalog (and any existing entries will be overwritten). </span></li>
-<li><span>Click <span class="uicontrol">OK</span>.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span> to close the Advanced XML Catalog
-Preferences dialog.</span></li>
-<li class="skipspace"><span>Make sure the XML file is in focus and click the<span class="uicontrol">Reload
-dependencies</span> toolbar button. </span></li>
-</ol>
-<div class="skipspace">The XML file is now associated with the latest version of the XML
-schema or DTD.</div>
-</div>
-
-<div>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cxmlcat.html" title="There are two different ways to associate XML files with DTDs or XML schemas.">XML file associations with DTDs and XML schemas</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a><br />
-<a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing your DOCTYPE declaration</a><br />
-<a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes.">Updating XML files with changes made to DTDs and schemas</a><br />
-<a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema it is associated with. ">Editing your namespace information</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html
deleted file mode 100644
index e524fe3..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Defining XML editor preferences</title>
-</head>
-<body id="txprefs"><a name="txprefs"><!-- --></a>
-
-<h1 class="topictitle1">Defining XML editor preferences</h1>
-<div><p>You can set various preferences for the Source view of the XML
-editor such as the formatter indentation style, line wrapping rules, and content
-assist rules.</p><div class="skipspace"><p>The following instructions were written for the XML perspective,
-but they will also work in many other perspectives.</p>
-<p>To define XML preferences,
-perform the following steps:</p>
-</div>
-<ol><li class="skipspace"><span>Click  <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">XML Files</span> &gt; <span class="uicontrol">XML
-Source</span></span>.</span></li>
-<li class="skipspace"><span>Enter a maximum width for formatted lines in the <span class="uicontrol">Line
-width</span> field</span> The default value is 72. </li>
-<li class="skipspace"><span>Select <span class="uicontrol">Split multiple attributes each on a new line</span> to
-start every attribute on a new line.</span></li>
-<li class="skipspace"><span>The <span class="uicontrol">Indent using tabs</span> check box is selected
-by default.</span> If you clear it, spaces are used instead of tab characters.</li>
-<li class="skipspace"><span>If you want blank lines to be removed when the document is formatted,
-select the <span class="uicontrol">Clear all blank lines</span> check box. </span> By default, blank lines are preserved in a formatted document.</li>
-<li class="skipspace"><span>You can specify certain characters ('&lt;' is default) that will
-cause the content assist list to pop up automatically.  Ensure the <span class="uicontrol">Automatically
-make suggestions</span> check box is selected and specify the characters
-in the  <span class="uicontrol">Prompt when these characters are inserted</span> field. </span></li>
-<li class="skipspace"><span>The <span class="uicontrol">Use inferred grammar in absence of DTD/Schema </span>check
-box is selected by default. </span> If this box is selected, when you
-have an XML file that is not associated with a DTD or XML schema, you will
-still be able to get content assist - the tool will infer what should come
-next in your file based on the existing content.</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
-save your changes.</span></li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html
deleted file mode 100644
index 2e32805..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Using xsi:type</title>
-</head>
-<body id="txsityp"><a name="txsityp"><!-- --></a>
-
-<h1 class="topictitle1">Using xsi:type</h1>
-<div><p>If you have elements in your XML file whose type is a complex type,
-xsi:type support in the XML editor lets you choose between the complex type
-and any other complex types derived from it.</p><div class="skipspace"><p>The XML Schema specification allows you to derive types by extension.
-For example, you have an XML schema and you create a complex type for it called
- <kbd class="userinput">Address</kbd>. You then add some basic elements to <kbd class="userinput">Address</kbd>,
-such as <kbd class="userinput">streetName</kbd> and <kbd class="userinput">city</kbd>. </p>
-<p>After
-this, you derive (by extension) two new complex types from  <kbd class="userinput">Address</kbd> -  <kbd class="userinput">USAddress</kbd> and <kbd class="userinput">UKAddress</kbd> You add a new element to <kbd class="userinput">USAddress</kbd> called
- <kbd class="userinput">state</kbd>, and also a new element to <kbd class="userinput">UKAddress</kbd> called <kbd class="userinput">postcode</kbd>.</p>
-<p>After
-you have done this, you create two more elements - <kbd class="userinput">billTo</kbd> and <kbd class="userinput">shipTo</kbd> -
-as  <tt class="sysout">Address</tt> types <tt class="sysout">.</tt></p>
-<p>When
-you create an XML instance document for an element such as  <tt class="sysout">billTo</tt> or
- <kbd class="userinput">Address</kbd>, an xsi:type attribute will automatically
-be added to it. For example:</p>
-<pre>&lt;billTo xsi:type="ipo:Address"&gt;</pre>
-<p>The
-xsi:type attribute is used to identify derived complex types (as well as complex
-types that have been derived from).</p>
-<p>In the Design view of the XML editor,
-a list will be available, letting you select the appropriate type definition
-(<span class="uicontrol">Address</span>, <span class="uicontrol">USAddress</span>, or  <span class="uicontrol">UKAddress</span>).
-The guided editing for the content model will reflect the type definition
-that you choose. For example, if you select  <span class="uicontrol">USAddress</span> ,
-your <samp class="codeph">billTo</samp> element can contain a <samp class="codeph">state</samp> element,
-but it cannot contain a <samp class="codeph">postcode</samp> element.</p>
-<p>The XML example
-"Editing and validating XML files" demonstrates <b>xsi:type</b> support.</p>
-<p>For
-more information about xsi:type, refer to the <b>Using Derived Types in Instance
-Documents</b> section in   <a href="http://www.w3.org/TR/xmlschema-0/#UseDerivInInstDocs" target="_blank">XML Schema Part 0: Primer.</a></p>
-<p>For
-more information about validation semantics when xsi:type is used, refer to
-the <b>Schema-Related Markup in Documents Being Validated</b> section
-in  <a href="http://www.w3.org/TR/xmlschema-1/#xsi_type" target="_blank">XML Schema Part 1: Structures</a>  </p>
-</div>
-</div>
-<div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/.project b/docs/org.eclipse.wst.xsdeditor.doc.user/.project
deleted file mode 100644
index 82170b5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsdeditor.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xsdeditor.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index a0b556c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.wst.xsdeditor.doc.user; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.xml
deleted file mode 100644
index 1de94e5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<toc label="XML schemas" topic="topics/tcxmlsch.html">
-   <topic label="Working with XML schemas (XSDs)">
-      <topic label="Creating XML schemas" href="topics/tcxmlsch.html">
-         <topic label="Generating an XML schema file from an XML file" href="topics/tcxsdxml.html"/>
-         <topic label="Generating an XML schema file from a relational table" href="topics/txmlfddl.html"/>
-         <topic label="Generating an XML schema from a DTD file" href="../org.eclipse.wst.dtdeditor.doc.user/topics/tgenxmls.html"/>
-      </topic>
-      <topic label="Importing an XML schema" href="topics/timpschm.html"/>
-      <topic label="Navigating XML schemas" href="topics/tnavsrc.html"/>
-      <topic label="Editing XML schema properties" href="topics/tedtschm.html">
-         <topic label="XML schema editor" href="topics/cxmlsced.html">
-            <topic label="Editing XML schema editor preferences" href="topics/tedtpref.html"/>
-         </topic>
-         <topic label="Adding an attribute group" href="topics/taddagrp.html"/>
-         <topic label="Adding a complex type" href="topics/taddcmxt.html"/>
-         <topic label="Adding a content model" href="topics/taddcmod.html">
-            <topic label="Adding an any element" href="topics/taddanye.html"/>
-            <topic label="Adding an element" href="topics/taddelm.html"/>
-            <topic label="Adding an element reference" href="topics/taddelmr.html"/>
-            <topic label="Adding a group reference" href="topics/taddgrpr.html"/>
-         </topic>
-         <topic label="Adding a global attribute" href="topics/taddglba.html"/>
-         <topic label="Adding a global element" href="topics/taddglem.html"/>
-         <topic label="Adding a group" href="topics/taddgrup.html"/>
-         <topic label="Adding an import element" href="topics/taddimpt.html"/>
-         <topic label="Adding an include element" href="topics/taddincl.html"/>
-         <topic label="Adding a notation" href="topics/taddnot.html"/>
-         <topic label="Adding a redefine element" href="topics/taddrdfn.html"/>
-         <topic label="Adding a simple type" href="topics/taddsmpt.html">
-            <topic label="Adding a pattern facet to a simple type" href="topics/taddreg.html"/>
-         </topic>
-      </topic>
-      <topic label="Icons used in the XML schema editor" href="topics/rxsdicons.html"/>
-      <topic label="Deleting XML schema components" href="topics/tdelscmp.html">
-         <topic label="Referential integrity in the XML schema editor" href="topics/rrefintg.html"/>
-      </topic>
-      <topic label="Validating an XML schema" href="topics/tvdtschm.html"/>
-     <!-- <topic label="Generating files from XML schemas">
-         <topic label="Generating Java beans" href="topics/twrpbens.html">
-            <topic label="Data binding rules for Java beans from XML schema files" href="topics/rbndrule.html"/>
-         </topic>
-         <topic label="Generating HTML documentation" href="topics/tgenhtml.html"/>
-         <topic label="Generating a relational table definition" href="topics/tgendll.html"/>
-      </topic>-->
-      <topic label="XML namespaces" href="topics/rnmspc.html"/>
-   </topic>
-</toc>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/about.html b/docs/org.eclipse.wst.xsdeditor.doc.user/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties b/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties
deleted file mode 100644
index b9ce6e5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = XSDeditormap_toc.xml,\
-               about.html,\
-               images/,\
-               plugin.properties,\
-               plugin.xml,\
-               topics/,\
-               xsdeditor_reference_toc.xml,\
-               META-INF/
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAll.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAll.gif
deleted file mode 100644
index 6d74e80..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAll.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAny.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAny.gif
deleted file mode 100644
index a39f93c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAny.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAnyAttribute.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAnyAttribute.gif
deleted file mode 100644
index 5280cc2..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAnyAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttribute.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttribute.gif
deleted file mode 100644
index 79d49d0..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroup.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroup.gif
deleted file mode 100644
index 648462f..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroup.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroupRef.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroupRef.gif
deleted file mode 100644
index a89fa8f..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroupRef.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeRef.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeRef.gif
deleted file mode 100644
index 8365af2..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeRef.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDChoice.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDChoice.gif
deleted file mode 100644
index 89ba825..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDChoice.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDComplexType.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDComplexType.gif
deleted file mode 100644
index 007f852..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDComplexType.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElement.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElement.gif
deleted file mode 100644
index dd45f08..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElement.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElementRef.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElementRef.gif
deleted file mode 100644
index 749acfc..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElementRef.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalAttribute.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalAttribute.gif
deleted file mode 100644
index 79d49d0..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalElement.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalElement.gif
deleted file mode 100644
index dd45f08..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalElement.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroup.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroup.gif
deleted file mode 100644
index 555ef53..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroup.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroupRef.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroupRef.gif
deleted file mode 100644
index 3621342..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroupRef.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDImport.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDImport.gif
deleted file mode 100644
index 9e44ce5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDImport.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDInclude.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDInclude.gif
deleted file mode 100644
index b26c527..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDInclude.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDRedefine.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDRedefine.gif
deleted file mode 100644
index 56964c1..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDRedefine.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSequence.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSequence.gif
deleted file mode 100644
index 8bf3f97..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSequence.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleEnum.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleEnum.gif
deleted file mode 100644
index 11d7958..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleEnum.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimplePattern.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimplePattern.gif
deleted file mode 100644
index a113cf4..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimplePattern.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleType.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleType.gif
deleted file mode 100644
index 75f33c2..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleType.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.properties b/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.properties
deleted file mode 100644
index 45279a5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-Plugin.name = XML schema editor
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.xml
deleted file mode 100644
index 08f2575..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-  <extension point="org.eclipse.help.toc">
-
-   <toc file="XSDeditormap_toc.xml"/>
-            
-   <toc file="xsdeditor_reference_toc.xml"/>
-                
-
-  </extension>
-
-</plugin>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.html
deleted file mode 100644
index eea95e3..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>XML schema editor</title>
-</head>
-<body id="cxmlsced"><a name="cxmlsced"><!-- --></a>
-
-<h1 class="topictitle1">XML schema editor</h1>
-<div><p>XML schemas are an XML language for describing and constraining
-the content of XML files. </p><p>XML schemas are a proposed alternative for the document type definition
-(DTD) based on XML. They are a formal specification of element names that
-indicates which elements are allowed in an XML file, and in which combinations.
-A schema is functionally equivalent to a DTD, but is written in XML; a schema
-also provides for extended functionality such as data typing, inheritance,
-and presentation rules.</p>
-<p>For more information on XML schema, refer to:</p>
-<ul><li> <a href="http://www.w3.org/TR/xmlschema-0/" target="_blank">http://www.w3.org/TR/xmlschema-0/</a> </li>
-<li> <a href="http://www.w3.org/TR/xmlschema-1/" target="_blank">http://www.w3.org/TR/xmlschema-1/</a> </li>
-<li> <a href="http://www.w3.org/TR/xmlschema-2/" target="_blank">http://www.w3.org/TR/xmlschema-2/</a> </li>
-</ul>
-<p>This product provides an XML schema editor for creating, viewing, and validating
-XML schemas. Using the XML schema editor, you can do the following:</p>
-<ul><li>Create and delete XML schema components such as complex types, simple
-types, elements, attributes, attribute groups, and groups</li>
-<li>Edit XML schemas</li>
-<li>Import existing XML schemas for structured viewing</li>
-</ul>
-<p>The XML schema support in the XML schema editor is based on the  </p>
-<p><a href="http://www.w3.org/TR/xmlschema-0/" target="_blank">W3C
-XML Schema Recommendation Specification of 2 May 2001</a></p>
-<p>The XML Schema specification from the W3C Web site is used for validation.</p>
-<div class="skipspace"><h4 class="sectiontitle">XML schema editor views - Graph, Outline, Properties, and
-Source</h4>There are four main views you can work with in the XML schema
-editor:<ul><li>Graph - the Graph view provides a graphical way to edit your schema</li>
-<li>Outline - the Outline view shows you the main components in your XML schema.
-You can use this view to add and remove certain components.</li>
-<li>Properties - the Properties view enables you to edit the properties of
-your XML schema components</li>
-<li>Source - the Source view enables you to edit your source code directly</li>
-</ul>
-</div>
-<div class="skipspace"><h4 class="sectiontitle">Status of the XML schema</h4><p></p>
-<p>Three status indicators
-for the schema are available. They are in the bottom right corner:</p>
-<ul><li> <span class="uicontrol">Writable</span> or <span class="uicontrol">Read Only</span>. </li>
-<li> (Source view only) <span class="uicontrol">Smart Insert</span> or <span class="uicontrol">Overwrite</span>.
-To toggle between these modes, press the <span class="uicontrol">Insert</span> button
-on your keyboard.</li>
-<li> <span class="uicontrol">Line</span> and <span class="uicontrol">column</span> number. </li>
-</ul>
-</div>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcxmlsch.html" title="You can create an XML schema and then edit it using the XML schema editor.">Creating XML schemas</a><br />
-<a href="../topics/tedtschm.html" title="After you create an XML schema, you can edit its various properties, such as its namespace and prefix.">Editing XML schema properties</a><br />
-<a href="../topics/tvdtschm.html" title="Validating an XML schema determines whether the current state of the XML schema file is semantically valid. Any errors will be displayed in the Problems view.">Validating an XML schema</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html
deleted file mode 100644
index a20461b..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>XML namespaces</title>
-</head>
-<body id="rnmspc"><a name="rnmspc"><!-- --></a>
-
-<h1 class="topictitle1">XML namespaces</h1>
-<div><div class="skipspace">XML namespaces are defined by a W3C recommendation, dating 14 January
-1999, called <a href="http://www.w3.org/TR/REC-xml-names/">Namespaces
-in XML</a>. XML tag names should be globally unique, as well as short for
-performance reasons. In order to resolve this conflict, the W3C namespace
-recommendation defines an attribute xmlns which can amend any XML element.
-If it is present in an element, it identifies the namespace for this element.</div>
-<div class="skipspace"><p>The xmlns attribute has the following syntax:</p>
-<p><samp class="codeph"> xmlns: <var class="varname">prefix</var>:namespace</samp> </p>
-<p>where <samp class="codeph">namespace</samp> is a unique URI (such as www.ibm.com) and where <samp class="codeph"><var class="varname">prefix</var></samp> represents
-the namespace and provides a pointer to it.</p>
-<p>In the following customer
-element definition, an accounting namespace is defined in order to be able
-to distinguish the element tags from those appearing in customer records created
-by other business applications:</p>
-<div class="p"><pre>&lt;acct:customer xmlns:acct="http://www.my.com/acct-REV10"&gt;
-	&lt;acct:name&gt;Corporation&lt;/acct:name&gt;
-	&lt;acct:order acct:ref="5566"/&gt;
-	&lt;acct:status&gt;invoice&lt;/acct:status&gt;
-&lt;/acct:customer&gt;  </pre>
- </div>
-<p>The <i>namespace definition</i> in
-the first line assigns the namespace <i>http://www.my.com/acct-REV10</i> to
-the prefix. This prefix is used on the element names such as name in order
-to attach them to the namespace. A second application, for example, a fulfillment
-system, can assign a different namespace to its customer elements:</p>
-<div class="p"><pre>&lt;ful:customer xmlns:ful="http://www.your.com/ful"&gt;
-	&lt;ful:name&gt;Corporation&lt;/ful:name&gt;
-	&lt;ful:order ful:ref="A98756"/&gt;
-	&lt;ful:status&gt;shipped&lt;/ful:status&gt;
- &lt;/ful:customer&gt;</pre>
- </div>
-<p>An application processing both data
-structures is now able to treat the accounting and the fulfillment data differently.
-There is a default namespace. It is set if no local name is assigned in the
-namespace definition:</p>
-<div class="p"><pre>&lt;acct:customer xmlns="http://www.my.com/acct-REV10" xmlns:acct="http://www.my.com/acct-REV10 "&gt;
-&lt;name&gt;Corporation&lt;/name&gt;
-&lt;order acct:ref="5566"/&gt;
-&lt;status&gt;invoice&lt;/status&gt;
-&lt;/customer&gt;</pre>
-</div>
-<p>In this example, all tags in the customer
-record are qualified to reside in the namespace <i>http://www.my.com/acct-REV10.</i> No
-explicit prefix is needed because the default namespace is used. Note that
-the default namespace applies to any attributes definitions.</p>
-</div>
-<div class="skipspace"><h4 class="sectiontitle">XML schemas and namespaces</h4><p>In the XML schema below,
-the default namespace for the schema is defined as the standard XML schema
-namespace <i>http://www.w3.org/2001/XMLSchem</i>a; there is also a schema
-specific namespace <i>http://www.ibm.com</i>.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:TestSchema="http://www.ibm.com"&gt;
- &lt;simpleType name="ZipCodeType"&gt;
- &lt;restriction base="integer"&gt;
-  &lt;minInclusive value="10000"/&gt;
- &lt;maxInclusive value="99999"/&gt;
-&lt;/restriction&gt;
- &lt;/simpleType&gt; 
- &lt;!--element definitions skipped --&gt;  
-&lt;/schema&gt;  </pre>
-</div>
-<p>Assuming that the XML schema defined above
-is saved as <span class="filepath">C:\temp\TestSchema.xsd</span>, a sample XML file
-that validates against this schema is:</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;x:addressList xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xsi:schemaLocation="http://www.ibm.com file:///C:/temp/TestSchema.xsd"&gt;
- xsi:schemaLocation="http://www.ibm.com file:///C:/temp/TestSchema.xsd"&gt;
-&lt;x:address&gt;
- &lt;x:street&gt;x:Vangerowstrasse&lt;/x:street&gt;
-  &lt;x:zipCode&gt;69115&lt;/x:zipCode&gt;
- &lt;x:city&gt;x:Heidelberg&lt;/x:city&gt;
- &lt;/x:address&gt;
-    &lt;x:address&gt; 
-&lt;x:street&gt;x:Bernal Road&lt;/x:street&gt; 
-&lt;x:zipCode&gt;90375&lt;/x:zipCode&gt;
-     &lt;x:city&gt;x:San Jose&lt;/x:city&gt;
- &lt;/x:address&gt;
-&lt;/x:addressList&gt; </pre>
-</div>
-</div>
-<div class="skipspace"><h4 class="sectiontitle">Target namespace</h4><p> The target namespace serves to
-identify the namespace within which the association between the element and
-its name exists. In the case of declarations, this association determines
-the namespace of the elements in XML files conforming to the schema. An XML
-file importing a schema must reference its target namespace in the schemaLocation
-attribute. Any mismatches between the target and the actual namespace of an
-element are reported as schema validation errors. In our example, the target
-namespace is http://www.ibm.com; it is defined in the  XML schema file and
-referenced twice in the XML file. Any mismatch between these three occurrences
-of the namespace lead to validation errors.</p>
-<p> The following are some
-examples of how target namespace and namespace prefixes work in XML schemas
-and their corresponding XML instance documents. </p>
-</div>
-<div class="skipspace"><h4 class="sectiontitle">Sample 1 - A schema with both a default and target namespace
-and unqualified locals</h4><p>The XML schema:  </p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com"&gt;
-&lt;complexType name="AddressType"&gt;
-&lt;sequence&gt;
-&lt;element name="name" type="string"&gt;&lt;/element&gt;
-&lt;/sequence&gt;
-&lt;/complexType&gt;
-&lt;element name="MyAddress" type="x:AddressType"&gt;&lt;/element&gt;
-&lt;/schema&gt; </pre>
- </div>
-<p>A valid XML instance document created from
-this schema looks like this. Local elements and attributes are <i>unqualified</i>.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com x.xsd "&gt;
-&lt;name&gt;Peter Smith&lt;/name&gt;
-&lt;/x:MyAddress&gt; </pre>
-</div>
-<p>When local elements (such as the <i>"name"</i> element)
-and attributes are unqualified in an XML file, then only the root element
-is qualified. So, in this example, the <i>"x"</i> namespace prefix is assigned
-to the root element <i>"MyAddress"</i>, associating it with the namespace <i>"http://www.ibm.com",</i> but
-the<i>"x"</i> prefix is not assigned to the local element <i>"name"</i>.</p>
-</div>
-<div class="skipspace"><h4 class="sectiontitle">Sample 2 - A schema with both a default and target namespace
-and qualified locals</h4><div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com" elementFormDefault="qualified"&gt;
-&lt;complexType name="AddressType"&gt;
-&lt;sequence&gt;
-&lt;element name="name" type="string"&gt;&lt;/element&gt;
-&lt;/sequence&gt;
-&lt;/complexType&gt;
-&lt;element name="MyAddress" type="x:AddressType"&gt;&lt;/element&gt;
- &lt;/schema&gt;  </pre>
-</div>
-<p>A valid XML instance document created from
-this schema looks like this. Local elements and attributes are <i>qualified</i> This
-is because the elementFormDefault attribute is set to qualified in the XML
-schema.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-  &lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.ibm.com x.xsd "&gt; 
-&lt;x:name&gt;Peter Smith&lt;/x:name&gt;
- &lt;/x:MyAddress&gt;</pre>
- </div>
-<p>In this example, the <i>"x"</i> namespace
-prefix is assigned to both the root element <i>"MyAddress"</i> and the local
-element <i>"name"</i>, associating them with the namespace <i>"http://www.ibm.com",</i>.</p>
-</div>
-<div class="skipspace"><h4 class="sectiontitle">Sample 3 - Schema with target Namespace, and explicitly defines
-xmlns:xsd</h4><p>This XML schema adds this attribute:  </p>
-<samp class="codeph">xmlns:xsd="http://www.w3.org/2001/XMLSchema </samp><p>What
-this means is that each of the constructs that are defined by the XML schema
-language will need to be qualified with the <var class="varname">"xsd"</var> prefix.
-For example, xsd:complexType and  xsd:string</p>
-<p>. Note that you can chose
-any other prefixes such as <var class="varname">"xs"</var> or <var class="varname">"foobar"</var> in
-your declaration and usage.</p>
-<p>You can specify this prefix in the XML Schema
-preferences page. For more information, refer to the related tasks below.</p>
-<p>All
-user defined types belong to the namespace  http://www.ibm.com as defined
-by the targetNamespace attribute, and the prefix is <i>"x"</i> as defined
-by the xmlns:x attribute.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com"&gt;
-&lt;xsd:complexType name="AddressType"&gt;
-&lt;xsd:sequence&gt;
-     &lt;xsd:element name="name" type="xsd:string"&gt;&lt;/xsd:element&gt;
-&lt;/xsd:sequence&gt;
- &lt;/xsd:complexType&gt;
- &lt;xsd:element name="MyAddress" type="x:AddressType"&gt;&lt;/xsd:element&gt;
-&lt;/xsd:schema&gt;</pre>
- </div>
-<p>A valid XML instance document created
-from this schema looks like this. Local elements and attributes are <i>unqualified</i>.
-The semantics of qualification is the same as Sample 1.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
- &lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"xsi:schemaLocation="http://www.ibm.com x.xsd "&gt;
-&lt;name&gt;Peter Smith&lt;/name&gt;
- &lt;/x:MyAddress&gt;</pre>
-</div>
-</div>
-<div class="skipspace"><h4 class="sectiontitle">Sample 4 - Schema with undeclared target Namespace that explicitly
-defines xmlns:xsd</h4><p>This XML schema has no target namespace for itself.
-In this case, it is highly recommended that all XML schema constructs be explicitly
-qualified with a prefix such as <i>"xsd"</i>. The definitions and declarations
-from this schema such as <i>AddressType</i> are referenced without namespace
-qualification since there is no namespace prefix.  </p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-&lt;xsd:complexType name="AddressType"&gt;
-&lt;xsd:sequence&gt;
-&lt;xsd:element name="name" type="xsd:string"&gt;&lt;/xsd:element&gt;
-&lt;xsd:element name="name" type="xsd:string"&gt;&lt;/xsd:element&gt;
-&lt;xsd:element name="name" type="xsd:string"&gt;&lt;/xsd:element&gt; 
-&lt;/xsd:sequence&gt; 
-&lt;/xsd:complexType&gt;
-&lt;xsd:element name="MyAddress" type="AddressType"&gt;&lt;/xsd:element&gt; 
-&lt;/xsd:schema&gt; </pre>
-</div>
-<p>A valid XML instance document created
-from the schema looks like this. All elements are <i>unqualified</i>.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;MyAddress xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="x.xsd"&gt;
-&lt;name&gt;name&lt;/name&gt;
-&lt;/MyAddress&gt;</pre>
-  </div>
-</div>
-<div class="skipspace"><h4 class="sectiontitle">Sample 5 - A schema where the target namespace is the default
-namespace</h4><p>This is an XML schema where the target namespace is the
-default namespace. As well, the namespace has no namespace prefix.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
- &lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns="http://www.ibm.com"&gt;
-&lt;xsd:complexType name="AddressType"&gt;
-&lt;xsd:sequence&gt;
-&lt;xsd:element name="name" type="xsd:string"&gt;&lt;/xsd:element&gt;
-&lt;/xsd:sequence&gt;
-&lt;/xsd:complexType&gt;
- &lt;xsd:element name="MyAddress" type="AddressType"&gt;&lt;/xsd:element&gt;
- &lt;/xsd:schema&gt; </pre>
- </div>
-<p>A valid XML instance document created
-from the schema looks like this:</p>
-<div class="p"><pre>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;MyAddress xmlns="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com NewXMLSchema.xsd"&gt;
-&lt;name&gt;name&lt;/name&gt;
- &lt;/MyAddress&gt;  </pre>
- </div>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.html
deleted file mode 100644
index 78cf364..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Referential integrity</title>
-</head>
-<body id="rrefintg"><a name="rrefintg"><!-- --></a>
-
-<h1 class="topictitle1">Referential integrity in the XML schema editor</h1>
-<div><p>When you define a complex type, you can add a content model to
-it and reference a global element. </p><div class="skipspace"><div class="p">For example:<pre>&lt;schema&gt;
-    &lt;element name="comment" type="string"&gt;
-    &lt;complexType name="Items"&gt;
-        &lt;sequence&gt;
-               &lt;element ref="comment"&gt;
-        &lt;/sequence&gt;
-    &lt;/complexType&gt;
-&lt;/schema&gt;</pre>
-</div>
-<p>If the global element (comment) was deleted,
-all references to it would be in error. To prevent this, the XML schema editor
-has a built-in mechanism to handle such referential integrity issues. When
-you delete the global element, the XML schema editor will clean up using the
-following algorithm:</p>
-<ul><li>If there are one or more global elements in the schema, it will change
-all existing references to the first global element.</li>
-<li>If there is no global element, then it will delete the element reference
-from the content model.</li>
-</ul>
-<p>Similar cleanup operations are performed when other types of objects
-are deleted.  The following lists describes various  cleanup operations.
- </p>
-<p>Deleting a global attribute will cause the following cleanup:</p>
-<ol><li>Any content model or attribute group that references the deleted global
-attribute will be reset using the above algorithm.</li>
-</ol>
-<p>Deleting a complex type will cause the following cleanup:</p>
-<ol><li>Any element type that is set to the deleted complex type will be reset
-to the <tt class="sysout">string</tt> type.</li>
-<li>Any complex type that derives from the deleted complex type will be reset
-to no derivation.</li>
-</ol>
-<p>Deleting a simple type will cause the following cleanup:</p>
-<ol><li>Any attribute type that is set to the deleted simple type will be reset
-to the  <tt class="sysout">string</tt> type.</li>
-<li>Any element type that is set to the deleted simple type will be reset
-to the  <tt class="sysout">string</tt> type.</li>
-<li>Any simple type that derives from the deleted simple type will be reset
-to  <tt class="sysout">string</tt> as its base type.</li>
-</ol>
-<p>Deleting a group or attribute group will cause the following cleanup:</p>
-<ol><li>Any complex type that references the deleted group or attribute group
-will be reset using the algorithm similar to the one described earlier for
-deleted global elements.</li>
-</ol>
-</div>
-<div class="skipspace"><h4 class="sectiontitle">Deleting include and import elements</h4><p>When an <samp class="codeph">include</samp> or <samp class="codeph">import</samp> element
-is added to a schema, types from the included or imported schema become visible
-to the current schema. For example, the following schema references the Address
-type from the Address.xsd file</p>
-<div class="p"><pre>&lt;schema targetNamespace="http://www.example.com/IPO"
-xmlns="http://www.w3.org/1999/XMLSchema" 
-xmlns:ipo="http://www.example.com/IPO&gt; 
-&lt;include schemaLocation="F:\vabase\itp\workbench\B2B\Project1\Address.xsd"/&gt;
-&lt;complexType name="PurchaseOrder"&gt;
-&lt;sequence&gt;
-&lt;element name="shipTo" type="ipo:Address"&gt;
-&lt;/sequence&gt;
-&lt;/complexType&gt;
-&lt;/schema&gt;  </pre>
-</div>
-<p>If the included schema is subsequently deleted,
-the <samp class="codeph">include</samp> element would be in error. To prevent this, the
-XML schema editor will perform the necessary cleanup. In this example, the
-type for the element <samp class="codeph">shipTo</samp> would be reset to the  <tt class="sysout">string</tt> data
-type.</p>
-<p>The XML schema editor resets the following type references when
-an include or import element is deleted:</p>
-<ul><li>Global element and element's type</li>
-<li>Attribute type</li>
-<li>Complex type derivation</li>
-<li>Simple type derivation</li>
-</ul>
-<p>The cleanup is similar to the other operations outlined above. The
-XML schema editor will write an information message to the Problems view to
-notify you of such operations.</p>
-<p>(c) Copyright 2001, World Wide Web Consortium
-(Massachusetts Institute of Technology, Institut National de Recherche en
-Informatique et en Automatique, Keio University)  </p>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.html
deleted file mode 100644
index 00efdae..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding an attribute group</title>
-</head>
-<body id="taddagrp"><a name="taddagrp"><!-- --></a>
-
-<h1 class="topictitle1">Adding an attribute group</h1>
-<div><p>An attribute group definition is an association between a name
-and a set of attribute declarations, enabling re-use of the same set in several
-complex type definitions. Named groups of attribute declarations can greatly
-facilitate the maintenance and reuse of common attribute declarations in an
-XML schema.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To add an
-attribute group to an XML schema, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your XML schema in the XML schema editor.</span></li>
-<li class="skipspace"><span>In the Outline view, right-click the XML schema and click  <span class="uicontrol">Add
-Attribute Group</span>.</span> It appears in the <span class="uicontrol">Attribute
-Groups</span> folder.</li>
-<li class="skipspace"><span>Select your new group, and in the Properties view, type a name
-for the attribute group in the  <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>To add an attribute, right-click your attribute group in the Outline
-view, click <span class="uicontrol">Add Attribute</span>.</span> The attribute
-appears below the attribute group in the Outline view.<ol type="a"><li class="skipspace"><span>Select the attribute, and in the Properties view, type the <span class="uicontrol">Name</span> of
-it. </span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">More</span> button and specify the
-type for the attribute.</span>  To specify that an attribute's type is
-anonymous, when the <span class="uicontrol">User-defined simple type</span> radio
-button is selected, click <span class="uicontrol">**anonymous**</span> in the type
-list.  The anonymous type is added to the outline under the attribute.
-Expand the attribute to see it. You can then start adding content to the new
-anonymous type.</li>
-</ol>
-</li>
-<li class="skipspace"><span>An attribute reference provides a reference to a global attribute.
-To add an attribute reference, right-click your attribute group, and click <span class="uicontrol">Add
-Attribute Ref</span>.</span> A declaration that references a global
-attribute enables the referenced attribute to appear in the instance document
-in the context of the referencing declaration. The menu option to add
-an attribute reference only appears if there are global attributes defined
-elsewhere in the document.<ol type="a"><li><span>Select the reference (which appears below the attribute group
-in the Outline view), then select the global attribute you want it to reference
-from the <span class="uicontrol">ref</span> drop down list.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>An attribute group reference provides a reference to an attribute
-group. To add an attribute group reference, right-click your attribute group,
-and click <span class="uicontrol">Add Attribute Group Ref</span>, and fill in the
-field values as necessary.</span> A declaration that references an attribute
-group enables the referenced attribute group to appear in the instance document
-in the context of the referencing declaration. The menu option to add an attribute
-group reference only appears if there are attribute groups defined elsewhere
-in the document.<ol type="a"><li><span>Select the reference (which appears below the attribute group
-in the Outline view), then select the attribute group you want it to reference
-from the <span class="uicontrol">ref</span> drop down list.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>An <samp class="codeph">any</samp> element enables attributes to appear
-in <samp class="codeph">any</samp> elements. To add an <samp class="codeph">any</samp> attribute,
-right-click in your attribute group and click <span class="uicontrol">Add Any Attribute</span>.</span> The <samp class="codeph">any</samp> appears below the attribute group in the Outline
-view. You can specify the following values for an <samp class="codeph">any</samp> attribute:<ul><li>For a <b>namespace</b> value, you can select <b>##any</b> (this allows
-any well-formed XML from any namespace), <b>##local </b> (this allows any
-well-formed XML that is not declared to be in a namespace, <b>##other </b> (this
-allows any well-formed XML that is not from the target namespace of the type
-being defined) or <b>##targetNamespace </b> (which is shorthand for the target
-namespace of the type being defined). </li>
-<li>For a <span class="uicontrol">processContents</span> value, you can select <b>skip</b> (the
-XML processor will not validate the attribute content at all), <b>lax</b> (the
-XML processor will validate the attribute content as much as it can), or <b>strict </b> (the
-XML processor will validate all the attribute content).</li>
-</ul>
- </li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.html
deleted file mode 100644
index 4d58aff..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding an any element</title>
-</head>
-<body id="taddanye"><a name="taddanye"><!-- --></a>
-
-<h1 class="topictitle1">Adding an any element</h1>
-<div><p>You can use the <samp class="codeph">any</samp> element to provide something
-similar to a DTD's ANY content model, however, it must be done in conjunction
-with namespaces. This enables you to include any well-formed XML content,
-such as an HTML Web page that conforms to XHTML 1.0 syntax.</p><div class="skipspace"><p>For example:</p>
-<div class="p"><pre>&lt;element name = "MyWebPage"&gt;
-&lt;complexType&gt;
-&lt;any namespace ="http://www.w3.org/1999/xhtml&gt;
- &lt; minOccurs="1" maxOccurs="unbounded" processContents="skip"/&gt; 
-&lt;/complexType&gt;
-&lt;/element&gt;</pre>
-</div>
-<p>The above schema fragment allows a <var class="varname">&lt;MyWebPage&gt;</var> element
-to contain any well-formed XHTML data that appears in the specified namespace.</p>
-<p>The
-following instructions were written for the Resource perspective, but they
-will also work in many other perspectives. </p>
-<p>To add an <samp class="codeph">any</samp> element,
-follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>In the Outline view, right-click the content model that you want
-to work with and click <span class="uicontrol">Add Any</span>. </span></li>
-<li class="skipspace"><span>Select the new <samp class="codeph">any</samp> element.</span></li>
-<li class="skipspace"><span>In the Properties view of the schema editor, for a <b>namespace</b> value,
-you can select <b>##any</b> (this allows any well-formed XML from any namespace), <b>##local </b> (this
-allows any well-formed XML that is not declared to be in a namespace), <b>##other </b> (this
-allows any well-formed XML that is not from the target namespace of the type
-being defined) or <b>##targetNamespace </b> (which is shorthand for the target
-namespace of the type being defined). </span></li>
-<li class="skipspace"><span>For a <span class="uicontrol">processContents</span> value, you can select <b>skip</b> (the
-XML processor will not validate the attribute content at all), <b>lax</b>(the
-XML processor will validate the attribute content as much as it can), or <b>strict </b> (the
-XML processor will validate all the attribute content).</span></li>
-<li class="skipspace"><span>The <span class="uicontrol">minOccurs</span> value is the number of times
-the <samp class="codeph">any</samp> element must appear. You can select <span class="uicontrol">0</span> if
-you want the element to be optional; otherwise, select <span class="uicontrol">1</span>. </span></li>
-<li class="skipspace"><span>The <span class="uicontrol">maxOccurs</span>value is the maximum number
-of times an <samp class="codeph">any</samp> element may appear. You can select <span class="uicontrol">0</span>, <span class="uicontrol">1</span>,
-or, to indicate there is no maximum number of occurrences, <span class="uicontrol">unbounded</span>.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description, and the <span class="uicontrol">App
-Info</span> page can be used to provide information for applications. </li>
-</ol>
-<div class="skipspace"><p>(c) Copyright 2001, World Wide Web (Massachusetts Institute of
-Technology, Institut National de Recherche en Informatique et en Automatique,
-Keio University).</p>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.html
deleted file mode 100644
index df2166c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a content model</title>
-</head>
-<body id="taddcmod"><a name="taddcmod"><!-- --></a>
-
-<h1 class="topictitle1">Adding a content model</h1>
-<div><p>You can add a content model to an element, global element, a complex
-type, or a group. A content model is the representation of any data that may
-be contained inside the element, global element, complex type, or group.</p><div class="skipspace"><div class="p">There are three different kinds of content models:<ul><li><b>Sequence</b>, which means that all the content model's children can
-appear in an instance of the XML schema. They must, however, appear in the
-order they are listed in the content model.</li>
-<li><b>Choice</b>, which means that only one of the content model's children
-can appear in an instance of the XML schema.</li>
-<li><b>All</b>, which means that all of the content model's children can appear
-once or not at all, and they may appear in any order. If you select this option,
-all of the contents model's children must be individual elements and no element
-in the content model may appear more than once</li>
-</ul>
-</div>
-<p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To add a content
-model, to a global element, complex type, or group, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>In the Outline view, select your global element, complex type,
-or group:</span><ul><li>If you selected an element or global element, you can right-click
-it and click <span class="uicontrol">Add Sequence</span>, <span class="uicontrol">Add Choice</span>,
-or <span class="uicontrol">Add All</span> to add the type of content model you want
-to your element or global element. Your content model is automatically added
-as a child of a local complex type - expand your element or global element
-in the Outline view to see it.</li>
-<li>If you selected a complex type, you can right-click it and click <span class="uicontrol">Add
-Sequence</span>, <span class="uicontrol">Add Choice</span>, or <span class="uicontrol">Add
-All</span> to add the type of content model you want to your complex
-type. Your content model is automatically added as a child of your complex
-type - expand in the Outline view to see it. <b>Note:</b>These
-options will not appear if you have set a base type for your complex type.
-You can either set a base type for your complex type, or you add a content
-model to it, but you cannot do both.</li>
-<li>Your group is automatically created with a sequence content model
-child. Expand it in the Outline view to see it and select it. In the Properties
-view, you can select to change it to a <span class="uicontrol">choice</span> or <span class="uicontrol">all</span> content
-model by selecting these options from the <span class="uicontrol">Kind</span> drop
-down list.</li>
-</ul>
-</li>
-<li class="skipspace"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MinOccurs</span> field.</span> This is the number of times the content model must appear. If you want
-the content model to be optional, select <span class="uicontrol">0</span>. Otherwise,
-select <span class="uicontrol">1</span>. </li>
-<li class="skipspace"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MaxOccurs</span> field.</span> This is the maximum number of times a content model may appear. You
-can select <span class="uicontrol">unbounded</span> to indicate there is no maximum
-number of occurrences.</li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this content model.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description, and the <span class="uicontrol">App
-Info</span> page can be used to provide information for applications. </li>
-</ol>
-<div class="skipspace"><p>You can add the following to a content object model. </p>
-<ul><li>Another content model.</li>
-<li>A group reference which enables the referenced group to appear in the
-instance document in the context of the referencing declaration. This
-menu option only appears if there are global groups defined elsewhere in the
-document or if groups are defined in included schemas.</li>
-<li>An element, fundamental building blocks in XML.</li>
-<li>An element reference, which provides a reference to a global element.
-This menu option only appears if there are global elements defined elsewhere
-in the document.</li>
-<li>An <samp class="codeph">any</samp> element. You can use an <samp class="codeph">any</samp> element
-to extend your content model by any elements belonging to a specified namespace.</li>
-</ul>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html
deleted file mode 100644
index 5a5d833..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a complex type</title>
-</head>
-<body id="taddcmxt"><a name="taddcmxt"><!-- --></a>
-
-<h1 class="topictitle1">Adding a complex type</h1>
-<div><p>A complex type allows elements in its content and may carry attributes.
-You can add as many complex types as you want to an XML schema.</p><div class="skipspace"><p></p>
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives. </p>
-<p>To
-add a complex type to an XML schema, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your XML schema in the XML schema editor.</span></li>
-<li class="skipspace"><span>In the Outline view, select your schema.</span></li>
-<li class="skipspace"><span>In the Graph view, right click in the <b>Types</b> section and
-click <span class="uicontrol">Add Complex Type</span>.</span></li>
-<li class="skipspace"><span>In the Properties view, type a new name for the complex type in
-the <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">More</span> button to select a base type
-for your complex type.</span> You can either set a base type for your
-complex type, or you add a content model to it (which represents any data
-that may be contained inside an element), but you cannot do both. For more
-information about content models, refer to the related tasks.</li>
-<li class="skipspace"><span>Select <span class="uicontrol">restriction</span> or <span class="uicontrol">extension</span> from
-the <span class="uicontrol">Derived by</span> drop down list.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Other</span> tab.</span> The following
-optional values can be specified in this page:<ol type="a"><li class="skipspace"><span>Select the appropriate value in the <span class="uicontrol">abstract</span> list.</span> When a complex type is declared abstract, it cannot be used in an instance
-document. Click <b>true</b> if you want the complex type to be abstract; otherwise,
-click <b>false</b>.</li>
-<li class="skipspace"><span>Select the appropriate value in the <span class="uicontrol">block</span> list.</span> If you select <b>#all</b>, the complex type may not be replaced by any
-derivations. If you select <b>extension</b>, the complex type may not be replaced
-by any type derived from it by extending it. If you select <b>restriction</b>,
-the complex type may not be replaced by any type derived from it by restricting
-it.</li>
-<li class="skipspace"><span> Select the appropriate value in the <span class="uicontrol">final</span> list.</span> If you select <b>#all</b>, the complex type may not be derived from
-at all. If you select <b>extension</b>, the complex type may not be derived
-from by extension. If you select <b>restriction</b>, the complex type may
-not be derived from by restriction.</li>
-<li class="skipspace"><span>Select the appropriate value in the <span class="uicontrol">mixed</span> list.</span> If you click <b>true</b>, the complex type can contain mixed content
-(both character data and other elements). If you click <b>false</b>, the complex
-type can only contain other elements.</li>
-</ol>
-</li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Attributes</span> tab</span> You
-can use this page to add attributes, attribute references, attributes group
-references, and <samp class="codeph">any</samp> attributes to your complex type.</li>
-<li class="skipspace"><span>An attribute associates an attribute name with a specific type
-and value. To add an attribute, right-click in the Attributes page, and click <span class="uicontrol">Add
-Attribute</span>.</span> You can specify the following values for
-an attribute<ul><li><span class="uicontrol">fixed/default</span>. Click the <span class="uicontrol">More</span> button
-and select the <span class="uicontrol">Fixed</span> or <span class="uicontrol">Default</span> radio
-button and specify an appropriate value. If you select <b>Fixed</b>, the attribute
-has a fixed value, which cannot be changed. If you select <b>Default</b>,
-the attribute has a default value.</li>
-<li><span class="uicontrol">form</span>. Use this field to indicate if the appearance
-of this attribute in an instance of the XML schema must be qualified by a
-namespace.</li>
-<li><span class="uicontrol">name</span>Enter the name of the attribute.</li>
-<li><span class="uicontrol">type</span>Click the <span class="uicontrol">More</span> button
-and select the type of the attribute. </li>
-<li><span class="uicontrol">use</span>This field indicates how an attribute may
-be used in an instance document. If you select <b>optional</b>, the attribute
-may appear once, but it does not have to. If you select <b>required</b>, the
-attribute must appear once. If you select <b>prohibited</b>, the attribute
-must not appear. <b>Note</b>: If you selected the <span class="uicontrol">Default</span> radio
-button, you must select <b>optional</b> in this field, otherwise the default
-value will not be valid.</li>
-</ul>
-</li>
-<li class="skipspace"><span>An attribute reference provides a reference to a global attribute.
-To add an attribute reference, right-click in the Attributes page, and click <span class="uicontrol">Add
-Attribute Ref</span></span> A declaration that references a global
-attribute enables the referenced attribute to appear in the instance document
-in the context of the referencing declaration. The menu option to add
-an attribute reference only appears if there are global attributes defined
-elsewhere in the document.<ol type="a"><li><span>Select the reference, then select the global attribute you want
-it to reference from the <span class="uicontrol">ref</span> drop down list.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>An attribute group reference provides a reference to an attribute
-group. To add an attribute group reference, right-click in the Attributes
-page, and click <span class="uicontrol">Add Attribute Group Ref</span></span> A
-declaration that references an attribute group enables the referenced attribute
-group to appear in the instance document in the context of the referencing
-declaration. The menu option to add an attribute group reference only appears
-if there are attribute groups defined elsewhere in the document.<ol type="a"><li><span>Select the reference, then select the attribute group you want
-it to reference from the<span class="uicontrol">ref</span> drop down list.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>An <samp class="codeph">any</samp> element enables attributes to appear
-in <samp class="codeph">any</samp> elements. To add an <samp class="codeph">any</samp> attribute,
-right-click in the Attributes page, and click <span class="uicontrol">Add Any Attribute</span>.</span> You can specify the following values for an <samp class="codeph">any</samp> attribute:<ul><li>For a <b>namespace</b> value, you can select <b>##any</b> (this allows
-any well-formed XML from any namespace), <b>##local </b> (this allows any
-well-formed XML that is not declared to be in a namespace, <b>##other </b> (this
-allows any well-formed XML that is not from the target namespace of the type
-being defined) or <b>##targetNamespace </b> (which is shorthand for the target
-namespace of the type being defined). </li>
-<li>For a <span class="uicontrol">processContents</span> value, you can select <b>skip</b> (the
-XML processor will not validate the attribute content at all), <b>lax</b>(the
-XML processor will validate the attribute content as much as it can), or <b>strict </b> (the
-XML processor will validate all the attribute content).</li>
-</ul>
- </li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this complext type.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description, and the <span class="uicontrol">App
-Info</span> page can be used to provide information for applications. </li>
-</ol>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/taddcmod.html" title="You can add a content model to an element, global element, a complex type, or a group. A content model is the representation of any data that may be contained inside the element, global element, complex type, or group.">Adding a content model</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.html
deleted file mode 100644
index ba6e968..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding an element</title>
-</head>
-<body id="taddelm"><a name="taddelm"><!-- --></a>
-
-<h1 class="topictitle1">Adding an element</h1>
-<div><p>Elements are fundamental building blocks in XML - they consist
-of a start-tag, and end-tag, and any text that is contained between the two.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To add an
-element, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>In the Outline view, right-click the content model you want to
-work with and click <span class="uicontrol">Add Element</span>.</span></li>
-<li class="skipspace"><span>In the Properties view, type a new name for the element in the <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>Specify its type information by clicking the <span class="uicontrol">More</span> button
-and selecting the appropriate type.</span> An element type can reference
-a complex type or a simple type. An element or attribute can define its type
-to be anonymous. You do not have to name an anonymous type since an anonymous
-type cannot be referenced directly. To specify that a global element's type
-is anonymous, when the <span class="uicontrol">User-defined simple type</span> or <span class="uicontrol">User-defined
-complex type</span> radio button is selected ,click <span class="uicontrol">**anonymous**</span> in
-the type list. </li>
-<li class="skipspace"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MinOccurs</span> field.</span> This is the number of times the element may appear. If you want the
-element to be optional, select <span class="uicontrol">0</span>. Otherwise, select <span class="uicontrol">1</span>. </li>
-<li class="skipspace"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MaxOccurs</span> field.</span> This is the maximum number of times the element may appear. You can
-select <span class="uicontrol">unbounded</span> to indicate there is no maximum number
-of occurrences.</li>
-<li class="skipspace"><span>(Optional) Click the <span class="uicontrol">Other</span> tab. </span> In this page, you can specify various values for the element, such as
-, <span class="uicontrol">block</span>, <span class="uicontrol">fixed/default</span>,<span class="uicontrol">form</span>and <span class="uicontrol">nillable</span>.</li>
-<li class="skipspace"><span>Open your XML schema in the XML schema editor.</span></li>
-<li class="skipspace"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents should be displayed in the Graph view.</li>
-<li class="skipspace"><span>In the Graph view, right click in the <b>Elements</b> section and
-click <span class="uicontrol">Add Element</span>.</span></li>
-<li class="skipspace"><span>In the Properties view, click the <span class="uicontrol">General</span> tab,
-and type a new name for the global element in the <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>Specify its type information by clicking the <span class="uicontrol">More</span> button
-and selecting the appropriate type.</span> An element type can reference
-a complex type or a simple type. An element or attribute can define its type
-to be anonymous. You do not have to name an anonymous type since an anonymous
-type cannot be referenced directly. To specify that a global element's type
-is anonymous, when the <span class="uicontrol">User-defined simple type</span> or <span class="uicontrol">User-defined
-complex type</span> radio button is selected ,click <span class="uicontrol">**anonymous**</span> in
-the type list. </li>
-<li class="skipspace"><span>(Optional) Click the <span class="uicontrol">Other</span> tab. </span> In this page, you can specify various values for the global element,
-such as <span class="uicontrol">abstract</span>, <span class="uicontrol">block</span>, <span class="uicontrol">final</span>, <span class="uicontrol">fixed/default</span>, <span class="uicontrol">nillable</span>, and <span class="uicontrol">substituionGroup</span>.</li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Attributes</span> tab</span> You
-can use this page to add attributes, attribute references, attributes group
-references, and <samp class="codeph">any</samp> attributes to your global element.</li>
-<li class="skipspace"><span>An attribute associates an attribute name with a specific type
-and value. To add an attribute, right-click in the Attributes page, and click <span class="uicontrol">Add
-Attribute</span>.</span> You can specify the following values for
-an attribute<ul><li><span class="uicontrol">fixed/default</span>.Click the <span class="uicontrol">More</span> button
-and select the <span class="uicontrol">Fixed</span> or <span class="uicontrol">Default</span> radio
-button and specify an appropriate value. If you select <b>Fixed</b>, the attribute
-has a fixed value, which cannot be changed. If you select <b>Default</b>,
-the attribute has a default value.</li>
-<li><span class="uicontrol">form</span>. Use this field to indicate if the appearance
-of this attribute in an instance of the XML schema must be qualified by a
-namespace.</li>
-<li><span class="uicontrol">name</span>. Enter the name of the attribute.</li>
-<li><span class="uicontrol">type</span>. Click the <span class="uicontrol">More</span> button
-and select the type of the attribute. </li>
-<li><span class="uicontrol">use</span>. This field indicates how an attribute
-may be used in an instance document. If you select <b>optional</b>, the attribute
-may appear once, but it does not have to. If you select <b>required</b>, the
-attribute must appear once. If you select <b>prohibited</b>, the attribute
-must not appear. <b>Note</b>: If you selected the <span class="uicontrol">Default</span> radio
-button, you must select <b>optional</b> in this field, otherwise the default
-value will not be valid.</li>
-</ul>
-</li>
-<li class="skipspace"><span>An attribute reference provides a reference to a global attribute.
-To add an attribute reference, right-click in the Attributes page, and click <span class="uicontrol">Add
-Attribute Ref</span>.</span> A declaration that references a global
-attribute enables the referenced attribute to appear in the instance document
-in the context of the referencing declaration. The menu option to add
-an attribute reference only appears if there are global attributes defined
-elsewhere in the document.<ol type="a"><li><span>Select the reference, then select the global attribute you want
-it to reference from the<span class="uicontrol">ref</span> drop down list.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>An attribute group reference provides a reference to an attribute
-group. To add an attribute group reference, right-click in the Attributes
-page, and click <span class="uicontrol">Add Attribute Group Ref</span>.</span> A
-declaration that references an attribute group enables the referenced attribute
-group to appear in the instance document in the context of the referencing
-declaration. The menu option to add an attribute group reference only appears
-if there are attribute groups defined elsewhere in the document.<ol type="a"><li><span>Select the reference, then select the attribute group you want
-it to reference from the<span class="uicontrol">ref</span> drop down list.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>An <samp class="codeph">any</samp> element enables attributes to appear
-in <samp class="codeph">any</samp> elements. To add an <samp class="codeph">any</samp> attribute,
-right-click in the Attributes page, and click <span class="uicontrol">Add Any Attribute</span>.</span> You can specify the following values for an <samp class="codeph">any</samp> attribute:<ul><li>For a <b>namespace</b> value, you can select <b>##any</b> (this allows
-any well-formed XML from any namespace), <b>##local </b> (this allows any
-well-formed XML that is not declared to be in a namespace, <b>##other </b> (this
-allows any well-formed XML that is not from the target namespace of the type
-being defined) or <b>##targetNamespace </b> (which is shorthand for the target
-namespace of the type being defined). </li>
-<li>For a <span class="uicontrol">processContents</span> value, you can select <b>skip</b> (the
-XML processor will not validate the attribute content at all), <b>lax</b> (the
-XML processor will validate the attribute content as much as it can), or <b>strict </b> (the
-XML processor will validate all the attribute content).</li>
-</ul>
- </li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description, and the <span class="uicontrol">App
-Info</span> page can be used to provide information for applications. </li>
-</ol>
-<div class="skipspace">You can add a content model to an element, which is the representation
-of any data that may be contained inside the element. For more information
-about working with content models, refer to the related tasks.</div>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/taddcmod.html" title="You can add a content model to an element, global element, a complex type, or a group. A content model is the representation of any data that may be contained inside the element, global element, complex type, or group.">Adding a content model</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.html
deleted file mode 100644
index 886a26e..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding an element reference</title>
-</head>
-<body id="taddelmr"><a name="taddelmr"><!-- --></a>
-
-<h1 class="topictitle1">Adding an element reference</h1>
-<div><p>An element reference provides a reference to a global element.
-A declaration that references a global element enables the referenced global
-element to appear in the instance document in the context of the referencing
-declaration.  </p><div class="skipspace">The menu option to add an element reference only appears if there
-are global elements defined elsewhere in the document.<p>The following instructions
-were written for the Resource perspective, but they will also work in many
-other perspectives. </p>
-<p>To add an element reference, follow these
-steps:</p>
-</div>
-<ol><li class="skipspace"><span>In the Outline view, right-click the content model you want to
-work with and click <span class="uicontrol">Add Element Ref</span>.</span></li>
-<li class="skipspace"><span>Select the element reference.</span></li>
-<li class="skipspace"><span>In the Properties view, select the global element you want to reference
-in the <span class="uicontrol">ref</span> list.</span></li>
-<li class="skipspace"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MinOccurs</span> field.</span> This is the number of times the global element referenced may appear.
-If you want the element to be optional, select <span class="uicontrol">0</span>. Otherwise,
-select <span class="uicontrol">1</span>. </li>
-<li class="skipspace"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MaxOccurs</span> field.</span> This is the maximum number of times the global element referenced may
-appear. You can select <span class="uicontrol">unbounded</span> to indicate there
-is no maximum number of occurrences.</li>
-<li class="skipspace"><span>(Optional) Click the <span class="uicontrol">Other</span> tab. </span> In this page, you can specify various values for thel element reference,
-such as <span class="uicontrol">abstract</span>, <span class="uicontrol">block</span>, <span class="uicontrol">final</span>, <span class="uicontrol">fixed/default</span>, <span class="uicontrol">nillable</span>, and <span class="uicontrol">substituionGroup</span>.</li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Attributes</span> tab</span> You
-can use this page to add attributes, attribute references, attributes group
-references, and <samp class="codeph">any</samp> attributes to your element reference.</li>
-<li class="skipspace"><span>An attribute associates an attribute name with a specific type
-and value. To add an attribute, right-click in the Attributes page, and click <span class="uicontrol">Add
-Attribute</span>.</span> You can specify the following values for
-an attribute<ul><li><span class="uicontrol">fixed/default</span>. Click the <span class="uicontrol">More</span> button
-and select the <span class="uicontrol">Fixed</span> or <span class="uicontrol">Default</span> radio
-button and specify an appropriate value. If you select <b>Fixed</b>, the attribute
-has a fixed value, which cannot be changed. If you select <b>Default</b>,
-the attribute has a default value.</li>
-<li><span class="uicontrol">form</span>. Use this field to indicate if the appearance
-of this attribute in an instance of the XML schema must be qualified by a
-namespace.</li>
-<li><span class="uicontrol">name</span>. Enter the name of the attribute.</li>
-<li><span class="uicontrol">type</span>. Click the <span class="uicontrol">More</span> button
-and select the type of the attribute. </li>
-<li><span class="uicontrol">use</span>. This field indicates how an attribute
-may be used in an instance document. If you select <b>optional</b>, the attribute
-may appear once, but it does not have to. If you select <b>required</b>, the
-attribute must appear once. If you select <b>prohibited</b>, the attribute
-must not appear. <b>Note</b>: If you selected the <span class="uicontrol">Default</span> radio
-button, you must select <b>optional</b> in this field, otherwise the default
-value will not be valid.</li>
-</ul>
-</li>
-<li class="skipspace"><span>An attribute reference provides a reference to a global attribute.
-To add an attribute reference, right-click in the Attributes page, and click <span class="uicontrol">Add
-Attribute Ref</span>.</span> A declaration that references a global
-attribute enables the referenced attribute to appear in the instance document
-in the context of the referencing declaration. The menu option to add
-an attribute reference only appears if there are global attributes defined
-elsewhere in the document.<ol type="a"><li><span>Select the reference, then select the global attribute you want
-it to reference from the <span class="uicontrol">ref</span> drop down list.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>An attribute group reference provides a reference to an attribute
-group. To add an attribute group reference, right-click in the Attributes
-page, and click <span class="uicontrol">Add Attribute Group Ref</span>.</span> A
-declaration that references an attribute group enables the referenced attribute
-group to appear in the instance document in the context of the referencing
-declaration. The menu option to add an attribute group reference only appears
-if there are attribute groups defined elsewhere in the document.<ol type="a"><li><span>Select the reference, then select the attribute group you want
-it to reference from the <span class="uicontrol">ref</span> drop down list.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>An <samp class="codeph">any</samp> element enables attributes to appear
-in <samp class="codeph">any</samp> elements. To add an <samp class="codeph">any</samp> attribute,
-right-click in the Attributes page, and click <span class="uicontrol">Add Any Attribute</span>.</span> You can specify the following values for an <samp class="codeph">any</samp> attribute:<ul><li>For a <b>namespace</b> value, you can select <b>##any</b> (this allows
-any well-formed XML from any namespace), <b>##local </b> (this allows any
-well-formed XML that is not declared to be in a namespace, <b>##other </b> (this
-allows any well-formed XML that is not from the target namespace of the type
-being defined) or <b>##targetNamespace </b> (which is shorthand for the target
-namespace of the type being defined). </li>
-<li>For a <span class="uicontrol">processContents</span> value, you can select <b>skip</b> (the
-XML processor will not validate the attribute content at all), <b>lax</b>(the
-XML processor will validate the attribute content as much as it can), or <b>strict </b> (the
-XML processor will validate all the attribute content).</li>
-</ul>
- </li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this element reference.</span> The <span class="uicontrol">Documentation</span> page is used for human readable
-material, such as a description, and the <span class="uicontrol">App Info</span> page
-can be used to provide information for applications. </li>
-</ol>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/taddglem.html" title="A global element is an element with a global scope. It is one that has been declared as part of the main schema rather than as part of a complex type definition.">Adding a global element</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.html
deleted file mode 100644
index dd0a9dc..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a global attribute</title>
-</head>
-<body id="taddglba"><a name="taddglba"><!-- --></a>
-
-<h1 class="topictitle1">Adding a global attribute</h1>
-<div><p>A global attribute is an attribute that can be recognized anywhere
-in a document. Once declared, a global attribute can be referenced in one
-or more declarations using an attribute reference. </p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To add a global
-attribute, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your XML schema in the XML schema editor.</span></li>
-<li class="skipspace"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents should be displayed in the Graph view.</li>
-<li class="skipspace"><span>In the Graph view, right click in the <b>Attributes</b> section
-and click <span class="uicontrol">Add Global Attribute</span>.</span></li>
-<li class="skipspace"><span>In the Properties view, type the attribute <span class="uicontrol">Name</span>.</span> </li>
-<li class="skipspace"><span>Click the <b>More</b> button next to the <span class="uicontrol">Type</span> field
-to launch the Available Types dialog.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Built-in simple type</span> or <span class="uicontrol">User-defined
-simple type</span> radio button, select the type you want in the type
-list, then click <span class="uicontrol">OK</span>. </span> If you want to create
-a local simple type, select the <span class="uicontrol">User-defined simple type</span> radio
-button, and select <span class="uicontrol">**anonymous**</span>.</li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this global attribute.</span> The <span class="uicontrol">Documentation</span> page is used for human readable
-material, such as a description, and the <span class="uicontrol">App Info</span> page
-can be used to provide information for applications. </li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.html
deleted file mode 100644
index 05896a5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a global element</title>
-</head>
-<body id="taddglem"><a name="taddglem"><!-- --></a>
-
-<h1 class="topictitle1">Adding a global element</h1>
-<div><p>A global element is an element with a global scope. It is one that
-has been declared as part of the main schema rather than as part of a complex
-type definition.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To add a global
-element, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your XML schema in the XML schema editor.</span></li>
-<li class="skipspace"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents should be displayed in the Graph view.</li>
-<li class="skipspace"><span>In the Graph view, right click in the <b>Elements</b> section and
-click <span class="uicontrol">Add Element</span>.</span></li>
-<li class="skipspace"><span>In the Properties view, click the <span class="uicontrol">General</span> tab,
-and type a new name for the global element in the <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>Specify its type information by clicking the <span class="uicontrol">More</span> button
-and selecting the appropriate type.</span> An element type can reference
-a complex type or a simple type. An element or attribute can define its type
-to be anonymous. You do not have to name an anonymous type since an anonymous
-type cannot be referenced directly. To specify that a global element's type
-is anonymous, when the <span class="uicontrol">User-defined simple type</span> or <span class="uicontrol">User-defined
-complex type</span> radio button is selected ,click <span class="uicontrol">**anonymous**</span> in
-the type list. </li>
-<li class="skipspace"><span>(Optional) Click the <span class="uicontrol">Other</span> tab. </span> In this page, you can specify various values for the global element,
-such as <span class="uicontrol">abstract</span>, <span class="uicontrol">block</span>, <span class="uicontrol">final</span>, <span class="uicontrol">fixed/default</span>, <span class="uicontrol">nillable</span>, and <span class="uicontrol">substituionGroup</span>.</li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Attributes</span> tab</span> You
-can use this page to add attributes, attribute references, attributes group
-references, and <samp class="codeph">any</samp> attributes to your global element.</li>
-<li class="skipspace"><span>An attribute associates an attribute name with a specific type
-and value. To add an attribute, right-click in the Attributes page, and click <span class="uicontrol">Add
-Attribute</span>.</span> You can specify the following values for
-an attribute<ul><li><span class="uicontrol">fixed/default</span>. Click the <span class="uicontrol">More</span> button
-and select the <span class="uicontrol">Fixed</span> or <span class="uicontrol">Default</span> radio
-button and specify an appropriate value. If you select <b>Fixed</b>, the attribute
-has a fixed value, which cannot be changed. If you select <b>Default</b>,
-the attribute has a default value.</li>
-<li><span class="uicontrol">form</span>. Use this field to indicate if the appearance
-of this attribute in an instance of the XML schema must be qualified by a
-namespace.</li>
-<li><span class="uicontrol">name</span>. Enter the name of the attribute.</li>
-<li><span class="uicontrol">type</span>. Click the <span class="uicontrol">More</span> button
-and select the type of the attribute. </li>
-<li><span class="uicontrol">use</span>. This field indicates how an attribute
-may be used in an instance document. If you select <b>optional</b>, the attribute
-may appear once, but it does not have to. If you select <b>required</b>, the
-attribute must appear once. If you select <b>prohibited</b>, the attribute
-must not appear. <b>Note</b>: If you selected the <span class="uicontrol">Default</span> radio
-button, you must select <b>optional</b> in this field, otherwise the default
-value will not be valid.</li>
-</ul>
-</li>
-<li class="skipspace"><span>An attribute reference provides a reference to a global attribute.
-To add an attribute reference, right-click in the Attributes page, and click <span class="uicontrol">Add
-Attribute Ref</span>.</span> A declaration that references a global
-attribute enables the referenced attribute to appear in the instance document
-in the context of the referencing declaration. The menu option to add
-an attribute reference only appears if there are global attributes defined
-elsewhere in the document.<ol type="a"><li><span>Select the reference, then select the global attribute you want
-it to reference from the <span class="uicontrol">ref</span> drop down list.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>An attribute group reference provides a reference to an attribute
-group. To add an attribute group reference, right-click in the Attributes
-page, and click <span class="uicontrol">Add Attribute Group Ref</span>.</span> A
-declaration that references an attribute group enables the referenced attribute
-group to appear in the instance document in the context of the referencing
-declaration. The menu option to add an attribute group reference only appears
-if there are attribute groups defined elsewhere in the document.<ol type="a"><li><span>Select the reference, then select the attribute group you want
-it to reference from the <span class="uicontrol">ref</span> drop down list.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>An <samp class="codeph">any</samp> element enables attributes to appear
-in <samp class="codeph">any</samp> elements. To add an <samp class="codeph">any</samp> attribute,
-right-click in the Attributes page, and click <span class="uicontrol">Add Any Attribute</span>.</span> You can specify the following values for an <samp class="codeph">any</samp> attribute:<ul><li>For a <b>namespace</b> value, you can select <b>##any</b> (this allows
-any well-formed XML from any namespace), <b>##local </b> (this allows any
-well-formed XML that is not declared to be in a namespace, <b>##other </b> (this
-allows any well-formed XML that is not from the target namespace of the type
-being defined) or <b>##targetNamespace </b> (which is shorthand for the target
-namespace of the type being defined). </li>
-<li>For a <span class="uicontrol">processContents</span> value, you can select <b>skip</b> (the
-XML processor will not validate the attribute content at all), <b>lax</b>(the
-XML processor will validate the attribute content as much as it can), or <b>strict </b> (the
-XML processor will validate all the attribute content).</li>
-</ul>
- </li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this global element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description, and the <span class="uicontrol">App
-Info</span> page can be used to provide information for applications. </li>
-</ol>
-<div class="skipspace">You can add a content model to a global element, which is the representation
-of any data that may be contained inside the global element. For more information
-about working with content models, refer to the related tasks.</div>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/taddcmod.html" title="You can add a content model to an element, global element, a complex type, or a group. A content model is the representation of any data that may be contained inside the element, global element, complex type, or group.">Adding a content model</a><br />
-<a href="../topics/taddelmr.html" title="An element reference provides a reference to a global element. A declaration that references a global element enables the referenced global element to appear in the instance document in the context of the referencing declaration. ">Adding an element reference</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.html
deleted file mode 100644
index 4538784..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a group reference</title>
-</head>
-<body id="taddgrpr"><a name="taddgrpr"><!-- --></a>
-
-<h1 class="topictitle1">Adding a group reference</h1>
-<div><p>A group reference is a declaration that references
-a group. It enables the referenced group to appear in the instance document
-in the context of the referencing declaration. </p><div class="skipspace">The menu option to add a group reference only appears if there are
-groups defined elsewhere in the document.<p>The following instructions were
-written for the Resource perspective, but they will also work in many other
-perspectives. </p>
-<p>To add a group reference, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>In the Outline view, right-click the content model you want to
-work with and select <span class="uicontrol">Add Group Ref</span>.</span></li>
-<li class="skipspace"><span>Select the new group reference.</span></li>
-<li class="skipspace"><span>In the Properties view, select the group you want to refer to in
-the <span class="uicontrol">ref</span> list.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this group reference.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description, and the <span class="uicontrol">App
-Info</span> page can be used to provide information for applications. </li>
-</ol>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/taddgrup.html" title="A group consists of element declarations, wildcards, and other content model groups. When you create a group, it automatically contains a content model.">Adding a group</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.html
deleted file mode 100644
index fab83e2..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a group</title>
-</head>
-<body id="taddgrup"><a name="taddgrup"><!-- --></a>
-
-<h1 class="topictitle1">Adding a group</h1>
-<div><p>A group consists of element declarations, wildcards, and other
-content model groups. When you create a group, it automatically contains a
-content model.</p><div class="skipspace"><p></p>
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives. </p>
-<p>To
-add a group, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your XML schema in the XML schema editor.</span></li>
-<li class="skipspace"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents should be displayed in the Graph view.</li>
-<li class="skipspace"><span>In the Graph view, right click in the <b>Groups</b> section and
-click <span class="uicontrol">Add Group</span>.</span></li>
-<li class="skipspace"><span>In the Properties view, type a new name for the group in the <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this group element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description, and the <span class="uicontrol">App
-Info</span> page can be used to provide information for applications. </li>
-<li class="skipspace"><span>In the Outline view, expand the <span class="uicontrol">Groups</span> folder
-and your new group.</span></li>
-<li class="skipspace"><span>Your group automatically contains a content model. </span> A
-group's content model is the representation of any data that may be contained
-inside the group. For more information about working with content models,
-refer to the related tasks.</li>
-</ol>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/taddgrpr.html" title="A group reference is a declaration that references a group. It enables the referenced group to appear in the instance document in the context of the referencing declaration. ">Adding a group reference</a><br />
-<a href="../topics/taddcmod.html" title="You can add a content model to an element, global element, a complex type, or a group. A content model is the representation of any data that may be contained inside the element, global element, complex type, or group.">Adding a content model</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.html
deleted file mode 100644
index c50681a..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding an import element</title>
-</head>
-<body id="taddimpt"><a name="taddimpt"><!-- --></a>
-
-<h1 class="topictitle1">Adding an import element</h1>
-<div><p>As schemas become larger, it is often desirable to divide their
-content among several schema documents for purposes such as ease of maintenance,
-reuse, and readability. XML schema defines two constructs to support this: <i>include</i> and <i>import</i>.
-The include element brings in definitions and declarations from the included
-schema into the current schema. It requires the included schema to be in the
-same target namespace as the including schema. The import element behaves
-in a similar way, with the exception that the imported schema can come from
-a different namespace.</p><div class="skipspace"><p>In the XML schema editor, you can add an import element to an
-XML schema. Before you can do this, you must create an XML schema and open
-it in the XML schema editor (you can open an XML schema in the XML schema
-editor by double-clicking it).</p>
-<p>You can add multiple import elements
-to an XML schema, however, prefixes and namespaces have to unique amongst
-the imported schemas.</p>
-<p>An import element is always added to the top of
-the schema file, as it must appear as the first children of the schema element. </p>
-<p>The
-following instructions were written for the Resource perspective, but they
-will also work in many other perspectives. </p>
-<p>To add an import element,
-follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your XML schema in the XML schema editor.</span></li>
-<li class="skipspace"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents should be displayed in the Graph view.</li>
-<li class="skipspace"><span>In the Graph view, right click in the <b>Directives</b> section
-and click <span class="uicontrol">Add Import</span>.</span></li>
-<li class="skipspace"><span>In the Properties view, click the <b>General</b> tab and click
-the <span class="uicontrol">More</span> button to the right of the <span class="uicontrol">Schema
-location</span> field.</span></li>
-<li class="skipspace"><span>If you want to import an XML schema located in the workbench, select
-the <span class="uicontrol">Workbench projects</span> radio button and click <span class="uicontrol">Next</span>. </span><ol type="a"><li><span>Select the schema you want to import and click <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>If you want to import an XML schema located on the Web, select
-the <span class="uicontrol">HTTP</span> radio button and click <span class="uicontrol">Next</span>.</span><ol type="a"><li class="skipspace"><span>Type the URL of the XML schema and click <span class="uicontrol">Finish</span>.</span> <div class="note"><span class="notetitle">Note: </span>A local copy of the schema will not be stored in the workbench.
-Every time you validate your schema, the schema's contents will be checked
-from the URL you specify.</div>
-</li>
-</ol>
-</li>
-<li class="skipspace"><span>The XML schema editor will retrieve the namespace for the imported
-XML schema file and display it as read-only in the <span class="uicontrol">Namespace</span> field.</span></li>
-<li class="skipspace"><span>If necessary, type a unique prefix for this namespace in the <span class="uicontrol">Prefix</span> field.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this import element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description, and the <span class="uicontrol">App
-Info</span> page can be used to provide information for applications. </li>
-</ol>
-<div class="skipspace"><p>Once you have added an import element to your XML schema, when
-you define new elements, attributes, complex types, or simple types where
-you can specify type information, any declarations from the included schema
-will be available in the <span class="uicontrol">Type</span> list for the element,
-attribute, complex or simple type.</p>
-</div>
-<div class="skipspace"></div>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/taddincl.html" title="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. XML schema defines two constructs to support this: include and import. The include element brings in definitions and declarations from the included schema into the current schema. It requires the included schema to be in the same target namespace as the including schema. The import element behaves in a similar way, with the exception that the imported schema can come from a different namespace.">Adding an include element</a><br />
-<a href="../topics/taddrdfn.html" title="You can use the redefine mechanism to redefine simple and complex types, groups, and attribute groups obtained from external schema files. Like the include mechanism, redefine requires the external components to be in the same target namespace as the redefining schema, although external components from schemas that have no namespace can also be redefined.">Adding a redefine element</a><br />
-</p>
-<p><b class="relrefhd">Related reference</b><br />
-<a href="../topics/rnmspc.html" title="">XML namespaces</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.html
deleted file mode 100644
index 6b31d51..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding an include element</title>
-</head>
-<body id="taddincl"><a name="taddincl"><!-- --></a>
-
-<h1 class="topictitle1">Adding an include element</h1>
-<div><p>As schemas become larger, it is often desirable to divide their
-content among several schema documents for purposes such as ease of maintenance,
-reuse, and readability. XML schema defines two constructs to support this: <i>include</i> and
- <i>import</i>. The include element brings in definitions and declarations
-from the included schema into the current schema. It requires the included
-schema to be in the same target namespace as the including schema. The import
-element behaves in a similar way, with the exception that the imported schema
-can come from a different namespace.</p><div class="skipspace"><p>In the XML schema editor, you can add an include element to an
-XML schema. Before you can do this, you must create an XML schema and open
-it in the XML schema editor (you can open an XML schema in the XML schema
-editor by double-clicking it).</p>
-<p>The following instructions were written
-for the XML perspective, but they will also work in many other perspectives. </p>
-<p>To
-add an include element , follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your XML schema in the XML schema editor.</span></li>
-<li class="skipspace"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents should be displayed in the Graph view.</li>
-<li class="skipspace"><span>In the Graph view, right click in the <b>Directives</b> section
-and click <span class="uicontrol">Add Include</span>.</span></li>
-<li class="skipspace"><span>In the Properties view, click the <b>General</b> tab and click
-the <span class="uicontrol">More</span> button to the right of the <span class="uicontrol">Schema
-location</span> field.</span> The XML schema file you select must
-have the same namespace as the current schema.</li>
-<li class="skipspace"><span>If you want to select an XML schema located in the
-workbench, select the <span class="uicontrol">Workbench projects</span> radio button
-and click <span class="uicontrol">Next</span>. </span><ol type="a"><li><span>Select the schema you want to include and click <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>If you want to select an XML schema located on the Web, select
-the <span class="uicontrol">HTTP</span> radio button and click <span class="uicontrol">Next</span>.</span><ol type="a"><li><span>Type the URL of the XML schema and click <span class="uicontrol">Finish</span>. </span></li>
-</ol>
- <div class="note"><span class="notetitle">Note: </span> A local copy of the schema will not be stored in the workbench.
-Every time you validate your schema, the schema's contents will be checked
-from the URL you specify.</div>
-</li>
-<li class="skipspace"><span>The XML schema editor will retrieve the location of the included
-XML schema file and display it as read-only in the <span class="uicontrol">Schema location</span> field.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this include element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description, and the <span class="uicontrol">App
-Info</span> page can be used to provide information for applications. </li>
-</ol>
-<div class="skipspace"><p>Once you have added the include element to your XML schema, when
-you define new elements, attributes, complex types, or simple types where
-you can specify type information, any declarations from the included schema
-will be available in the <span class="uicontrol">Type</span> list for the element,
-attribute, complex or simple type.</p>
-<p>For example, if Address.xsd has the
-following content:</p>
-<pre>&lt;complexType name="Address"&gt;
-    &lt;sequence&gt;
-        &lt;element name="name" type="string"&gt;
-        &lt;element name="street" type="string"&gt;
-    &lt;/sequence&gt;
-&lt;/complexType&gt;</pre>
-and you have an XML schema called PurchaseOrder.xsd that has added
-an include for Address.xsd, then when defining a new element in  PurchaseOrder,
-you can select Address as its type.  <p>(c) Copyright 2001, World Wide Web
-Consortium (Massachusetts Institute of Technology, Institut National de Recherche
-en Informatique et en Automatique, Keio University).</p>
-</div>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/taddimpt.html" title="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. XML schema defines two constructs to support this: include and import. The include element brings in definitions and declarations from the included schema into the current schema. It requires the included schema to be in the same target namespace as the including schema. The import element behaves in a similar way, with the exception that the imported schema can come from a different namespace.">Adding an import element</a><br />
-<a href="../topics/taddrdfn.html" title="You can use the redefine mechanism to redefine simple and complex types, groups, and attribute groups obtained from external schema files. Like the include mechanism, redefine requires the external components to be in the same target namespace as the redefining schema, although external components from schemas that have no namespace can also be redefined.">Adding a redefine element</a><br />
-</p>
-<p><b class="relrefhd">Related reference</b><br />
-<a href="../topics/rnmspc.html" title="">XML namespaces</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.html
deleted file mode 100644
index a1fb746..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a notation</title>
-</head>
-<body id="taddnot"><a name="taddnot"><!-- --></a>
-
-<h1 class="topictitle1">Adding a notation</h1>
-<div><p>A notation is a means of associating a binary description with
-an entity or attribute. For example, you are making a catalogue of your clothing
-and want to include an image of one of your shirts. You would have to create
-a notation such as the following:  <kbd class="userinput">&lt;notation name="My_Shirt"
-system="GIF"&gt;&lt;/notation&gt;</kbd> which defines a notation for a GIF
-image.</p><div class="skipspace"><p>In the XML schema editor, you can add an notation element to an
-XML schema. Before you can do this, you must create an XML schema and open
-it in the XML schema editor.</p>
-<p>The following instructions were written
-for the Resource perspective, but they will also work in many other perspectives. </p>
-<p>To
-create a notation, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your XML schema in the XML schema editor.</span></li>
-<li class="skipspace"><span>In the Outline view, right-click your XML schema and click <span class="uicontrol">Add
-Notation</span>.</span></li>
-<li class="skipspace"><span>In the Properties view, type the name of the notation in the <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Other</span> tab.</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">public</span> field, type a public identifier.</span>  This is optional if you enter a value in the <span class="uicontrol">system</span> field.</li>
-<li class="skipspace"><span>In the <span class="uicontrol">system</span> field, type a URI reference.</span>  This is optional if you enter a value in the <span class="uicontrol">public</span> field.</li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this notation.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description, and the <span class="uicontrol">App
-Info</span> page can be used to provide information for applications. </li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.html
deleted file mode 100644
index d95b7b2..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a redefine element</title>
-</head>
-<body id="taddrdfn"><a name="taddrdfn"><!-- --></a>
-
-<h1 class="topictitle1">Adding a redefine element</h1>
-<div><p>You can use the redefine mechanism to redefine simple and complex
-types, groups, and attribute groups obtained from external schema files. Like
-the include mechanism, redefine requires the external components to be in
-the same target namespace as the redefining schema, although external components
-from schemas that have no namespace can also be redefined.</p><div class="skipspace"><p>In the XML schema editor, you can add a redefine element to an
-XML schema.</p>
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives. </p>
-<p>To
-add a redefine element , follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your XML schema in the XML schema editor.</span></li>
-<li class="skipspace"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents should be displayed in the Graph view.</li>
-<li class="skipspace"><span>In the Graph view, right-click in the <b>Directives</b> section
-and click <span class="uicontrol">Add Redefine</span>.</span></li>
-<li class="skipspace"><span>In the Properties view, click the <b>General</b> tab and click
-the <span class="uicontrol">More</span> button to the right of the <span class="uicontrol">Schema
-location</span> field.</span> The XML schema file you select must
-have the same namespace as the current schema.</li>
-<li class="skipspace"><span>If you want to select an XML schema located in the workbench, select
-the <span class="uicontrol">Workbench projects</span> radio button and click <span class="uicontrol">Next.</span></span><ol type="a"><li><span> Select the schema you want to include and click <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>If you want to select an XML schema located on the Web, select
-the <span class="uicontrol">HTTP</span> radio button and click <span class="uicontrol">Next</span>.</span><ol type="a"><li><span>Type the URL of the XML schema and click <span class="uicontrol">Finish</span>.
- </span></li>
-</ol>
-  <div class="note"><span class="notetitle">Note: </span>A local copy of the schema will not be stored in the workbench.
-Every time you validate your schema, the schema's contents will be checked
-from the URL you specify.</div>
-</li>
-<li class="skipspace"><span>The XML schema editor will retrieve the location of the included
-XML schema file and display it as read-only in the  <span class="uicontrol">Schema location</span> field.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this redefine element.</span> The <span class="uicontrol">Documentation</span> page is used for human readable
-material, such as a description, and the <span class="uicontrol">App Info</span> page
-can be used to provide information for applications. </li>
-</ol>
-<div class="skipspace"><p>Once you have added the redefine element to your XML schema, you
-can redefine any of the simple and complex types, groups, and attribute groups
-in the XML schema you selected in the redefine element.  </p>
-</div>
-<div class="skipspace"><p>(c) Copyright 2001, World Wide Web Consortium (Massachusetts Institute
-of Technology, Institut National de Recherche en Informatique et en Automatique,
-Keio University).</p>
-</div>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/taddimpt.html" title="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. XML schema defines two constructs to support this: include and import. The include element brings in definitions and declarations from the included schema into the current schema. It requires the included schema to be in the same target namespace as the including schema. The import element behaves in a similar way, with the exception that the imported schema can come from a different namespace.">Adding an import element</a><br />
-<a href="../topics/taddincl.html" title="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. XML schema defines two constructs to support this: include and import. The include element brings in definitions and declarations from the included schema into the current schema. It requires the included schema to be in the same target namespace as the including schema. The import element behaves in a similar way, with the exception that the imported schema can come from a different namespace.">Adding an include element</a><br />
-</p>
-<p><b class="relrefhd">Related reference</b><br />
-<a href="../topics/rnmspc.html" title="">XML namespaces</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.html
deleted file mode 100644
index 265a65f..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a pattern facet to a simple type</title>
-</head>
-<body id="taddreg"><a name="taddreg"><!-- --></a>
-
-<h1 class="topictitle1">Adding a pattern facet to a simple type</h1>
-<div><div class="skipspace"><p>A pattern facet can be used to constrain the value of a type's
-lexical space (the set of string literals that represent the values of a type),
-which indirectly constrains the value space. The value of the pattern is called
-a regular expression. You can specify it using the <span class="uicontrol">Regular Expression</span> wizard.</p>
-<p>To
-add a pattern to a simple type, follow these steps</p>
-</div>
-<ol><li class="skipspace"><span>In the Graph view, select the simple type you want to work with.</span></li>
-<li class="skipspace"><span>In the Properties view, click the <span class="uicontrol">Advanced</span> tab,
-then the <span class="uicontrol">Pattern</span> tab.</span> The <span class="uicontrol">Pattern</span> tab
-will only appear if the pattern facet is applicable to the base type of the
-simple type.</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Add</span>.</span> The Regular Expression
-Wizard opens.</li>
-<li class="skipspace"><span>Select the token you want to add to the expression.</span></li>
-<li class="skipspace"><span>Indicate how often you want the token to appear in order for a
-match to succeed.</span> If you want the token to repeat, click <span class="uicontrol">Repeat</span> and
-specify the number of times the token must appear. If you want to specify
-a minimum and maximum number of times the token can appear, click <span class="uicontrol">Range</span> and
-enter a minimum and maximum value.</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Add</span> to add the token to the regular
-expression. </span></li>
-<li class="skipspace"><span>Repeat the previous three steps as necessary to create the entire
-expression.</span></li>
-<li class="skipspace"><span>When you are finished, click <span class="uicontrol">Next</span>.</span></li>
-<li class="skipspace"><span>(Optional) Enter some sample text to test against the regular expression
-and see if a match occurs. </span></li>
-<li class="skipspace"><span>Click<span class="uicontrol">Finish</span>. </span></li>
-</ol>
-<div class="skipspace">The regular expression will appear in the Pattern page.</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.html
deleted file mode 100644
index 6996580..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a simple type</title>
-</head>
-<body id="taddsmpt"><a name="taddsmpt"><!-- --></a>
-
-<h1 class="topictitle1">Adding a simple type</h1>
-<div><p>In the XML schema editor, you can add a simple type to an XML schema.
-A simple type cannot have element content and cannot carry attributes. Elements
-that contain numbers (and strings, and dates, and so on) but do not contain
-any sub-elements are said to have simple types. </p><div class="skipspace"><p></p>
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives. </p>
-<p>To
-add a simple type, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your XML schema in the XML schema editor.</span></li>
-<li class="skipspace"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents should be displayed in the Graph view.</li>
-<li class="skipspace"><span>In the Graph view, right click in the <b>Types</b> section and
-click <span class="uicontrol">Add Simple Type</span>.</span></li>
-<li class="skipspace"><span>In the Properties view, click the <span class="uicontrol">General</span> tab,
-and type a new name for the simple type in the <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>You can select the following options from the <span class="uicontrol">Variety</span> drop
-down list:</span><ul><li><span class="uicontrol">atomic</span> - atomic types are all the simple types
-built into the XML schema language</li>
-<li><span class="uicontrol">list</span> -  list types are comprised of sequences
-of atomic types. They have values that are comprised of finite-length sequences
-of atomic values.  </li>
-<li><span class="uicontrol">union</span> - a union type enables an element or
-attribute value to be one or more instances of one type drawn from the union
-of multiple atomic and list types</li>
-</ul>
-</li>
-<li class="skipspace"><span>If you selected <span class="uicontrol">atomic</span> from the <span class="uicontrol">Variety</span> drop
-down list, click the <span class="uicontrol">More</span> button next to the <span class="uicontrol">Base
-type</span> field to specify a base type for the simple type.</span> You
-can select either a <span class="uicontrol">Built-in simple type</span>, or <span class="uicontrol">User-defined
-simple type</span> to be the base type.</li>
-<li class="skipspace"><span>If you selected <span class="uicontrol">list</span> from the <span class="uicontrol">Variety</span> drop
-down list, click the <span class="uicontrol">More</span> button next to the <span class="uicontrol">Item
-type</span> field to specify a item type for the simple type.</span> You
-can select either a <span class="uicontrol">Built-in simple type</span>, or <span class="uicontrol">User-defined
-simple type</span> to be the item type.</li>
-<li class="skipspace"><span>If you selected <span class="uicontrol">union</span> from the <span class="uicontrol">Variety</span> drop
-down list, click the <span class="uicontrol">More</span> button next to the <span class="uicontrol">Member
-types</span> field to specify the member types for the simple type.</span> You can select both <span class="uicontrol">Built-in simple type</span>, or <span class="uicontrol">User-defined
-simple type</span> to add to the member types list.</li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Enumerations</span> tab.</span> Enumerations
-help you to define a set of valid values for simple types. Enumerations are
-the actual values the simple type can take as valid values in the instance
-document. You can either add one enumeration or several enumerations at a
-time:<ol type="a"><li class="skipspace"><span>To add one enumeration at a time, click the <span class="uicontrol">Add</span> button
-and specify a value for the enumeration.</span></li>
-<li class="skipspace"><span>To add several enumerations at one time, follow these steps:</span> <ol><li>Click the <span class="uicontrol">Add...</span> button.</li>
-<li>Enter the value of each enumeration. Each value must be separated by the <span class="uicontrol">Delimiter
-character</span>. For example: <samp class="codeph">First, Second</samp> will create
-two enumerations, one with the value "First" and one with the value "Second".</li>
-<li>Select the <span class="uicontrol">Preserve leading and trailing whitespace</span> check
-box if you want any white space around your enumeration values to be preserved.
-If, for example, you select this check box, the values of <samp class="codeph">First, Second</samp> will
-show up as "First" and " Second" (there is a space before Second) because
-you put a space before "Second" when entered the value.</li>
-<li>Click <span class="uicontrol">OK</span>. Your enumerations will be created and
-appear in the Properties view.</li>
-</ol>
-</li>
-</ol>
-</li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this simple type.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description, and the <span class="uicontrol">App
-Info</span> page can be used to provide information for applications. </li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Advanced</span> tab.</span> The options
-available from this page will vary depending on what option you selected in
-the <span class="uicontrol">Variety</span> field, and the <span class="uicontrol">Base type</span>, <span class="uicontrol">Item
-type</span>, or <span class="uicontrol">Member types</span> field on the <span class="uicontrol">General</span> page.</li>
-<li class="skipspace"><span>If applicable to the type, the <span class="uicontrol">Facets</span> table
-will be populated with constraining facets. A constraining facet is an optional
-property that can be applied to a datatype to constrain its value.</span><ol type="a"><li><span>To change a facet's value, click its name in the <span class="uicontrol">Name</span> column,
-then click its value (or the empty cell that will contain its value) in the <span class="uicontrol">Value</span> column
-and type or select a new value</span></li>
-<li><span> To change whether a facet's value is fixed or not, click its
-name in the Name column, then click the appropriate cell in the Fixed column,
-and change the value to true or false.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>If applicable to the type, a Pattern page will be
-available. Click the <span class="uicontrol">Pattern</span> tab to switch to it.</span> A pattern can be used to constrain the value of a type's lexical space
-(the set of string literals that represent the values of a type), which indirectly
-constrains the value space. For more information on adding a pattern to a
-simple type, refer to the related tasks.</li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html
deleted file mode 100644
index 9657746..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating XML schemas</title>
-</head>
-<body id="tcxmlsch"><a name="tcxmlsch"><!-- --></a>
-
-<h1 class="topictitle1">Creating XML schemas</h1>
-<div><p>You can create an XML schema and then edit it using the XML schema
-editor.</p><div class="skipspace">To create an XML schema, follow these steps:</div>
-<ol><li class="skipspace"><span>Create a project to contain the XML schema.</span> If you intend
-to generate Java™ beans from your XML schema, we recommend that
-you create a Java project to contain both the schema and the beans.
-The beans must be contained in a Java project, however, the XML schema does
-not have to be. Otherwise, it does not matter what kind of project you create.</li>
-<li class="skipspace"><span>In the workbench, select  <span class="menucascade"><span class="uicontrol">File &gt; New &gt;
-Other &gt; XML &gt; XML Schema</span></span>. Click <span class="uicontrol">Next</span>.</span> If you cannot see the <span class="uicontrol">XML</span> option, select the <span class="uicontrol">Show
-All Wizards</span> check box.</li>
-<li class="skipspace"><span>Select the project or folder that will contain the XML schema.
-In the </span> <span class="uicontrol">File name</span> field, type the name of
-the XML schema, for example <kbd class="userinput">MyXMLSchema.xsd</kbd>. The name
-of your XML schema must end in <tt class="sysout">.xsd</tt></li>
-<li class="skipspace"><span>Click  <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-<div class="skipspace">The XML schema opens in the XML schema editor. </div>
-</div>
-
-<div>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cxmlsced.html" title="XML schemas are an XML language for describing and constraining the content of XML files. ">XML schema editor</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tedtschm.html" title="After you create an XML schema, you can edit its various properties, such as its namespace and prefix.">Editing XML schema properties</a><br />
-<a href="../topics/tvdtschm.html" title="Validating an XML schema determines whether the current state of the XML schema file is semantically valid. Any errors will be displayed in the Problems view.">Validating an XML schema</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.html
deleted file mode 100644
index b19d23d..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Deleting XML schema components</title>
-</head>
-<body id="tdelscmp"><a name="tdelscmp"><!-- --></a>
-
-<h1 class="topictitle1">Deleting XML schema components</h1>
-<div><p>In the XML schema editor, you can delete any of the XML schema
-components that you have created.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To delete
-an XML schema component, follow these steps:</p>
-</div>
-<ol><li><span>Open your XML schema in the XML schema editor.</span></li>
-<li><span>In the Outline view, click the item to delete.</span></li>
-<li><span>Right-click the item, and, from its pop-up menu, click <span class="uicontrol">Delete</span>.</span></li>
-</ol>
-<div class="skipspace"><p>The XML schema editor has a built-in mechanism to
-handle referential integrity issues. When you delete certain components, cleanup
-will automatically occur. Refer to the related reference section below for
-more information.</p>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html
deleted file mode 100644
index 665780e..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing XML schema editor preferences</title>
-</head>
-<body id="tedtpref"><a name="tedtpref"><!-- --></a>
-
-<h1 class="topictitle1">Editing XML schema editor preferences</h1>
-<div><p>You can set various preferences for the XML schema editor such
-as the formatter indentation style and default target namespace.</p><div class="skipspace"><p>To define XML schema preferences, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Select  <span class="menucascade"><span class="uicontrol">Window &gt; Preferences &gt; Web and
-XML &gt; XML Schema Files</span></span>.</span></li>
-<li class="skipspace"><span>Select the <span class="uicontrol">Qualify XML schema language constructs </span>check
-box if you want a prefix applied to all XML Schema language constructs in
-your XML schema.</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">XML schema language constructs prefix</span> field,
-type the prefix you want applied to XML Schema language constructs in your
-XML schema.</span>  The prefix <span class="uicontrol">xsd</span> is
-used by convention to denote the XML Schema namespace, but any prefix can
-be used. The purpose of the association is to identify the elements and simple
-types as belonging to the vocabulary of the XML Schema language rather than
-the vocabulary of the schema author.  <div class="note"><span class="notetitle">Note: </span>This prefix will not appear in
-any schemas that currently exist - it will only appear in new schemas you
-create after you type the prefix and click <span class="uicontrol">Apply</span>. Any
-schemas that already exist will have the prefix specified in the schema applied
-to the XML schema language constructs.</div>
-</li>
-<li class="skipspace"><span>You can change the <span class="uicontrol">Default Target Namespace</span> value.</span> The value specified in this field will be the default target namespace
-for any new XML schema files created.</li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span>.</span></li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html
deleted file mode 100644
index 877cf30..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing XML schema properties</title>
-</head>
-<body id="tedtschm"><a name="tedtschm"><!-- --></a>
-
-<h1 class="topictitle1">Editing XML schema properties</h1>
-<div><p>After you create an XML schema, you can edit its various properties,
-such as its namespace and prefix.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To edit an
-XML schemas properties follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Create a new XML schema or double-click an existing schema in the
-Navigator view.</span>  It will automatically open in the XML schema editor.</li>
-<li class="skipspace"><span>In the Properties view, click the <span class="uicontrol">General</span> tab.</span></li>
-<li class="skipspace"><span>You can change the <span class="uicontrol">Prefix</span> associated with
-the current namespace.</span> Element and attribute names that are associated
-with this namespace will be prefixed with this value.</li>
-<li class="skipspace"><span>You can also edit the <span class="uicontrol">Target namespace</span> for
-this schema.</span>  A namespace is a URI that provides a unique name
-to associate with all the elements and type definitions in a schema.<ol type="a"><li><span>Click <span class="uicontrol">Advanced</span> if you want to add more
-namespace declarations to your XML schema.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Other</span> tab.</span> You can
-modify the following values in this page.<ol type="a"><li class="skipspace"><span>The <span class="uicontrol">attributeFormDefault</span> value. </span> Select <span class="uicontrol">qualified</span> if you want attributes in an
-XML schema instance to be qualified by the prefix that is associated with
-the schema namespace; otherwise, select <span class="uicontrol">unqualified</span>.</li>
-<li class="skipspace"><span>The <span class="uicontrol">blockDefault</span> value.</span> This
-field determines whether the types or elements in the schema may be replaced
-by elements or types derived from them.</li>
-<li class="skipspace"><span>The <span class="uicontrol">elementFormDefault</span> value.</span> Select <span class="uicontrol">qualified</span> if
-you want elements in an XML schema instance to be qualified by the prefix
-that is associated with the schema namespace; otherwise, select <span class="uicontrol">unqualified</span>.</li>
-<li class="skipspace"><span>The <span class="uicontrol">finalDefault</span> value.</span> This
-field determines whether the types or elements in the schema may be derived
-from.</li>
-<li class="skipspace"><span>The <span class="uicontrol">version</span> value.</span> Type the
-version number of the schema in the <span class="uicontrol">version</span> field</li>
-<li class="skipspace"><span>The <span class="uicontrol">xml:lang</span> value. </span> Type
-the appropriate ISO-IETF (for example, en-us) tag in this field. This tag
-may be inserted in documents to specify the language used in the contents
-and attribute values of any element in an XML file.</li>
-</ol>
-</li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this XML schema.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description, and the <span class="uicontrol">App
-Info</span> page can be used to provide information for applications. </li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.html
deleted file mode 100644
index 430d08a..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Importing an XML schema</title>
-</head>
-<body id="timpschm"><a name="timpschm"><!-- --></a>
-
-<h1 class="topictitle1">Importing an XML schema</h1>
-<div><p>You can import schemas into the workbench and open them in the
-XML schema editor. Opening them in the XML schema editor provides you with
-an opportunity to have a structured view of the XML schema file.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To import
-an XML schema into the workbench, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Click  <span class="menucascade"><span class="uicontrol">File &gt; Import</span></span>.</span></li>
-<li class="skipspace"><span>Select the import source.</span>  Click <span class="uicontrol">Next</span>.</li>
-<li class="skipspace"><span>Fill in the fields in the Import wizard as necessary.</span>  When
-you are finished, click <span class="uicontrol">Finish</span>.</li>
-</ol>
-<div class="skipspace"><p>The imported schema now appears in the Navigator view. Double-click
-it to open it in the XML schema editor.</p>
-</div>
-</div>
-
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cxmlsced.html" title="XML schemas are an XML language for describing and constraining the content of XML files. ">XML schema editor</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tedtschm.html" title="After you create an XML schema, you can edit its various properties, such as its namespace and prefix.">Editing XML schema properties</a><br />
-<a href="../topics/tvdtschm.html" title="Validating an XML schema determines whether the current state of the XML schema file is semantically valid. Any errors will be displayed in the Problems view.">Validating an XML schema</a><br />
-<a href="../topics/taddimpt.html" title="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. XML schema defines two constructs to support this: include and import. The include element brings in definitions and declarations from the included schema into the current schema. It requires the included schema to be in the same target namespace as the including schema. The import element behaves in a similar way, with the exception that the imported schema can come from a different namespace.">Adding an import element</a><br />
-<a href="../topics/taddincl.html" title="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. XML schema defines two constructs to support this: include and import. The include element brings in definitions and declarations from the included schema into the current schema. It requires the included schema to be in the same target namespace as the including schema. The import element behaves in a similar way, with the exception that the imported schema can come from a different namespace.">Adding an include element</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.html
deleted file mode 100644
index 458da4d..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Navigating XML schemas</title>
-</head>
-<body id="tnavsrc"><a name="tnavsrc"><!-- --></a>
-
-<h1 class="topictitle1">Navigating XML schemas</h1>
-<div><p>When you are working in the Source view, you can use F3 to navigate
-through the file. You can place your cursor in any of the following items
-and press the F3 key to jump to the item it refers to. You must place your
-cursor exactly in the location of the reference (for example between the double
-quotes for  <tt class="sysout">type = "   "</tt> or  <tt class="sysout">base
-= "   "</tt>):</p><div class="skipspace"><ul><li>Element or attribute declaration's type</li>
-<li> Restriction (you jump to the base type it refers to) </li>
-<li> List (you jump to the type it refers to) </li>
-<li> Union (you jump to the type it refers to) </li>
-<li>Element references</li>
-<li>Key references</li>
-<li>Group references</li>
-<li>Attribute references</li>
-<li>Attribute group references</li>
-<li>Import, include, and redefine element (the external schema will open in
-the XML schema editor. This only works with schemas in the workspace).</li>
-</ul>
-<p>For example, if you place your cursor anywhere in the bolded text
-below and click F3:</p>
-<p> <tt class="sysout">&lt;element name="shipTo" type="po:USAddress"&gt;&lt;/element&gt;</tt> </p>
-<p>the
-cursor will automatically jump to the location in the file where the type
-USAddress is defined.</p>
-<p>Or, if you place your cursor anywhere in the bolded
-text below and click F3:</p>
-<p> <tt class="sysout">&lt;element ref="po:ContactElement"&gt;&lt;/element&gt;</tt> </p>
-<p>the
-cursor will automatically jump to the location in the file where the global
-element ContactElement is defined.</p>
-<p>This works across files. For example,
-if  the type you have selected is defined in another XML schema and you click
-F3, you will automatically be taken to that file.</p>
-</div>
-</div>
-
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cxmlsced.html" title="XML schemas are an XML language for describing and constraining the content of XML files. ">XML schema editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.html
deleted file mode 100644
index 015300a..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Validating an XML schema</title>
-</head>
-<body id="tvdtschm"><a name="tvdtschm"><!-- --></a>
-
-<h1 class="topictitle1">Validating an XML schema</h1>
-<div><p>Validating an XML schema determines whether the current state of
-the XML schema file is semantically valid. Any errors will be displayed in
-the Problems view.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To validate
-an XML schema, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Right-click your file in the Navigator view and click <span class="uicontrol">Validate
-XML Schema.</span></span></li>
-<li class="skipspace"><span>You will receive a message indicating whether the XML schema file is
-valid.</span>  If validation was not successful, refer to the Problems
-view to see what problems were logged.  <div class="note"><span class="notetitle">Note: </span>If you receive an error message
-indicating that the Problems view is full, you can increase the number of
-error messages allowed by selecting  <span class="menucascade"><span class="uicontrol">Properties &gt;
-Validation</span></span> from the project's pop-up menu and specifying
-the maximum number of error messages allowed.</div>
-</li>
-</ol>
-<div class="skipspace"><p>The XML schema support in the XML schema editor is
-based on the W3C XML Schema Recommendation Specification of 2 May 2001. The
-XML Schema specifications <a href="http://www.w3.org/TR/xmlschema-1/" target="_blank">XML Schema Part 1: Structures</a> and <a href="http://www.w3.org/TR/xmlschema-2/" target="_blank">XML Schema Part 2: Datatypes</a> from the
-W3C Web site are used for validation. </p>
-<p>Certain error messages contain
-a reference to the schema constraints listed in Appendix C of the  <a href="http://www.w3.org/TR/xmlschema-1/" target="_blank">XML Schema Part 1: Structures</a> document.
-Each constraint has a unique name that will be referenced in the error message.
-For example, if you receive an error message with this text:  <tt class="sysout">ct-props-correct.2,</tt> and
-you searched in the Structure document for the text, you would find that it
-is for the section "Schema Component Constraint: Complex Type Definition Properties
-Correct". The <tt class="sysout">.2</tt> means the 2nd constraint, which
-reads: "2. If the {base type definition} is a simple type definition, the
-{derivation method} must be extension."</p>
-<p>You can set up a project's properties
-so that different types of project resources are automatically validated when
-you save them. From a project's pop-up menu select <span class="uicontrol">Properties</span>,
-then select <span class="uicontrol">Validation</span>. Any validators you can run
-against your  project will be listed in the Validation page. </p>
-</div>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcxmlsch.html" title="You can create an XML schema and then edit it using the XML schema editor.">Creating XML schemas</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/xsdeditor_reference_toc.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/xsdeditor_reference_toc.xml
deleted file mode 100644
index 1092fa7..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/xsdeditor_reference_toc.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<toc label="XML schema editor reference files" topic="topics/rxsdicons.html">
-   <topic label="XML schema editor reference">
-     <!-- <topic label="Icons used in the XML schema editor" href="topics/rxsdicons.html"/>-->
-      <topic label="Referential integrity in the XML schema editor" href="topics/rrefintg.html"/>
-      <!-- <topic label="Data binding rules for Java beans from XML schema files" href="topics/rbndrule.html"/>-->
-      <topic label="XML namespaces" href="topics/rnmspc.html"/>
-   </topic>
-</toc>