atagunov 2003/06/13 01:45:47
Modified: src/java/org/apache/avalon/framework/configuration
SAXConfigurationHandler.java
NamespacedSAXConfigurationHandler.java
Log:
lets nave file:27 rather then file:27:-1 in Configuration.getLocation(). Or should I
better revert this change?
Revision Changes Path
1.30 +4 -3
avalon/src/java/org/apache/avalon/framework/configuration/SAXConfigurationHandler.java
Index: SAXConfigurationHandler.java
===================================================================
RCS file:
/home/cvs/avalon/src/java/org/apache/avalon/framework/configuration/SAXConfigurationHandler.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- SAXConfigurationHandler.java 11 Feb 2003 15:58:39 -0000 1.29
+++ SAXConfigurationHandler.java 13 Jun 2003 08:45:46 -0000 1.30
@@ -313,10 +313,11 @@
}
else
{
+ final int columnNumber = m_locator.getColumnNumber();
return
m_locator.getSystemId() + ":"
- + m_locator.getLineNumber() + ":"
- + m_locator.getColumnNumber();
+ + m_locator.getLineNumber()
+ + ( columnNumber >= 0 ? ( ":" + columnNumber ) : "" );
}
}
}
1.18 +4 -3
avalon/src/java/org/apache/avalon/framework/configuration/NamespacedSAXConfigurationHandler.java
Index: NamespacedSAXConfigurationHandler.java
===================================================================
RCS file:
/home/cvs/avalon/src/java/org/apache/avalon/framework/configuration/NamespacedSAXConfigurationHandler.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- NamespacedSAXConfigurationHandler.java 11 Feb 2003 15:58:39 -0000 1.17
+++ NamespacedSAXConfigurationHandler.java 13 Jun 2003 08:45:46 -0000 1.18
@@ -383,10 +383,11 @@
}
else
{
+ final int columnNumber = m_locator.getColumnNumber();
return
m_locator.getSystemId() + ":"
- + m_locator.getLineNumber() + ":"
- + m_locator.getColumnNumber();
+ + m_locator.getLineNumber()
+ + ( columnNumber >= 0 ? ( ":" + columnNumber ) : "" );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
