[jsword-svn] jsword/java/jsword/org/crosswire/jsword/book/search s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search
In directory www.crosswire.org:/tmp/cvs-serv6194/java/jsword/org/crosswire/jsword/book/search

Modified Files:
	SearchType.java 
Removed Files:
	Msg.java Msg.properties Thesaurus.java Thesaurus.properties 
	ThesaurusFactory.java Grammar.java 
Log Message:
Moved unused code to limbo.
Upgraded support-tools: checkstyle, pmd and findbugs to most recent.
Addressed over 100 issues reported by findbugs and checkstyle.
Resulted in major refactoring of GBFFilter.
Net result is that code size is significantly smaller.

--- Thesaurus.java DELETED ---

--- Thesaurus.properties DELETED ---

--- Msg.java DELETED ---

--- Grammar.java DELETED ---

Index: SearchType.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/SearchType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SearchType.java	2 May 2005 01:29:32 -0000	1.2
--- SearchType.java	9 May 2005 01:29:06 -0000	1.3
***************
*** 40,44 ****
          public String decorate(String queryWords)
          {
!             return searchSyntax.decoratePhrase(queryWords);
          }
  
--- 40,44 ----
          public String decorate(String queryWords)
          {
!             return SEARCH_SYNTAX.decoratePhrase(queryWords);
          }
  
***************
*** 59,63 ****
          public String decorate(String queryWords)
          {
!             return searchSyntax.decorateAllWords(queryWords);
          }
  
--- 59,63 ----
          public String decorate(String queryWords)
          {
!             return SEARCH_SYNTAX.decorateAllWords(queryWords);
          }
  
***************
*** 78,82 ****
          public String decorate(String queryWords)
          {
!             return searchSyntax.decorateAnyWords(queryWords);
          }
  
--- 78,82 ----
          public String decorate(String queryWords)
          {
!             return SEARCH_SYNTAX.decorateAnyWords(queryWords);
          }
  
***************
*** 98,102 ****
          public String decorate(String queryWords)
          {
!             return searchSyntax.decorateNotWords(queryWords);
          }
  
--- 98,102 ----
          public String decorate(String queryWords)
          {
!             return SEARCH_SYNTAX.decorateNotWords(queryWords);
          }
  
***************
*** 117,121 ****
          public String decorate(String queryWords)
          {
!             return searchSyntax.decorateStartWords(queryWords);
          }
  
--- 117,121 ----
          public String decorate(String queryWords)
          {
!             return SEARCH_SYNTAX.decorateStartWords(queryWords);
          }
  
***************
*** 136,140 ****
          public String decorate(String queryWords)
          {
!             return searchSyntax.decorateSpellWords(queryWords);
          }
  
--- 136,140 ----
          public String decorate(String queryWords)
          {
!             return SEARCH_SYNTAX.decorateSpellWords(queryWords);
          }
  
***************
*** 155,159 ****
          public String decorate(String queryWords)
          {
!             return searchSyntax.decorateRange(queryWords);
          }
  
--- 155,159 ----
          public String decorate(String queryWords)
          {
!             return SEARCH_SYNTAX.decorateRange(queryWords);
          }
  
***************
*** 232,236 ****
      private String name;
  
!     protected static SearchSyntax searchSyntax = SearchSyntaxFactory.getSearchSyntax();
  
      // Support for serialization
--- 232,236 ----
      private String name;
  
!     protected static final SearchSyntax SEARCH_SYNTAX = SearchSyntaxFactory.getSearchSyntax();
  
      // Support for serialization

--- Msg.properties DELETED ---

--- ThesaurusFactory.java DELETED ---