[258328] Access to setDocumentHandler
diff --git a/plugins/org.eclipse.actf.model.dom.html/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.model.dom.html/META-INF/MANIFEST.MF
index 8757e8b..4a8a337 100644
--- a/plugins/org.eclipse.actf.model.dom.html/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.model.dom.html/META-INF/MANIFEST.MF
@@ -6,4 +6,5 @@
Bundle-Vendor: Eclipse.org
Eclipse-LazyStart: false
Export-Package: org.eclipse.actf.model.dom.html,
+ org.eclipse.actf.model.dom.html.dochandler,
org.eclipse.actf.model.dom.html.errorhandler
diff --git a/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/dom/html/IParser.java b/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/dom/html/IParser.java
index 7d299d7..ab1f329 100644
--- a/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/dom/html/IParser.java
+++ b/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/dom/html/IParser.java
@@ -17,6 +17,7 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.xml.sax.DocumentHandler;
import org.xml.sax.SAXException;
/**
@@ -243,4 +244,10 @@
*/
public void setTagCase(int tagCase);
+ /**
+ * Sets a <i>DocumentHandler </i> instance for this parser.
+ *
+ * @see #getDocumentHandler()
+ */
+ public void setDocumentHandler(DocumentHandler handler);
}
diff --git a/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/sgml/impl/DefaultDocumentHandler.java b/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/dom/html/dochandler/DefaultDocumentHandler.java
similarity index 96%
rename from plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/sgml/impl/DefaultDocumentHandler.java
rename to plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/dom/html/dochandler/DefaultDocumentHandler.java
index 6cdfa49..12c3067 100644
--- a/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/sgml/impl/DefaultDocumentHandler.java
+++ b/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/dom/html/dochandler/DefaultDocumentHandler.java
@@ -9,9 +9,10 @@
* Goh KONDOH - initial API and implementation
*******************************************************************************/
-package org.eclipse.actf.model.internal.dom.sgml.impl;
+package org.eclipse.actf.model.dom.html.dochandler;
import org.eclipse.actf.model.internal.dom.sgml.ISGMLParser;
+import org.eclipse.actf.model.internal.dom.sgml.impl.SGMLParser;
import org.xml.sax.AttributeList;
import org.xml.sax.DocumentHandler;
import org.xml.sax.Locator;
diff --git a/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/html/parser/PREHandler.java b/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/dom/html/dochandler/PREHandler.java
similarity index 89%
rename from plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/html/parser/PREHandler.java
rename to plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/dom/html/dochandler/PREHandler.java
index 8e8cf23..1250d1f 100644
--- a/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/html/parser/PREHandler.java
+++ b/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/dom/html/dochandler/PREHandler.java
@@ -9,13 +9,12 @@
* Goh KONDOH - initial API and implementation
*******************************************************************************/
-package org.eclipse.actf.model.internal.dom.html.parser;
+package org.eclipse.actf.model.dom.html.dochandler;
-import org.eclipse.actf.model.internal.dom.sgml.impl.DefaultDocumentHandler;
+import org.eclipse.actf.model.internal.dom.html.parser.HTMLParser;
import org.xml.sax.AttributeList;
import org.xml.sax.SAXException;
-
public class PREHandler extends DefaultDocumentHandler {
private boolean previousPrsvWS;
diff --git a/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/html/parser/CharsetHandler.java b/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/html/parser/CharsetHandler.java
index c7164d4..e9f3f67 100644
--- a/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/html/parser/CharsetHandler.java
+++ b/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/html/parser/CharsetHandler.java
@@ -16,8 +16,8 @@
import org.eclipse.actf.model.dom.html.IHTMLParser;
import org.eclipse.actf.model.dom.html.IParserError;
+import org.eclipse.actf.model.dom.html.dochandler.DefaultDocumentHandler;
import org.eclipse.actf.model.internal.dom.html.util.RereadableInputStream;
-import org.eclipse.actf.model.internal.dom.sgml.impl.DefaultDocumentHandler;
import org.xml.sax.AttributeList;
import org.xml.sax.SAXException;
diff --git a/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/html/parser/HTMLParser.java b/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/html/parser/HTMLParser.java
index 986a6b2..522fd07 100644
--- a/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/html/parser/HTMLParser.java
+++ b/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/html/parser/HTMLParser.java
@@ -27,6 +27,7 @@
import org.eclipse.actf.model.dom.html.IHTMLParser;
import org.eclipse.actf.model.dom.html.IParser;
import org.eclipse.actf.model.dom.html.ParseException;
+import org.eclipse.actf.model.dom.html.dochandler.PREHandler;
import org.eclipse.actf.model.dom.html.errorhandler.FramesetErrorHandler;
import org.eclipse.actf.model.dom.html.errorhandler.HTMLErrorHandler;
import org.eclipse.actf.model.internal.dom.html.impl.SHDOMImpl;
diff --git a/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/sgml/ISGMLParser.java b/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/sgml/ISGMLParser.java
index f7d9653..98e374a 100644
--- a/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/sgml/ISGMLParser.java
+++ b/plugins/org.eclipse.actf.model.dom.html/src/org/eclipse/actf/model/internal/dom/sgml/ISGMLParser.java
@@ -13,18 +13,13 @@
import java.io.IOException;
import java.util.Hashtable;
-import org.eclipse.actf.model.dom.html.IErrorLogListener;
import org.eclipse.actf.model.dom.html.IParser;
import org.eclipse.actf.model.dom.html.ParseException;
-import org.eclipse.actf.model.internal.dom.sgml.impl.EndTag;
import org.eclipse.actf.model.internal.dom.sgml.impl.SGMLDocTypeDef;
import org.eclipse.actf.model.internal.dom.sgml.modelgroup.IModelGroup;
import org.eclipse.actf.model.internal.dom.sgml.modelgroup.AndModelGroup.AndContext;
-import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.xml.sax.DocumentHandler;
-import org.xml.sax.SAXException;
public interface ISGMLParser extends IParser {
@@ -57,13 +52,6 @@
public void insert(String str) throws IOException;
/**
- * Sets a <i>DocumentHandler </i> instace for this parser.
- *
- * @see #getDocumentHandler()
- */
- public void setDocumentHandler(DocumentHandler handler);
-
- /**
* Determines if this parser preserve whitespaces or not. If preserve, the
* parser create text node for whitespace between tags and does not ignore
* carriage return and line feed after start tags and before end tags. By
@@ -80,14 +68,13 @@
public Hashtable<Node, Node> getPlusMap();
public IModelGroup[] getSeqArray();
-
+
/**
* Set up syntax information described by DTD.
*
* @param publicID
* DTD's public id that specifies which to set up.
*/
- public void setupDTD(String publicID) throws ParseException, IOException;
-
+ public void setupDTD(String publicID) throws ParseException, IOException;
}
\ No newline at end of file
