You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by er...@apache.org on 2004/11/04 21:43:54 UTC
cvs commit: xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2 Cur.java Locale.java Xobj.java
ericvas 2004/11/04 12:43:54
Modified: v2/src/newstore2/org/apache/xmlbeans/impl/newstore2 Cur.java
Locale.java Xobj.java
Log:
Stop creation of CharUtil to pass triple data
Revision Changes Path
1.49 +4 -17 xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Cur.java
Index: Cur.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Cur.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Cur.java 3 Nov 2004 18:04:55 -0000 1.48
+++ Cur.java 4 Nov 2004 20:43:54 -0000 1.49
@@ -1799,7 +1799,8 @@
// exactly be "correct" here.
xTo.insertCharsHelper(
- pTo, xFrom.getCharsHelper( pFrom, cch ), xFrom.offSrc(), xFrom.cchSrc(), false );
+ pTo, xFrom.getCharsHelper( pFrom, cch ),
+ xFrom._locale._offSrc, xFrom._locale._cchSrc, false );
xFrom.removeCharsHelper( pFrom, cch, xTo, pTo, true, false );
}
@@ -2284,11 +2285,6 @@
String getCharsAsString ( int cch, int wsr )
{
return _xobj.getCharsAsString( _pos, cch, wsr );
-// assert isNormal() && _xobj != null;
-//
-// String s = _xobj.getString( _pos, cch );
-//
-// return Locale.applyWhiteSpaceRule( s, wsr );
}
String getValueAsString ( int wsr )
@@ -2296,15 +2292,6 @@
assert isNode();
return _xobj.getValueAsString( wsr );
-//
-// // TODO - make sure there are no children (ok for an element to have
-// // attrs)
-//
-// assert ! hasChildren();
-//
-// String s = _xobj.getValueAsString();
-//
-// return Locale.applyWhiteSpaceRule( s, wsr );
}
String getValueAsString ( )
@@ -2328,8 +2315,8 @@
Object src = _xobj.getFirstChars();
- _offSrc = _xobj.offSrc();
- _cchSrc = _xobj.cchSrc();
+ _offSrc = _locale._offSrc;
+ _cchSrc = _locale._cchSrc;
return src;
}
1.31 +3 -20 xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Locale.java
Index: Locale.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Locale.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Locale.java 3 Nov 2004 18:04:56 -0000 1.30
+++ Locale.java 4 Nov 2004 20:43:54 -0000 1.31
@@ -1457,26 +1457,6 @@
return sb.toString();
}
-// static String getTextValue ( Cur c, int wsr )
-// {
-// assert c.isNode();
-//
-// if (!c.hasChildren())
-// return c.getValueAsString( wsr );
-//
-// ScrubBuffer sb = getScrubBuffer( wsr );
-//
-// c.push();
-//
-// for ( c.next() ; !c.isAtEndOfLastPush() ; c.next() )
-// if (c.isText())
-// sb.scrub( c.getChars( -1 ), c._offSrc, c._cchSrc );
-//
-// c.pop();
-//
-// return sb.getResultAsString();
-// }
-
static int getTextValue ( Cur c, int wsr, char[] chars, int off, int maxCch )
{
// TODO - hack impl for now ... improve
@@ -3109,6 +3089,9 @@
Locations _locations;
private CharUtil _charUtil;
+
+ int _offSrc;
+ int _cchSrc;
Saaj _saaj;
1.14 +13 -20 xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Xobj.java
Index: Xobj.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Xobj.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Xobj.java 4 Nov 2004 17:22:04 -0000 1.13
+++ Xobj.java 4 Nov 2004 20:43:54 -0000 1.14
@@ -1003,11 +1003,11 @@
Object src = getChars( p, cch );
if (wsr == Locale.WS_PRESERVE)
- return CharUtil.getString( src, offSrc(), cchSrc() );
+ return CharUtil.getString( src, _locale._offSrc, _locale._cchSrc );
Locale.ScrubBuffer scrub = Locale.getScrubBuffer( wsr );
- scrub.scrub( src, offSrc(), cchSrc() );
+ scrub.scrub( src, _locale._offSrc, _locale._cchSrc );
return scrub.getResultAsString();
}
@@ -1020,7 +1020,7 @@
if (wsr == Locale.WS_PRESERVE)
{
- String s = CharUtil.getString( src, offSrc(), cchSrc() );
+ String s = CharUtil.getString( src, _locale._offSrc, _locale._cchSrc );
// Cache string to be able to use it later again
@@ -1049,7 +1049,7 @@
Locale.ScrubBuffer scrub = Locale.getScrubBuffer( wsr );
- scrub.scrub( src, offSrc(), cchSrc() );
+ scrub.scrub( src, _locale._offSrc, _locale._cchSrc );
return scrub.getResultAsString();
}
@@ -1137,10 +1137,8 @@
if (lastAttr == null || lastAttr._cchAfter <= 0)
{
- CharUtil cu = _locale.getCharUtil();
-
- cu._offSrc = 0;
- cu._cchSrc = 0;
+ _locale._offSrc = 0;
+ _locale._cchSrc = 0;
return null;
}
@@ -1152,17 +1150,14 @@
{
Object src = getChars( pos, cch );
- c._offSrc = offSrc();
- c._cchSrc = cchSrc();
+ c._offSrc = _locale._offSrc;
+ c._cchSrc = _locale._cchSrc;
return src;
}
// These return the remainder of the char triple that getChars starts
- final int offSrc ( ) { return _locale.getCharUtil()._offSrc; }
- final int cchSrc ( ) { return _locale.getCharUtil()._cchSrc; }
-
Object getChars ( int pos, int cch )
{
assert isNormal( pos );
@@ -1174,10 +1169,8 @@
if (cch == 0)
{
- CharUtil cu = _locale.getCharUtil();
-
- cu._offSrc = 0;
- cu._cchSrc = 0;
+ _locale._offSrc = 0;
+ _locale._cchSrc = 0;
return null;
}
@@ -1198,15 +1191,15 @@
if (pos >= pa)
{
src = _srcAfter;
- _locale.getCharUtil()._offSrc = _offAfter + pos - pa;
+ _locale._offSrc = _offAfter + pos - pa;
}
else
{
src = _srcValue;
- _locale.getCharUtil()._offSrc = _offValue + pos - 1;
+ _locale._offSrc = _offValue + pos - 1;
}
- _locale.getCharUtil()._cchSrc = cch;
+ _locale._cchSrc = cch;
return src;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org