[bspell commit] r6 - in trunk/src: main/java/com/google/bspell main/java/com/google/bspell/ant main/java/com/goog...
codesite...@google.com
Date: Mon Aug 13 23:55:39 2007
New Revision: 6
Modified:
trunk/src/main/java/com/google/bspell/BSpellCheck.java
trunk/src/main/java/com/google/bspell/ant/BSpellTask.java
trunk/src/main/java/com/google/bspell/model/Word.java
trunk/src/main/java/com/google/bspell/parsers/AbstractParser.java
trunk/src/main/java/com/google/bspell/parsers/JavaParser.java
trunk/src/main/java/com/google/bspell/parsers/Parser.java
trunk/src/main/java/com/google/bspell/parsers/ParserFactory.java
trunk/src/main/java/com/google/bspell/parsers/TxtParser.java
trunk/src/test/java/com/google/bspell/parsers/JavaParserTest.java
Log:
Fix checks
Link xml as a TxtParser
Modified: trunk/src/main/java/com/google/bspell/BSpellCheck.java
==============================================================================
--- trunk/src/main/java/com/google/bspell/BSpellCheck.java (original)
+++ trunk/src/main/java/com/google/bspell/BSpellCheck.java Mon Aug 13 23:55:39 2007
@@ -9,18 +9,16 @@
import com.google.bspell.model.Configuration;
import com.google.bspell.model.Word;
-import com.google.bspell.utils.StringUtils;
import com.google.bspell.parsers.Parser;
import com.google.bspell.parsers.ParserFactory;
+import com.google.bspell.utils.StringUtils;
import com.softcorporation.suggester.BasicSuggester;
import com.softcorporation.suggester.Suggestion;
import com.softcorporation.suggester.dictionary.BasicDictionary;
import com.softcorporation.suggester.tools.SpellCheck;
-import com.softcorporation.suggester.util.BasicSuggesterConfiguration;
import com.softcorporation.suggester.util.Constants;
import com.softcorporation.suggester.util.SpellCheckConfiguration;
-import com.softcorporation.util.Logger;
public class BSpellCheck {
private Configuration config;
@@ -56,7 +54,7 @@
spellCheck.setText(word.getValue().toString(), Constants.DOC_TYPE_TEXT, "en");
spellCheck.check();
- ArrayList suggestions = null;
+ List suggestions = null;
while (spellCheck.hasMisspelt()) {
suggestions = spellCheck.getSuggestions();
@@ -77,10 +75,10 @@
failed.add(word);
}
}
- return failed;
- }
+ return failed;
+ }
- public String getCombinedWithValidWords(ArrayList suggestions, String misspeltWord) {
+ public String getCombinedWithValidWords(List suggestions, String misspeltWord) {
for (int j = 0; j < suggestions.size(); j++) {
Suggestion suggestion = (Suggestion) suggestions.get(j);
String word = suggestion.getWord();
Modified: trunk/src/main/java/com/google/bspell/ant/BSpellTask.java
==============================================================================
--- trunk/src/main/java/com/google/bspell/ant/BSpellTask.java (original)
+++ trunk/src/main/java/com/google/bspell/ant/BSpellTask.java Mon Aug 13 23:55:39 2007
@@ -2,7 +2,6 @@
import java.io.File;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -20,11 +19,11 @@
public class BSpellTask extends Task {
- private Configuration config;
-
protected Vector rcs = new Vector();
protected boolean failonerror = true;
+ private Configuration config;
+
public void addConfiguration(Configuration c) {
this.config = c;
}
@@ -33,6 +32,7 @@
add(set);
}
+ @SuppressWarnings("unchecked")
public void add(ResourceCollection res) {
rcs.add(res);
}
Modified: trunk/src/main/java/com/google/bspell/model/Word.java
==============================================================================
--- trunk/src/main/java/com/google/bspell/model/Word.java (original)
+++ trunk/src/main/java/com/google/bspell/model/Word.java Mon Aug 13 23:55:39 2007
@@ -4,9 +4,9 @@
import java.util.List;
public final class Word {
-
List<String> suggestions = new ArrayList<String>();
List<Location> locations = new ArrayList<Location>();
+ private StringBuffer value = new StringBuffer();
public List<Location> getLocations() {
return locations;
@@ -16,7 +16,7 @@
return suggestions;
}
- private StringBuffer value = new StringBuffer();
+
public StringBuffer getValue() {
return value;
Modified: trunk/src/main/java/com/google/bspell/parsers/AbstractParser.java
==============================================================================
--- trunk/src/main/java/com/google/bspell/parsers/AbstractParser.java (original)
+++ trunk/src/main/java/com/google/bspell/parsers/AbstractParser.java Mon Aug 13 23:55:39 2007
@@ -19,7 +19,7 @@
public static final char[] LOWER_CASE = new char[] {'a', 'z'};
public static final char[] UPPER_CASE = new char[] {'A', 'Z'};
- public Set<String> userExcludes = new HashSet<String>();
+ private Set<String> userExcludes = new HashSet<String>();
public Set<String> getUserExcludes() {
return userExcludes;
Modified: trunk/src/main/java/com/google/bspell/parsers/JavaParser.java
==============================================================================
--- trunk/src/main/java/com/google/bspell/parsers/JavaParser.java (original)
+++ trunk/src/main/java/com/google/bspell/parsers/JavaParser.java Mon Aug 13 23:55:39 2007
@@ -20,7 +20,7 @@
public static final Set<String> EXCLUDES = new HashSet<String>(Arrays.asList(
"println", "util", "args", "argv", "main", "millis",
"get", "set", "io", "out", "src", "jaxb", "jaxws", "wsdl4j", "xmlns", "pom"
- ));
+ ));
public boolean isJavaKeyword(final String keyword) {
return KEYWORDS.contains(keyword);
Modified: trunk/src/main/java/com/google/bspell/parsers/Parser.java
==============================================================================
--- trunk/src/main/java/com/google/bspell/parsers/Parser.java (original)
+++ trunk/src/main/java/com/google/bspell/parsers/Parser.java Mon Aug 13 23:55:39 2007
@@ -10,5 +10,5 @@
public interface Parser {
List<Word> parse(final File file) throws FileNotFoundException, IOException;
- public Set<String> getUserExcludes();
+ Set<String> getUserExcludes();
}
Modified: trunk/src/main/java/com/google/bspell/parsers/ParserFactory.java
==============================================================================
--- trunk/src/main/java/com/google/bspell/parsers/ParserFactory.java (original)
+++ trunk/src/main/java/com/google/bspell/parsers/ParserFactory.java Mon Aug 13 23:55:39 2007
@@ -11,11 +11,11 @@
import com.google.bspell.utils.PropertiesUtils;
import com.google.bspell.utils.StringUtils;
-public class ParserFactory {
- private static ParserFactory INSTANCE;
+public final class ParserFactory {
+ private static ParserFactory instance;
private final Configuration config;
- Map<String, Parser> registry = new HashMap<String, Parser>();
+ private Map<String, Parser> registry = new HashMap<String, Parser>();
private ParserFactory(Configuration c) {
this.config = c;
@@ -56,8 +56,8 @@
}
}
- protected void initRegistry(final String registry) throws Exception {
- Properties properties = PropertiesUtils.loadProperties(registry);
+ protected void initRegistry(final String r) throws Exception {
+ Properties properties = PropertiesUtils.loadProperties(r);
Enumeration<?> extensions = properties.propertyNames();
while (extensions.hasMoreElements()) {
String extension = (String) extensions.nextElement();
@@ -70,10 +70,10 @@
}
public static ParserFactory getInstance(Configuration c) {
- if (INSTANCE == null) {
- INSTANCE = new ParserFactory(c);
+ if (instance == null) {
+ instance = new ParserFactory(c);
}
- return INSTANCE;
+ return instance;
}
public Map<String, Parser> getRegistry() {
Modified: trunk/src/main/java/com/google/bspell/parsers/TxtParser.java
==============================================================================
--- trunk/src/main/java/com/google/bspell/parsers/TxtParser.java (original)
+++ trunk/src/main/java/com/google/bspell/parsers/TxtParser.java Mon Aug 13 23:55:39 2007
@@ -1,10 +1,17 @@
package com.google.bspell.parsers;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
public class TxtParser extends AbstractParser {
+
+ public static final Set<String> EXCLUDES = new HashSet<String>(Arrays.asList(
+ "println", "util", "args", "argv", "main", "millis", "txt"
+ ));
public boolean isExcluded(final String keyword) {
- //return EXCLUDES.contains(keyword);
- return false;
+ return EXCLUDES.contains(keyword);
}
}
Modified: trunk/src/test/java/com/google/bspell/parsers/JavaParserTest.java
==============================================================================
--- trunk/src/test/java/com/google/bspell/parsers/JavaParserTest.java (original)
+++ trunk/src/test/java/com/google/bspell/parsers/JavaParserTest.java Mon Aug 13 23:55:39 2007
@@ -48,7 +48,7 @@
File file = new File(getClass().getResource("resources/test.java.txt").toURI());
List<Word> words = p.parse(file);
assertTrue(words.get(0).equals("com"));
- assertEquals(words.size(), 52);
+ assertEquals(51, words.size());
}
@Test