You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2005/01/09 08:43:27 UTC
svn commit: r124719 - cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser
Author: antonio
Date: Sat Jan 8 23:43:25 2005
New Revision: 124719
URL: http://svn.apache.org/viewcvs?view=rev&rev=124719
Log:
Use conventional method's names
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/SimpleCharStream.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/SimpleCharStream.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/SimpleCharStream.java?view=diff&rev=124719&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/SimpleCharStream.java&r1=124718&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/SimpleCharStream.java&r2=124719
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/SimpleCharStream.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/SimpleCharStream.java Sat Jan 8 23:43:25 2005
@@ -169,7 +169,7 @@
}
}
- public char BeginToken() throws java.io.IOException {
+ public char beginToken() throws java.io.IOException {
tokenBegin = -1;
char c = readChar();
tokenBegin = bufpos;
@@ -295,7 +295,7 @@
public SimpleCharStream(java.io.Reader dstream) {
this(dstream, 1, 1, 4096);
}
- public void ReInit(
+ public void reInit(
java.io.Reader dstream,
int startline,
int startcolumn,
@@ -315,15 +315,15 @@
bufpos = -1;
}
- public void ReInit(
+ public void reInit(
java.io.Reader dstream,
int startline,
int startcolumn) {
- ReInit(dstream, startline, startcolumn, 4096);
+ reInit(dstream, startline, startcolumn, 4096);
}
- public void ReInit(java.io.Reader dstream) {
- ReInit(dstream, 1, 1, 4096);
+ public void reInit(java.io.Reader dstream) {
+ reInit(dstream, 1, 1, 4096);
}
public SimpleCharStream(
java.io.InputStream dstream,
@@ -348,28 +348,28 @@
this(dstream, 1, 1, 4096);
}
- public void ReInit(
+ public void reInit(
java.io.InputStream dstream,
int startline,
int startcolumn,
int buffersize) {
- ReInit(
+ reInit(
new java.io.InputStreamReader(dstream),
startline,
startcolumn,
buffersize);
}
- public void ReInit(java.io.InputStream dstream) {
- ReInit(dstream, 1, 1, 4096);
+ public void reInit(java.io.InputStream dstream) {
+ reInit(dstream, 1, 1, 4096);
}
- public void ReInit(
+ public void reInit(
java.io.InputStream dstream,
int startline,
int startcolumn) {
- ReInit(dstream, startline, startcolumn, 4096);
+ reInit(dstream, startline, startcolumn, 4096);
}
- public String GetImage() {
+ public String getImage() {
if (bufpos >= tokenBegin)
return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
else
@@ -377,7 +377,7 @@
+ new String(buffer, 0, bufpos + 1);
}
- public char[] GetSuffix(int len) {
+ public char[] getSuffix(int len) {
char[] ret = new char[len];
if ((bufpos + 1) >= len)
@@ -395,7 +395,7 @@
return ret;
}
- public void Done() {
+ public void done() {
buffer = null;
bufline = null;
bufcolumn = null;
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java?view=diff&rev=124719&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java&r1=124718&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java&r2=124719
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java Sat Jan 8 23:43:25 2005
@@ -148,14 +148,14 @@
}
jj_consume_token(LBRACE);
// when going inside the scheme data, swith to a different lexical state
- token_source.SwitchTo(IN_SCHEME);
+ token_source.switchTo(IN_SCHEME);
// store the scheme name
schemeName = x.image;
schemeData = schemeData();
jj_consume_token(RBRACE);
// when going outside the scheme data, swith back to the default lexical state
- token_source.SwitchTo(DEFAULT);
+ token_source.switchTo(DEFAULT);
// parse schemeName in prefix and localName
String schemeNamespace = null, schemeLocalName = null;
@@ -351,9 +351,9 @@
jj_2_rtns[i] = new JJCalls();
}
- public void ReInit(java.io.InputStream stream) {
- jj_input_stream.ReInit(stream, 1, 1);
- token_source.ReInit(jj_input_stream);
+ public void reInit(java.io.InputStream stream) {
+ jj_input_stream.reInit(stream, 1, 1);
+ token_source.reInit(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
@@ -375,9 +375,9 @@
jj_2_rtns[i] = new JJCalls();
}
- public void ReInit(java.io.Reader stream) {
- jj_input_stream.ReInit(stream, 1, 1);
- token_source.ReInit(jj_input_stream);
+ public void reInit(java.io.Reader stream) {
+ jj_input_stream.reInit(stream, 1, 1);
+ token_source.reInit(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
@@ -398,7 +398,7 @@
jj_2_rtns[i] = new JJCalls();
}
- public void ReInit(XPointerFrameworkParserTokenManager tm) {
+ public void reInit(XPointerFrameworkParserTokenManager tm) {
token_source = tm;
token = new Token();
jj_ntk = -1;
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java?view=diff&rev=124719&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java&r1=124718&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java&r2=124719
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java Sat Jan 8 23:43:25 2005
@@ -632,9 +632,9 @@
SimpleCharStream stream,
int lexState) {
this(stream);
- SwitchTo(lexState);
+ switchTo(lexState);
}
- public void ReInit(SimpleCharStream stream) {
+ public void reInit(SimpleCharStream stream) {
jjmatchedPos = jjnewStateCnt = 0;
curLexState = defaultLexState;
input_stream = stream;
@@ -646,11 +646,11 @@
for (i = 7; i-- > 0;)
jjrounds[i] = 0x80000000;
}
- public void ReInit(SimpleCharStream stream, int lexState) {
- ReInit(stream);
- SwitchTo(lexState);
+ public void reInit(SimpleCharStream stream, int lexState) {
+ reInit(stream);
+ switchTo(lexState);
}
- public void SwitchTo(int lexState) {
+ public void switchTo(int lexState) {
if (lexState >= 2 || lexState < 0)
throw new TokenMgrError(
"Error: Ignoring invalid lexical state : "
@@ -665,7 +665,7 @@
Token t = Token.newToken(jjmatchedKind);
t.kind = jjmatchedKind;
String im = jjstrLiteralImages[jjmatchedKind];
- t.image = (im == null) ? input_stream.GetImage() : im;
+ t.image = (im == null) ? input_stream.getImage() : im;
t.beginLine = input_stream.getBeginLine();
t.beginColumn = input_stream.getBeginColumn();
t.endLine = input_stream.getEndLine();
@@ -686,7 +686,7 @@
EOFLoop : for (;;) {
try {
- curChar = input_stream.BeginToken();
+ curChar = input_stream.beginToken();
} catch (java.io.IOException e) {
jjmatchedKind = 0;
matchedToken = jjFillToken();
@@ -722,7 +722,7 @@
input_stream.backup(1);
} catch (java.io.IOException e1) {
EOFSeen = true;
- error_after = curPos <= 1 ? "" : input_stream.GetImage();
+ error_after = curPos <= 1 ? "" : input_stream.getImage();
if (curChar == '\n' || curChar == '\r') {
error_line++;
error_column = 0;
@@ -731,7 +731,7 @@
}
if (!EOFSeen) {
input_stream.backup(1);
- error_after = curPos <= 1 ? "" : input_stream.GetImage();
+ error_after = curPos <= 1 ? "" : input_stream.getImage();
}
throw new TokenMgrError(
EOFSeen,