remove unused method GapContent.getString(int, int)
Signed-off-by: Florian Thienel <florian@thienel.org>
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/GapContentTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/GapContentTest.java
index cac5e5a..973b032 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/GapContentTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/GapContentTest.java
@@ -35,7 +35,7 @@
stringContent.insertText(0, "\0\0");
assertEquals(stringContent.length(), elementMarkerContent.length());
- assertEquals(stringContent.getString(0, stringContent.length()), elementMarkerContent.getString(0, elementMarkerContent.length()));
+ assertEquals(stringContent.getText(0, stringContent.length() - 1), elementMarkerContent.getText(0, elementMarkerContent.length() - 1));
}
@Test
@@ -64,25 +64,25 @@
final Position pe = content.createPosition(4);
try {
- content.getString(-1, 1);
+ content.getText(-1, 0);
fail("expected exception");
} catch (final IllegalArgumentException ex) {
}
try {
- content.getString(4, 1);
+ content.getText(4, 4);
fail("expected exception");
} catch (final IllegalArgumentException ex) {
}
try {
- content.getString(0, -1);
+ content.getText(0, -1);
fail("expected exception");
} catch (final IllegalArgumentException ex) {
}
try {
- content.getString(0, 5);
+ content.getText(0, 4);
fail("expected exception");
} catch (final IllegalArgumentException ex) {
}
@@ -99,19 +99,19 @@
} catch (final IllegalArgumentException ex) {
}
- assertEquals("a", content.getString(0, 1));
- assertEquals("b", content.getString(1, 1));
- assertEquals("c", content.getString(2, 1));
- assertEquals("d", content.getString(3, 1));
+ assertEquals("a", content.getText(0, 0));
+ assertEquals("b", content.getText(1, 1));
+ assertEquals("c", content.getText(2, 2));
+ assertEquals("d", content.getText(3, 3));
- assertEquals("ab", content.getString(0, 2));
- assertEquals("bc", content.getString(1, 2));
- assertEquals("cd", content.getString(2, 2));
+ assertEquals("ab", content.getText(0, 1));
+ assertEquals("bc", content.getText(1, 2));
+ assertEquals("cd", content.getText(2, 3));
- assertEquals("abc", content.getString(0, 3));
- assertEquals("bcd", content.getString(1, 3));
+ assertEquals("abc", content.getText(0, 2));
+ assertEquals("bcd", content.getText(1, 3));
- assertEquals("abcd", content.getString(0, 4));
+ assertEquals("abcd", content.getText(0, 3));
//
// a b x (gap) y c d
@@ -144,19 +144,19 @@
assertEquals(3, pd.getOffset());
assertEquals(4, pe.getOffset());
- assertEquals("a", content.getString(0, 1));
- assertEquals("b", content.getString(1, 1));
- assertEquals("c", content.getString(2, 1));
- assertEquals("d", content.getString(3, 1));
+ assertEquals("a", content.getText(0, 0));
+ assertEquals("b", content.getText(1, 1));
+ assertEquals("c", content.getText(2, 2));
+ assertEquals("d", content.getText(3, 3));
- assertEquals("ab", content.getString(0, 2));
- assertEquals("bc", content.getString(1, 2));
- assertEquals("cd", content.getString(2, 2));
+ assertEquals("ab", content.getText(0, 1));
+ assertEquals("bc", content.getText(1, 2));
+ assertEquals("cd", content.getText(2, 3));
- assertEquals("abc", content.getString(0, 3));
- assertEquals("bcd", content.getString(1, 3));
+ assertEquals("abc", content.getText(0, 2));
+ assertEquals("bcd", content.getText(1, 3));
- assertEquals("abcd", content.getString(0, 4));
+ assertEquals("abcd", content.getText(0, 3));
}
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/GapContent.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/GapContent.java
index 6f95876..c99c19d 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/GapContent.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/GapContent.java
@@ -145,7 +145,6 @@
* Number of characters to delete.
*/
public void remove(final int offset, final int length) {
-
assertOffset(offset, 0, length() - length);
assertPositive(length);
@@ -161,23 +160,6 @@
}
}
- public String getString(final int offset, final int length) {
-
- assertOffset(offset, 0, length() - length);
- assertPositive(length);
-
- if (offset + length < gapStart) {
- return new String(content, offset, length);
- } else if (offset >= gapStart) {
- return new String(content, offset - gapStart + gapEnd, length);
- } else {
- final StringBuilder sb = new StringBuilder(length);
- sb.append(content, offset, gapStart - offset);
- sb.append(content, gapEnd, offset + length - gapStart);
- return sb.toString();
- }
- }
-
public String getText() {
return getText(0, length() - 1);
}