Revision: 7062
http://languagetool.svn.sourceforge.net/languagetool/?rev=7062&view=rev
Author: dnaber
Date: 2012-05-26 15:03:57 +0000 (Sat, 26 May 2012)
Log Message:
-----------
remove unused code; small cleanups
Modified Paths:
--------------
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/PatternRuleHandler.java
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/Unifier.java
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/XMLRuleHandler.java
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/bitext/BitextPatternRule.java
Modified:
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/PatternRuleHandler.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/PatternRuleHandler.java
2012-05-26 14:32:25 UTC (rev 7061)
+++
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/PatternRuleHandler.java
2012-05-26 15:03:57 UTC (rev 7062)
@@ -68,7 +68,7 @@
if (language == null) {
throw new SAXException("Unknown language '" + languageStr + "'");
}
- } else if ("rule".equals(qName)) {
+ } else if (RULE.equals(qName)) {
shortMessage = new StringBuilder();
url = new StringBuilder();
id = attrs.getValue("id");
@@ -99,36 +99,32 @@
} else if (AND.equals(qName)) {
inAndGroup = true;
tokenCountForMarker++;
- } else if ("unify".equals(qName)) {
+ } else if (UNIFY.equals(qName)) {
inUnification = true;
uniNegation = YES.equals(attrs.getValue(NEGATE));
- } else if ("feature".equals(qName)) {
+ } else if (FEATURE.equals(qName)) {
uFeature = attrs.getValue("id");
- } else if (qName.equals(TYPE)) {
+ } else if (TYPE.equals(qName)) {
uType = attrs.getValue("id");
uTypeList.add(uType);
- } else if (qName.equals(TOKEN)) {
+ } else if (TOKEN.equals(qName)) {
setToken(attrs);
if (!inAndGroup) {
tokenCountForMarker++;
}
- } else if (qName.equals("marker") && inPattern) {
- startPos = tokenCounter;
} else if (EXCEPTION.equals(qName)) {
setExceptions(attrs);
- } else if (qName.equals(EXAMPLE)
- && attrs.getValue(TYPE).equals("correct")) {
+ } else if (EXAMPLE.equals(qName) &&
attrs.getValue(TYPE).equals("correct")) {
inCorrectExample = true;
correctExample = new StringBuilder();
- } else if (qName.equals(EXAMPLE)
- && attrs.getValue(TYPE).equals("incorrect")) {
+ } else if (EXAMPLE.equals(qName) &&
attrs.getValue(TYPE).equals("incorrect")) {
inIncorrectExample = true;
incorrectExample = new StringBuilder();
exampleCorrection = new StringBuilder();
if (attrs.getValue("correction") != null) {
exampleCorrection.append(attrs.getValue("correction"));
}
- } else if ("message".equals(qName)) {
+ } else if (MESSAGE.equals(qName)) {
inMessage = true;
inSuggestion = false;
message = new StringBuilder();
@@ -138,7 +134,7 @@
} else if ("url".equals(qName)) {
inUrl = true;
url = new StringBuilder();
- } else if ("rulegroup".equals(qName)) {
+ } else if (RULEGROUP.equals(qName)) {
ruleGroupId = attrs.getValue("id");
ruleGroupDescription = attrs.getValue("name");
defaultOff = "off".equals(attrs.getValue(DEFAULT));
@@ -148,12 +144,14 @@
} else if ("suggestion".equals(qName) && inMessage) {
message.append("<suggestion>");
inSuggestion = true;
- } else if ("match".equals(qName)) {
+ } else if (MATCH.equals(qName)) {
setMatchElement(attrs);
- } else if (qName.equals(MARKER) && inCorrectExample) {
+ } else if (MARKER.equals(qName) && inCorrectExample) {
correctExample.append("<marker>");
- } else if (qName.equals(MARKER) && inIncorrectExample) {
+ } else if (MARKER.equals(qName) && inIncorrectExample) {
incorrectExample.append("<marker>");
+ } else if (MARKER.equals(qName) && inPattern) {
+ startPos = tokenCounter;
} else if (UNIFICATION.equals(qName)) {
uFeature = attrs.getValue("feature");
inUnificationDef = true;
@@ -174,7 +172,7 @@
@Override
public void endElement(final String namespaceURI, final String sName,
final String qName) throws SAXException {
- if ("rule".equals(qName)) {
+ if (RULE.equals(qName)) {
phraseElementInit();
if (phraseElementList.isEmpty()) {
final PatternRule rule = new PatternRule(id, language, elementList,
@@ -202,23 +200,21 @@
phraseElementList.clear();
}
- } else if (qName.equals(EXCEPTION)) {
+ } else if (EXCEPTION.equals(qName)) {
finalizeExceptions();
- } else if (qName.equals(AND)) {
+ } else if (AND.equals(qName)) {
inAndGroup = false;
andGroupCounter = 0;
tokenCounter++;
- } else if (qName.equals(TOKEN)) {
+ } else if (TOKEN.equals(qName)) {
finalizeTokens();
- } else if (qName.equals("marker") && inPattern) {
- endPos = tokenCountForMarker;
- } else if (qName.equals(PATTERN)) {
+ } else if (PATTERN.equals(qName)) {
inPattern = false;
if (lastPhrase) {
elementList.clear();
}
tokenCounter = 0;
- } else if (qName.equals(EXAMPLE)) {
+ } else if (EXAMPLE.equals(qName)) {
if (inCorrectExample) {
correctExamples.add(correctExample.toString());
} else if (inIncorrectExample) {
@@ -236,14 +232,14 @@
correctExample = new StringBuilder();
incorrectExample = new StringBuilder();
exampleCorrection = new StringBuilder();
- } else if ("message".equals(qName)) {
+ } else if (MESSAGE.equals(qName)) {
suggestionMatches = addLegacyMatches();
inMessage = false;
} else if ("short".equals(qName)) {
inShortMessage = false;
} else if ("url".equals(qName)) {
inUrl = false;
- } else if ("match".equals(qName)) {
+ } else if (MATCH.equals(qName)) {
if (inMessage) {
suggestionMatches.get(suggestionMatches.size() - 1).
setLemmaString(match.toString());
@@ -251,15 +247,17 @@
tokenReference.setLemmaString(match.toString());
}
inMatch = false;
- } else if ("rulegroup".equals(qName)) {
+ } else if (RULEGROUP.equals(qName)) {
inRuleGroup = false;
} else if ("suggestion".equals(qName) && inMessage) {
message.append("</suggestion>");
inSuggestion = false;
- } else if (qName.equals(MARKER) && inCorrectExample) {
+ } else if (MARKER.equals(qName) && inCorrectExample) {
correctExample.append("</marker>");
- } else if (qName.equals(MARKER) && inIncorrectExample) {
+ } else if (MARKER.equals(qName) && inIncorrectExample) {
incorrectExample.append("</marker>");
+ } else if (MARKER.equals(qName) && inPattern) {
+ endPos = tokenCountForMarker;
} else if ("phrase".equals(qName) && inPhrases) {
finalizePhrase();
} else if ("includephrases".equals(qName)) {
@@ -268,10 +266,10 @@
inPhrases = false;
} else if (UNIFICATION.equals(qName)) {
inUnificationDef = false;
- } else if ("feature".equals(qName)) {
+ } else if (FEATURE.equals(qName)) {
equivalenceFeatures.put(uFeature, uTypeList);
uTypeList = new ArrayList<String>();
- } else if ("unify".equals(qName)) {
+ } else if (UNIFY.equals(qName)) {
inUnification = false;
//clear the features...
equivalenceFeatures = new HashMap<String, List<String>>();
Modified:
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/Unifier.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/Unifier.java
2012-05-26 14:32:25 UTC (rev 7061)
+++ trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/Unifier.java
2012-05-26 15:03:57 UTC (rev 7062)
@@ -216,8 +216,7 @@
if (featuresFound.get(i)
&& equivalencesMatched.get(i).containsKey(feat.getKey())
&&
equivalencesMatched.get(i).get(feat.getKey()).contains(typeName)) {
- final Element testElem = equivalenceTypes
- .get(new EquivalenceTypeLocator(feat.getKey(), typeName));
+ final Element testElem = equivalenceTypes.get(new
EquivalenceTypeLocator(feat.getKey(), typeName));
featUnified = featUnified || testElem.isMatched(aToken);
}
}
@@ -319,8 +318,8 @@
}
firstUnified = true;
}
- final AnalyzedTokenReadings[] atr = tokSequence
- .toArray(new AnalyzedTokenReadings[tokSequence.size()]);
+ final AnalyzedTokenReadings[] atr =
+ tokSequence.toArray(new AnalyzedTokenReadings[tokSequence.size()]);
return atr;
}
Modified:
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/XMLRuleHandler.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/XMLRuleHandler.java
2012-05-26 14:32:25 UTC (rev 7061)
+++
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/XMLRuleHandler.java
2012-05-26 15:03:57 UTC (rev 7062)
@@ -183,8 +183,6 @@
protected static final String RULE = "rule";
protected static final String RULEGROUP = "rulegroup";
protected static final String NO = "no";
- protected static final String MARK_TO = "mark_to";
- protected static final String MARK_FROM = "mark_from";
protected static final String PHRASES = "phrases";
protected static final String MESSAGE = "message";
@@ -282,18 +280,6 @@
protected void startPattern(final Attributes attrs) throws SAXException {
tokenCounter = 0;
inPattern = true;
- if (attrs.getValue(MARK_FROM) != null) {
- startPositionCorrection = Integer.parseInt(attrs.getValue(MARK_FROM));
- }
- if (attrs.getValue(MARK_TO) != null) {
- endPositionCorrection = Integer.parseInt(attrs.getValue(MARK_TO));
- if (endPositionCorrection > 0) {
- throw new SAXException("End position correction (mark_to="+
endPositionCorrection
- + ") cannot be larger than 0: " + "\n Line: "
- + pLocator.getLineNumber() + ", column: "
- + pLocator.getColumnNumber() + ".");
- }
- }
caseSensitive = YES.equals(attrs.getValue(CASE_SENSITIVE));
}
@@ -516,8 +502,7 @@
}
if (inAndGroup && andGroupCounter > 0) {
- elementList.get(elementList.size() - 1)
- .setAndGroupElement(tokenElement);
+ elementList.get(elementList.size() - 1).setAndGroupElement(tokenElement);
} else {
elementList.add(tokenElement);
}
Modified:
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/bitext/BitextPatternRule.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/bitext/BitextPatternRule.java
2012-05-26 14:32:25 UTC (rev 7061)
+++
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/bitext/BitextPatternRule.java
2012-05-26 15:03:57 UTC (rev 7062)
@@ -87,8 +87,6 @@
@Override
public void reset() {
- // TODO Auto-generated method stub
-
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Languagetool-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
