Revision: 7008
http://languagetool.svn.sourceforge.net/languagetool/?rev=7008&view=rev
Author: milek_pl
Date: 2012-05-20 09:06:38 +0000 (Sun, 20 May 2012)
Log Message:
-----------
add missing argument types
Modified Paths:
--------------
trunk/JLanguageTool/src/dev/org/languagetool/dev/conversion/RuleCoverage.java
trunk/JLanguageTool/src/dev/org/languagetool/dev/conversion/gui/Main.java
Modified:
trunk/JLanguageTool/src/dev/org/languagetool/dev/conversion/RuleCoverage.java
===================================================================
---
trunk/JLanguageTool/src/dev/org/languagetool/dev/conversion/RuleCoverage.java
2012-05-20 09:03:50 UTC (rev 7007)
+++
trunk/JLanguageTool/src/dev/org/languagetool/dev/conversion/RuleCoverage.java
2012-05-20 09:06:38 UTC (rev 7008)
@@ -310,7 +310,7 @@
andGroup.set(a,and);
}
// get exceptions in attribute form for faster processings
- ArrayList<ArrayList> exceptionAttributes =
getExceptionAttributes(allExceptions);
+ ArrayList<ArrayList<Pattern>> exceptionAttributes =
getExceptionAttributes(allExceptions);
// do the dictionary iteration thing; this part could take a
while, depending on how far through the dict we have to go
int numResets = 0;
@@ -329,7 +329,7 @@
}
}
if (matched) {
- if
(!inExceptionList(word,exceptionAttributes,allExceptions)) {
+ if (!inExceptionList(word, exceptionAttributes,
allExceptions)) {
return word;
}
}
@@ -348,7 +348,7 @@
}
exceptions.addAll(prevExceptions);
- ArrayList<ArrayList> exceptionAttributes =
getExceptionAttributes(exceptions);
+ ArrayList<ArrayList<Pattern>> exceptionAttributes =
getExceptionAttributes(exceptions);
if (e.isSentStart()) {
return "";
@@ -424,12 +424,12 @@
* @return
*/
@SuppressWarnings("unchecked")
- private ArrayList<ArrayList> getExceptionAttributes(List<Element>
exceptions) {
+ private ArrayList<ArrayList<Pattern>>
getExceptionAttributes(List<Element> exceptions) {
if (exceptions.size() == 0) {
- return new ArrayList<ArrayList>();
+ return new ArrayList<ArrayList<Pattern>>();
}
int size = exceptions.size();
- ArrayList<ArrayList> ret = new ArrayList<ArrayList>(6);
+ ArrayList<ArrayList<Pattern>> ret = new
ArrayList<ArrayList<Pattern>>(6);
ArrayList<Pattern> tokenPatterns = new ArrayList<Pattern>(size);
ArrayList<Pattern> posPatterns = new ArrayList<Pattern>(size);
for (Element e : exceptions) {
@@ -473,7 +473,7 @@
* @return
*/
@SuppressWarnings("unchecked")
- private boolean inExceptionList(String word, ArrayList<ArrayList>
exceptionAttributes, List<Element> exceptions) {
+ private boolean inExceptionList(String word,
ArrayList<ArrayList<Pattern>> exceptionAttributes, List<Element> exceptions) {
if (exceptions.size() == 0) {
return false;
}
Modified:
trunk/JLanguageTool/src/dev/org/languagetool/dev/conversion/gui/Main.java
===================================================================
--- trunk/JLanguageTool/src/dev/org/languagetool/dev/conversion/gui/Main.java
2012-05-20 09:03:50 UTC (rev 7007)
+++ trunk/JLanguageTool/src/dev/org/languagetool/dev/conversion/gui/Main.java
2012-05-20 09:06:38 UTC (rev 7008)
@@ -56,11 +56,11 @@
// Display elements
private JFrame frame; // main frame
- private JComboBox rulesBox;
+ private JComboBox<String> rulesBox;
private XmlTextPane resultArea;
- private JComboBox ruleTypeBox;
- private JComboBox specificRuleTypeBox;
+ private JComboBox<String> ruleTypeBox;
+ private JComboBox<String> specificRuleTypeBox;
private JTextPane coveredByPane;
private JTextPane warningPane;
@@ -165,7 +165,7 @@
scrollPane.setMinimumSize(new Dimension(10, 10));
// original rule combo box
- rulesBox = new JComboBox();
+ rulesBox = new JComboBox<String>();
rulesBox.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@@ -176,7 +176,7 @@
});
// rule type combo box
- ruleTypeBox = new JComboBox();
+ ruleTypeBox = new JComboBox<String>();
ruleTypeBox.addItem(atdString);
ruleTypeBox.addItem(cgString);
ruleTypeBox.addActionListener(new ActionListener() {
@@ -186,7 +186,7 @@
}
});
// specific rule type
- specificRuleTypeBox = new JComboBox();
+ specificRuleTypeBox = new JComboBox<String>();
populateSpecificRuleType();
// rule file pane
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
