bug 250829 - continued VEX Document refactoring
diff --git a/sourceediting/features/org.eclipse.wst.xml.vex.feature/feature.xml b/sourceediting/features/org.eclipse.wst.xml.vex.feature/feature.xml
index c86fb57..1ae07dc 100644
--- a/sourceediting/features/org.eclipse.wst.xml.vex.feature/feature.xml
+++ b/sourceediting/features/org.eclipse.wst.xml.vex.feature/feature.xml
@@ -24,16 +24,13 @@
</url>
<requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.expressions"/>
- <import plugin="org.eclipse.ui.views"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.ui.editors"/>
- <import plugin="org.junit"/>
- <import plugin="org.eclipse.help"/>
<import plugin="org.eclipse.wst.xml.vex.core" version="0.5.0" match="greaterOrEqual"/>
+ <import plugin="org.w3c.css.sac" version="1.3.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.wst.sse.core" version="1.1" match="compatible"/>
+ <import plugin="org.eclipse.wst.sse.ui" version="1.1" match="compatible"/>
+ <import plugin="org.eclipse.wst.xml.core" version="1.1" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.wst.xml.ui" version="1.0" match="greaterOrEqual"/>
+ <import plugin="org.apache.xerces" version="2.9.0" match="compatible"/>
</requires>
<plugin
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 6099065..d6cc260 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
@@ -8,9 +8,9 @@
org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
org.w3c.css.sac;bundle-version="[1.3.0,2.0.0)",
org.apache.xerces;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.400,2.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.400,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.100,4.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)"
Export-Package: com.wutka.dtd,
org.eclipse.wst.xml.vex.core.internal;x-internal:=true,
org.eclipse.wst.xml.vex.core.internal.core;x-internal:=true,
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 bf82116..f068aab 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
@@ -40,9 +40,9 @@
return this.labelProvider;
}
- public Element getOutlineElement(final Element child) {
+ public IVEXElement getOutlineElement(final IVEXElement child) {
- Element element = child;
+ IVEXElement element = child;
while (( element.getParent() != null)
&& !isTitledElement(element) ) {
element = element.getParent();
@@ -60,11 +60,11 @@
}
public Object[] getChildren(final Object parentElement) {
- return getOutlineChildren((Element) parentElement);
+ return getOutlineChildren((IVEXElement) parentElement);
}
public Object getParent(final Object element) {
- final Element parent = ((Element) element).getParent();
+ final IVEXElement parent = ((IVEXElement) element).getParent();
if (parent == null) {
return element;
} else {
@@ -73,11 +73,11 @@
}
public boolean hasChildren(final Object element) {
- return getOutlineChildren((Element) element).length > 0;
+ return getOutlineChildren((IVEXElement) element).length > 0;
}
public Object[] getElements(final Object inputElement) {
- final Document document = (Document) inputElement;
+ final IVEXDocument document = (IVEXDocument) inputElement;
return new Object[] { document.getRootElement() };
}
@@ -90,26 +90,26 @@
* @param element
* @return
*/
- private Element[] getOutlineChildren(final Element element) {
+ private IVEXElement[] getOutlineChildren(final IVEXElement element) {
final List children = new ArrayList();
- final Element[] childElements = element.getChildElements();
+ final IVEXElement[] childElements = element.getChildElements();
for (int i = 0; i < childElements.length; i++) {
if (titledElements.contains(childElements[i].getName())) {
children.add(childElements[i]);
}
}
- return (Element[]) children.toArray(new Element[children.size()]);
+ return (IVEXElement[]) children.toArray(new IVEXElement[children.size()]);
}
private final ILabelProvider labelProvider = new LabelProvider() {
public String getText(final Object o) {
- final Element e = (Element) o;
- Element titleChild = findChild(e, "title");
+ final IVEXElement e = (IVEXElement) o;
+ IVEXElement titleChild = findChild(e, "title");
if (titleChild != null) {
return titleChild.getText();
} else {
- Element infoChild = findChild(e, e.getName() + "info");
+ IVEXElement infoChild = findChild(e, e.getName() + "info");
if (infoChild != null) {
titleChild = findChild(infoChild, "title");
if (titleChild != null) {
@@ -133,11 +133,11 @@
* @param element
* @return
*/
- private boolean isTitledElement( final Element e ) {
+ private boolean isTitledElement( final IVEXElement e ) {
if( titledElements.contains(e.getName() )
|| e.getParent() == null ) {
- final Element [] children = e.getChildElements();
+ final IVEXElement [] children = e.getChildElements();
if( (children.length > 0 && children[0].getName().equals("title"))
|| (children.length > 1 && children[1].getName().equals("title"))
) {
@@ -152,10 +152,10 @@
* null if none found. We should move this to XPath when we gain that
* facility.
*/
- private Element findChild(Element parent, String childName) {
- Element[] children = parent.getChildElements();
+ private IVEXElement findChild(IVEXElement parent, String childName) {
+ IVEXElement[] children = parent.getChildElements();
for (int i = 0; i < children.length; i++) {
- Element child = children[i];
+ IVEXElement child = children[i];
if (child.getName().equals(childName)) {
return child;
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.docbook/styles/docbook-plain.css b/sourceediting/plugins/org.eclipse.wst.xml.vex.docbook/styles/docbook-plain.css
index 73512d6..55fc767 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.docbook/styles/docbook-plain.css
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.docbook/styles/docbook-plain.css
@@ -27,7 +27,7 @@
display: block;
}
-article,book {
+article,book,chapter {
font-family: "Times New Roman", serif;
font-size: 16px;
display: block;
@@ -194,10 +194,6 @@
color: yellow;
}
-chapter {
- display: block;
-}
-
citetitle {
display: inline;
font-style: italic;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/META-INF/MANIFEST.MF b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/META-INF/MANIFEST.MF
index 19f2369..5cd4024 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/META-INF/MANIFEST.MF
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/META-INF/MANIFEST.MF
@@ -15,10 +15,10 @@
org.eclipse.wst.xml.vex.core;bundle-version="[0.5.0,1.0.0)",
org.w3c.css.sac;bundle-version="1.3.0",
org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.400,2.0.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.1.100,2.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.400,2.0.0)",
- org.eclipse.wst.xml.ui;bundle-version="[1.0.500,2.0.0)"
+ org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.xml.ui;bundle-version="[1.0.0,2.0.0)"
Export-Package: org.eclipse.wst.xml.vex.ui.internal;x-internal:=true,
org.eclipse.wst.xml.vex.ui.internal.action;x-internal:=true,
org.eclipse.wst.xml.vex.ui.internal.config;x-internal:=true,
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 2584ab5..a45f933 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.dom.Validator;
+import org.eclipse.wst.xml.vex.core.internal.dom.IValidator;
import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
/**
@@ -283,7 +283,7 @@
final String resourcePath = ((IFile) this.getElement())
.getProjectRelativePath().toString();
- final Validator validator = (Validator) ((ConfigSource) this
+ final IValidator validator = (IValidator) ((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 0809762..4c0f6c0 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.dom.Validator;
+import org.eclipse.wst.xml.vex.core.internal.dom.IValidator;
import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor;
/**
@@ -133,8 +133,8 @@
this.systemId = systemId;
}
- public Validator getValidator() {
- return (Validator) this.getConfig().getParsedResource(
+ public IValidator getValidator() {
+ return (IValidator) 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 0d27737..ad9bbfd 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.dom.Validator;
+import org.eclipse.wst.xml.vex.core.internal.dom.IValidator;
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) {
- Validator validator = dt.getValidator();
+ IValidator 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 27d0421..d93a42b 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
@@ -70,7 +70,7 @@
import org.eclipse.wst.xml.vex.core.internal.dom.IVEXElement;
import org.eclipse.wst.xml.vex.core.internal.dom.IWhitespacePolicy;
import org.eclipse.wst.xml.vex.core.internal.dom.IWhitespacePolicyFactory;
-import org.eclipse.wst.xml.vex.core.internal.dom.Validator;
+import org.eclipse.wst.xml.vex.core.internal.dom.IValidator;
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.action.ChangeElementAction;
@@ -371,7 +371,7 @@
// this.style is set by wsPolicyFactory
// Otherwise, a PartInitException would have been thrown by now
- Validator validator = this.doctype.getValidator();
+ IValidator validator = this.doctype.getValidator();
if (validator != null) {
this.doc.setValidator(validator);
if (this.debugging) {
@@ -1042,7 +1042,7 @@
IStructuredSelection sel = (IStructuredSelection) vexWidget
.getSelection();
boolean multi = (sel != null && sel.size() > 1);
- Validator validator = vexWidget.getDocument()
+ IValidator validator = vexWidget.getDocument()
.getValidator();
return new ElementPropertySource((IVEXElement) object,
validator, multi);
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 e2d1380..dbb0c3c 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
@@ -71,7 +71,7 @@
import org.eclipse.wst.xml.vex.core.internal.dom.IVEXElement;
import org.eclipse.wst.xml.vex.core.internal.dom.IWhitespacePolicy;
import org.eclipse.wst.xml.vex.core.internal.dom.IWhitespacePolicyFactory;
-import org.eclipse.wst.xml.vex.core.internal.dom.Validator;
+import org.eclipse.wst.xml.vex.core.internal.dom.IValidator;
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.action.ChangeElementAction;
@@ -373,7 +373,7 @@
// this.style is set by wsPolicyFactory
// Otherwise, a PartInitException would have been thrown by now
- Validator validator = this.doctype.getValidator();
+ IValidator validator = this.doctype.getValidator();
if (validator != null) {
this.doc.setValidator(validator);
if (this.debugging) {
@@ -944,7 +944,7 @@
IStructuredSelection sel = (IStructuredSelection) vexWidget
.getSelection();
boolean multi = (sel != null && sel.size() > 1);
- Validator validator = vexWidget.getDocument()
+ IValidator validator = vexWidget.getDocument()
.getValidator();
return new ElementPropertySource((IVEXElement) object,
validator, multi);
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 b94a7e0..c2057f2 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
@@ -18,7 +18,7 @@
import org.eclipse.wst.xml.vex.core.internal.dom.AttributeDefinition;
import org.eclipse.wst.xml.vex.core.internal.dom.DocumentValidationException;
import org.eclipse.wst.xml.vex.core.internal.dom.IVEXElement;
-import org.eclipse.wst.xml.vex.core.internal.dom.Validator;
+import org.eclipse.wst.xml.vex.core.internal.dom.IValidator;
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, Validator validator,
+ public ElementPropertySource(IVEXElement element, IValidator validator,
boolean multi) {
this.element = element;
this.validator = validator;
@@ -154,7 +154,7 @@
private static final String ATTR_ID = "id"; //$NON-NLS-1$
private IVEXElement element;
- private Validator validator;
+ private IValidator validator;
private boolean multi;
private String[] getEnumValues(AttributeDefinition def) {
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 7439829..2a9c101 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
@@ -24,7 +24,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.dom.Validator;
+import org.eclipse.wst.xml.vex.core.internal.dom.IValidator;
import junit.framework.TestCase;
@@ -32,7 +32,7 @@
public void testAll() throws Exception {
URL url = DTDValidatorTest.class.getResource("test1.dtd");
- Validator validator = DTDValidator.create(url);
+ IValidator validator = DTDValidator.create(url);
AttributeDefinition.Type adType = validator
.getAttributeDefinitions("section")[0].getType();
@@ -44,7 +44,7 @@
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bais);
- validator = (Validator) ois.readObject();
+ validator = (IValidator) ois.readObject();
AttributeDefinition.Type adType2 = validator
.getAttributeDefinitions("section")[0].getType();
@@ -61,7 +61,7 @@
doc = new Document(new RootElement("any"));
doc.setValidator(validator);
Set anySet = new HashSet();
- anySet.add(Validator.PCDATA);
+ anySet.add(IValidator.PCDATA);
anySet.add("any");
anySet.add("empty");
anySet.add("section");
@@ -79,7 +79,7 @@
doc.insertElement(5, new Element("para"));
assertEquals(Collections.EMPTY_SET, getValidItemsAt(doc, 1));
- expected = Collections.singleton(Validator.PCDATA);
+ expected = Collections.singleton(IValidator.PCDATA);
assertEquals(expected, getValidItemsAt(doc, 2));
assertEquals(expected, getValidItemsAt(doc, 3));
assertEquals(expected, getValidItemsAt(doc, 4));
@@ -87,7 +87,7 @@
assertEquals(expected, getValidItemsAt(doc, 5));
assertEquals(expected, getValidItemsAt(doc, 7));
expected = new HashSet();
- expected.add(Validator.PCDATA);
+ expected.add(IValidator.PCDATA);
expected.add("emphasis");
assertEquals(expected, getValidItemsAt(doc, 6));
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContentTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContentTest.java
index 19e6d59..1643846 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContentTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContentTest.java
@@ -11,7 +11,7 @@
package org.eclipse.wst.xml.vex.core.internal.dom;
import org.eclipse.wst.xml.vex.core.internal.dom.GapContent;
-import org.eclipse.wst.xml.vex.core.internal.dom.Position;
+import org.eclipse.wst.xml.vex.core.internal.dom.IPosition;
import junit.framework.TestCase;
@@ -38,11 +38,11 @@
content.insertString(1, "b");
assertEquals(4, content.getLength());
- Position pa = content.createPosition(0);
- Position pb = content.createPosition(1);
- Position pc = content.createPosition(2);
- Position pd = content.createPosition(3);
- Position pe = content.createPosition(4);
+ IPosition pa = content.createPosition(0);
+ IPosition pb = content.createPosition(1);
+ IPosition pc = content.createPosition(2);
+ IPosition pd = content.createPosition(3);
+ IPosition pe = content.createPosition(4);
try {
content.getString(-1, 1);
@@ -110,8 +110,8 @@
assertEquals(5, pd.getOffset());
assertEquals(6, pe.getOffset());
- Position px = content.createPosition(2);
- Position py = content.createPosition(3);
+ IPosition px = content.createPosition(2);
+ IPosition py = content.createPosition(3);
content.remove(2, 2);