[jsword-svn]
jsword/java/jsword/org/crosswire/jsword/book/search/parse s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Sun Mar 6 13:21:49 MST 2005
Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse
In directory www.crosswire.org:/tmp/cvs-serv26524/java/jsword/org/crosswire/jsword/book/search/parse
Modified Files:
GrammarParamWord.java CustomTokenizer.java
StartsParamWord.java IndexSearcher.java
Log Message:
Changes to satisfy CheckStyle
Index: GrammarParamWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/GrammarParamWord.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** GrammarParamWord.java 29 Sep 2004 22:21:23 -0000 1.10
--- GrammarParamWord.java 6 Mar 2005 20:21:47 -0000 1.11
***************
*** 68,71 ****
* The source of thesaurus data
*/
! private Thesaurus thesaurus = null;
}
--- 68,71 ----
* The source of thesaurus data
*/
! private Thesaurus thesaurus;
}
Index: CustomTokenizer.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/CustomTokenizer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CustomTokenizer.java 16 Feb 2005 00:53:49 -0000 1.9
--- CustomTokenizer.java 6 Mar 2005 20:21:47 -0000 1.10
***************
*** 13,17 ****
* between parts of the command, and since this is specialized we also leave the
* results in a Vector of SearchWords.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 13,17 ----
* between parts of the command, and since this is specialized we also leave the
* results in a Vector of SearchWords.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 85,89 ****
i = end + 1;
}
!
// Pass through everything between pairs of :: e.g. ::bread::
// as a single word. If there is no trailing :: take it
--- 85,89 ----
i = end + 1;
}
!
// Pass through everything between pairs of :: e.g. ::bread::
// as a single word. If there is no trailing :: take it
***************
*** 91,103 ****
if (i < sought.length() - 4 && sought.indexOf("::", i) != -1) //$NON-NLS-1$
{
! int end = sought.indexOf("::", i+2); //$NON-NLS-1$
if (end == -1)
{
! addWord(output, commands, sought.substring(i+1));
i = sought.length();
}
else
{
! addWord(output, commands, sought.substring(i+1, end));
i = end + 2;
}
--- 91,103 ----
if (i < sought.length() - 4 && sought.indexOf("::", i) != -1) //$NON-NLS-1$
{
! int end = sought.indexOf("::", i + 2); //$NON-NLS-1$
if (end == -1)
{
! addWord(output, commands, sought.substring(i + 1));
i = sought.length();
}
else
{
! addWord(output, commands, sought.substring(i + 1, end));
i = end + 2;
}
Index: IndexSearcher.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/IndexSearcher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IndexSearcher.java 15 Feb 2005 17:05:56 -0000 1.4
--- IndexSearcher.java 6 Mar 2005 20:21:47 -0000 1.5
***************
*** 17,21 ****
/**
* The central interface to all searching.
! *
* Functionality the I invisage includes:<ul>
* <li>A simple search syntax that goes something like this.<ul>
--- 17,21 ----
/**
* The central interface to all searching.
! *
* Functionality the I invisage includes:<ul>
* <li>A simple search syntax that goes something like this.<ul>
***************
*** 28,32 ****
* <li>grammar have (words like has have had and so on. Can also use gr ...)</ul>
* <li>The ability to add soundslike type extensions.</ul>
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 28,32 ----
* <li>grammar have (words like has have had and so on. Can also use gr ...)</ul>
* <li>The ability to add soundslike type extensions.</ul>
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 238,242 ****
wordMap = new HashMap();
preferredMap = new HashMap();
!
for (Iterator it = prop.keySet().iterator(); it.hasNext(); )
{
--- 238,242 ----
wordMap = new HashMap();
preferredMap = new HashMap();
!
for (Iterator it = prop.keySet().iterator(); it.hasNext(); )
{
***************
*** 302,330 ****
* The cache of known words
*/
! private static Map wordMap = null;
/**
* The cache of preferred symbols for the words
*/
! private static Map preferredMap = null;
/**
* The parsed version of the current string
*/
! private List output = null;
/**
* The commands that we know about
*/
! private Map commands = null;
/**
* While the answer is being worked out ...
*/
! private Iterator wit = null;
/**
* The index
*/
! private Index index = null;
}
--- 302,330 ----
* The cache of known words
*/
! private static Map wordMap;
/**
* The cache of preferred symbols for the words
*/
! private static Map preferredMap;
/**
* The parsed version of the current string
*/
! private List output;
/**
* The commands that we know about
*/
! private Map commands;
/**
* While the answer is being worked out ...
*/
! private Iterator wit;
/**
* The index
*/
! private Index index;
}
Index: StartsParamWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/StartsParamWord.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** StartsParamWord.java 29 Sep 2004 22:21:23 -0000 1.10
--- StartsParamWord.java 6 Mar 2005 20:21:47 -0000 1.11
***************
*** 69,72 ****
* The source of thesaurus data
*/
! private Thesaurus thesaurus = null;
}
--- 69,72 ----
* The source of thesaurus data
*/
! private Thesaurus thesaurus;
}
More information about the jsword-svn
mailing list