Author: mrglavas
Date: Wed Aug 30 11:25:26 2006
New Revision: 438577
URL: http://svn.apache.org/viewvc?rev=438577&view=rev
Log:
Fixing a bug. When an error is detected in an internal entity the locator
reports
the current location in the closest external entity. This wasn't working for the
document entity.
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/XMLEntityManager.java
Modified: xerces/java/trunk/src/org/apache/xerces/impl/XMLEntityManager.java
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/XMLEntityManager.java?rev=438577&r1=438576&r2=438577&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/XMLEntityManager.java
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/XMLEntityManager.java Wed Aug
30 11:25:26 2006
@@ -2588,7 +2588,7 @@
// search for the first external entity on the stack
int size = fEntityStack.size();
- for (int i = size - 1; i >= 0 ; i--) {
+ for (int i = size - 1; i >= 0; --i) {
ScannedEntity externalEntity =
(ScannedEntity)fEntityStack.elementAt(i);
@@ -2605,7 +2605,7 @@
public String getLiteralSystemId() {
// search for the first external entity on the stack
int size = fEntityStack.size();
- for (int i = size - 1; i >= 0 ; i--) {
+ for (int i = size - 1; i >= 0; --i) {
ScannedEntity externalEntity =
(ScannedEntity)fEntityStack.elementAt(i);
@@ -2622,7 +2622,7 @@
public int getLineNumber() {
// search for the first external entity on the stack
int size = fEntityStack.size();
- for (int i=size-1; i>0 ; i--) {
+ for (int i = size - 1; i >= 0 ; --i) {
ScannedEntity firstExternalEntity =
(ScannedEntity)fEntityStack.elementAt(i);
if (firstExternalEntity.isExternal()) {
return firstExternalEntity.lineNumber;
@@ -2636,7 +2636,7 @@
public int getColumnNumber() {
// search for the first external entity on the stack
int size = fEntityStack.size();
- for (int i=size-1; i>0 ; i--) {
+ for (int i = size - 1; i >= 0; --i) {
ScannedEntity firstExternalEntity =
(ScannedEntity)fEntityStack.elementAt(i);
if (firstExternalEntity.isExternal()) {
return firstExternalEntity.columnNumber;
@@ -2650,7 +2650,7 @@
public int getCharacterOffset() {
// search for the first external entity on the stack
int size = fEntityStack.size();
- for (int i=size-1; i>0 ; i--) {
+ for (int i = size - 1; i >= 0; --i) {
ScannedEntity firstExternalEntity =
(ScannedEntity)fEntityStack.elementAt(i);
if (firstExternalEntity.isExternal()) {
return firstExternalEntity.baseCharOffset +
(firstExternalEntity.position - firstExternalEntity.startPosition);
@@ -2663,7 +2663,7 @@
public String getEncoding() {
// search for the first external entity on the stack
int size = fEntityStack.size();
- for (int i=size-1; i>0 ; i--) {
+ for (int i = size - 1; i >= 0; --i) {
ScannedEntity firstExternalEntity =
(ScannedEntity)fEntityStack.elementAt(i);
if (firstExternalEntity.isExternal()) {
return firstExternalEntity.encoding;
@@ -2676,7 +2676,7 @@
public String getXMLVersion() {
// search for the first external entity on the stack
int size = fEntityStack.size();
- for (int i=size-1; i>0 ; i--) {
+ for (int i = size - 1; i >= 0; --i) {
ScannedEntity firstExternalEntity =
(ScannedEntity)fEntityStack.elementAt(i);
if (firstExternalEntity.isExternal()) {
return firstExternalEntity.xmlVersion;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
