1.1 --- a/html.editor.lib/nbproject/project.xml	Thu Jul 22 16:00:07 2010 +0200
     1.2 +++ b/html.editor.lib/nbproject/project.xml	Thu Jul 22 16:16:14 2010 +0200
     1.3 @@ -275,6 +275,7 @@
     1.4                  <friend>org.netbeans.modules.web.jsf.editor</friend>
     1.5                  <package>org.netbeans.editor.ext.html.dtd</package>
     1.6                  <package>org.netbeans.editor.ext.html.dtd.spi</package>
     1.7 +                <package>org.netbeans.editor.ext.html.parser</package>
     1.8                  <package>org.netbeans.editor.ext.html.parser.api</package>
     1.9                  <package>org.netbeans.editor.ext.html.parser.spi</package>
    1.10              </friend-packages>

     2.1 --- a/javascript.editing/src/org/netbeans/modules/javascript/editing/JsCodeCompletion.java	Thu Jul 22 16:00:07 2010 +0200
     2.2 +++ b/javascript.editing/src/org/netbeans/modules/javascript/editing/JsCodeCompletion.java	Thu Jul 22 16:16:14 2010 +0200
     2.3 @@ -806,7 +806,7 @@
     2.4                      @Override
     2.5                      void run(ResultIterator resultIterator) throws Exception {
     2.6                          HtmlParserResult htmlResult = (HtmlParserResult) resultIterator.getParserResult();
     2.7 -                        List<SyntaxElement> elementsList = htmlResult.elementsList();
     2.8 +                        List<SyntaxElement> elementsList = htmlResult.getSyntaxAnalyzerResult().getElements().items();
     2.9                          Set<String> classes = new HashSet<String>();
    2.10                          for (SyntaxElement s : elementsList) {
    2.11                              if (s.type() == SyntaxElement.TYPE_TAG) {
    2.12 @@ -847,7 +847,7 @@
    2.13                      @Override
    2.14                      void run(ResultIterator resultIterator) throws Exception {
    2.15                          HtmlParserResult htmlResult = (HtmlParserResult) resultIterator.getParserResult();
    2.16 -                        List<SyntaxElement> elementsList = htmlResult.elementsList();
    2.17 +                        List<SyntaxElement> elementsList = htmlResult.getSyntaxAnalyzerResult().getElements().items();
    2.18                          Set<String> tagNames = new HashSet<String>();
    2.19                          for (SyntaxElement s : elementsList) {
    2.20                              if (s.type() == SyntaxElement.TYPE_TAG) {
    2.21 @@ -888,8 +888,8 @@
    2.22                      @Override
    2.23                      void run(ResultIterator resultIterator) throws Exception {
    2.24                          HtmlParserResult htmlResult = (HtmlParserResult) resultIterator.getParserResult();
    2.25 -                        Set<SyntaxElement.TagAttribute> elementIds = new HashSet<SyntaxElement.TagAttribute>(htmlResult.elementsList().size() / 10);
    2.26 -                        for (SyntaxElement element : htmlResult.elementsList()) {
    2.27 +                        Set<SyntaxElement.TagAttribute> elementIds = new HashSet<SyntaxElement.TagAttribute>();
    2.28 +                        for (SyntaxElement element : htmlResult.getSyntaxAnalyzerResult().getElements().items()) {
    2.29                              if (element.type() == SyntaxElement.TYPE_TAG) {
    2.30                                  SyntaxElement.TagAttribute attr = ((SyntaxElement.Tag) element).getAttribute("id"); //NOI18N
    2.31                                  if (attr != null) {

     3.1 --- a/web.jsf/src/org/netbeans/modules/web/jsf/palette/items/MetaData.java	Thu Jul 22 16:00:07 2010 +0200
     3.2 +++ b/web.jsf/src/org/netbeans/modules/web/jsf/palette/items/MetaData.java	Thu Jul 22 16:16:14 2010 +0200
     3.3 @@ -51,7 +51,7 @@
     3.4  import javax.swing.text.BadLocationException;
     3.5  import javax.swing.text.JTextComponent;
     3.6  import org.netbeans.editor.BaseDocument;
     3.7 -import org.netbeans.editor.ext.html.parser.AstNode;
     3.8 +import org.netbeans.editor.ext.html.parser.api.AstNode;
     3.9  import org.netbeans.modules.editor.NbEditorUtilities;
    3.10  import org.netbeans.modules.html.editor.api.gsf.HtmlParserResult;
    3.11  import org.netbeans.modules.parsing.api.ParserManager;

     4.1 --- a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/TemplateClientPanelVisual.java	Thu Jul 22 16:00:07 2010 +0200
     4.2 +++ b/web.jsf/src/org/netbeans/modules/web/jsf/wizards/TemplateClientPanelVisual.java	Thu Jul 22 16:16:14 2010 +0200
     4.3 @@ -32,7 +32,7 @@
     4.4  import javax.swing.event.ChangeListener;
     4.5  import org.netbeans.api.project.SourceGroup;
     4.6  import org.netbeans.api.project.Sources;
     4.7 -import org.netbeans.editor.ext.html.parser.AstNode;
     4.8 +import org.netbeans.editor.ext.html.parser.api.AstNode;
     4.9  import org.netbeans.modules.html.editor.api.gsf.HtmlParserResult;
    4.10  import org.netbeans.modules.parsing.api.ParserManager;
    4.11  import org.netbeans.modules.parsing.api.ResultIterator;