Node.getNodeType is not very OOP, hence removed it.
Signed-off-by: Florian Thienel <florian@thienel.org>
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/ParentTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/ParentTest.java
index c172734..f9b6cd2 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/ParentTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/ParentTest.java
@@ -122,11 +122,6 @@
private static class TestParent extends Parent {
@Override
- public String getNodeType() {
- return "Parent";
- }
-
- @Override
public String getBaseURI() {
return null;
}
@@ -142,11 +137,6 @@
}
@Override
- public String getNodeType() {
- return "Child";
- }
-
- @Override
public String getBaseURI() {
return null;
}
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Document.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Document.java
index 3451da5..df5eb7b 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Document.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Document.java
@@ -331,7 +331,7 @@
* @param elements
* child elements that are within the run
*/
- static List<Node> createNodeList(final Content content, final int startOffset, final int endOffset, final List<Node> elements) {
+ static List<Node> createNodeList(final Content content, final int startOffset, final int endOffset, final List<? extends Node> elements) {
final List<Node> nodes = new ArrayList<Node>();
int offset = startOffset;
@@ -833,9 +833,4 @@
return getDocumentURI();
}
- @Override
- public String getNodeType() {
- // TODO Auto-generated method stub
- return null;
- }
}
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentFragment.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentFragment.java
index 5bd60f5..0c5b0db 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentFragment.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentFragment.java
@@ -97,23 +97,8 @@
return names;
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.vex.core.internal.dom.IVEXDocumentFragment#getNodes()
- */
public List<Node> getNodes() {
- return Document.createNodeList(getContent(), 0, getContent().getLength(), getNodes(getElements()));
- }
-
- private List<Node> getNodes(final List<Element> elements) {
- final List<Node> nodes = new ArrayList<Node>();
- for (final Node node : elements) {
- if (node.getNodeType().equals("Element")) {
- nodes.add(node);
- }
- }
- return nodes;
+ return Document.createNodeList(getContent(), 0, getContent().getLength(), getElements());
}
/*
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Element.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Element.java
index 2aa854a..b9588b4 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Element.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Element.java
@@ -175,8 +175,9 @@
final Iterator<Node> iter = nodes.iterator();
final List<Element> elements = new ArrayList<Element>();
while (iter.hasNext()) {
+ // TODO use INodeVisitor once available
final Node node = iter.next();
- if (node.getNodeType().equals("Element")) {
+ if (node instanceof Element) {
elements.add((Element) node);
}
}
@@ -353,11 +354,6 @@
}
@Override
- public String getNodeType() {
- return "Element";
- }
-
- @Override
public void setContent(final Content content, final int startOffset, final int endOffset) {
super.setContent(content, startOffset, endOffset);
}
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Node.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Node.java
index b0845ca..95ed7a0 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Node.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Node.java
@@ -78,7 +78,5 @@
return getDocument(parent);
}
- public abstract String getNodeType();
-
public abstract String getBaseURI();
}
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Text.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Text.java
index 2ddae8c..03548df 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Text.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Text.java
@@ -31,11 +31,6 @@
}
@Override
- public String getNodeType() {
- return "Text";
- }
-
- @Override
public String getBaseURI() {
return null;
}