Author: mrglavas
Date: Wed Oct 7 17:34:28 2015
New Revision: 1707342
URL: http://svn.apache.org/viewvc?rev=1707342&view=rev
Log:
Reducing code duplication. Factoring out buffer resizing into its own method.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XML11EntityScanner.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLEntityScanner.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XML11EntityScanner.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XML11EntityScanner.java?rev=1707342&r1=1707341&r2=1707342&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XML11EntityScanner.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XML11EntityScanner.java
Wed Oct 7 17:34:28 2015
@@ -153,10 +153,7 @@ public class XML11EntityScanner
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
@@ -173,10 +170,7 @@ public class XML11EntityScanner
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
@@ -199,10 +193,7 @@ public class XML11EntityScanner
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
@@ -307,10 +298,7 @@ public class XML11EntityScanner
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
@@ -327,10 +315,7 @@ public class XML11EntityScanner
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
@@ -353,10 +338,7 @@ public class XML11EntityScanner
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
@@ -462,10 +444,7 @@ public class XML11EntityScanner
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
@@ -482,10 +461,7 @@ public class XML11EntityScanner
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
@@ -508,10 +484,7 @@ public class XML11EntityScanner
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
@@ -633,10 +606,7 @@ public class XML11EntityScanner
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
@@ -656,10 +626,7 @@ public class XML11EntityScanner
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
@@ -687,10 +654,7 @@ public class XML11EntityScanner
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLEntityScanner.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLEntityScanner.java?rev=1707342&r1=1707341&r2=1707342&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLEntityScanner.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLEntityScanner.java
Wed Oct 7 17:34:28 2015
@@ -309,10 +309,7 @@ public class XMLEntityScanner implements
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
@@ -391,10 +388,7 @@ public class XMLEntityScanner implements
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
@@ -474,10 +468,7 @@ public class XMLEntityScanner implements
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
@@ -574,10 +565,7 @@ public class XMLEntityScanner implements
int length = fCurrentEntity.position - offset;
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
- System.arraycopy(fCurrentEntity.ch, offset,
- tmp, 0, length);
- fCurrentEntity.ch = tmp;
+ resizeBuffer(offset, length);
}
else {
System.arraycopy(fCurrentEntity.ch, offset,
@@ -1789,6 +1777,13 @@ public class XMLEntityScanner implements
return entityChanged;
} // load(int, boolean):boolean
+
+ final void resizeBuffer(int offset, int length) {
+ char[] tmp = new char[fCurrentEntity.ch.length << 1];
+ System.arraycopy(fCurrentEntity.ch, offset,
+ tmp, 0, length);
+ fCurrentEntity.ch = tmp;
+ } // resizeBuffer(int, int)
} // class XMLEntityScanner
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
