Revision: 6940
http://languagetool.svn.sourceforge.net/languagetool/?rev=6940&view=rev
Author: dnaber
Date: 2012-05-16 20:52:27 +0000 (Wed, 16 May 2012)
Log Message:
-----------
small code cleanup
Modified Paths:
--------------
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/XMLRuleHandler.java
Modified:
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/XMLRuleHandler.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/XMLRuleHandler.java
2012-05-16 20:05:11 UTC (rev 6939)
+++
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/XMLRuleHandler.java
2012-05-16 20:52:27 UTC (rev 6940)
@@ -249,8 +249,7 @@
if (elementList.isEmpty()) {
phraseElementList.add(new ArrayList<Element>(curPhrEl));
} else {
- final ArrayList<Element> prevList = new ArrayList<Element>(
- elementList);
+ final ArrayList<Element> prevList = new
ArrayList<Element>(elementList);
prevList.addAll(curPhrEl);
phraseElementList.add(new ArrayList<Element>(prevList));
prevList.clear();
@@ -350,25 +349,10 @@
//add incorrect XML character for simplicity
message.append("\u0001\\");
message.append(attrs.getValue("no"));
- if (StringTools.isEmpty(attrs.getValue("no"))) {
- throw new SAXException("References cannot be empty: " + "\n Line: "
- + pLocator.getLineNumber() + ", column: "
- + pLocator.getColumnNumber() + ".");
- } else if (Integer.parseInt(attrs.getValue("no")) < 1) {
- throw new SAXException("References must be larger than 0: "
- + attrs.getValue("no") + "\n Line: " + pLocator.getLineNumber()
- + ", column: " + pLocator.getColumnNumber() + ".");
- }
+ checkNumber(attrs);
} else if (inToken && attrs.getValue("no") != null) {
final int refNumber = Integer.parseInt(attrs.getValue("no"));
- if (refNumber > elementList.size()) {
- throw new SAXException(
- "Only backward references in match elements are possible, tried to
specify token "
- + refNumber
- + "\n Line: "
- + pLocator.getLineNumber()
- + ", column: " + pLocator.getColumnNumber() + ".");
- }
+ checkRefNumber(refNumber);
mWorker.setTokenRef(refNumber);
tokenReference = mWorker;
elements.append('\\');
@@ -376,6 +360,26 @@
}
}
+ private void checkNumber(Attributes attrs) throws SAXException {
+ if (StringTools.isEmpty(attrs.getValue("no"))) {
+ throw new SAXException("References cannot be empty: " + "\n Line: "
+ + pLocator.getLineNumber() + ", column: "
+ + pLocator.getColumnNumber() + ".");
+ } else if (Integer.parseInt(attrs.getValue("no")) < 1) {
+ throw new SAXException("References must be larger than 0: "
+ + attrs.getValue("no") + "\n Line: " + pLocator.getLineNumber()
+ + ", column: " + pLocator.getColumnNumber() + ".");
+ }
+ }
+
+ private void checkRefNumber(int refNumber) throws SAXException {
+ if (refNumber > elementList.size()) {
+ throw new SAXException("Only backward references in match elements are
possible, tried to specify token "
+ + refNumber + "\n" + "Line: " + pLocator.getLineNumber()
+ + ", column: " + pLocator.getColumnNumber() + ".");
+ }
+ }
+
protected void setExceptions(final Attributes attrs) {
inException = true;
exceptions = new StringBuilder();
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
