250829 - refactor out DTDValidator, replace with WTPVEXValidator.
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/META-INF/MANIFEST.MF b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/META-INF/MANIFEST.MF
index a59832d..caf6f92 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/META-INF/MANIFEST.MF
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@
org.apache.xerces;bundle-version="[2.9.0,3.0.0)",
org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)"
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.wst.common.uriresolver;bundle-version="1.1.301"
Export-Package: org.eclipse.wst.xml.vex.core.internal;x-internal:=true,
org.eclipse.wst.xml.vex.core.internal.core;x-internal:=true,
org.eclipse.wst.xml.vex.core.internal.css;x-internal:=true,
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PseudoElement.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PseudoElement.java
index fa6fd79..2f3a447 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PseudoElement.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PseudoElement.java
@@ -11,7 +11,7 @@
package org.eclipse.wst.xml.vex.core.internal.css;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* Represents a :before or :after pseudo-element.
@@ -29,7 +29,7 @@
* @param name
* Name of this pseudo-element, e.g. PseudoElement.BEFORE.
*/
- public PseudoElement(IVEXElement parent, String name) {
+ public PseudoElement(VEXElement parent, String name) {
super(name);
this.setParent(parent);
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Rule.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Rule.java
index 81fb739..a5a599f 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Rule.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Rule.java
@@ -18,7 +18,7 @@
import java.util.List;
import java.util.StringTokenizer;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.w3c.css.sac.AttributeCondition;
import org.w3c.css.sac.CombinatorCondition;
import org.w3c.css.sac.Condition;
@@ -116,7 +116,7 @@
* @param element
* Element to check.
*/
- public boolean matches(IVEXElement element) {
+ public boolean matches(VEXElement element) {
return matches(this.selector, element);
}
@@ -125,7 +125,7 @@
/**
* Returns true if the given element matches the given selector.
*/
- private static boolean matches(Selector selector, IVEXElement element) {
+ private static boolean matches(Selector selector, VEXElement element) {
if (element == null) {
// This can happen when, e.g., with the rule "foo > *".
@@ -189,7 +189,7 @@
case Selector.SAC_CHILD_SELECTOR:
DescendantSelector ds2 = (DescendantSelector) selector;
- IVEXElement parent = element.getParent();
+ VEXElement parent = element.getParent();
if (element instanceof PseudoElement) {
parent = parent.getParent(); // sigh - this looks inelegant, but
// whatcha gonna do?
@@ -207,12 +207,12 @@
// find next sibling
final Iterator i = element.getParent().getChildIterator();
- IVEXElement e = null;
- IVEXElement f = null;
+ VEXElement e = null;
+ VEXElement f = null;
while (i.hasNext() && e != element) {
f = e;
- e = (IVEXElement) i.next();
+ e = (VEXElement) i.next();
}
if (e == element) {
@@ -232,8 +232,8 @@
* Returns true if some ancestor of the given element matches the given
* selector.
*/
- private static boolean matchesAncestor(Selector selector, IVEXElement element) {
- IVEXElement e = element;
+ private static boolean matchesAncestor(Selector selector, VEXElement element) {
+ VEXElement e = element;
while (e != null) {
if (matches(selector, e)) {
return true;
@@ -243,7 +243,7 @@
return false;
}
- private static boolean matchesCondition(Condition condition, IVEXElement element) {
+ private static boolean matchesCondition(Condition condition, VEXElement element) {
AttributeCondition acon;
String attributeName;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheet.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheet.java
index 21d3424..7946e23 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheet.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheet.java
@@ -25,7 +25,7 @@
import org.eclipse.wst.xml.vex.core.internal.core.FontSpec;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.w3c.css.sac.LexicalUnit;
/**
@@ -132,7 +132,7 @@
* @param element
* IVEXElement for which styles are to be flushed.
*/
- public void flushStyles(IVEXElement element) {
+ public void flushStyles(VEXElement element) {
this.getStyleMap().remove(element);
}
@@ -143,7 +143,7 @@
* @param element
* Parent element of the pseudo-element.
*/
- public IVEXElement getAfterElement(IVEXElement element) {
+ public VEXElement getAfterElement(VEXElement element) {
PseudoElement pe = new PseudoElement(element, PseudoElement.AFTER);
Styles styles = this.getStyles(pe);
if (styles == null) {
@@ -160,7 +160,7 @@
* @param element
* Parent element of the pseudo-element.
*/
- public IVEXElement getBeforeElement(IVEXElement element) {
+ public VEXElement getBeforeElement(VEXElement element) {
PseudoElement pe = new PseudoElement(element, PseudoElement.BEFORE);
Styles styles = this.getStyles(pe);
if (styles == null) {
@@ -184,7 +184,7 @@
* @param element
* IVEXElement for which to calculate the styles.
*/
- public Styles getStyles(IVEXElement element) {
+ public Styles getStyles(VEXElement element) {
Styles styles;
WeakReference ref = (WeakReference) this.getStyleMap().get(element);
@@ -215,7 +215,7 @@
return styles;
}
- private Styles calculateStyles(IVEXElement element) {
+ private Styles calculateStyles(VEXElement element) {
Styles styles = new Styles();
Styles parentStyles = null;
@@ -309,7 +309,7 @@
/**
* Returns all the declarations that apply to the given element.
*/
- private Map getApplicableDecls(IVEXElement element) {
+ private Map getApplicableDecls(VEXElement element) {
// Find all the property declarations that apply to this element.
List declList = new ArrayList();
Rule[] rules = this.getRules();
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DOMDocumentReader.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DOMDocumentReader.java
index 5935380..1a6574c 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DOMDocumentReader.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DOMDocumentReader.java
@@ -18,7 +18,7 @@
import javax.xml.parsers.ParserConfigurationException;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -34,7 +34,7 @@
* @param domDocument
* IDOMDocument from which to load the document.
*/
- public IVEXDocument read(IDOMDocument domDocument) throws IOException,
+ public VEXDocument read(IDOMDocument domDocument) throws IOException,
ParserConfigurationException, SAXException {
Reader reader = new StringReader(domDocument.getSource());
return read(new InputSource(new BufferedReader(reader)));
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Document.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Document.java
index 02cdcbd..275a3db 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Document.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Document.java
@@ -17,11 +17,11 @@
import org.eclipse.wst.xml.vex.core.internal.core.ListenerList;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IContent;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IPosition;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXNode;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IValidator;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocumentFragment;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXNode;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.Validator;
import org.eclipse.wst.xml.vex.core.internal.undo.CannotRedoException;
import org.eclipse.wst.xml.vex.core.internal.undo.CannotUndoException;
import org.eclipse.wst.xml.vex.core.internal.undo.IUndoableEdit;
@@ -30,7 +30,7 @@
* Represents an XML document.
*
*/
-public class Document implements IVEXDocument {
+public class Document implements VEXDocument {
private IContent content;
private RootElement rootElement;
@@ -41,7 +41,7 @@
private String publicID;
private String systemID;
private String encoding;
- private IValidator validator;
+ private Validator validator;
/**
* Class constructor.
@@ -86,13 +86,13 @@
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#canInsertFragment(int, org.eclipse.wst.xml.vex.core.internal.dom.DocumentFragment)
*
*/
- public boolean canInsertFragment(int offset, IVEXDocumentFragment fragment) {
+ public boolean canInsertFragment(int offset, VEXDocumentFragment fragment) {
if (this.validator == null) {
return true;
}
- IVEXElement element = this.getElementAt(offset);
+ VEXElement element = this.getElementAt(offset);
String[] seq1 = this.getNodeNames(element.getStartOffset() + 1, offset);
String[] seq2 = fragment.getNodeNames();
String[] seq3 = this.getNodeNames(offset, element.getEndOffset());
@@ -110,9 +110,9 @@
return true;
}
- IVEXElement element = this.getElementAt(offset);
+ VEXElement element = this.getElementAt(offset);
String[] seq1 = this.getNodeNames(element.getStartOffset() + 1, offset);
- String[] seq2 = new String[] { IValidator.PCDATA };
+ String[] seq2 = new String[] { Validator.PCDATA };
String[] seq3 = this.getNodeNames(offset, element.getEndOffset());
return this.validator.isValidSequence(element.getName(), seq1, seq2,
@@ -134,14 +134,14 @@
public void delete(int startOffset, int endOffset)
throws DocumentValidationException {
- IVEXElement e1 = this.getElementAt(startOffset);
- IVEXElement e2 = this.getElementAt(endOffset);
+ VEXElement e1 = this.getElementAt(startOffset);
+ VEXElement e2 = this.getElementAt(endOffset);
if (e1 != e2) {
throw new IllegalArgumentException("Deletion from " + startOffset
+ " to " + endOffset + " is unbalanced");
}
- IValidator validator = this.getValidator();
+ Validator validator = this.getValidator();
if (validator != null) {
String[] seq1 = this.getNodeNames(e1.getStartOffset() + 1,
startOffset);
@@ -154,7 +154,7 @@
}
// Grab the fragment for the undoable edit while it's still here
- IVEXDocumentFragment frag = getFragment(startOffset, endOffset);
+ VEXDocumentFragment frag = getFragment(startOffset, endOffset);
this.fireBeforeContentDeleted(new DocumentEvent(this, e1, startOffset,
endOffset - startOffset, null));
@@ -181,11 +181,11 @@
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#findCommonElement(int, int)
*
*/
- public IVEXElement findCommonElement(int offset1, int offset2) {
- IVEXElement element = this.rootElement;
+ public VEXElement findCommonElement(int offset1, int offset2) {
+ VEXElement element = this.rootElement;
for (;;) {
boolean tryAgain = false;
- IVEXElement[] children = element.getChildElements();
+ VEXElement[] children = element.getChildElements();
for (int i = 0; i < children.length; i++) {
if (offset1 > children[i].getStartOffset()
&& offset2 > children[i].getStartOffset()
@@ -216,17 +216,17 @@
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#getElementAt(int)
*
*/
- public IVEXElement getElementAt(int offset) {
+ public VEXElement getElementAt(int offset) {
if (offset < 1 || offset >= this.getLength()) {
throw new IllegalArgumentException("Illegal offset: " + offset
+ ". Must be between 1 and n-1");
}
- IVEXElement element = this.rootElement;
+ VEXElement element = this.rootElement;
for (;;) {
boolean tryAgain = false;
- IVEXElement[] children = element.getChildElements();
+ VEXElement[] children = element.getChildElements();
for (int i = 0; i < children.length; i++) {
- IVEXElement child = children[i];
+ VEXElement child = children[i];
if (offset <= child.getStartOffset()) {
return element;
} else if (offset <= child.getEndOffset()) {
@@ -254,7 +254,7 @@
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#getFragment(int, int)
*
*/
- public IVEXDocumentFragment getFragment(int startOffset, int endOffset) {
+ public VEXDocumentFragment getFragment(int startOffset, int endOffset) {
assertOffset(startOffset, 0, this.content.getLength());
assertOffset(endOffset, 0, this.content.getLength());
@@ -264,21 +264,21 @@
+ ", " + endOffset + ")");
}
- IVEXElement e1 = this.getElementAt(startOffset);
- IVEXElement e2 = this.getElementAt(endOffset);
+ VEXElement e1 = this.getElementAt(startOffset);
+ VEXElement e2 = this.getElementAt(endOffset);
if (e1 != e2) {
throw new IllegalArgumentException("Fragment from " + startOffset
+ " to " + endOffset + " is unbalanced");
}
- IVEXElement[] children = e1.getChildElements();
+ VEXElement[] children = e1.getChildElements();
IContent newContent = new GapContent(endOffset - startOffset);
String s = this.content.getString(startOffset, endOffset - startOffset);
newContent.insertString(0, s);
List newChildren = new ArrayList();
for (int i = 0; i < children.length; i++) {
- IVEXElement child = children[i];
+ VEXElement child = children[i];
if (child.getEndOffset() <= startOffset) {
continue;
} else if (child.getStartOffset() >= endOffset) {
@@ -289,8 +289,8 @@
}
}
- IVEXElement[] elementArray = (IVEXElement[]) newChildren
- .toArray(new IVEXElement[newChildren.size()]);
+ VEXElement[] elementArray = (VEXElement[]) newChildren
+ .toArray(new VEXElement[newChildren.size()]);
return new DocumentFragment(newContent, elementArray);
}
@@ -308,15 +308,15 @@
*/
public String[] getNodeNames(int startOffset, int endOffset) {
- IVEXNode[] nodes = this.getNodes(startOffset, endOffset);
+ VEXNode[] nodes = this.getNodes(startOffset, endOffset);
String[] names = new String[nodes.length];
for (int i = 0; i < nodes.length; i++) {
- IVEXNode node = nodes[i];
+ VEXNode node = nodes[i];
if (node instanceof Element) {
- names[i] = ((IVEXElement) node).getName();
+ names[i] = ((VEXElement) node).getName();
} else {
- names[i] = IValidator.PCDATA;
+ names[i] = Validator.PCDATA;
}
}
@@ -327,9 +327,9 @@
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#getNodes(int, int)
*
*/
- public IVEXNode[] getNodes(int startOffset, int endOffset) {
+ public VEXNode[] getNodes(int startOffset, int endOffset) {
- IVEXElement element = this.getElementAt(startOffset);
+ VEXElement element = this.getElementAt(startOffset);
if (element != this.getElementAt(endOffset)) {
throw new IllegalArgumentException("Offsets are unbalanced: "
+ startOffset + " is in " + element.getName() + ", "
@@ -338,9 +338,9 @@
}
List list = new ArrayList();
- IVEXNode[] nodes = element.getChildNodes();
+ VEXNode[] nodes = element.getChildNodes();
for (int i = 0; i < nodes.length; i++) {
- IVEXNode node = nodes[i];
+ VEXNode node = nodes[i];
if (node.getEndOffset() <= startOffset) {
continue;
} else if (node.getStartOffset() >= endOffset) {
@@ -362,7 +362,7 @@
}
}
- return (IVEXNode[]) list.toArray(new IVEXNode[list.size()]);
+ return (VEXNode[]) list.toArray(new VEXNode[list.size()]);
}
/**
@@ -379,8 +379,8 @@
* @param elements
* child elements that are within the run
*/
- static IVEXNode[] createNodeArray(IContent content, int startOffset,
- int endOffset, IVEXElement[] elements) {
+ static VEXNode[] createNodeArray(IContent content, int startOffset,
+ int endOffset, VEXElement[] elements) {
List nodes = new ArrayList();
int offset = startOffset;
@@ -397,7 +397,7 @@
nodes.add(new Text(content, offset, endOffset));
}
- return (IVEXNode[]) nodes.toArray(new IVEXNode[nodes.size()]);
+ return (VEXNode[]) nodes.toArray(new VEXNode[nodes.size()]);
}
/* (non-Javadoc)
@@ -453,7 +453,7 @@
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#getValidator()
*
*/
- public IValidator getValidator() {
+ public Validator getValidator() {
return this.validator;
}
@@ -461,7 +461,7 @@
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#insertElement(int, org.eclipse.wst.xml.vex.core.internal.dom.Element)
*
*/
- public void insertElement(int offset, IVEXElement element)
+ public void insertElement(int offset, VEXElement element)
throws DocumentValidationException {
if (offset < 1 || offset >= this.getLength()) {
@@ -471,9 +471,9 @@
+ (this.getLength() - 1));
}
- IValidator validator = this.getValidator();
+ Validator validator = this.getValidator();
if (validator != null) {
- IVEXElement parent = this.getElementAt(offset);
+ VEXElement parent = this.getElementAt(offset);
String[] seq1 = this.getNodeNames(parent.getStartOffset() + 1,
offset);
String[] seq2 = new String[] { element.getName() };
@@ -487,13 +487,13 @@
// find the parent, and the index into its children at which
// this element should be inserted
- IVEXElement parent = this.rootElement;
+ VEXElement parent = this.rootElement;
int childIndex = -1;
while (childIndex == -1) {
boolean tryAgain = false;
- IVEXElement[] children = parent.getChildElements();
+ VEXElement[] children = parent.getChildElements();
for (int i = 0; i < children.length; i++) {
- IVEXElement child = children[i];
+ VEXElement child = children[i];
if (offset <= child.getStartOffset()) {
childIndex = i;
break;
@@ -529,7 +529,7 @@
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#insertFragment(int, org.eclipse.wst.xml.vex.core.internal.dom.DocumentFragment)
*
*/
- public void insertFragment(int offset, IVEXDocumentFragment fragment)
+ public void insertFragment(int offset, VEXDocumentFragment fragment)
throws DocumentValidationException {
if (offset < 1 || offset >= this.getLength()) {
@@ -537,7 +537,7 @@
"Error inserting document fragment");
}
- IVEXElement parent = this.getElementAt(offset);
+ VEXElement parent = this.getElementAt(offset);
if (this.validator != null) {
String[] seq1 = this.getNodeNames(parent.getStartOffset() + 1,
@@ -559,16 +559,16 @@
String s = c.getString(0, c.getLength());
this.content.insertString(offset, s);
- IVEXElement[] children = parent.getChildElements();
+ VEXElement[] children = parent.getChildElements();
int index = 0;
while (index < children.length
&& children[index].getEndOffset() < offset) {
index++;
}
- IVEXElement[] elements = fragment.getElements();
+ VEXElement[] elements = fragment.getElements();
for (int i = 0; i < elements.length; i++) {
- IVEXElement newElement = this.cloneElement(elements[i], this.content,
+ VEXElement newElement = this.cloneElement(elements[i], this.content,
offset, parent);
parent.insertChild(index, newElement);
index++;
@@ -593,7 +593,7 @@
"Offset must be between 1 and n-1");
}
- IVEXElement parent = this.getElementAt(offset);
+ VEXElement parent = this.getElementAt(offset);
boolean isValid = false;
if (this.getCharacterAt(offset - 1) != '\0') {
@@ -601,11 +601,11 @@
} else if (this.getCharacterAt(offset) != '\0') {
isValid = true;
} else {
- IValidator validator = this.getValidator();
+ Validator validator = this.getValidator();
if (validator != null) {
String[] seq1 = this.getNodeNames(parent.getStartOffset() + 1,
offset);
- String[] seq2 = new String[] { IValidator.PCDATA };
+ String[] seq2 = new String[] { Validator.PCDATA };
String[] seq3 = this
.getNodeNames(offset, parent.getEndOffset());
isValid = validator.isValidSequence(parent.getName(), seq1,
@@ -686,7 +686,7 @@
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#setValidator(org.eclipse.wst.xml.vex.core.internal.dom.Validator)
*
*/
- public void setValidator(IValidator validator) {
+ public void setValidator(Validator validator) {
this.validator = validator;
}
@@ -699,9 +699,9 @@
private int startOffset;
private int endOffset;
- private IVEXDocumentFragment frag;
+ private VEXDocumentFragment frag;
- public DeleteEdit(int startOffset, int endOffset, IVEXDocumentFragment frag) {
+ public DeleteEdit(int startOffset, int endOffset, VEXDocumentFragment frag) {
this.startOffset = startOffset;
this.endOffset = endOffset;
this.frag = frag;
@@ -741,9 +741,9 @@
private class InsertElementEdit implements IUndoableEdit {
private int offset;
- private IVEXElement element;
+ private VEXElement element;
- public InsertElementEdit(int offset, IVEXElement element2) {
+ public InsertElementEdit(int offset, VEXElement element2) {
this.offset = offset;
this.element = element2;
}
@@ -782,9 +782,9 @@
private class InsertFragmentEdit implements IUndoableEdit {
private int offset;
- private IVEXDocumentFragment frag;
+ private VEXDocumentFragment frag;
- public InsertFragmentEdit(int offset, IVEXDocumentFragment frag) {
+ public InsertFragmentEdit(int offset, VEXDocumentFragment frag) {
this.offset = offset;
this.frag = frag;
}
@@ -889,8 +889,8 @@
* @param parent
* parent for the cloned Element
*/
- private IVEXElement cloneElement(IVEXElement original, IContent content, int shift,
- IVEXElement parent) {
+ private VEXElement cloneElement(VEXElement original, IContent content, int shift,
+ VEXElement parent) {
Element clone = new Element(original.getName());
clone.setContent(content, original.getStartOffset() + shift, original
@@ -907,9 +907,9 @@
}
clone.setParent(parent);
- IVEXElement[] children = original.getChildElements();
+ VEXElement[] children = original.getChildElements();
for (int i = 0; i < children.length; i++) {
- IVEXElement cloneChild = this.cloneElement(children[i], content, shift,
+ VEXElement cloneChild = this.cloneElement(children[i], content, shift,
clone);
clone.insertChild(i, cloneChild);
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentBuilder.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentBuilder.java
index 98dbaba..af50118 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentBuilder.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentBuilder.java
@@ -13,8 +13,8 @@
import java.util.LinkedList;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IContent;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicy;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicyFactory;
import org.xml.sax.Attributes;
@@ -52,7 +52,7 @@
/**
* Returns the newly built <code>Document</code> object.
*/
- public IVEXDocument getDocument() {
+ public VEXDocument getDocument() {
return this.doc;
}
@@ -133,7 +133,7 @@
}
} else {
element = new Element(qName);
- IVEXElement parent = ((StackEntry) stack.getLast()).element;
+ VEXElement parent = ((StackEntry) stack.getLast()).element;
parent.addChild(element);
}
@@ -262,11 +262,11 @@
this.trimLeading = false;
}
- private boolean isBlock(IVEXElement element) {
+ private boolean isBlock(VEXElement element) {
return this.policy != null && this.policy.isBlock(element);
}
- private boolean isPre(IVEXElement element) {
+ private boolean isPre(VEXElement element) {
return this.policy != null && this.policy.isPre(element);
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentEvent.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentEvent.java
index b09e05e..f427c07 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentEvent.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentEvent.java
@@ -12,8 +12,8 @@
import java.util.EventObject;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.eclipse.wst.xml.vex.core.internal.undo.IUndoableEdit;
/**
@@ -22,8 +22,8 @@
*/
public class DocumentEvent extends EventObject {
- private IVEXDocument document;
- private IVEXElement parentElement;
+ private VEXDocument document;
+ private VEXElement parentElement;
private int offset;
private int length;
private String attributeName;
@@ -45,7 +45,7 @@
* @param undoableEdit
* IUndoableEdit that can be used to undo the change.
*/
- public DocumentEvent(IVEXDocument document, IVEXElement e1, int offset,
+ public DocumentEvent(VEXDocument document, VEXElement e1, int offset,
int length, IUndoableEdit undoableEdit) {
super(document);
@@ -72,7 +72,7 @@
* @param undoableEdit
* IUndoableEdit that can be used to undo the change.
*/
- public DocumentEvent(IVEXDocument document, Element parentElement,
+ public DocumentEvent(VEXDocument document, Element parentElement,
String attributeName, String oldAttributeValue,
String newAttributeValue, IUndoableEdit undoableEdit) {
@@ -105,7 +105,7 @@
* Returns the element containing the change.
* @model
*/
- public IVEXElement getParentElement() {
+ public VEXElement getParentElement() {
return this.parentElement;
}
@@ -139,7 +139,7 @@
* @return the document for which this event was generated
* @model
*/
- public IVEXDocument getDocument() {
+ public VEXDocument getDocument() {
return document;
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentFragment.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentFragment.java
index 92080ce..dc4658b 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentFragment.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentFragment.java
@@ -16,18 +16,18 @@
import java.io.Serializable;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IContent;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXNode;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IValidator;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocumentFragment;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXNode;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.Validator;
/**
* Represents a fragment of an XML document.
*/
-public class DocumentFragment implements Serializable, IVEXDocumentFragment {
+public class DocumentFragment implements Serializable, VEXDocumentFragment {
private IContent content;
- private IVEXElement[] elements;
+ private VEXElement[] elements;
/**
* Class constructor.
@@ -37,7 +37,7 @@
* @param elementArray
* Elements that make up this fragment.
*/
- public DocumentFragment(IContent content, IVEXElement[] elementArray) {
+ public DocumentFragment(IContent content, VEXElement[] elementArray) {
this.content = content;
this.elements = elementArray;
}
@@ -59,7 +59,7 @@
/* (non-Javadoc)
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocumentFragment#getElements()
*/
- public IVEXElement[] getElements() {
+ public VEXElement[] getElements() {
return this.elements;
}
@@ -68,13 +68,13 @@
*/
public String[] getNodeNames() {
- IVEXNode[] nodes = this.getNodes();
+ VEXNode[] nodes = this.getNodes();
String[] names = new String[nodes.length];
for (int i = 0; i < nodes.length; i++) {
if (nodes[i] instanceof Text) {
- names[i] = IValidator.PCDATA;
+ names[i] = Validator.PCDATA;
} else {
- names[i] = ((IVEXElement) nodes[i]).getName();
+ names[i] = ((VEXElement) nodes[i]).getName();
}
}
@@ -84,7 +84,7 @@
/* (non-Javadoc)
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocumentFragment#getNodes()
*/
- public IVEXNode[] getNodes() {
+ public VEXNode[] getNodes() {
return Document.createNodeArray(this.getContent(), 0, this.getContent()
.getLength(), this.getElements());
}
@@ -103,7 +103,7 @@
}
}
- private void writeElement(IVEXElement element, ObjectOutputStream out)
+ private void writeElement(VEXElement element, ObjectOutputStream out)
throws IOException {
out.writeObject(element.getName());
@@ -115,7 +115,7 @@
out.writeObject(attrNames[i]);
out.writeObject(element.getAttribute(attrNames[i]));
}
- IVEXElement[] children = element.getChildElements();
+ VEXElement[] children = element.getChildElements();
out.writeInt(children.length);
for (int i = 0; i < children.length; i++) {
this.writeElement(children[i], out);
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentReader.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentReader.java
index a911959..89d87ae 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentReader.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentReader.java
@@ -21,7 +21,7 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicyFactory;
import org.xml.sax.ContentHandler;
import org.xml.sax.EntityResolver;
@@ -62,7 +62,7 @@
* @param url
* URL from which to load the document.
*/
- public IVEXDocument read(URL url) throws IOException,
+ public VEXDocument read(URL url) throws IOException,
ParserConfigurationException, SAXException {
return read(new InputSource(url.toString()));
@@ -75,7 +75,7 @@
* @param s
* String containing the document to be read.
*/
- public IVEXDocument read(String s) throws IOException,
+ public VEXDocument read(String s) throws IOException,
ParserConfigurationException, SAXException {
Reader reader = new CharArrayReader(s.toCharArray());
@@ -88,7 +88,7 @@
* @param is
* SAX InputSource from which to load the document.
*/
- public IVEXDocument read(InputSource is) throws IOException,
+ public VEXDocument read(InputSource is) throws IOException,
ParserConfigurationException, SAXException {
SAXParserFactory factory = SAXParserFactory.newInstance();
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriter.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriter.java
index 9b17467..2beafec 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriter.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriter.java
@@ -16,10 +16,10 @@
import java.io.PrintWriter;
import java.util.Arrays;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXNode;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IValidator;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXNode;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.Validator;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicy;
import org.eclipse.wst.xml.vex.core.internal.validator.AttributeDefinition;
@@ -135,7 +135,7 @@
this.wrapColumn = wrapColumn;
}
- public void write(IVEXDocument doc, OutputStream os) throws IOException {
+ public void write(VEXDocument doc, OutputStream os) throws IOException {
OutputStreamWriter osw = new OutputStreamWriter(os, "UTF-8");
PrintWriter pw = new PrintWriter(osw);
@@ -163,7 +163,7 @@
// ====================================================== PRIVATE
- private void writeNode(IVEXNode node, PrintWriter pw, String indent) {
+ private void writeNode(VEXNode node, PrintWriter pw, String indent) {
if (node instanceof Text) {
TextWrapper wrapper = new TextWrapper();
@@ -189,7 +189,7 @@
}
boolean hasBlockChild = false;
- IVEXElement[] children = element.getChildElements();
+ VEXElement[] children = element.getChildElements();
for (int i = 0; i < children.length; i++) {
if (this.whitespacePolicy != null
&& this.whitespacePolicy.isBlock(children[i])) {
@@ -221,7 +221,7 @@
pw.println(">");
String childIndent = indent + this.indent;
- IVEXNode[] content = element.getChildNodes();
+ VEXNode[] content = element.getChildNodes();
for (int i = 0; i < content.length; i++) {
this.writeNode(content[i], pw, childIndent);
}
@@ -243,20 +243,20 @@
}
}
- private void writeNodeNoWrap(IVEXNode node, PrintWriter pw) {
+ private void writeNodeNoWrap(VEXNode node, PrintWriter pw) {
if (node instanceof Text) {
pw.print(escape(node.getText()));
} else {
- IVEXElement element = (IVEXElement) node;
+ VEXElement element = (VEXElement) node;
pw.print("<");
pw.print(element.getName());
pw.print(this.getAttributeString(element));
pw.print(">");
- IVEXNode[] content = element.getChildNodes();
+ VEXNode[] content = element.getChildNodes();
for (int i = 0; i < content.length; i++) {
this.writeNodeNoWrap(content[i], pw);
}
@@ -277,12 +277,12 @@
return sb.toString();
}
- private void addNode(IVEXNode node, TextWrapper wrapper) {
+ private void addNode(VEXNode node, TextWrapper wrapper) {
if (node instanceof Text) {
wrapper.add(escape(node.getText()));
} else {
- IVEXElement element = (IVEXElement) node;
- IVEXNode[] content = element.getChildNodes();
+ VEXElement element = (VEXElement) node;
+ VEXNode[] content = element.getChildNodes();
String[] attrs = element.getAttributeNames();
Arrays.sort(attrs);
@@ -293,7 +293,7 @@
wrapper.add("<" + element.getName() + ">");
}
} else {
- IValidator validator = element.getDocument().getValidator();
+ Validator validator = element.getDocument().getValidator();
StringBuffer sb = new StringBuffer();
for (int i = 0; i < attrs.length; i++) {
sb.setLength(0);
@@ -325,9 +325,9 @@
}
}
- private String getAttributeString(IVEXElement element) {
+ private String getAttributeString(VEXElement element) {
- IValidator validator = element.getDocument().getValidator();
+ Validator validator = element.getDocument().getValidator();
String[] attrs = element.getAttributeNames();
Arrays.sort(attrs);
@@ -345,8 +345,8 @@
return sb.toString();
}
- private static boolean attrHasDefaultValue(IValidator validator,
- IVEXElement element, String attribute) {
+ private static boolean attrHasDefaultValue(Validator validator,
+ VEXElement element, String attribute) {
if (validator != null) {
AttributeDefinition ad = validator.getAttributeDefinition(element
.getName(), attribute);
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Element.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Element.java
index 07a4ff0..d26abd7 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Element.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Element.java
@@ -17,9 +17,9 @@
import java.util.List;
import java.util.Map;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXNode;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXNode;
import org.eclipse.wst.xml.vex.core.internal.undo.CannotRedoException;
import org.eclipse.wst.xml.vex.core.internal.undo.CannotUndoException;
import org.eclipse.wst.xml.vex.core.internal.undo.IUndoableEdit;
@@ -28,10 +28,10 @@
* <code>Element</code> represents a tag in an XML document. Methods are
* available for managing the element's attributes and children.
*/
-public class Element extends Node implements Cloneable, IVEXElement {
+public class Element extends Node implements Cloneable, VEXElement {
private String name;
- private IVEXElement parent = null;
+ private VEXElement parent = null;
private List children = new ArrayList();
private Map attributes = new HashMap();
@@ -49,7 +49,7 @@
/* (non-Javadoc)
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXElement#addChild(org.eclipse.wst.xml.vex.core.internal.dom.Element)
*/
- public void addChild(IVEXElement child) {
+ public void addChild(VEXElement child) {
this.children.add(child);
child.setParent(this);
}
@@ -59,7 +59,7 @@
*/
public Object clone() {
try {
- IVEXElement element = new Element(this.getName());
+ VEXElement element = new Element(this.getName());
for (Iterator it = this.attributes.keySet().iterator(); it
.hasNext();) {
String attrName = (String) it.next();
@@ -99,15 +99,15 @@
/* (non-Javadoc)
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXElement#getChildElements()
*/
- public IVEXElement[] getChildElements() {
+ public VEXElement[] getChildElements() {
int size = this.children.size();
- return (IVEXElement[]) this.children.toArray(new IVEXElement[size]);
+ return (VEXElement[]) this.children.toArray(new VEXElement[size]);
}
/* (non-Javadoc)
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXElement#getChildNodes()
*/
- public IVEXNode[] getChildNodes() {
+ public VEXNode[] getChildNodes() {
return Document.createNodeArray(this.getContent(), this
.getStartOffset() + 1, this.getEndOffset(), this
.getChildElements());
@@ -116,13 +116,13 @@
/* (non-Javadoc)
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXElement#getDocument()
*/
- public IVEXDocument getDocument() {
- IVEXElement root = this;
+ public VEXDocument getDocument() {
+ VEXElement root = this;
while (root.getParent() != null) {
root = root.getParent();
}
if (root instanceof RootElement) {
- return ((IVEXElement) root).getDocument();
+ return ((VEXElement) root).getDocument();
} else {
return null;
}
@@ -138,7 +138,7 @@
/* (non-Javadoc)
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXElement#getParent()
*/
- public IVEXElement getParent() {
+ public VEXElement getParent() {
return this.parent;
}
@@ -161,7 +161,7 @@
* Inserts the given element as a child at the given child index. Sets the
* parent attribute of the given element to this element.
*/
- public void insertChild(int index, IVEXElement child) {
+ public void insertChild(int index, VEXElement child) {
this.children.add(index, child);
child.setParent(this);
}
@@ -183,7 +183,7 @@
if (oldValue != null) {
this.attributes.remove(name);
}
- IVEXDocument doc = this.getDocument();
+ VEXDocument doc = this.getDocument();
if (doc != null) { // doc may be null, e.g. when we're cloning an
// element
// to produce a document fragment
@@ -212,7 +212,7 @@
return;
} else {
this.attributes.put(name, value);
- IVEXDocument doc = this.getDocument();
+ VEXDocument doc = this.getDocument();
if (doc != null) { // doc may be null, e.g. when we're cloning an
// element
// to produce a document fragment
@@ -284,7 +284,7 @@
}
public void undo() throws CannotUndoException {
- IVEXDocument doc = getDocument();
+ VEXDocument doc = getDocument();
try {
doc.setUndoEnabled(false);
setAttribute(name, oldValue);
@@ -296,7 +296,7 @@
}
public void redo() throws CannotRedoException {
- IVEXDocument doc = getDocument();
+ VEXDocument doc = getDocument();
try {
doc.setUndoEnabled(false);
setAttribute(name, newValue);
@@ -308,7 +308,7 @@
}
}
- public void setParent(IVEXElement parent) {
+ public void setParent(VEXElement parent) {
this.parent = parent;
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Node.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Node.java
index edd5bae..d09358b 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Node.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Node.java
@@ -12,13 +12,13 @@
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IContent;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IPosition;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXNode;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXNode;
/**
* <code>Node</code> represents a component of an XML document. .
*
*/
-public class Node implements IVEXNode {
+public class Node implements VEXNode {
private IContent content = null;
private IPosition start = null;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/RootElement.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/RootElement.java
index 08c9395..dfb06f3 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/RootElement.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/RootElement.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.wst.xml.vex.core.internal.dom;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* The root element of a document. Keeps track of the document to which it is
@@ -20,9 +20,9 @@
* notify document listeners that the document has changed when the element
* changes.
*/
-public class RootElement extends Element implements IVEXElement {
+public class RootElement extends Element implements VEXElement {
- private IVEXDocument document;
+ private VEXDocument document;
/**
* Class constructor
@@ -37,14 +37,14 @@
/* (non-Javadoc)
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXRootElement#getDocument()
*/
- public IVEXDocument getDocument() {
+ public VEXDocument getDocument() {
return document;
}
/* (non-Javadoc)
* @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXRootElement#setDocument(org.eclipse.wst.xml.vex.core.internal.dom.Document)
*/
- public void setDocument(IVEXDocument document) {
+ public void setDocument(VEXDocument document) {
this.document = document;
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBlockBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBlockBox.java
index c804368..c0dfda9 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBlockBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBlockBox.java
@@ -27,8 +27,8 @@
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IPosition;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* Base class of block boxes that can contain other block boxes. This class
@@ -57,7 +57,7 @@
* Element associated with this box. anonymous box.
*/
public AbstractBlockBox(LayoutContext context, BlockBox parent,
- IVEXElement element) {
+ VEXElement element) {
this.parent = parent;
this.element = element;
@@ -87,7 +87,7 @@
this.marginTop = 0;
this.marginBottom = 0;
- IVEXDocument doc = context.getDocument();
+ VEXDocument doc = context.getDocument();
this.startPosition = doc.createPosition(startOffset);
this.endPosition = doc.createPosition(endOffset);
}
@@ -95,9 +95,9 @@
/**
* Walks the box tree and returns the nearest enclosing element.
*/
- protected IVEXElement findContainingElement() {
+ protected VEXElement findContainingElement() {
BlockBox box = this;
- IVEXElement element = box.getElement();
+ VEXElement element = box.getElement();
while (element == null) {
box = box.getParent();
element = box.getElement();
@@ -177,12 +177,12 @@
.toArray(new BlockBox[contentChildren.size()]);
}
- public IVEXElement getElement() {
+ public VEXElement getElement() {
return this.element;
}
public int getEndOffset() {
- IVEXElement element = this.getElement();
+ VEXElement element = this.getElement();
if (element != null) {
return element.getEndOffset();
} else if (this.getEndPosition() != null) {
@@ -203,7 +203,7 @@
*/
protected int getEstimatedHeight(LayoutContext context) {
- IVEXElement element = this.findContainingElement();
+ VEXElement element = this.findContainingElement();
Styles styles = context.getStyleSheet().getStyles(element);
int charCount = this.getEndOffset() - this.getStartOffset();
@@ -379,7 +379,7 @@
}
public int getStartOffset() {
- IVEXElement element = this.getElement();
+ VEXElement element = this.getElement();
if (element != null) {
return element.getStartOffset() + 1;
} else if (this.getStartPosition() != null) {
@@ -506,8 +506,8 @@
protected void paintSelectionFrame(LayoutContext context, int x, int y,
boolean selected) {
- IVEXElement element = this.getElement();
- IVEXElement parent = element == null ? null : element.getParent();
+ VEXElement element = this.getElement();
+ VEXElement parent = element == null ? null : element.getParent();
boolean paintFrame = context.isElementSelected(element)
&& !context.isElementSelected(parent);
@@ -647,9 +647,9 @@
pendingInlines.addAll(beforeInlines);
}
- IVEXDocument document = context.getDocument();
+ VEXDocument document = context.getDocument();
- IVEXElement element = document.findCommonElement(startOffset,
+ VEXElement element = document.findCommonElement(startOffset,
endOffset);
if (startOffset == endOffset) {
@@ -734,7 +734,7 @@
private class BlockInlineIterator {
- public BlockInlineIterator(LayoutContext context, IVEXElement element,
+ public BlockInlineIterator(LayoutContext context, VEXElement element,
int startOffset, int endOffset) {
this.context = context;
this.element = element;
@@ -752,7 +752,7 @@
} else if (startOffset == endOffset) {
return null;
} else {
- IVEXElement blockElement = findNextBlockElement(this.context,
+ VEXElement blockElement = findNextBlockElement(this.context,
this.element, startOffset, endOffset);
if (blockElement == null) {
if (startOffset < endOffset) {
@@ -792,7 +792,7 @@
}
private LayoutContext context;
- private IVEXElement element;
+ private VEXElement element;
private int startOffset;
private int endOffset;
private LinkedList pushStack = new LinkedList();
@@ -882,7 +882,7 @@
/**
* Element with which we are associated. For anonymous boxes, this is null.
*/
- private IVEXElement element;
+ private VEXElement element;
/*
* We cache the top and bottom margins, since they may be affected by our
@@ -914,12 +914,12 @@
* @param endOffset
* The offset at which to end the search.
*/
- private static IVEXElement findNextBlockElement(LayoutContext context,
- IVEXElement element, int startOffset, int endOffset) {
+ private static VEXElement findNextBlockElement(LayoutContext context,
+ VEXElement element, int startOffset, int endOffset) {
- IVEXElement[] children = element.getChildElements();
+ VEXElement[] children = element.getChildElements();
for (int i = 0; i < children.length; i++) {
- IVEXElement child = children[i];
+ VEXElement child = children[i];
if (child.getEndOffset() < startOffset) {
continue;
} else if (child.getStartOffset() >= endOffset) {
@@ -931,7 +931,7 @@
// determination
return child;
} else {
- IVEXElement fromChild = findNextBlockElement(context, child,
+ VEXElement fromChild = findNextBlockElement(context, child,
startOffset, endOffset);
if (fromChild != null) {
return fromChild;
@@ -962,7 +962,7 @@
private boolean isTableChild(LayoutContext context, Object rangeOrElement) {
if (rangeOrElement != null && rangeOrElement instanceof Element) {
return LayoutUtils.isTableChild(context.getStyleSheet(),
- (IVEXElement) rangeOrElement);
+ (VEXElement) rangeOrElement);
} else {
return false;
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBox.java
index a6f9a9d..73a87a1 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBox.java
@@ -19,7 +19,7 @@
import org.eclipse.wst.xml.vex.core.internal.css.CSS;
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* Base implementation of the <code>Box</code> interface, implementing some
@@ -76,7 +76,7 @@
*
* @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getElement()
*/
- public IVEXElement getElement() {
+ public VEXElement getElement() {
return null;
}
@@ -115,7 +115,7 @@
* returns all zeros.
*/
public Insets getInsets(LayoutContext context, int containerWidth) {
- IVEXElement element = this.getElement();
+ VEXElement element = this.getElement();
if (element == null) {
return Insets.ZERO_INSETS;
} else {
@@ -294,7 +294,7 @@
* otherwise, just the background is filled. This is handy when
* removing the borders when drawing the selection frame.
*/
- protected void drawBox(LayoutContext context, IVEXElement element, int x,
+ protected void drawBox(LayoutContext context, VEXElement element, int x,
int y, int containerWidth, boolean drawBorders) {
if (element == null) {
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockElementBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockElementBox.java
index 1441243..cc0853a 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockElementBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockElementBox.java
@@ -21,7 +21,7 @@
import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* A block box corresponding to a DOM IVEXElement. Block boxes lay their children
@@ -53,7 +53,7 @@
* IVEXElement to which this box corresponds.
*/
public BlockElementBox(LayoutContext context, BlockBox parent,
- IVEXElement element) {
+ VEXElement element) {
super(context, parent, element);
}
@@ -127,7 +127,7 @@
start = System.currentTimeMillis();
}
- IVEXElement element = this.getElement();
+ VEXElement element = this.getElement();
int width = this.getWidth();
List childList = new ArrayList();
@@ -135,7 +135,7 @@
StyleSheet ss = context.getStyleSheet();
// element and styles for generated boxes
- IVEXElement genElement;
+ VEXElement genElement;
Styles genStyles;
// :before content
@@ -229,7 +229,7 @@
/**
* Returns a Drawable that draws a circle-style list item bullet.
*/
- private static InlineBox createCircleBullet(IVEXElement element, Styles styles) {
+ private static InlineBox createCircleBullet(VEXElement element, Styles styles) {
final int size = Math.round(0.5f * styles.getFontSize());
final int lift = Math.round(0.1f * styles.getFontSize());
Drawable drawable = new Drawable() {
@@ -249,7 +249,7 @@
/**
* Returns a Drawable that draws a disc-style list item bullet.
*/
- private static InlineBox createDiscBullet(IVEXElement element, Styles styles) {
+ private static InlineBox createDiscBullet(VEXElement element, Styles styles) {
final int size = Math.round(0.5f * styles.getFontSize());
final int lift = Math.round(0.1f * styles.getFontSize());
Drawable drawable = new Drawable() {
@@ -267,7 +267,7 @@
/**
* Returns a Drawable that draws a square-style list item bullet.
*/
- private static InlineBox createSquareBullet(IVEXElement element, Styles styles) {
+ private static InlineBox createSquareBullet(VEXElement element, Styles styles) {
final int size = Math.round(0.5f * styles.getFontSize());
final int lift = Math.round(0.1f * styles.getFontSize());
Drawable drawable = new Drawable() {
@@ -307,15 +307,15 @@
* with 1.
*/
private int getItemNumber() {
- IVEXElement element = this.getElement();
- IVEXElement parent = element.getParent();
+ VEXElement element = this.getElement();
+ VEXElement parent = element.getParent();
if (parent == null) {
return 1;
}
int item = 1;
- IVEXElement[] children = parent.getChildElements();
+ VEXElement[] children = parent.getChildElements();
for (int i = 0; i < children.length; i++) {
if (children[i] == element) {
return item;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockPseudoElementBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockPseudoElementBox.java
index 518efd1..85617d1 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockPseudoElementBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockPseudoElementBox.java
@@ -15,21 +15,21 @@
import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* Implements a Block
*/
public class BlockPseudoElementBox extends AbstractBox implements BlockBox {
- private IVEXElement pseudoElement;
+ private VEXElement pseudoElement;
private BlockBox parent;
private ParagraphBox para;
private int marginTop;
private int marginBottom;
- public BlockPseudoElementBox(LayoutContext context, IVEXElement pseudoElement,
+ public BlockPseudoElementBox(LayoutContext context, VEXElement pseudoElement,
BlockBox parent, int width) {
this.pseudoElement = pseudoElement;
@@ -71,7 +71,7 @@
/**
* @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getElement()
*/
- public IVEXElement getElement() {
+ public VEXElement getElement() {
return this.pseudoElement;
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/Box.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/Box.java
index 0622619..50a249c 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/Box.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/Box.java
@@ -13,7 +13,7 @@
import org.eclipse.wst.xml.vex.core.internal.core.Caret;
import org.eclipse.wst.xml.vex.core.internal.core.Insets;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* Represents a rectangular area in the layout. The height and width of the box
@@ -51,7 +51,7 @@
* is no such box. The box may directly represent the Element, or simply use
* it for formatting information.
*/
- public IVEXElement getElement();
+ public VEXElement getElement();
/**
* Returns the offset of the end of the content that the box covers.
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DocumentTextBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DocumentTextBox.java
index 388eb55..458f021 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DocumentTextBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DocumentTextBox.java
@@ -16,8 +16,8 @@
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
import org.eclipse.wst.xml.vex.core.internal.dom.Text;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* A TextBox that gets its text from the document. Represents text which is
@@ -53,7 +53,7 @@
* @param endOffset
* end offset of the text
*/
- public DocumentTextBox(LayoutContext context, IVEXElement element,
+ public DocumentTextBox(LayoutContext context, VEXElement element,
int startOffset, int endOffset) {
super(element);
@@ -97,7 +97,7 @@
* @see org.eclipse.wst.xml.vex.core.internal.layout.TextBox#getText()
*/
public String getText() {
- IVEXDocument doc = this.getElement().getDocument();
+ VEXDocument doc = this.getElement().getDocument();
return doc.getText(this.getStartOffset(), this.getEndOffset() + 1);
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DrawableBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DrawableBox.java
index 647e6ba..f115add 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DrawableBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DrawableBox.java
@@ -18,7 +18,7 @@
import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* An inline box that draws a Drawable object. The drawable is drawn relative to
@@ -32,7 +32,7 @@
public static final byte END_MARKER = 2;
private Drawable drawable;
- private IVEXElement element;
+ private VEXElement element;
private byte marker;
/**
@@ -43,7 +43,7 @@
* @param element2
* Element whose styles determine the color of the drawable.
*/
- public DrawableBox(Drawable drawable, IVEXElement element2) {
+ public DrawableBox(Drawable drawable, VEXElement element2) {
this(drawable, element2, NO_MARKER);
}
@@ -59,7 +59,7 @@
* which marker should be drawn. Must be one of NO_MARKER,
* START_MARKER, or END_MARKER.
*/
- public DrawableBox(Drawable drawable, IVEXElement element2, byte marker) {
+ public DrawableBox(Drawable drawable, VEXElement element2, byte marker) {
this.drawable = drawable;
this.element = element2;
this.marker = marker;
@@ -78,7 +78,7 @@
/**
* Returns the element that controls the styling for this text element.
*/
- public IVEXElement getElement() {
+ public VEXElement getElement() {
return this.element;
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ElementOrRangeCallback.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ElementOrRangeCallback.java
index 9067e6b..f37ccd1 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ElementOrRangeCallback.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ElementOrRangeCallback.java
@@ -11,10 +11,10 @@
package org.eclipse.wst.xml.vex.core.internal.layout;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
public interface ElementOrRangeCallback {
public void onElement(Element child, String displayStyle);
- public void onRange(IVEXElement parent, int startOffset, int endOffset);
+ public void onRange(VEXElement parent, int startOffset, int endOffset);
}
\ No newline at end of file
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineElementBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineElementBox.java
index cde1127..df665ed 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineElementBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineElementBox.java
@@ -21,8 +21,8 @@
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
import org.eclipse.wst.xml.vex.core.internal.dom.Text;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXNode;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXNode;
/**
* An inline box that represents an inline element. This box is responsible for
@@ -72,7 +72,7 @@
}
// :before content
- IVEXElement beforeElement = context.getStyleSheet().getBeforeElement(
+ VEXElement beforeElement = context.getStyleSheet().getBeforeElement(
element);
if (beforeElement != null) {
childList.addAll(LayoutUtils.createGeneratedInlines(context,
@@ -99,7 +99,7 @@
childList.add(createRightMarker(element, styles));
// :after content
- IVEXElement afterElement = context.getStyleSheet().getAfterElement(
+ VEXElement afterElement = context.getStyleSheet().getAfterElement(
element);
if (afterElement != null) {
childList.addAll(LayoutUtils.createGeneratedInlines(context,
@@ -267,14 +267,14 @@
* @return
*/
static InlineBoxes createInlineBoxes(LayoutContext context,
- IVEXElement element2, int startOffset, int endOffset) {
+ VEXElement element2, int startOffset, int endOffset) {
InlineBoxes result = new InlineBoxes();
- IVEXNode[] nodes = element2.getChildNodes();
+ VEXNode[] nodes = element2.getChildNodes();
for (int i = 0; i < nodes.length; i++) {
- IVEXNode node = nodes[i];
+ VEXNode node = nodes[i];
InlineBox child;
if (node.getStartOffset() >= endOffset) {
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutContext.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutContext.java
index 76c1360..28a8f1e 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutContext.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutContext.java
@@ -13,8 +13,8 @@
import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* Encapsulation of all the resources needed to create a box tree. Most
@@ -24,7 +24,7 @@
public class LayoutContext {
private BoxFactory boxFactory;
- private IVEXDocument document;
+ private VEXDocument document;
private Graphics graphics;
private StyleSheet styleSheet;
private int selectionStart;
@@ -47,7 +47,7 @@
/**
* Returns the document being layed out.
*/
- public IVEXDocument getDocument() {
+ public VEXDocument getDocument() {
return document;
}
@@ -82,7 +82,7 @@
* Element to test. May be null, in which case this method
* returns false.
*/
- public boolean isElementSelected(IVEXElement element) {
+ public boolean isElementSelected(VEXElement element) {
return element != null
&& element.getStartOffset() >= this.getSelectionStart()
&& element.getEndOffset() + 1 <= this.getSelectionEnd();
@@ -105,7 +105,7 @@
/**
* Sets the document being layed out.
*/
- public void setDocument(IVEXDocument document) {
+ public void setDocument(VEXDocument document) {
this.document = document;
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutUtils.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutUtils.java
index 934ee7e..528f4f9 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutUtils.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutUtils.java
@@ -21,8 +21,8 @@
import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXNode;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXNode;
/**
* Tools for layout and rendering of CSS-styled boxes
@@ -38,7 +38,7 @@
* Element representing the generated content.
*/
public static List createGeneratedInlines(LayoutContext context,
- IVEXElement pseudoElement) {
+ VEXElement pseudoElement) {
String text = getGeneratedContent(context, pseudoElement);
List list = new ArrayList();
if (text.length() > 0) {
@@ -78,7 +78,7 @@
* returned.
*/
private static String getGeneratedContent(LayoutContext context,
- IVEXElement pseudoElement) {
+ VEXElement pseudoElement) {
Styles styles = context.getStyleSheet().getStyles(pseudoElement);
List content = styles.getContent();
StringBuffer sb = new StringBuffer();
@@ -111,19 +111,19 @@
* matching elements and non-matching ranges.
*/
public static void iterateChildrenByDisplayStyle(StyleSheet styleSheet,
- Set displayStyles, IVEXElement element, int startOffset, int endOffset,
+ Set displayStyles, VEXElement element, int startOffset, int endOffset,
ElementOrRangeCallback callback) {
List nonMatching = new ArrayList();
- IVEXNode[] nodes = element.getChildNodes();
+ VEXNode[] nodes = element.getChildNodes();
for (int i = 0; i < nodes.length; i++) {
if (nodes[i].getEndOffset() <= startOffset) {
continue;
} else if (nodes[i].getStartOffset() >= endOffset) {
break;
} else {
- IVEXNode node = nodes[i];
+ VEXNode node = nodes[i];
if (node instanceof Element) {
Element childElement = (Element) node;
@@ -131,8 +131,8 @@
.getDisplay();
if (displayStyles.contains(display)) {
if (nonMatching.size() > 0) {
- IVEXNode firstNode = (IVEXNode) nonMatching.get(0);
- IVEXNode lastNode = (IVEXNode) nonMatching.get(nonMatching
+ VEXNode firstNode = (VEXNode) nonMatching.get(0);
+ VEXNode lastNode = (VEXNode) nonMatching.get(nonMatching
.size() - 1);
if (lastNode instanceof Element) {
callback.onRange(element, firstNode
@@ -156,8 +156,8 @@
}
if (nonMatching.size() > 0) {
- IVEXNode firstNode = (IVEXNode) nonMatching.get(0);
- IVEXNode lastNode = (IVEXNode) nonMatching.get(nonMatching.size() - 1);
+ VEXNode firstNode = (VEXNode) nonMatching.get(0);
+ VEXNode lastNode = (VEXNode) nonMatching.get(nonMatching.size() - 1);
if (lastNode instanceof Element) {
callback.onRange(element, firstNode.getStartOffset(), lastNode
.getEndOffset() + 1);
@@ -185,7 +185,7 @@
* matching elements and non-matching ranges.
*/
public static void iterateChildrenByDisplayStyle(StyleSheet styleSheet,
- Set displayStyles, IVEXElement table, ElementOrRangeCallback callback) {
+ Set displayStyles, VEXElement table, ElementOrRangeCallback callback) {
iterateChildrenByDisplayStyle(styleSheet, displayStyles, table,
table.getStartOffset() + 1, table.getEndOffset(), callback);
}
@@ -199,13 +199,13 @@
* @param element
* Element to test.
*/
- public static boolean isTableChild(StyleSheet styleSheet, IVEXElement element) {
+ public static boolean isTableChild(StyleSheet styleSheet, VEXElement element) {
String display = styleSheet.getStyles(element).getDisplay();
return TABLE_CHILD_STYLES.contains(display);
}
public static void iterateTableRows(final StyleSheet styleSheet,
- final IVEXElement element, int startOffset, int endOffset,
+ final VEXElement element, int startOffset, int endOffset,
final ElementOrRangeCallback callback) {
iterateChildrenByDisplayStyle(styleSheet, nonRowStyles, element,
@@ -225,7 +225,7 @@
}
}
- public void onRange(IVEXElement parent, int startOffset,
+ public void onRange(VEXElement parent, int startOffset,
int endOffset) {
// iterate over rows in range
iterateChildrenByDisplayStyle(styleSheet, rowStyles,
@@ -236,14 +236,14 @@
}
public static void iterateTableCells(StyleSheet styleSheet,
- IVEXElement element, int startOffset, int endOffset,
+ VEXElement element, int startOffset, int endOffset,
final ElementOrRangeCallback callback) {
iterateChildrenByDisplayStyle(styleSheet, cellStyles, element,
startOffset, endOffset, callback);
}
public static void iterateTableCells(StyleSheet styleSheet,
- IVEXElement row, final ElementOrRangeCallback callback) {
+ VEXElement row, final ElementOrRangeCallback callback) {
iterateChildrenByDisplayStyle(styleSheet, cellStyles, row, row
.getStartOffset(), row.getEndOffset(), callback);
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LineBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LineBox.java
index 408291a..0943580 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LineBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LineBox.java
@@ -11,14 +11,14 @@
package org.eclipse.wst.xml.vex.core.internal.layout;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* Represents a line of text and inline images.
*/
public class LineBox extends CompositeInlineBox {
- private IVEXElement element;
+ private VEXElement element;
private InlineBox[] children;
private InlineBox firstContentChild = null;
private InlineBox lastContentChild = null;
@@ -32,7 +32,7 @@
* @param children
* InlineBoxes that make up this line.
*/
- public LineBox(LayoutContext context, IVEXElement element, InlineBox[] children) {
+ public LineBox(LayoutContext context, VEXElement element, InlineBox[] children) {
this.element = element;
this.children = children;
@@ -73,7 +73,7 @@
/**
* @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getElement()
*/
- public IVEXElement getElement() {
+ public VEXElement getElement() {
return this.element;
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ParagraphBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ParagraphBox.java
index 2d1bf69..0860b07 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ParagraphBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ParagraphBox.java
@@ -19,7 +19,7 @@
import org.eclipse.wst.xml.vex.core.internal.css.CSS;
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* A box that wraps inline content into a paragraph.
@@ -61,7 +61,7 @@
* width to which the paragraph is to be wrapped
* @return
*/
- public static ParagraphBox create(LayoutContext context, IVEXElement element,
+ public static ParagraphBox create(LayoutContext context, VEXElement element,
List inlines, int width) {
InlineBox[] array = (InlineBox[]) inlines.toArray(new InlineBox[inlines
.size()]);
@@ -81,7 +81,7 @@
* @param width
* width to which the paragraph is to be wrapped.
*/
- public static ParagraphBox create(LayoutContext context, IVEXElement element,
+ public static ParagraphBox create(LayoutContext context, VEXElement element,
InlineBox[] inlines, int width) {
// lines is the list of LineBoxes we are creating
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/PlaceholderBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/PlaceholderBox.java
index 0d39604..160de63 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/PlaceholderBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/PlaceholderBox.java
@@ -16,14 +16,14 @@
import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* A zero-width box that represents a single offset in the document.
*/
public class PlaceholderBox extends AbstractBox implements InlineBox {
- private IVEXElement element;
+ private VEXElement element;
private int relOffset;
private int textTop;
private int baseline;
@@ -41,7 +41,7 @@
* Offset of the placeholder, relative to the start of the
* element.
*/
- public PlaceholderBox(LayoutContext context, IVEXElement element2, int relOffset) {
+ public PlaceholderBox(LayoutContext context, VEXElement element2, int relOffset) {
this.element = element2;
this.relOffset = relOffset;
@@ -90,7 +90,7 @@
/**
* @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getElement()
*/
- public IVEXElement getElement() {
+ public VEXElement getElement() {
return this.element;
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/RootBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/RootBox.java
index 0c11350..7dae1a3 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/RootBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/RootBox.java
@@ -16,7 +16,7 @@
import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* A wrapper for the top level <code>BlockElementBox</code> that applies its
@@ -24,7 +24,7 @@
*/
public class RootBox extends AbstractBox implements BlockBox {
- private IVEXElement element;
+ private VEXElement element;
private BlockElementBox childBox;
private Box[] children = new Box[1];
@@ -38,7 +38,7 @@
* @param width
* width of this box
*/
- public RootBox(LayoutContext context, IVEXElement element, int width) {
+ public RootBox(LayoutContext context, VEXElement element, int width) {
this.element = element;
this.setWidth(width);
@@ -68,7 +68,7 @@
/**
* @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getElement()
*/
- public IVEXElement getElement() {
+ public VEXElement getElement() {
return this.element;
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/StaticTextBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/StaticTextBox.java
index 87978cb..c7f86b2 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/StaticTextBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/StaticTextBox.java
@@ -15,7 +15,7 @@
import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* A TextBox representing a static string. Represents text which is not editable
@@ -40,7 +40,7 @@
* @param text
* Static text to display
*/
- public StaticTextBox(LayoutContext context, IVEXElement element, String text) {
+ public StaticTextBox(LayoutContext context, VEXElement element, String text) {
this(context, element, text, NO_MARKER);
if (text.length() == 0) {
throw new IllegalArgumentException(
@@ -65,7 +65,7 @@
* represents the start sentinel or the end sentinel of the
* element
*/
- public StaticTextBox(LayoutContext context, IVEXElement element, String text,
+ public StaticTextBox(LayoutContext context, VEXElement element, String text,
byte marker) {
super(element);
this.text = text;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBodyBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBodyBox.java
index df8748e..4d3ec81 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBodyBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBodyBox.java
@@ -19,7 +19,7 @@
import org.eclipse.wst.xml.vex.core.internal.css.CSS;
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* An anonymous box that contains the table row groups for a table. This box is
@@ -49,7 +49,7 @@
TableBodyBox.this, child));
}
- public void onRange(IVEXElement parent, int startOffset,
+ public void onRange(VEXElement parent, int startOffset,
int endOffset) {
children.add(new TableRowGroupBox(context,
TableBodyBox.this, startOffset, endOffset));
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBox.java
index 2ea6283..7ed2165 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBox.java
@@ -21,7 +21,7 @@
import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* Box that lays out a table.
@@ -60,7 +60,7 @@
TableBox.this, child));
}
- public void onRange(IVEXElement parent, int startOffset,
+ public void onRange(VEXElement parent, int startOffset,
int endOffset) {
children.add(new TableBodyBox(context, TableBox.this,
startOffset, endOffset));
@@ -149,7 +149,7 @@
this.count++;
}
- public void onRange(IVEXElement parent, int startOffset, int endOffset) {
+ public void onRange(VEXElement parent, int startOffset, int endOffset) {
this.count++;
}
@@ -162,7 +162,7 @@
*/
private int computeColumnCount(LayoutContext context) {
- IVEXElement tableElement = this.findContainingElement();
+ VEXElement tableElement = this.findContainingElement();
final int[] columnCounts = new int[1]; // work around Java's insistence
// on final
columnCounts[0] = 0;
@@ -179,7 +179,7 @@
callback.reset();
}
- public void onRange(IVEXElement parent, int startOffset,
+ public void onRange(VEXElement parent, int startOffset,
int endOffset) {
LayoutUtils.iterateTableCells(styleSheet, parent,
startOffset, endOffset, callback);
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowBox.java
index d8872ab..c419b30 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowBox.java
@@ -16,7 +16,7 @@
import org.eclipse.wst.xml.vex.core.internal.core.Caret;
import org.eclipse.wst.xml.vex.core.internal.core.Insets;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* Box representing a row in a table.
@@ -37,7 +37,7 @@
final List children = new ArrayList();
- IVEXElement element = this.findContainingElement();
+ VEXElement element = this.findContainingElement();
final int[] widths = this.getTableBox().getColumnWidths();
LayoutUtils.iterateTableCells(context.getStyleSheet(), element, this
@@ -50,7 +50,7 @@
TableRowBox.this, child, widths[column++]));
}
- public void onRange(IVEXElement parent, int startOffset,
+ public void onRange(VEXElement parent, int startOffset,
int endOffset) {
children.add(new TableCellBox(context,
TableRowBox.this, startOffset, endOffset,
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowGroupBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowGroupBox.java
index 846800d..14d4ace 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowGroupBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowGroupBox.java
@@ -19,7 +19,7 @@
import org.eclipse.wst.xml.vex.core.internal.css.CSS;
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* Container for TableRowBox objects. May correspond to an element with
@@ -77,7 +77,7 @@
TableRowGroupBox.this, child));
}
- public void onRange(IVEXElement parent, int startOffset,
+ public void onRange(VEXElement parent, int startOffset,
int endOffset) {
children.add(new TableRowBox(context,
TableRowGroupBox.this, startOffset, endOffset));
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextBox.java
index 98a7aee..f538c92 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextBox.java
@@ -18,7 +18,7 @@
import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
/**
* An inline box containing text. The <code>getText</code> and
@@ -27,7 +27,7 @@
*/
public abstract class TextBox extends AbstractBox implements InlineBox {
- private IVEXElement element;
+ private VEXElement element;
private int baseline;
public static final char NEWLINE_CHAR = 0xa;
@@ -40,7 +40,7 @@
* Element containing the text. This is used for styling
* information.
*/
- public TextBox(IVEXElement element) {
+ public TextBox(VEXElement element) {
this.element = element;
}
@@ -98,7 +98,7 @@
/**
* Returns the element that controls the styling for this text element.
*/
- public IVEXElement getElement() {
+ public VEXElement getElement() {
return this.element;
}
@@ -142,7 +142,7 @@
Graphics g = context.getGraphics();
boolean inSelectedBlock = false;
- IVEXElement e = this.getElement();
+ VEXElement e = this.getElement();
while (e != null) {
Styles styles = context.getStyleSheet().getStyles(e);
if (styles.isBlock()) {
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IWhitespacePolicy.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IWhitespacePolicy.java
index 06fdec2..51afacd 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IWhitespacePolicy.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IWhitespacePolicy.java
@@ -24,7 +24,7 @@
* @param element
* Element to test.
*/
- public boolean isBlock(IVEXElement element);
+ public boolean isBlock(VEXElement element);
/**
* Returns true if the given element is pre-formatted, that is, all of its
@@ -33,5 +33,5 @@
* @param element
* Element to test.
*/
- public boolean isPre(IVEXElement element);
+ public boolean isPre(VEXElement element);
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IVEXDocument.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/VEXDocument.java
similarity index 91%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IVEXDocument.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/VEXDocument.java
index 17f998b..79ac07c 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IVEXDocument.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/VEXDocument.java
@@ -9,7 +9,7 @@
* @author dcarver
* @model
*/
-public interface IVEXDocument {
+public interface VEXDocument {
/**
* Adds a document listener to the list of listeners to be notified of
@@ -17,7 +17,7 @@
*
* @param listener
* <code>DocumentListener</code> to add.
- * @model
+ *
*/
public void addDocumentListener(DocumentListener listener);
@@ -31,7 +31,7 @@
* fragment to be inserted
* @model
*/
- public boolean canInsertFragment(int offset, IVEXDocumentFragment fragment);
+ public boolean canInsertFragment(int offset, VEXDocumentFragment fragment);
/**
* Returns true if text can be inserted at the given offset.
@@ -75,7 +75,7 @@
* the second offset
* @model
*/
- public IVEXElement findCommonElement(int offset1, int offset2);
+ public VEXElement findCommonElement(int offset1, int offset2);
/**
* Returns the character at the given offset.
@@ -90,7 +90,7 @@
*
* @model
*/
- public IVEXElement getElementAt(int offset);
+ public VEXElement getElementAt(int offset);
/**
* Returns the encoding used for this document, or null if no encoding has
@@ -108,7 +108,7 @@
*
* @model
*/
- public IVEXDocumentFragment getFragment(int startOffset, int endOffset);
+ public VEXDocumentFragment getFragment(int startOffset, int endOffset);
/**
* Returns the length of the document in characters, including the null
@@ -127,7 +127,7 @@
* the offset at which the sequence begins
* @param endOffset
* the offset at which the sequence ends
- * @model containment="true"
+ * @model
*/
public String[] getNodeNames(int startOffset, int endOffset);
@@ -140,9 +140,9 @@
* @param endOffset
* the offset at which the sequence ends
*
- * @model type="IVEXNode" containment="true"
+ * @model
*/
- public IVEXNode[] getNodes(int startOffset, int endOffset);
+ public VEXNode[] getNodes(int startOffset, int endOffset);
/**
@@ -162,7 +162,7 @@
*
* @model
*/
- public IVEXElement getRootElement();
+ public VEXElement getRootElement();
/**
@@ -184,7 +184,7 @@
*
* @model
*/
- public IValidator getValidator();
+ public Validator getValidator();
/**
* Inserts an element at the given position.
@@ -200,7 +200,7 @@
* if the change would result in an invalid document.
* @model
*/
- public void insertElement(int offset, IVEXElement defaults)
+ public void insertElement(int offset, VEXElement defaults)
throws DocumentValidationException;
/**
@@ -217,7 +217,7 @@
* if the change would result in an invalid document.
* @model
*/
- public void insertFragment(int offset, IVEXDocumentFragment fragment)
+ public void insertFragment(int offset, VEXDocumentFragment fragment)
throws DocumentValidationException;
/**
@@ -252,7 +252,7 @@
*
* @param listener
* <code>DocumentListener</code> to remove.
- * @model
+ *
*/
public void removeDocumentListener(DocumentListener listener);
@@ -303,11 +303,11 @@
* Validator to use for this document.
*
*/
- public void setValidator(IValidator validator);
+ public void setValidator(Validator validator);
/**
* @param documentEvent
- * @model
+ *
*/
public void fireAttributeChanged(DocumentEvent documentEvent);
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IVEXDocumentFragment.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/VEXDocumentFragment.java
similarity index 82%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IVEXDocumentFragment.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/VEXDocumentFragment.java
index 0cb9acf..2cd61cb 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IVEXDocumentFragment.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/VEXDocumentFragment.java
@@ -4,7 +4,7 @@
/**
* @model
*/
-public interface IVEXDocumentFragment {
+public interface VEXDocumentFragment {
/**
* Mime type representing document fragments: "text/x-vex-document-fragment"
@@ -30,9 +30,9 @@
/**
* Returns the elements that make up this fragment.
*
- * @model type="IVEXElement" containment="true"
+ * @model
*/
- public IVEXElement[] getElements();
+ public VEXElement[] getElements();
/**
* Returns an array of element names and Validator.PCDATA representing the
@@ -46,8 +46,8 @@
* Returns the nodes that make up this fragment, including elements and
* <code>Text</code> objects.
*
- * @model type="IVEXNode"
+ * @model
*/
- public IVEXNode[] getNodes();
+ public VEXNode[] getNodes();
}
\ No newline at end of file
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IVEXElement.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/VEXElement.java
similarity index 88%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IVEXElement.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/VEXElement.java
index f0c3c4e..e2a301e 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IVEXElement.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/VEXElement.java
@@ -10,7 +10,7 @@
*
* @model
*/
-public interface IVEXElement extends IVEXNode {
+public interface VEXElement extends VEXNode {
/**
* Adds the given child to the end of the child list. Sets the parent
@@ -18,7 +18,7 @@
*
* @model
*/
- public void addChild(IVEXElement child);
+ public void addChild(VEXElement child);
/**
* Clones the element and its attributes. The returned element has no parent
@@ -58,7 +58,7 @@
*
* @model type="IVEXElement" containment="true"
*/
- public IVEXElement[] getChildElements();
+ public VEXElement[] getChildElements();
/**
* Returns an array of nodes representing the content of this element. The
@@ -67,14 +67,14 @@
*
* @model type="IVEXNode" containment="true"
*/
- public IVEXNode[] getChildNodes();
+ public VEXNode[] getChildNodes();
/**
* @return The document to which this element belongs. Returns null if this
* element is part of a document fragment.
* @model
*/
- public IVEXDocument getDocument();
+ public VEXDocument getDocument();
/**
* Returns the name of the element.
@@ -115,9 +115,9 @@
/**
* Returns the parent of this element, or null if this is the root element.
*
- * @model type="IVEXElement"
+ * @model
*/
- public IVEXElement getParent();
+ public VEXElement getParent();
/**
* Sets the parent of this element.
@@ -126,7 +126,7 @@
* Parent element.
*
*/
- public void setParent(IVEXElement parent);
+ public void setParent(VEXElement parent);
/**
*
@@ -150,6 +150,6 @@
* @param child
* @model
*/
- public void insertChild(int index, IVEXElement child);
+ public void insertChild(int index, VEXElement child);
}
\ No newline at end of file
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IVEXNode.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/VEXNode.java
similarity index 97%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IVEXNode.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/VEXNode.java
index 2825d2a..436ff63 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IVEXNode.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/VEXNode.java
@@ -4,7 +4,7 @@
/**
* @model
*/
-public interface IVEXNode {
+public interface VEXNode {
/**
* Returns the document associated with this node. Null if the node has not
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IValidator.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/Validator.java
similarity index 87%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IValidator.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/Validator.java
index d83fe31..76d299c 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IValidator.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/Validator.java
@@ -20,7 +20,7 @@
* Validators must be serializable.
* @model
*/
-public interface IValidator extends Serializable {
+public interface Validator extends Serializable {
/**
* String indicating that character data is allowed at the given point in
@@ -53,7 +53,7 @@
/**
* Returns a set of Strings representing valid root elements for the given
* document type.
- * @model type="IVEXElement" containment="true"
+ * @model
*/
public Set getValidRootElements();
@@ -64,15 +64,9 @@
*
* @param element
* Name of the parent element.
- * @param prefix
- * Array of strings representing nodes coming before the
- * insertion point
- * @param suffix
- * Array of strings representing nodes coming after the insertion
- * point
- * @model type="String" containment="true"
+ * @model
*/
- public Set getValidItems(String element, String[] prefix, String[] suffix);
+ public Set<String> getValidItems(String element);
/**
* Returns true if the given sequence is valid for the given element.
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/AbstractValidator.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/AbstractValidator.java
index a2ed51a..803780f 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/AbstractValidator.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/AbstractValidator.java
@@ -13,15 +13,15 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IValidator;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.Validator;
/**
* Partial implementation of the Validator interface.
*/
-public abstract class AbstractValidator implements IValidator {
+public abstract class AbstractValidator implements Validator {
/**
- * @see IValidator#isValidSequence
+ * @see Validator#isValidSequence
*/
public boolean isValidSequence(String element, String[] seq1,
String[] seq2, String[] seq3, boolean partial) {
@@ -32,9 +32,9 @@
}
if (seq2 != null) {
for (int i = 0; i < seq2.length; i++) {
- if (i == 0 && seq2[i].equals(IValidator.PCDATA)
+ if (i == 0 && seq2[i].equals(Validator.PCDATA)
&& list.size() > 0
- && list.get(list.size() - 1).equals(IValidator.PCDATA)) {
+ && list.get(list.size() - 1).equals(Validator.PCDATA)) {
// Avoid consecutive PCDATA's
continue;
}
@@ -43,9 +43,9 @@
}
if (seq3 != null) {
for (int i = 0; i < seq3.length; i++) {
- if (i == 0 && seq3[i].equals(IValidator.PCDATA)
+ if (i == 0 && seq3[i].equals(Validator.PCDATA)
&& list.size() > 0
- && list.get(list.size() - 1).equals(IValidator.PCDATA)) {
+ && list.get(list.size() - 1).equals(Validator.PCDATA)) {
// Avoid consecutive PCDATA's
continue;
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/DTDValidator.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/DTDValidator.java
index 8baa35e..4f73b40 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/DTDValidator.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/DTDValidator.java
@@ -32,7 +32,7 @@
import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IValidator;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.Validator;
import org.eclipse.wst.xml.vex.core.internal.validator.AttributeDefinition.Type;
import org.eclipse.wst.xml.vex.core.internal.validator.DFABuilder.Node;
@@ -131,7 +131,7 @@
validator.anySet = new HashSet();
validator.anySet.addAll(validator.elementDFAs.keySet());
- validator.anySet.add(IValidator.PCDATA);
+ validator.anySet.add(Validator.PCDATA);
return validator;
}
@@ -155,60 +155,63 @@
return this.elementDFAs.keySet();
}
- /** @see IValidator#getValidItems */
- public Set getValidItems(String element, String[] prefix, String[] suffix) {
+ /** @see Validator#getValidItems */
+ /**
+ * @deprecated
+ */
+ public Set<String> getValidItems(String element) {
// First, get a set of candidates. We'll later test to see if each is
// valid to insert here.
Set candidates = null;
- DFAState dfa = (DFAState) elementDFAs.get(element);
- if (dfa == null) {
- // Anything goes!
- return this.anySet;
- }
-
- DFAState target = dfa.getState(Arrays.asList(prefix));
- if (target == null) {
- return Collections.EMPTY_SET;
- } else {
- // If the last transition was due to PCDATA, adding more PCDATA
- // is also valid
- if (prefix.length > 0
- && prefix[prefix.length - 1].equals(IValidator.PCDATA)) {
- candidates = new HashSet();
- candidates.addAll(target.getValidSymbols());
- candidates.add(IValidator.PCDATA);
- } else {
- candidates = target.getValidSymbols();
- }
- }
-
- // Now, see if each candidate can be inserted at the given
- // offset. This second test is necessary in some simple
- // cases. Consider a <section> with an optional <title>; if
- // we're at the first offset of the <section> and a <title>
- // already exists, we should not allow another <title>.
-
- if (candidates.isEmpty()) {
- return Collections.EMPTY_SET;
- }
-
- Set results = new HashSet();
- String[] middle = new String[1];
- for (Iterator iter = candidates.iterator(); iter.hasNext();) {
- middle[0] = (String) iter.next();
- if (this.isValidSequence(element, prefix, middle, suffix, true)) {
- results.add(middle[0]);
- }
- }
+// DFAState dfa = (DFAState) elementDFAs.get(element);
+// if (dfa == null) {
+// // Anything goes!
+// return this.anySet;
+// }
+//
+// DFAState target = dfa.getState(Arrays.asList(prefix));
+// if (target == null) {
+// return Collections.EMPTY_SET;
+// } else {
+// // If the last transition was due to PCDATA, adding more PCDATA
+// // is also valid
+// if (prefix.length > 0
+// && prefix[prefix.length - 1].equals(Validator.PCDATA)) {
+// candidates = new HashSet();
+// candidates.addAll(target.getValidSymbols());
+// candidates.add(Validator.PCDATA);
+// } else {
+// candidates = target.getValidSymbols();
+// }
+// }
+//
+// // Now, see if each candidate can be inserted at the given
+// // offset. This second test is necessary in some simple
+// // cases. Consider a <section> with an optional <title>; if
+// // we're at the first offset of the <section> and a <title>
+// // already exists, we should not allow another <title>.
+//
+// if (candidates.isEmpty()) {
+// return Collections.EMPTY_SET;
+// }
+//
+// Set results = new HashSet();
+// String[] middle = new String[1];
+// for (Iterator iter = candidates.iterator(); iter.hasNext();) {
+// middle[0] = (String) iter.next();
+// if (this.isValidSequence(element, prefix, middle, suffix, true)) {
+// results.add(middle[0]);
+// }
+// }
- return Collections.unmodifiableSet(results);
+ return candidates;
}
/**
- * @see IValidator#isValidSequence
+ * @see Validator#isValidSequence
*/
public boolean isValidSequence(String element, String[] nodes,
boolean partial) {
@@ -248,14 +251,14 @@
DFABuilder.Node node = null;
if (content == null) {
- return DFABuilder.createSymbolNode(IValidator.PCDATA);
+ return DFABuilder.createSymbolNode(Validator.PCDATA);
}
if (content instanceof CMElementDeclaration) {
CMElementDeclaration element = (CMElementDeclaration) content;
String elementName = element.getNodeName();
if (element.getContentType() == CMElementDeclaration.PCDATA) {
- node = DFABuilder.createSymbolNode(IValidator.PCDATA);
+ node = DFABuilder.createSymbolNode(Validator.PCDATA);
} else if (element.getContentType() == CMElementDeclaration.MIXED) {
CMContent child = element.getContent();
DFABuilder.Node newNode = createDFANode(child);
@@ -265,7 +268,7 @@
node = DFABuilder.createChoiceNode(node, newNode);
}
DFABuilder.Node pcdata = DFABuilder
- .createSymbolNode(IValidator.PCDATA);
+ .createSymbolNode(Validator.PCDATA);
node = DFABuilder.createChoiceNode(node, pcdata);
} else if (element.getContent() != null) {
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/VEXModelQueryExtensionManagerImpl.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/VEXModelQueryExtensionManagerImpl.java
new file mode 100644
index 0000000..9943727
--- /dev/null
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/VEXModelQueryExtensionManagerImpl.java
@@ -0,0 +1,75 @@
+package org.eclipse.wst.xml.vex.core.internal.validator;
+
+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.internal.modelqueryimpl.ModelQueryExtensionManagerImpl;
+import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
+import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.extension.ModelQueryExtension;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+public class VEXModelQueryExtensionManagerImpl extends
+ ModelQueryExtensionManagerImpl {
+
+ public VEXModelQueryExtensionManagerImpl() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public void filterAvailableElementContent(List cmnodes, String element,
+ CMElementDeclaration ed, int includeOptions) {
+ String contentTypeId = getContentTypeId();
+ // FIXME: Make VEX Element implement DOM so that we don't need to do this.
+// String parentNamespace = element.getNamespaceURI();
+
+ List modelQueryExtensions = modelQueryExtensionRegistry
+ .getApplicableExtensions(contentTypeId, null);
+ if ((includeOptions & ModelQuery.INCLUDE_CHILD_NODES) > 0) {
+ 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();
+ }
+ }
+ }
+ }
+ }
+ // add MQE-provided content
+ for (int k = 0; k < modelQueryExtensions.size(); k++) {
+ ModelQueryExtension extension = (ModelQueryExtension) modelQueryExtensions
+ .get(k);
+ //cmnodes.addAll(Arrays.asList(extension.getAvailableElementContent(
+ // element, parentNamespace, includeOptions)));
+ }
+ }
+
+ 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() {
+ String contentTypeId = "org.eclipse.core.runtime.xml"; //$NON-NLS-1$
+ return contentTypeId;
+ }
+}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/WTPVEXValidator.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/WTPVEXValidator.java
index eaa9d55..95c93ca 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/WTPVEXValidator.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/WTPVEXValidator.java
@@ -3,26 +3,47 @@
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashSet;
+import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.Vector;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
+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.vex.core.internal.provisional.dom.IValidator;
+import org.eclipse.wst.xml.core.internal.contentmodel.internal.modelqueryimpl.ModelQueryExtensionManagerImpl;
+import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
+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.contentmodel.modelqueryimpl.ModelQueryImpl.AvailableContentCMVisitor;
+import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
+import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
+import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceTable;
+import org.eclipse.wst.xml.core.internal.modelquery.XMLModelQueryImpl;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.Validator;
+import org.w3c.dom.Element;
@SuppressWarnings("restriction")
-public class WTPVEXValidator implements IValidator {
+public class WTPVEXValidator implements Validator {
/**
*
*/
private static final long serialVersionUID = -7632029717211069257L;
private static CMDocument contentModel;
+
public static CMDocument getContentModel() {
return contentModel;
}
@@ -44,7 +65,7 @@
.getInstance();
String resolved = url.toString();
setContentModel(contentModelManager.createCMDocument(resolved, null));
-
+
return new WTPVEXValidator();
}
@@ -104,10 +125,53 @@
return vexAttr;
}
- public Set getValidItems(String element, String[] prefix, String[] suffix) {
- // FIXME: This needs to actually get the items that are valid at this
- // spot.
- return getValidRootElements();
+ public Set<String> getValidItems(String element) {
+ CMElementDeclaration elementDec = (CMElementDeclaration) contentModel
+ .getElements().getNamedItem(element);
+ List<CMNode> nodes = getAvailableContent(element, elementDec);
+ Set<String> results = new HashSet<String>();
+ Iterator iter = nodes.iterator();
+ while (iter.hasNext()) {
+ CMNode node = (CMNode) iter.next();
+ if (node instanceof CMElementDeclaration) {
+ CMElementDeclaration elem = (CMElementDeclaration) node;
+ results.add(elem.getElementName());
+ }
+ }
+ return results;
+ }
+
+ /**
+ * Returns a list of all CMNode 'meta data' that may be potentially added to
+ * the element.
+ */
+ protected List getAvailableContent(String element, CMElementDeclaration ed) {
+// VEXAvailableContentCMVisitor visitor = new VEXAvailableContentCMVisitor(
+// element, ed);
+ List<CMNode> list = new ArrayList<CMNode>();
+ // List list = visitor
+ // .computeAvailableContent(ModelQuery.INCLUDE_CHILD_NODES);
+ if (ed.getContentType() == CMElementDeclaration.ELEMENT
+ || ed.getContentType() == CMElementDeclaration.MIXED) {
+ CMGroup groupContent = (CMGroup) ed.getContent();
+ list.addAll(getAllChildren(groupContent));
+ }
+ return list;
+ }
+
+ private List<CMNode> getAllChildren(CMGroup group) {
+ List<CMNode> list = new ArrayList<CMNode>();
+ CMNodeList nodeList = group.getChildNodes();
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ CMNode node = nodeList.item(i);
+ if (node instanceof CMElementDeclaration) {
+ String e = node.getNodeName();
+ list.add(node);
+ } else if (node instanceof CMGroup) {
+ list.addAll(getAllChildren((CMGroup)node));
+ }
+ }
+ return list;
}
public Set getValidRootElements() {
@@ -124,14 +188,11 @@
public boolean isValidSequence(String element, String[] nodes,
boolean partial) {
- // TODO Auto-generated method stub
return true;
}
public boolean isValidSequence(String element, String[] seq1,
String[] seq2, String[] seq3, boolean partial) {
- // TODO Auto-generated method stub
return true;
}
-
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/CssWhitespacePolicy.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/CssWhitespacePolicy.java
index 7fd97b2..f6f0a2b 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/CssWhitespacePolicy.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/CssWhitespacePolicy.java
@@ -12,7 +12,7 @@
import org.eclipse.wst.xml.vex.core.internal.css.CSS;
import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicy;
/**
@@ -30,11 +30,11 @@
this.styleSheet = styleSheet;
}
- public boolean isBlock(IVEXElement element) {
+ public boolean isBlock(VEXElement element) {
return this.styleSheet.getStyles(element).isBlock();
}
- public boolean isPre(IVEXElement element) {
+ public boolean isPre(VEXElement element) {
return CSS.PRE.equals(this.styleSheet.getStyles(element)
.getWhiteSpace());
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IVexWidget.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IVexWidget.java
index a2ce55c..725ee20 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IVexWidget.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IVexWidget.java
@@ -20,9 +20,9 @@
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
import org.eclipse.wst.xml.vex.core.internal.layout.Box;
import org.eclipse.wst.xml.vex.core.internal.layout.BoxFactory;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocumentFragment;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.eclipse.wst.xml.vex.core.internal.undo.CannotRedoException;
import org.eclipse.wst.xml.vex.core.internal.undo.CannotUndoException;
import org.xml.sax.SAXException;
@@ -185,12 +185,12 @@
/**
* Returns the element at the current caret offset.
*/
- public IVEXElement getCurrentElement();
+ public VEXElement getCurrentElement();
/**
* Returns the document associated with this component.
*/
- public IVEXDocument getDocument();
+ public VEXDocument getDocument();
/**
* Returns the width to which the document was layed out.
@@ -211,7 +211,7 @@
* Returns the currently selected document fragment, or null if there is no
* current selection.
*/
- public IVEXDocumentFragment getSelectedFragment();
+ public VEXDocumentFragment getSelectedFragment();
/**
* Returns the currently selected string, or an empty string if there is no
@@ -268,7 +268,7 @@
* @param frag
* DocumentFragment to insert.
*/
- public void insertFragment(IVEXDocumentFragment frag)
+ public void insertFragment(VEXDocumentFragment frag)
throws DocumentValidationException;
/**
@@ -504,7 +504,7 @@
* @param styleSheet
* StyleSheet to use for formatting
*/
- public void setDocument(IVEXDocument document, StyleSheet styleSheet);
+ public void setDocument(VEXDocument document, StyleSheet styleSheet);
/**
* Sets a new document for this control.
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetImpl.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetImpl.java
index f6f9ed7..8817200 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetImpl.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetImpl.java
@@ -41,10 +41,10 @@
import org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext;
import org.eclipse.wst.xml.vex.core.internal.layout.RootBox;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IPosition;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IValidator;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocumentFragment;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.Validator;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicy;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicyFactory;
import org.eclipse.wst.xml.vex.core.internal.undo.CannotRedoException;
@@ -86,7 +86,7 @@
private int layoutWidth = 500; // something reasonable to handle a document
// being set before the widget is sized
- private IVEXDocument document;
+ private VEXDocument document;
private StyleSheet styleSheet;
private BoxFactory boxFactory = new CssBoxFactory();
@@ -108,7 +108,7 @@
private int selectionStart;
private int selectionEnd;
- private IVEXElement currentElement;
+ private VEXElement currentElement;
private boolean caretVisible = true;
private Caret caret;
@@ -190,14 +190,14 @@
* @param frag
* DocumentFragment to be inserted.
*/
- public boolean canInsertFragment(IVEXDocumentFragment frag) {
+ public boolean canInsertFragment(VEXDocumentFragment frag) {
- IVEXDocument doc = this.getDocument();
+ VEXDocument doc = this.getDocument();
if (doc == null) {
return false;
}
- IValidator validator = doc.getValidator();
+ Validator validator = doc.getValidator();
if (validator == null) {
return true;
}
@@ -209,7 +209,7 @@
endOffset = this.getSelectionEnd();
}
- IVEXElement parent = this.getDocument().getElementAt(startOffset);
+ VEXElement parent = this.getDocument().getElementAt(startOffset);
String[] seq1 = doc.getNodeNames(parent.getStartOffset() + 1,
startOffset);
String[] seq2 = frag.getNodeNames();
@@ -224,12 +224,12 @@
*/
public boolean canInsertText() {
- IVEXDocument doc = this.getDocument();
+ VEXDocument doc = this.getDocument();
if (doc == null) {
return false;
}
- IValidator validator = this.document.getValidator();
+ Validator validator = this.document.getValidator();
if (validator == null) {
return true;
}
@@ -241,10 +241,10 @@
endOffset = this.getSelectionEnd();
}
- IVEXElement parent = this.getDocument().getElementAt(startOffset);
+ VEXElement parent = this.getDocument().getElementAt(startOffset);
String[] seq1 = doc.getNodeNames(parent.getStartOffset() + 1,
startOffset);
- String[] seq2 = new String[] { IValidator.PCDATA };
+ String[] seq2 = new String[] { Validator.PCDATA };
String[] seq3 = doc.getNodeNames(endOffset, parent.getEndOffset());
return validator.isValidSequence(parent.getName(), seq1, seq2, seq3,
@@ -270,18 +270,18 @@
}
public boolean canUnwrap() {
- IVEXDocument doc = this.getDocument();
+ VEXDocument doc = this.getDocument();
if (doc == null) {
return false;
}
- IValidator validator = doc.getValidator();
+ Validator validator = doc.getValidator();
if (validator == null) {
return false;
}
- IVEXElement element = doc.getElementAt(this.getCaretOffset());
- IVEXElement parent = element.getParent();
+ VEXElement element = doc.getElementAt(this.getCaretOffset());
+ VEXElement parent = element.getParent();
if (parent == null) {
// can't unwrap the root
return false;
@@ -313,9 +313,9 @@
this.deleteSelection();
} else {
int offset = this.getCaretOffset();
- IVEXDocument doc = this.getDocument();
+ VEXDocument doc = this.getDocument();
int n = doc.getLength() - 1;
- IVEXElement element = doc.getElementAt(offset);
+ VEXElement element = doc.getElementAt(offset);
if (offset == n) {
// nop
@@ -350,8 +350,8 @@
this.deleteSelection();
} else {
int offset = this.getCaretOffset();
- IVEXDocument doc = this.getDocument();
- IVEXElement element = doc.getElementAt(offset);
+ VEXDocument doc = this.getDocument();
+ VEXElement element = doc.getElementAt(offset);
if (offset == 1) {
// nop
@@ -516,11 +516,11 @@
return this.caretOffset;
}
- public IVEXElement getCurrentElement() {
+ public VEXElement getCurrentElement() {
return this.currentElement;
}
- public IVEXDocument getDocument() {
+ public VEXDocument getDocument() {
return this.document;
}
@@ -534,12 +534,12 @@
public String[] getValidInsertElements() {
- IVEXDocument doc = this.getDocument();
+ VEXDocument doc = this.getDocument();
if (doc == null) {
return new String[0];
}
- IValidator validator = doc.getValidator();
+ Validator validator = doc.getValidator();
if (validator == null) {
return new String[0];
}
@@ -551,14 +551,14 @@
endOffset = this.getSelectionEnd();
}
- IVEXElement parent = doc.getElementAt(startOffset);
+ VEXElement parent = doc.getElementAt(startOffset);
String[] prefix = doc.getNodeNames(parent.getStartOffset() + 1,
startOffset);
String[] suffix = doc.getNodeNames(endOffset, parent.getEndOffset());
+
List candidates = new ArrayList();
- candidates.addAll(validator.getValidItems(parent.getName(), prefix,
- suffix));
- candidates.remove(IValidator.PCDATA);
+ candidates.addAll(validator.getValidItems(parent.getName()));
+ candidates.remove(Validator.PCDATA);
// If there's a selection, root out those candidates that can't
// contain it.
@@ -589,18 +589,18 @@
public String[] getValidMorphElements() {
- IVEXDocument doc = this.getDocument();
+ VEXDocument doc = this.getDocument();
if (doc == null) {
return new String[0];
}
- IValidator validator = doc.getValidator();
+ Validator validator = doc.getValidator();
if (validator == null) {
return new String[0];
}
- IVEXElement element = doc.getElementAt(this.getCaretOffset());
- IVEXElement parent = element.getParent();
+ VEXElement element = doc.getElementAt(this.getCaretOffset());
+ VEXElement parent = element.getParent();
if (parent == null) {
// can't morph the root
return new String[0];
@@ -612,9 +612,8 @@
.getEndOffset());
List candidates = new ArrayList();
- candidates.addAll(validator.getValidItems(parent.getName(), prefix,
- suffix));
- candidates.remove(IValidator.PCDATA);
+ candidates.addAll(validator.getValidItems(parent.getName()));
+ candidates.remove(Validator.PCDATA);
// root out those that can't contain the current content
String[] content = doc.getNodeNames(element.getStartOffset() + 1,
@@ -638,7 +637,7 @@
return this.selectionStart;
}
- public IVEXDocumentFragment getSelectedFragment() {
+ public VEXDocumentFragment getSelectedFragment() {
if (this.hasSelection()) {
return this.document.getFragment(this.getSelectionStart(), this
.getSelectionEnd());
@@ -684,7 +683,7 @@
this.moveBy(+1);
}
- public void insertFragment(IVEXDocumentFragment frag)
+ public void insertFragment(VEXDocumentFragment frag)
throws DocumentValidationException {
if (this.hasSelection()) {
@@ -702,7 +701,7 @@
try {
this.beginWork();
- IVEXDocumentFragment frag = null;
+ VEXDocumentFragment frag = null;
if (this.hasSelection()) {
frag = this.getSelectedFragment();
this.deleteSelection();
@@ -755,9 +754,9 @@
public void morph(Element element) throws DocumentValidationException {
- IVEXDocument doc = this.getDocument();
+ VEXDocument doc = this.getDocument();
int offset = this.getCaretOffset();
- IVEXElement currentElement = doc.getElementAt(offset);
+ VEXElement currentElement = doc.getElementAt(offset);
if (currentElement == doc.getRootElement()) {
throw new DocumentValidationException(
@@ -769,7 +768,7 @@
this.beginWork();
this.moveTo(currentElement.getStartOffset() + 1, false);
this.moveTo(currentElement.getEndOffset(), true);
- IVEXDocumentFragment frag = this.getSelectedFragment();
+ VEXDocumentFragment frag = this.getSelectedFragment();
this.deleteSelection();
this.moveBy(-1, false);
this.moveBy(2, true);
@@ -806,7 +805,7 @@
this.repaintCaret();
this.repaintRange(this.getSelectionStart(), this.getSelectionEnd());
- IVEXElement oldElement = this.currentElement;
+ VEXElement oldElement = this.currentElement;
this.caretOffset = offset;
@@ -818,10 +817,10 @@
// move selectionStart and selectionEnd to make sure we don't
// select a partial element
- IVEXElement commonElement = this.document.findCommonElement(
+ VEXElement commonElement = this.document.findCommonElement(
this.selectionStart, this.selectionEnd);
- IVEXElement element = this.document
+ VEXElement element = this.document
.getElementAt(this.selectionStart);
while (element != commonElement) {
this.selectionStart = element.getStartOffset();
@@ -848,7 +847,7 @@
LayoutContext context = this.createLayoutContext(g);
this.caret = this.rootBox.getCaret(context, offset);
- IVEXElement element = this.getCurrentElement();
+ VEXElement element = this.getCurrentElement();
if (element != oldElement) {
this.caretColor = Color.BLACK;
while (element != null) {
@@ -911,7 +910,7 @@
}
public void moveToNextWord(boolean select) {
- IVEXDocument doc = this.getDocument();
+ VEXDocument doc = this.getDocument();
int n = doc.getLength() - 1;
int offset = this.getCaretOffset();
while (offset < n
@@ -949,7 +948,7 @@
}
public void moveToPreviousWord(boolean select) {
- IVEXDocument doc = this.getDocument();
+ VEXDocument doc = this.getDocument();
int offset = this.getCaretOffset();
while (offset > 1
&& !Character.isLetterOrDigit(doc.getCharacterAt(offset - 1))) {
@@ -1037,7 +1036,7 @@
public void removeAttribute(String attributeName) {
try {
- IVEXElement element = this.getCurrentElement();
+ VEXElement element = this.getCurrentElement();
if (element.getAttribute(attributeName) != null) {
element.removeAttribute(attributeName);
}
@@ -1061,7 +1060,7 @@
}
public void selectWord() {
- IVEXDocument doc = this.getDocument();
+ VEXDocument doc = this.getDocument();
int startOffset = this.getCaretOffset();
int endOffset = this.getCaretOffset();
while (startOffset > 1
@@ -1093,7 +1092,7 @@
public void setAttribute(String attributeName, String value) {
try {
- IVEXElement element = this.getCurrentElement();
+ VEXElement element = this.getCurrentElement();
if (value == null) {
this.removeAttribute(attributeName);
} else if (!value.equals(element.getAttribute(attributeName))) {
@@ -1115,7 +1114,7 @@
this.debugging = debugging;
}
- public void setDocument(IVEXDocument document, StyleSheet styleSheet) {
+ public void setDocument(VEXDocument document, StyleSheet styleSheet) {
if (this.document != null) {
this.document.removeDocumentListener(this.documentListener);
@@ -1150,7 +1149,7 @@
}
});
- IVEXDocument doc = reader.read(docUrl);
+ VEXDocument doc = reader.read(docUrl);
this.setDocument(doc, ss);
}
@@ -1193,8 +1192,8 @@
long start = System.currentTimeMillis();
- IVEXDocument doc = this.getDocument();
- IVEXElement element = doc.getElementAt(this.getCaretOffset());
+ VEXDocument doc = this.getDocument();
+ VEXElement element = doc.getElementAt(this.getCaretOffset());
Styles styles = this.getStyleSheet().getStyles(element);
while (!styles.isBlock()) {
element = element.getParent();
@@ -1210,7 +1209,7 @@
doc.insertText(offset, "\n");
this.moveTo(offset + 1);
} else {
- IVEXDocumentFragment frag = null;
+ VEXDocumentFragment frag = null;
int offset = this.getCaretOffset();
boolean atEnd = (offset == element.getEndOffset());
if (!atEnd) {
@@ -1359,7 +1358,7 @@
* @param element
* Element for which to search.
*/
- private void invalidateElementBox(final IVEXElement element) {
+ private void invalidateElementBox(final VEXElement element) {
BlockBox elementBox = (BlockBox) this
.findInnermostBox(new IBoxFilter() {
@@ -1388,8 +1387,8 @@
if (offset <= 1 || offset >= this.getDocument().getLength() - 1) {
return false;
}
- IVEXElement e1 = this.getDocument().getElementAt(offset - 1);
- IVEXElement e2 = this.getDocument().getElementAt(offset + 1);
+ VEXElement e1 = this.getDocument().getElementAt(offset - 1);
+ VEXElement e2 = this.getDocument().getElementAt(offset + 1);
return e1 != e2 && e1.getParent() == e2.getParent()
&& e1.getName().equals(e2.getName());
}
@@ -1459,9 +1458,9 @@
try {
this.beginWork();
this.moveTo(offset + 1);
- IVEXElement element = this.getCurrentElement();
+ VEXElement element = this.getCurrentElement();
boolean moveContent = !element.isEmpty();
- IVEXDocumentFragment frag = null;
+ VEXDocumentFragment frag = null;
if (moveContent) {
this.moveTo(element.getEndOffset(), true);
frag = this.getSelectedFragment();
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.docbook/src/org/eclipse/wst/xml/vex/docbook/DocBookOutlineProvider.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.docbook/src/org/eclipse/wst/xml/vex/docbook/DocBookOutlineProvider.java
index 1e91f0d..982266f 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.docbook/src/org/eclipse/wst/xml/vex/docbook/DocBookOutlineProvider.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.docbook/src/org/eclipse/wst/xml/vex/docbook/DocBookOutlineProvider.java
@@ -15,8 +15,8 @@
import java.util.List;
import org.eclipse.wst.xml.vex.core.internal.dom.*;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.ILabelProvider;
@@ -42,9 +42,9 @@
return this.labelProvider;
}
- public IVEXElement getOutlineElement(final IVEXElement child) {
+ public VEXElement getOutlineElement(final VEXElement child) {
- IVEXElement element = child;
+ VEXElement element = child;
while (( element.getParent() != null)
&& !isTitledElement(element) ) {
element = element.getParent();
@@ -62,11 +62,11 @@
}
public Object[] getChildren(final Object parentElement) {
- return getOutlineChildren((IVEXElement) parentElement);
+ return getOutlineChildren((VEXElement) parentElement);
}
public Object getParent(final Object element) {
- final IVEXElement parent = ((IVEXElement) element).getParent();
+ final VEXElement parent = ((VEXElement) element).getParent();
if (parent == null) {
return element;
} else {
@@ -75,11 +75,11 @@
}
public boolean hasChildren(final Object element) {
- return getOutlineChildren((IVEXElement) element).length > 0;
+ return getOutlineChildren((VEXElement) element).length > 0;
}
public Object[] getElements(final Object inputElement) {
- final IVEXDocument document = (IVEXDocument) inputElement;
+ final VEXDocument document = (VEXDocument) inputElement;
return new Object[] { document.getRootElement() };
}
@@ -92,26 +92,26 @@
* @param element
* @return
*/
- private IVEXElement[] getOutlineChildren(final IVEXElement element) {
+ private VEXElement[] getOutlineChildren(final VEXElement element) {
final List children = new ArrayList();
- final IVEXElement[] childElements = element.getChildElements();
+ final VEXElement[] childElements = element.getChildElements();
for (int i = 0; i < childElements.length; i++) {
if (titledElements.contains(childElements[i].getName())) {
children.add(childElements[i]);
}
}
- return (IVEXElement[]) children.toArray(new IVEXElement[children.size()]);
+ return (VEXElement[]) children.toArray(new VEXElement[children.size()]);
}
private final ILabelProvider labelProvider = new LabelProvider() {
public String getText(final Object o) {
- final IVEXElement e = (IVEXElement) o;
- IVEXElement titleChild = findChild(e, "title");
+ final VEXElement e = (VEXElement) o;
+ VEXElement titleChild = findChild(e, "title");
if (titleChild != null) {
return titleChild.getText();
} else {
- IVEXElement infoChild = findChild(e, e.getName() + "info");
+ VEXElement infoChild = findChild(e, e.getName() + "info");
if (infoChild != null) {
titleChild = findChild(infoChild, "title");
if (titleChild != null) {
@@ -135,11 +135,11 @@
* @param element
* @return
*/
- private boolean isTitledElement( final IVEXElement e ) {
+ private boolean isTitledElement( final VEXElement e ) {
if( titledElements.contains(e.getName() )
|| e.getParent() == null ) {
- final IVEXElement [] children = e.getChildElements();
+ final VEXElement [] children = e.getChildElements();
if( (children.length > 0 && children[0].getName().equals("title"))
|| (children.length > 1 && children[1].getName().equals("title"))
) {
@@ -154,10 +154,10 @@
* null if none found. We should move this to XPath when we gain that
* facility.
*/
- private IVEXElement findChild(IVEXElement parent, String childName) {
- IVEXElement[] children = parent.getChildElements();
+ private VEXElement findChild(VEXElement parent, String childName) {
+ VEXElement[] children = parent.getChildElements();
for (int i = 0; i < children.length; i++) {
- IVEXElement child = children[i];
+ VEXElement child = children[i];
if (child.getName().equals(childName)) {
return child;
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/ActionUtils.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/ActionUtils.java
index ba8a4eb..fa85f27 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/ActionUtils.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/ActionUtils.java
@@ -22,9 +22,9 @@
import org.eclipse.wst.xml.vex.core.internal.layout.ElementOrRangeCallback;
import org.eclipse.wst.xml.vex.core.internal.layout.LayoutUtils;
import org.eclipse.wst.xml.vex.core.internal.layout.TableRowBox;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXNode;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXNode;
import org.eclipse.wst.xml.vex.core.internal.widget.IBoxFilter;
import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
@@ -135,7 +135,7 @@
*/
public static int getCurrentColumnIndex(IVexWidget vexWidget) {
- IVEXElement row = getCurrentTableRow(vexWidget);
+ VEXElement row = getCurrentTableRow(vexWidget);
if (row == null) {
return -1;
@@ -155,7 +155,7 @@
i++;
}
- public void onRange(IVEXElement parent, int startOffset,
+ public void onRange(VEXElement parent, int startOffset,
int endOffset) {
i++;
}
@@ -171,10 +171,10 @@
* @param vexWidget
* IVexWidget to use.
*/
- public static IVEXElement getCurrentTableRow(IVexWidget vexWidget) {
+ public static VEXElement getCurrentTableRow(IVexWidget vexWidget) {
StyleSheet ss = vexWidget.getStyleSheet();
- IVEXElement element = vexWidget.getCurrentElement();
+ VEXElement element = vexWidget.getCurrentElement();
while (element != null) {
if (ss.getStyles(element).getDisplay().equals(CSS.TABLE_ROW)) {
@@ -213,10 +213,10 @@
}
int previousSiblingStart = -1;
- IVEXElement parent = vexWidget.getDocument().getElementAt(startOffset);
- IVEXNode[] children = parent.getChildNodes();
+ VEXElement parent = vexWidget.getDocument().getElementAt(startOffset);
+ VEXNode[] children = parent.getChildNodes();
for (int i = 0; i < children.length; i++) {
- IVEXNode child = children[i];
+ VEXNode child = children[i];
if (startOffset == child.getStartOffset()) {
break;
}
@@ -336,7 +336,7 @@
cellIndex++;
}
- public void onRange(IVEXElement parent,
+ public void onRange(VEXElement parent,
int startOffset, int endOffset) {
callback.onCell(row, new IntRange(startOffset,
endOffset), rowIndex[0], cellIndex);
@@ -349,7 +349,7 @@
rowIndex[0]++;
}
- public void onRange(IVEXElement parent, final int startOffset,
+ public void onRange(VEXElement parent, final int startOffset,
final int endOffset) {
final IntRange row = new IntRange(startOffset, endOffset);
@@ -366,7 +366,7 @@
cellIndex++;
}
- public void onRange(IVEXElement parent,
+ public void onRange(VEXElement parent,
int startOffset, int endOffset) {
callback.onCell(row, new IntRange(startOffset,
endOffset), rowIndex[0], cellIndex);
@@ -450,13 +450,13 @@
ElementOrRangeCallback callback) {
final StyleSheet ss = vexWidget.getStyleSheet();
- final IVEXDocument doc = vexWidget.getDocument();
+ final VEXDocument doc = vexWidget.getDocument();
final int offset = vexWidget.getCaretOffset();
// This may or may not be a table
// In any case, it's the element that contains the top-level table
// children
- IVEXElement table = doc.getElementAt(offset);
+ VEXElement table = doc.getElementAt(offset);
while (table != null && !LayoutUtils.isTableChild(ss, table)) {
table = table.getParent();
@@ -483,7 +483,7 @@
tableChildren.add(child);
}
- public void onRange(IVEXElement parent, int startOffset,
+ public void onRange(VEXElement parent, int startOffset,
int endOffset) {
if (!found[0]) {
tableChildren.clear();
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/DuplicateSelectionAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/DuplicateSelectionAction.java
index b8a23fb..0571424 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/DuplicateSelectionAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/DuplicateSelectionAction.java
@@ -11,7 +11,7 @@
package org.eclipse.wst.xml.vex.ui.internal.action;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
/**
@@ -24,7 +24,7 @@
vexWidget.doWork(new Runnable() {
public void run() {
if (!vexWidget.hasSelection()) {
- IVEXElement element = vexWidget.getCurrentElement();
+ VEXElement element = vexWidget.getCurrentElement();
if (element.getParent() == null) {
// Can't dup the root element
return;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertRowAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertRowAction.java
index 45f0c39..368cc94 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertRowAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertRowAction.java
@@ -14,7 +14,7 @@
import java.util.List;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
/**
@@ -116,7 +116,7 @@
Object row = rowsToInsert.get(i);
if (row instanceof Element) {
- vexWidget.insertElement((Element) ((IVEXElement) row)
+ vexWidget.insertElement((Element) ((VEXElement) row)
.clone());
}
@@ -125,7 +125,7 @@
for (int j = 0; j < cellsToInsert.size(); j++) {
Object cell = cellsToInsert.get(j);
if (cell instanceof Element) {
- vexWidget.insertElement((Element) ((IVEXElement) cell)
+ vexWidget.insertElement((Element) ((VEXElement) cell)
.clone());
vexWidget.moveBy(+1);
} else {
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveSelectionUpAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveSelectionUpAction.java
index 0e8f03d..4152942 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveSelectionUpAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveSelectionUpAction.java
@@ -13,7 +13,7 @@
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
import org.eclipse.wst.xml.vex.core.internal.layout.BlockBox;
import org.eclipse.wst.xml.vex.core.internal.layout.Box;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.eclipse.wst.xml.vex.core.internal.widget.IBoxFilter;
import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
@@ -57,7 +57,7 @@
// would
// be a VERY large change.)
System.out.println("Box is " + box);
- IVEXElement element = box.getElement();
+ VEXElement element = box.getElement();
if (element != null) {
vexWidget.moveTo(element.getEndOffset());
vexWidget.moveTo(element.getStartOffset(), true);
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/RemoveElementAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/RemoveElementAction.java
index a814ec2..5eecbbc 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/RemoveElementAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/RemoveElementAction.java
@@ -11,8 +11,8 @@
package org.eclipse.wst.xml.vex.ui.internal.action;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocumentFragment;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
/**
@@ -23,11 +23,11 @@
public void run(final IVexWidget vexWidget) {
vexWidget.doWork(new Runnable() {
public void run() {
- IVEXElement element = vexWidget.getDocument().getElementAt(
+ VEXElement element = vexWidget.getDocument().getElementAt(
vexWidget.getCaretOffset());
vexWidget.moveTo(element.getStartOffset() + 1, false);
vexWidget.moveTo(element.getEndOffset(), true);
- IVEXDocumentFragment frag = vexWidget.getSelectedFragment();
+ VEXDocumentFragment frag = vexWidget.getSelectedFragment();
vexWidget.deleteSelection();
vexWidget.moveBy(-1, false);
vexWidget.moveBy(2, true);
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/SplitAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/SplitAction.java
index 3b23f4b..faed003 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/SplitAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/SplitAction.java
@@ -17,9 +17,9 @@
import org.eclipse.wst.xml.vex.core.internal.css.CSS;
import org.eclipse.wst.xml.vex.core.internal.css.Styles;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocumentFragment;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
/**
@@ -28,7 +28,7 @@
public class SplitAction extends AbstractVexAction {
public void run(final IVexWidget vexWidget) {
- IVEXElement element = vexWidget.getCurrentElement();
+ VEXElement element = vexWidget.getCurrentElement();
Styles styles = vexWidget.getStyleSheet().getStyles(element);
while (!styles.isBlock()) {
element = element.getParent();
@@ -46,7 +46,7 @@
* Element to be split.
*/
public static void splitElement(final IVexWidget vexWidget,
- final IVEXElement element) {
+ final VEXElement element) {
vexWidget.doWork(new Runnable() {
public void run() {
@@ -61,7 +61,7 @@
if (styles.getWhiteSpace().equals(CSS.PRE)) {
// can't call vexWidget.insertText() or we'll get an
// infinite loop
- IVEXDocument doc = vexWidget.getDocument();
+ VEXDocument doc = vexWidget.getDocument();
int offset = vexWidget.getCaretOffset();
doc.insertText(offset, "\n");
vexWidget.moveTo(offset + 1);
@@ -74,7 +74,7 @@
// we clone the element.
List children = new ArrayList();
List frags = new ArrayList();
- IVEXElement child = vexWidget.getCurrentElement();
+ VEXElement child = vexWidget.getCurrentElement();
while (true) {
children.add(child);
vexWidget.moveTo(child.getEndOffset(), true);
@@ -89,7 +89,7 @@
for (int i = children.size() - 1; i >= 0; i--) {
child = (Element) children.get(i);
- IVEXDocumentFragment frag = (IVEXDocumentFragment) frags.get(i);
+ VEXDocumentFragment frag = (VEXDocumentFragment) frags.get(i);
vexWidget.insertElement((Element) child.clone());
int offset = vexWidget.getCaretOffset();
if (frag != null) {
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/SplitItemAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/SplitItemAction.java
index ab4ddba..4e5b99e 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/SplitItemAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/SplitItemAction.java
@@ -14,7 +14,7 @@
import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
import org.eclipse.wst.xml.vex.core.internal.layout.Box;
import org.eclipse.wst.xml.vex.core.internal.layout.TableRowBox;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.eclipse.wst.xml.vex.core.internal.widget.IBoxFilter;
import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
@@ -35,7 +35,7 @@
if (box instanceof TableRowBox) {
return true;
} else {
- IVEXElement element = box.getElement();
+ VEXElement element = box.getElement();
return element != null
&& ss.getStyles(element).getDisplay().equals(
CSS.LIST_ITEM);
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypePropertyPage.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypePropertyPage.java
index 746e3c8..7671ce6 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypePropertyPage.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypePropertyPage.java
@@ -31,7 +31,7 @@
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IValidator;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.Validator;
import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
/**
@@ -283,7 +283,7 @@
final String resourcePath = ((IFile) this.getElement())
.getProjectRelativePath().toString();
- final IValidator validator = (IValidator) ((ConfigSource) this
+ final Validator validator = (Validator) ((ConfigSource) this
.getPluginProject()).getParsedResource(resourcePath);
if (validator != null) {
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DocumentType.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DocumentType.java
index 4f4f56f..cd4b6e7 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DocumentType.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DocumentType.java
@@ -14,7 +14,7 @@
import java.util.Iterator;
import java.util.List;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IValidator;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.Validator;
import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor;
/**
@@ -133,8 +133,8 @@
this.systemId = systemId;
}
- public IValidator getValidator() {
- return (IValidator) this.getConfig().getParsedResource(
+ public Validator getValidator() {
+ return (Validator) this.getConfig().getParsedResource(
this.getResourcePath());
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionPage.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionPage.java
index 84d3740..467acdd 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionPage.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionPage.java
@@ -23,7 +23,7 @@
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IValidator;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.Validator;
import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
import org.eclipse.wst.xml.vex.ui.internal.config.DocumentType;
@@ -160,7 +160,7 @@
String selectedRoot = null;
if (roots.length == 0) {
- IValidator validator = dt.getValidator();
+ Validator validator = dt.getValidator();
if (validator != null) {
Set set = validator.getValidRootElements();
roots = (String[]) set.toArray(new String[set.size()]);
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
index 0e4b661..9f4f608 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
@@ -76,9 +76,9 @@
import org.eclipse.wst.xml.vex.core.internal.dom.DocumentReader;
import org.eclipse.wst.xml.vex.core.internal.dom.DocumentWriter;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IValidator;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.Validator;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicy;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicyFactory;
import org.eclipse.wst.xml.vex.core.internal.validator.WTPVEXValidator;
@@ -392,7 +392,7 @@
// Otherwise, a PartInitException would have been thrown by now
//IValidator validator = this.doctype.getValidator();
- IValidator validator = WTPVEXValidator.create(doctype.getResourceUrl());
+ Validator validator = WTPVEXValidator.create(doctype.getResourceUrl());
if (validator != null) {
this.doc.setValidator(validator);
if (this.debugging) {
@@ -584,7 +584,7 @@
private boolean loaded;
private DocumentType doctype;
- private IVEXDocument doc;
+ private VEXDocument doc;
private Style style;
private VexWidget vexWidget;
@@ -1050,7 +1050,7 @@
private String getLocation() {
List path = new ArrayList();
- IVEXElement element = this.vexWidget.getCurrentElement();
+ VEXElement element = this.vexWidget.getCurrentElement();
while (element != null) {
path.add(element.getName());
element = element.getParent();
@@ -1078,9 +1078,9 @@
IStructuredSelection sel = (IStructuredSelection) vexWidget
.getSelection();
boolean multi = (sel != null && sel.size() > 1);
- IValidator validator = vexWidget.getDocument()
+ Validator validator = vexWidget.getDocument()
.getValidator();
- return new ElementPropertySource((IVEXElement) object,
+ return new ElementPropertySource((VEXElement) object,
validator, multi);
} else {
return null;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditorMultiPage.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditorMultiPage.java
index fd5d0a6..7c040ce 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditorMultiPage.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditorMultiPage.java
@@ -67,9 +67,9 @@
import org.eclipse.wst.xml.vex.core.internal.dom.DocumentReader;
import org.eclipse.wst.xml.vex.core.internal.dom.DocumentWriter;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IValidator;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.Validator;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicy;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicyFactory;
import org.eclipse.wst.xml.vex.core.internal.widget.CssWhitespacePolicy;
@@ -373,7 +373,7 @@
// this.style is set by wsPolicyFactory
// Otherwise, a PartInitException would have been thrown by now
- IValidator validator = this.doctype.getValidator();
+ Validator validator = this.doctype.getValidator();
if (validator != null) {
this.doc.setValidator(validator);
if (this.debugging) {
@@ -550,7 +550,7 @@
private boolean loaded;
private DocumentType doctype;
- private IVEXDocument doc;
+ private VEXDocument doc;
private Style style;
private VexWidget vexWidget;
@@ -916,7 +916,7 @@
private String getLocation() {
List path = new ArrayList();
- IVEXElement element = this.vexWidget.getCurrentElement();
+ VEXElement element = this.vexWidget.getCurrentElement();
while (element != null) {
path.add(element.getName());
element = element.getParent();
@@ -944,9 +944,9 @@
IStructuredSelection sel = (IStructuredSelection) vexWidget
.getSelection();
boolean multi = (sel != null && sel.size() > 1);
- IValidator validator = vexWidget.getDocument()
+ Validator validator = vexWidget.getDocument()
.getValidator();
- return new ElementPropertySource((IVEXElement) object,
+ return new ElementPropertySource((VEXElement) object,
validator, multi);
} else {
return null;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DefaultOutlineProvider.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DefaultOutlineProvider.java
index 3930eac..888cad3 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DefaultOutlineProvider.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DefaultOutlineProvider.java
@@ -18,8 +18,8 @@
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicy;
import org.eclipse.wst.xml.vex.core.internal.widget.CssWhitespacePolicy;
import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor;
@@ -36,7 +36,7 @@
this.contentProvider = new ContentProvider();
this.labelProvider = new LabelProvider() {
public String getText(Object o) {
- IVEXElement e = (IVEXElement) o;
+ VEXElement e = (VEXElement) o;
String s = e.getText();
if (s.length() > 30) {
s = s.substring(0, 30) + "..."; //$NON-NLS-1$
@@ -55,8 +55,8 @@
return this.labelProvider;
}
- public IVEXElement getOutlineElement(IVEXElement child) {
- IVEXElement element = child;
+ public VEXElement getOutlineElement(VEXElement child) {
+ VEXElement element = child;
while (element != null) {
if (this.whitespacePolicy.isBlock(element)) {
return element;
@@ -76,7 +76,7 @@
public Object[] getChildren(Object parentElement) {
List blockChildren = new ArrayList();
- IVEXElement[] children = ((IVEXElement) parentElement).getChildElements();
+ VEXElement[] children = ((VEXElement) parentElement).getChildElements();
for (int i = 0; i < children.length; i++) {
if (whitespacePolicy.isBlock(children[i])) {
blockChildren.add(children[i]);
@@ -86,15 +86,15 @@
}
public Object getParent(Object element) {
- return ((IVEXElement) element).getParent();
+ return ((VEXElement) element).getParent();
}
public boolean hasChildren(Object o) {
- return this.hasBlockChild((IVEXElement) o);
+ return this.hasBlockChild((VEXElement) o);
}
public Object[] getElements(Object inputElement) {
- return new Object[] { ((IVEXDocument) inputElement).getRootElement() };
+ return new Object[] { ((VEXDocument) inputElement).getRootElement() };
// return this.getChildren(inputElement);
}
@@ -108,8 +108,8 @@
// ====================================================== PRIVATE
- private boolean hasBlockChild(IVEXElement element) {
- IVEXElement[] children = element.getChildElements();
+ private boolean hasBlockChild(VEXElement element) {
+ VEXElement[] children = element.getChildElements();
for (int i = 0; i < children.length; i++) {
if (whitespacePolicy.isBlock(children[i])) {
return true;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DocumentOutlinePage.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DocumentOutlinePage.java
index f5ee02a..bc90d70 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DocumentOutlinePage.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DocumentOutlinePage.java
@@ -29,7 +29,7 @@
import org.eclipse.ui.part.Page;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
import org.eclipse.wst.xml.vex.ui.internal.config.DocumentType;
import org.eclipse.wst.xml.vex.ui.internal.editor.IVexEditorListener;
@@ -214,8 +214,8 @@
VexWidget vexWidget = (VexWidget) event.getSource();
if (vexWidget.isFocusControl() && getTreeViewer() != null) {
- IVEXElement element = vexWidget.getCurrentElement();
- IVEXElement outlineElement = outlineProvider
+ VEXElement element = vexWidget.getCurrentElement();
+ VEXElement outlineElement = outlineProvider
.getOutlineElement(element);
getTreeViewer().refresh(outlineElement);
getTreeViewer().setSelection(
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/IOutlineProvider.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/IOutlineProvider.java
index 0f8267f..5c61dbf 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/IOutlineProvider.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/IOutlineProvider.java
@@ -12,7 +12,7 @@
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor;
/**
@@ -49,5 +49,5 @@
* @param child
* Element for which to find the outline element.
*/
- public IVEXElement getOutlineElement(IVEXElement child);
+ public VEXElement getOutlineElement(VEXElement child);
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/property/ElementPropertySource.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/property/ElementPropertySource.java
index 8f9ed5f..2bc11cd 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/property/ElementPropertySource.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/property/ElementPropertySource.java
@@ -16,8 +16,8 @@
import org.eclipse.ui.views.properties.PropertyDescriptor;
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
import org.eclipse.wst.xml.vex.core.internal.dom.DocumentValidationException;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IValidator;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.Validator;
import org.eclipse.wst.xml.vex.core.internal.validator.AttributeDefinition;
import org.eclipse.wst.xml.vex.ui.internal.editor.Messages;
@@ -37,7 +37,7 @@
* True if multiple elements are selected. In this case the "id"
* attribute will not be editable.
*/
- public ElementPropertySource(IVEXElement element, IValidator validator,
+ public ElementPropertySource(VEXElement element, Validator validator,
boolean multi) {
this.element = element;
this.validator = validator;
@@ -153,8 +153,8 @@
private static final String ATTR_ID = "id"; //$NON-NLS-1$
- private IVEXElement element;
- private IValidator validator;
+ private VEXElement element;
+ private Validator validator;
private boolean multi;
private String[] getEnumValues(AttributeDefinition def) {
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexComponent.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexComponent.java
index 1bb61af..7aadefc 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexComponent.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexComponent.java
@@ -67,9 +67,9 @@
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
import org.eclipse.wst.xml.vex.core.internal.layout.Box;
import org.eclipse.wst.xml.vex.core.internal.layout.BoxFactory;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocumentFragment;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import org.eclipse.wst.xml.vex.core.internal.widget.HostComponent;
import org.eclipse.wst.xml.vex.core.internal.widget.IBoxFilter;
import org.eclipse.wst.xml.vex.core.internal.widget.VexWidgetImpl;
@@ -239,9 +239,9 @@
return this.canPasteText();
}
- IVEXDocumentFragment frag;
+ VEXDocumentFragment frag;
try {
- frag = (IVEXDocumentFragment) tfbl.getTransferData(flavor);
+ frag = (VEXDocumentFragment) tfbl.getTransferData(flavor);
} catch (UnsupportedFlavorException ex) {
return false;
} catch (IOException ex) {
@@ -440,7 +440,7 @@
Transferable tfbl = this.clipboard.getContents(null);
DataFlavor flavor = VexSelection.VEX_DOCUMENT_FRAGMENT_FLAVOR;
if (tfbl.isDataFlavorSupported(flavor)) {
- IVEXDocumentFragment frag = (IVEXDocumentFragment) tfbl
+ VEXDocumentFragment frag = (VEXDocumentFragment) tfbl
.getTransferData(flavor);
this.impl.insertFragment(frag);
} else {
@@ -513,11 +513,11 @@
return this.impl.getCaretOffset();
}
- public IVEXElement getCurrentElement() {
+ public VEXElement getCurrentElement() {
return this.impl.getCurrentElement();
}
- public IVEXDocument getDocument() {
+ public VEXDocument getDocument() {
return this.impl.getDocument();
}
@@ -533,7 +533,7 @@
return this.impl.getSelectionStart();
}
- public IVEXDocumentFragment getSelectedFragment() {
+ public VEXDocumentFragment getSelectedFragment() {
return this.impl.getSelectedFragment();
}
@@ -565,7 +565,7 @@
this.impl.insertChar(c);
}
- public void insertFragment(IVEXDocumentFragment frag)
+ public void insertFragment(VEXDocumentFragment frag)
throws DocumentValidationException {
this.impl.insertFragment(frag);
}
@@ -658,7 +658,7 @@
impl.setDebugging(debugging);
}
- public void setDocument(IVEXDocument doc, StyleSheet styleSheet) {
+ public void setDocument(VEXDocument doc, StyleSheet styleSheet) {
this.impl.setDocument(doc, styleSheet);
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexSelection.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexSelection.java
index 4237f82..5717187 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexSelection.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexSelection.java
@@ -16,7 +16,7 @@
import java.io.IOException;
import org.eclipse.wst.xml.vex.core.internal.dom.DocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocumentFragment;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocumentFragment;
/**
* Represents a selection of a Vex document, which can be viewed as plaintext or
@@ -28,10 +28,10 @@
* DataFlavor representing a Vex document fragment.
*/
public static final DataFlavor VEX_DOCUMENT_FRAGMENT_FLAVOR = new DataFlavor(
- DocumentFragment.class, IVEXDocumentFragment.MIME_TYPE);
+ DocumentFragment.class, VEXDocumentFragment.MIME_TYPE);
private DataFlavor[] flavors;
- private IVEXDocumentFragment frag;
+ private VEXDocumentFragment frag;
/**
* Class constructor.
@@ -41,7 +41,7 @@
* @param frag
* Document fragment representing the selection.
*/
- public VexSelection(String s, IVEXDocumentFragment frag) {
+ public VexSelection(String s, VEXDocumentFragment frag) {
super(s);
this.frag = frag;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/DocumentFragmentTransfer.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/DocumentFragmentTransfer.java
index 76f9b09..281004b 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/DocumentFragmentTransfer.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/DocumentFragmentTransfer.java
@@ -19,7 +19,7 @@
import org.eclipse.swt.dnd.ByteArrayTransfer;
import org.eclipse.swt.dnd.TransferData;
import org.eclipse.wst.xml.vex.core.internal.dom.DocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocumentFragment;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocumentFragment;
/**
* Transfer object that handles Vex DocumentFragments.
@@ -49,7 +49,7 @@
return;
if (isSupportedType(transferData)) {
- IVEXDocumentFragment frag = (IVEXDocumentFragment) object;
+ VEXDocumentFragment frag = (VEXDocumentFragment) object;
try {
// write data to a byte array and then ask super to convert to
// pMedium
@@ -89,9 +89,9 @@
// =================================================== PRIVATE
- private static final String[] typeNames = { IVEXDocumentFragment.MIME_TYPE };
+ private static final String[] typeNames = { VEXDocumentFragment.MIME_TYPE };
private static final int[] typeIds = { ByteArrayTransfer
- .registerType(IVEXDocumentFragment.MIME_TYPE) };
+ .registerType(VEXDocumentFragment.MIME_TYPE) };
private static DocumentFragmentTransfer instance;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/VexWidget.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/VexWidget.java
index f344fae..b944bb6 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/VexWidget.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/VexWidget.java
@@ -60,10 +60,10 @@
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
import org.eclipse.wst.xml.vex.core.internal.layout.Box;
import org.eclipse.wst.xml.vex.core.internal.layout.BoxFactory;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXNode;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocumentFragment;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXNode;
import org.eclipse.wst.xml.vex.core.internal.widget.HostComponent;
import org.eclipse.wst.xml.vex.core.internal.widget.IBoxFilter;
import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
@@ -228,11 +228,11 @@
return this.impl.getCaretOffset();
}
- public IVEXElement getCurrentElement() {
+ public VEXElement getCurrentElement() {
return this.impl.getCurrentElement();
}
- public IVEXDocument getDocument() {
+ public VEXDocument getDocument() {
return this.impl.getDocument();
}
@@ -248,7 +248,7 @@
return this.impl.getSelectionStart();
}
- public IVEXDocumentFragment getSelectedFragment() {
+ public VEXDocumentFragment getSelectedFragment() {
return this.impl.getSelectedFragment();
}
@@ -280,7 +280,7 @@
this.impl.insertChar(c);
}
- public void insertFragment(IVEXDocumentFragment frag)
+ public void insertFragment(VEXDocumentFragment frag)
throws DocumentValidationException {
this.impl.insertFragment(frag);
}
@@ -373,7 +373,7 @@
*/
public void paste() throws DocumentValidationException {
Clipboard clipboard = new Clipboard(this.getDisplay());
- IVEXDocumentFragment frag = (IVEXDocumentFragment) clipboard
+ VEXDocumentFragment frag = (VEXDocumentFragment) clipboard
.getContents(DocumentFragmentTransfer.getInstance());
if (frag != null) {
this.insertFragment(frag);
@@ -426,7 +426,7 @@
impl.setDebugging(debugging);
}
- public void setDocument(IVEXDocument doc, StyleSheet styleSheet) {
+ public void setDocument(VEXDocument doc, StyleSheet styleSheet) {
this.impl.setDocument(doc, styleSheet);
}
@@ -574,7 +574,7 @@
public void fireSelectionChanged() {
if (hasSelection()) {
- IVEXNode[] nodes = getDocument().getNodes(getSelectionStart(),
+ VEXNode[] nodes = getDocument().getNodes(getSelectionStart(),
getSelectionEnd());
selection = new StructuredSelection(nodes);
} else {
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/wizards/NewDocumentWizard.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/wizards/NewDocumentWizard.java
index e342b39..7751994 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/wizards/NewDocumentWizard.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/wizards/NewDocumentWizard.java
@@ -33,7 +33,7 @@
import org.eclipse.wst.xml.vex.core.internal.dom.Document;
import org.eclipse.wst.xml.vex.core.internal.dom.DocumentWriter;
import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
import org.eclipse.wst.xml.vex.core.internal.widget.CssWhitespacePolicy;
import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
import org.eclipse.wst.xml.vex.ui.internal.config.Style;
@@ -65,7 +65,7 @@
try {
RootElement root = new RootElement(this.typePage
.getRootElementName());
- IVEXDocument doc = new Document(root);
+ VEXDocument doc = new Document(root);
doc.setPublicID(this.typePage.getDocumentType().getPublicId());
doc.setSystemID(this.typePage.getDocumentType().getSystemId());
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/CssTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/CssTest.java
index 30ec19b..d7030ed 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/CssTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/CssTest.java
@@ -21,8 +21,8 @@
import org.eclipse.wst.xml.vex.core.internal.dom.Document;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
import junit.framework.TestCase;
@@ -187,8 +187,8 @@
*/
public void testDefaultInheritance() throws Exception {
RootElement simple = new RootElement("simple");
- IVEXElement defaults = new Element("defaults");
- IVEXDocument doc = new Document(simple);
+ VEXElement defaults = new Element("defaults");
+ VEXDocument doc = new Document(simple);
doc.insertElement(1, defaults);
StyleSheet ss = parseStyleSheetResource("test2.css");
@@ -449,7 +449,7 @@
public void testForcedInheritance() throws Exception {
RootElement simple = new RootElement("simple");
Element inherit = new Element("inherit");
- IVEXDocument doc = new Document(simple);
+ VEXDocument doc = new Document(simple);
doc.insertElement(1, inherit);
StyleSheet ss = parseStyleSheetResource("test2.css");
@@ -491,7 +491,7 @@
public void testImportant() throws Exception {
StyleSheet ss = parseStyleSheetResource("testImportant.css");
- IVEXElement a = new Element("a");
+ VEXElement a = new Element("a");
Styles styles = ss.getStyles(a);
Color black = new Color(0, 0, 0);
@@ -508,7 +508,7 @@
public void testMarginInheritance() throws Exception {
StyleSheet ss = parseStyleSheetResource("test2.css");
Element root = new Element("margin1");
- IVEXElement child = new Element("defaults");
+ VEXElement child = new Element("defaults");
child.setParent(root);
Styles styles = ss.getStyles(child);
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/RuleTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/RuleTest.java
index 9f3f908..353e638 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/RuleTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/RuleTest.java
@@ -18,7 +18,7 @@
import org.eclipse.wst.xml.vex.core.internal.dom.Document;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
import junit.framework.TestCase;
@@ -49,7 +49,7 @@
e.setAttribute("color", "red blue");
f.setAttribute("color", "bluered");
- IVEXDocument doc = new Document(a);
+ VEXDocument doc = new Document(a);
doc.insertElement(1, b);
doc.insertElement(2, c);
doc.insertElement(3, d);
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/BlockElementBoxTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/BlockElementBoxTest.java
index dcbc6fe..634a03c 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/BlockElementBoxTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/BlockElementBoxTest.java
@@ -24,7 +24,7 @@
import org.eclipse.wst.xml.vex.core.internal.layout.FakeGraphics;
import org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext;
import org.eclipse.wst.xml.vex.core.internal.layout.RootBox;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
import junit.framework.TestCase;
@@ -53,7 +53,7 @@
String docString = "<root><small/><medium/><large/></root>";
DocumentReader docReader = new DocumentReader();
docReader.setDebugging(true);
- IVEXDocument doc = docReader.read(docString);
+ VEXDocument doc = docReader.read(docString);
context.setDocument(doc);
RootBox parentBox = new RootBox(context, doc.getRootElement(), 500);
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DTDValidatorTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DTDValidatorTest.java
index 2ae03ee..5c83e3b 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DTDValidatorTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DTDValidatorTest.java
@@ -22,22 +22,23 @@
import org.eclipse.wst.xml.vex.core.internal.dom.Document;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IValidator;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.Validator;
import org.eclipse.wst.xml.vex.core.internal.validator.AttributeDefinition;
import org.eclipse.wst.xml.vex.core.internal.validator.DTDValidator;
+import org.eclipse.wst.xml.vex.core.internal.validator.WTPVEXValidator;
import junit.framework.TestCase;
@SuppressWarnings("restriction")
public class DTDValidatorTest extends TestCase {
- IValidator validator = null;
+ Validator validator = null;
protected void setUp() {
try {
URL url = DTDValidatorTest.class.getResource("test1.dtd");
- validator = DTDValidator.create(url);
+ validator = WTPVEXValidator.create(url);
} catch (Exception ex) {
fail("Failed to load test1.dtd");
}
@@ -54,7 +55,7 @@
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bais);
- validator = (IValidator) ois.readObject();
+ validator = (Validator) ois.readObject();
AttributeDefinition.Type adType2 = validator
.getAttributeDefinitions("section")[0].getType();
@@ -63,35 +64,35 @@
}
- public void testEmptyDTD() throws Exception {
- IVEXDocument doc;
- Set expected;
-
- doc = new Document(new RootElement("empty"));
- doc.setValidator(validator);
- assertEquals(Collections.EMPTY_SET, getValidItemsAt(doc, 1));
- }
+// public void testEmptyDTD() throws Exception {
+// VEXDocument doc;
+// Set expected;
+//
+// doc = new Document(new RootElement("empty"));
+// doc.setValidator(validator);
+// assertEquals(Collections.EMPTY_SET, getValidItemsAt(doc, 1));
+// }
- public void testAnyDTD() throws Exception {
- IVEXDocument doc;
- Set expected;
-
- doc = new Document(new RootElement("any"));
- doc.setValidator(validator);
- Set anySet = new HashSet();
- anySet.add(IValidator.PCDATA);
- anySet.add("any");
- anySet.add("empty");
- anySet.add("section");
- anySet.add("title");
- anySet.add("para");
- anySet.add("emphasis");
- assertEquals(anySet, getValidItemsAt(doc, 1));
-
- }
+// public void testAnyDTD() throws Exception {
+// VEXDocument doc;
+// Set expected;
+//
+// doc = new Document(new RootElement("any"));
+// doc.setValidator(validator);
+// Set anySet = new HashSet();
+// anySet.add(Validator.PCDATA);
+// anySet.add("any");
+// anySet.add("empty");
+// anySet.add("section");
+// anySet.add("title");
+// anySet.add("para");
+// anySet.add("emphasis");
+// assertEquals(anySet, getValidItemsAt(doc, 1));
+//
+// }
public void testSectionElement() {
- IVEXDocument doc;
+ VEXDocument doc;
Set expected;
// <section> <title> a b </title> <para> </para> </section>
@@ -108,30 +109,34 @@
// New tests will need to be written when further refactoring of the content model
// is done.
-
-// expected = Collections.singleton(IValidator.PCDATA);
-// assertEquals(expected, getValidItemsAt(doc, 1));
-// expected = Collections.singleton(IValidator.PCDATA);
-// assertEquals(expected, getValidItemsAt(doc, 2));
-// assertEquals(expected, getValidItemsAt(doc, 3));
-// assertEquals(expected, getValidItemsAt(doc, 4));
-// expected = Collections.singleton("para");
-// assertEquals(expected, getValidItemsAt(doc, 5));
-// assertEquals(expected, getValidItemsAt(doc, 7));
-// expected = new HashSet();
-// expected.add(IValidator.PCDATA);
-// expected.add("emphasis");
-// assertEquals(expected, getValidItemsAt(doc, 6));
+ expected = new HashSet();
+ expected.add("title");
+ expected.add("para");
+ assertEquals(expected, getValidItemsAt(doc, 1));
+
+ expected = Collections.emptySet();
+ assertEquals(expected, getValidItemsAt(doc, 2));
+ assertEquals(expected, getValidItemsAt(doc, 3));
+ assertEquals(expected, getValidItemsAt(doc, 4));
+
+ expected = new HashSet();
+ expected.add("title");
+ expected.add("para");
+ assertEquals(expected, getValidItemsAt(doc, 5));
+ assertEquals(expected, getValidItemsAt(doc, 7));
+
+ expected = new HashSet();
+ expected.add("emphasis");
+ assertEquals(expected, getValidItemsAt(doc, 6));
}
- private Set getValidItemsAt(IVEXDocument doc, int offset) {
- IVEXElement element = doc.getElementAt(offset);
+ private Set getValidItemsAt(VEXDocument doc, int offset) {
+ VEXElement element = doc.getElementAt(offset);
String[] prefix = doc
.getNodeNames(element.getStartOffset() + 1, offset);
String[] suffix = doc.getNodeNames(offset, element.getEndOffset());
- return doc.getValidator().getValidItems(element.getName(), prefix,
- suffix);
+ return doc.getValidator().getValidItems(element.getName());
}
/*
* private void dump(Validator validator, Document doc, int offset) { Set
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriterTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriterTest.java
index 66d3bb3..6945a90 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriterTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriterTest.java
@@ -25,9 +25,9 @@
import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
import org.eclipse.wst.xml.vex.core.internal.dom.DocumentWriter;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXNode;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXNode;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicy;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicyFactory;
import org.eclipse.wst.xml.vex.core.internal.widget.CssWhitespacePolicy;
@@ -48,7 +48,7 @@
URL docUrl = this.getClass().getResource("DocumentWriterTest1.xml");
- IVEXDocument docOrig = readDocument(new InputSource(docUrl.toString()), ss);
+ VEXDocument docOrig = readDocument(new InputSource(docUrl.toString()), ss);
DocumentWriter dw = new DocumentWriter();
dw.setWhitespacePolicy(new CssWhitespacePolicy(ss));
@@ -67,18 +67,18 @@
// }
// is.reset();
- IVEXDocument docNew = readDocument(new InputSource(is), ss);
+ VEXDocument docNew = readDocument(new InputSource(is), ss);
assertEquals(docOrig, docNew);
}
- private void assertEquals(IVEXDocument expected, IVEXDocument actual)
+ private void assertEquals(VEXDocument expected, VEXDocument actual)
throws Exception {
assertEquals(expected.getRootElement(), actual.getRootElement());
}
- private void assertEquals(IVEXElement expected, IVEXElement actual)
+ private void assertEquals(VEXElement expected, VEXElement actual)
throws Exception {
System.out.println("Checking " + actual.getName());
@@ -95,15 +95,15 @@
assertEquals(expectedAttrs[i], actualAttrs[i]);
}
- IVEXNode[] expectedContent = expected.getChildNodes();
- IVEXNode[] actualContent = actual.getChildNodes();
+ VEXNode[] expectedContent = expected.getChildNodes();
+ VEXNode[] actualContent = actual.getChildNodes();
assertEquals(expectedContent.length, actualContent.length);
for (int i = 0; i < expectedContent.length; i++) {
assertEquals(expectedContent[i].getClass(), actualContent[i]
.getClass());
if (expectedContent[i] instanceof Element) {
- assertEquals((IVEXElement) expectedContent[i],
- (IVEXElement) actualContent[i]);
+ assertEquals((VEXElement) expectedContent[i],
+ (VEXElement) actualContent[i]);
} else {
assertEquals(expectedContent[i].getText(), actualContent[i]
.getText());
@@ -111,7 +111,7 @@
}
}
- private static IVEXDocument readDocument(InputSource is, StyleSheet ss)
+ private static VEXDocument readDocument(InputSource is, StyleSheet ss)
throws ParserConfigurationException, SAXException, IOException {
SAXParserFactory factory = SAXParserFactory.newInstance();
@@ -162,7 +162,7 @@
StyleSheetReader reader = new StyleSheetReader();
StyleSheet ss = reader.read(DocumentWriterTest.class
.getResource("test.css"));
- IVEXDocument doc = readDocument(new InputSource(fis), ss);
+ VEXDocument doc = readDocument(new InputSource(fis), ss);
DocumentWriter writer = new DocumentWriter();
writer.setWhitespacePolicy(new CssWhitespacePolicy(ss));
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DomTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DomTest.java
index 3b0cf5f..d5d7729 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DomTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DomTest.java
@@ -14,10 +14,10 @@
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
import org.eclipse.wst.xml.vex.core.internal.dom.Text;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXNode;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocumentFragment;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXNode;
import junit.framework.TestCase;
@@ -32,9 +32,9 @@
// Document initialisation
//
RootElement root = new RootElement("article");
- IVEXDocument doc = new Document(root);
- IVEXNode[] content;
- IVEXElement[] children;
+ VEXDocument doc = new Document(root);
+ VEXNode[] content;
+ VEXElement[] children;
// root
// | |
@@ -118,14 +118,14 @@
public void testFragments() throws Exception {
- IVEXDocument doc;
- IVEXDocumentFragment frag;
- IVEXElement[] elements;
- IVEXNode[] nodes;
- IVEXElement root;
- IVEXElement x;
- IVEXElement y;
- IVEXElement z;
+ VEXDocument doc;
+ VEXDocumentFragment frag;
+ VEXElement[] elements;
+ VEXNode[] nodes;
+ VEXElement root;
+ VEXElement x;
+ VEXElement y;
+ VEXElement z;
// Case 1: just text
//
@@ -272,7 +272,7 @@
assertIsText(nodes[0], "a", 1, 2);
assertIsElement(nodes[1], "z", doc.getRootElement(), 2, 14);
assertIsText(nodes[2], "i", 15, 16);
- z = (IVEXElement) nodes[1];
+ z = (VEXElement) nodes[1];
nodes = z.getChildNodes();
assertEquals(5, nodes.length);
assertIsText(nodes[0], "bc", 3, 5);
@@ -280,8 +280,8 @@
assertIsText(nodes[2], "e", 8, 9);
assertIsElement(nodes[3], "y", z, 9, 11);
assertIsText(nodes[4], "gh", 12, 14);
- x = (IVEXElement) nodes[1];
- y = (IVEXElement) nodes[3];
+ x = (VEXElement) nodes[1];
+ y = (VEXElement) nodes[3];
nodes = x.getChildNodes();
assertEquals(1, nodes.length);
assertIsText(nodes[0], "d", 6, 7);
@@ -301,7 +301,7 @@
assertIsText(nodes[0], "a", 1, 2);
assertIsElement(nodes[1], "z", doc.getRootElement(), 2, 14);
assertIsText(nodes[2], "i", 15, 16);
- z = (IVEXElement) nodes[1];
+ z = (VEXElement) nodes[1];
nodes = z.getChildNodes();
assertEquals(5, nodes.length);
assertIsText(nodes[0], "bc", 3, 5);
@@ -309,8 +309,8 @@
assertIsText(nodes[2], "e", 8, 9);
assertIsElement(nodes[3], "y", z, 9, 11);
assertIsText(nodes[4], "gh", 12, 14);
- x = (IVEXElement) nodes[1];
- y = (IVEXElement) nodes[3];
+ x = (VEXElement) nodes[1];
+ y = (VEXElement) nodes[3];
nodes = x.getChildNodes();
assertEquals(1, nodes.length);
assertIsText(nodes[0], "d", 6, 7);
@@ -320,17 +320,17 @@
}
- public void assertIsElement(IVEXNode node, String name, IVEXElement parent,
+ public void assertIsElement(VEXNode node, String name, VEXElement parent,
int startOffset, int endOffset) {
assertTrue(node instanceof Element);
- assertEquals(name, ((IVEXElement) node).getName());
- assertEquals(parent, ((IVEXElement) node).getParent());
+ assertEquals(name, ((VEXElement) node).getName());
+ assertEquals(parent, ((VEXElement) node).getParent());
assertEquals(startOffset, node.getStartOffset());
assertEquals(endOffset, node.getEndOffset());
}
- public void assertIsText(IVEXNode node, String text, int startOffset,
+ public void assertIsText(VEXNode node, String text, int startOffset,
int endOffset) {
assertTrue(node instanceof Text);
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SpaceNormalizerTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SpaceNormalizerTest.java
index 0c1d6c9..140eeba 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SpaceNormalizerTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SpaceNormalizerTest.java
@@ -40,9 +40,9 @@
import org.eclipse.wst.xml.vex.core.internal.dom.DocumentBuilder;
import org.eclipse.wst.xml.vex.core.internal.dom.Element;
import org.eclipse.wst.xml.vex.core.internal.dom.Text;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXNode;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXElement;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXNode;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicy;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicyFactory;
import org.eclipse.wst.xml.vex.core.internal.widget.CssWhitespacePolicy;
@@ -164,19 +164,19 @@
StyleSheet ss = getStyleSheet();
- IVEXDocument doc = createDocument(input, ss);
- IVEXElement element;
+ VEXDocument doc = createDocument(input, ss);
+ VEXElement element;
element = doc.getRootElement();
assertContent(element, new String[] { "<block>", "<block>", "<block>",
"<block>" });
- IVEXElement[] children = element.getChildElements();
+ VEXElement[] children = element.getChildElements();
// --- Block 0 ---
assertContent(children[0], new String[] { "foo ", "<inline>", " baz" });
- IVEXElement[] c2 = children[0].getChildElements();
+ VEXElement[] c2 = children[0].getChildElements();
assertContent(c2[0], new String[] { "foo bar" });
// --- Block 1 ---
@@ -205,12 +205,12 @@
String input = "<doc>\n " + "<pre>\n foo\n</pre>\n " + "\n </doc>";
- IVEXDocument doc = createDocument(input, getStyleSheet());
+ VEXDocument doc = createDocument(input, getStyleSheet());
- IVEXElement element = doc.getRootElement();
+ VEXElement element = doc.getRootElement();
assertContent(element, new String[] { "<pre>" });
- IVEXElement pre = element.getChildElements()[0];
+ VEXElement pre = element.getChildElements()[0];
assertContent(pre, new String[] { "\n foo\n" });
}
@@ -221,11 +221,11 @@
+ "<pre>\n foo\n <inline>\n foo\n bar\n </inline></pre>\n "
+ "\n </doc>";
- IVEXDocument doc = createDocument(input, getStyleSheet());
+ VEXDocument doc = createDocument(input, getStyleSheet());
- IVEXElement element = doc.getRootElement();
- IVEXElement pre = element.getChildElements()[0];
- IVEXElement inline = pre.getChildElements()[0];
+ VEXElement element = doc.getRootElement();
+ VEXElement pre = element.getChildElements()[0];
+ VEXElement inline = pre.getChildElements()[0];
assertContent(inline, new String[] { "\n foo\n bar\n " });
}
@@ -237,16 +237,16 @@
+ "<pre>\n\t foo\n\t <inline>\n\t foo\n\t bar\n\t </inline>\n\t baz\n\t </pre>\n "
+ "\n </doc>";
- IVEXDocument doc = createDocument(input, getStyleSheet());
+ VEXDocument doc = createDocument(input, getStyleSheet());
- IVEXElement element = doc.getRootElement();
+ VEXElement element = doc.getRootElement();
assertContent(element, new String[] { "<pre>" });
- IVEXElement pre = element.getChildElements()[0];
+ VEXElement pre = element.getChildElements()[0];
assertContent(pre,
new String[] { "\n\t foo\n\t ", "<inline>", "\n\t baz\n\t " });
- IVEXElement inline = pre.getChildElements()[0];
+ VEXElement inline = pre.getChildElements()[0];
assertContent(inline, new String[] { "\n\t foo\n\t bar\n\t " });
}
@@ -266,14 +266,14 @@
* string in content is enclosed in angle brackets, it's assume to refer to
* the name of an element; otherwise, it represents text content.
*/
- private void assertContent(IVEXElement element, String[] strings) {
- IVEXNode[] content = element.getChildNodes();
+ private void assertContent(VEXElement element, String[] strings) {
+ VEXNode[] content = element.getChildNodes();
assertEquals(strings.length, content.length);
for (int i = 0; i < strings.length; i++) {
if (strings[i].startsWith("<")) {
String name = strings[i].substring(1, strings[i].length() - 1);
assertTrue(content[i] instanceof Element);
- assertEquals(name, ((IVEXElement) content[i]).getName());
+ assertEquals(name, ((VEXElement) content[i]).getName());
} else {
assertTrue(content[i] instanceof Text);
String contentText = content[i].getText();
@@ -282,7 +282,7 @@
}
}
- private IVEXDocument createDocument(String s, StyleSheet ss)
+ private VEXDocument createDocument(String s, StyleSheet ss)
throws ParserConfigurationException, SAXException, IOException {
SAXParserFactory factory = SAXParserFactory.newInstance();
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutTestSuite.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutTestSuite.java
index ad5c66c..eb321f0 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutTestSuite.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutTestSuite.java
@@ -32,7 +32,7 @@
import org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext;
import org.eclipse.wst.xml.vex.core.internal.layout.RootBox;
import org.eclipse.wst.xml.vex.core.internal.layout.TextBox;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicy;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicyFactory;
import org.eclipse.wst.xml.vex.core.internal.widget.CssWhitespacePolicy;
@@ -111,7 +111,7 @@
return new CssWhitespacePolicy(ss);
}
});
- IVEXDocument doc = docReader.read(this.doc);
+ VEXDocument doc = docReader.read(this.doc);
context.setDocument(doc);
RootBox rootBox = new RootBox(context, doc.getRootElement(),
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java
index 9efa04c..a6f29a2 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java
@@ -22,7 +22,7 @@
import org.eclipse.wst.xml.vex.core.internal.layout.Box;
import org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext;
import org.eclipse.wst.xml.vex.core.internal.layout.RootBox;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
import junit.framework.TestCase;
@@ -47,7 +47,7 @@
public void testBeforeAfter() throws Exception {
RootElement root = new RootElement("root");
- IVEXDocument doc = new Document(root);
+ VEXDocument doc = new Document(root);
doc.insertElement(1, new Element("beforeBlock"));
context.setDocument(doc);
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlocksInInlines.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlocksInInlines.java
index d9b8721..648f698 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlocksInInlines.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlocksInInlines.java
@@ -21,7 +21,7 @@
import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
import org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext;
import org.eclipse.wst.xml.vex.core.internal.layout.RootBox;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
import junit.framework.TestCase;
@@ -56,7 +56,7 @@
public void testBlockInInline() throws Exception {
RootElement root = new RootElement("root");
- IVEXDocument doc = new Document(root);
+ VEXDocument doc = new Document(root);
context.setDocument(doc);
doc.insertText(1, "one five");
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestDocumentTextBox.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestDocumentTextBox.java
index bf1b063..8fa832d 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestDocumentTextBox.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestDocumentTextBox.java
@@ -21,7 +21,7 @@
import org.eclipse.wst.xml.vex.core.internal.layout.DocumentTextBox;
import org.eclipse.wst.xml.vex.core.internal.layout.InlineBox;
import org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IVEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.VEXDocument;
import junit.framework.TestCase;
@@ -51,7 +51,7 @@
public void testSplit() throws Exception {
RootElement root = new RootElement("root");
- IVEXDocument doc = new Document(root);
+ VEXDocument doc = new Document(root);
Styles styles = this.context.getStyleSheet().getStyles(root);