[Arianne-commits] stendhal/src/games/stendhal/common/parser WordList.java, 1.2, 1.3

[Martin F. <mar...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/common/parser
In directory vz-cvs-4.sog:/tmp/cvs-serv32220/src/games/stendhal/common/parser

Modified Files:
	WordList.java 
Log Message:
remove old code to hash the word list content

Index: WordList.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/common/parser/WordList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WordList.java	2 May 2011 18:39:51 -0000	1.2
--- WordList.java	2 May 2011 19:21:03 -0000	1.3
***************
*** 54,62 ****
  	public static final String WORDS_FILENAME = "words.txt";
  
- /*	static final String HASH_KEYWORD = "@Hash";
- 
- 	** MD5 Hash code to check for changes
- 	protected String hash = "";*/
- 
  	private Map<String, WordEntry> words = new TreeMap<String, WordEntry>();
  
--- 54,57 ----
***************
*** 69,85 ****
  	static private WordList instance;
  
! //	/**
! //	 * Take over the content of the other WordList object.
! //	 * @param other
! //	 */
! //	protected void takeOver(WordList other)
! //	{
! //		words = instance.words;
! //		compoundNames = instance.compoundNames;
! //		hash = instance.hash;
! //		subjectRefCount = other.subjectRefCount;
! //	}
! 
! 	// Initialise the word list by querying the database or reading from the
  	// input file "words.txt" in the class path.
  	static {
--- 64,68 ----
  	static private WordList instance;
  
! 	// Initialise the word list by reading from the
  	// input file "words.txt" in the class path.
  	static {
***************
*** 103,106 ****
--- 86,90 ----
  	 */
  	private void readFromResources() {
+ 
  		final InputStream str = WordList.class.getResourceAsStream(WORDS_FILENAME);
  
***************
*** 141,199 ****
  	}
  
- 	/*
- 	 * Returns the WordList version number.
- 	 * 
- 	 * @return MD5 hash code
- 	 *
- 	public String getHash() {
- 		return hash;
- 	}
- 
- 	 **
- 	 * Updates the MD5 hash code.
- 	 * 
- 	 * @return true on success
- 	 *
- 	public boolean calculateHash() {
- 		MessageDigest md;
- 
- 		try {
- 			md = MessageDigest.getInstance("MD5");
- 		} catch (final NoSuchAlgorithmException e) {
- 			return false;
- 		}
- 
- 		for (final WordEntry e : words.values()) {
- 			String s = e.getNormalized();
- 			if (s != null) {
- 				md.update(s.getBytes());
- 			}
- 
- 			s = e.getPlurSing();
- 			if (s != null) {
- 				md.update(s.getBytes());
- 			}
- 
- 			s = e.getTypeString();
- 			if (s != null) {
- 				md.update(s.getBytes());
- 			}
- 
- 			// md.update(e.getValue().getBytes());
- 		}
- 
- 		final byte[] buffer = md.digest();
- 
- 		final StringBuffer sb = new StringBuffer();
- 
- 		for (final byte b : buffer) {
- 			sb.append(Integer.toHexString(b & 0xFF).toUpperCase());
- 		}
- 
- 		hash = sb.toString();
- 
- 		return true;
- 	}
- */
  	/**
  	 * Reads word list from reader object.
--- 125,128 ----