[okapi] push by jhargrav...@gmail.com - fixhtml5 and cleanup of yaml based rules to support wild cards on 2012-03-05 03:13 GMT
ok...@googlecode.com
Author: Jim Hargrave <jhargr...@gmail.com>
Date: Sun Mar 4 19:12:38 2012
Log: fixhtml5 and cleanup of yaml based rules to support wild cards
http://code.google.com/p/okapi/source/detail?r=4b42389d631f
Modified:
/okapi/filters/abstractmarkup/src/main/java/net/sf/okapi/filters/abstractmarkup/AbstractMarkupFilter.java
/okapi/filters/abstractmarkup/src/main/java/net/sf/okapi/filters/yaml/TaggedFilterConfiguration.java
/okapi/filters/abstractmarkup/src/main/java/net/sf/okapi/filters/yaml/YamlConfigurationReader.java
/okapi/filters/html/src/main/java/net/sf/okapi/filters/html/HtmlFilter.java
/okapi/filters/html/src/main/resources/net/sf/okapi/filters/html/nonwellformedConfiguration.yml
/okapi/filters/html/src/main/resources/net/sf/okapi/filters/html/wellformedConfiguration.yml
/okapi/filters/html/src/test/java/net/sf/okapi/filters/html/HtmlConfigurationTest.java
/okapi/filters/openxml/src/main/java/net/sf/okapi/filters/openxml/ExcelAnalyzer.java
/okapi/filters/openxml/src/main/java/net/sf/okapi/filters/openxml/OpenXMLContentFilter.java
/okapi/filters/openxml/src/test/java/net/sf/okapi/filters/openxml/OpenXMLConfigurationTest.java
=======================================
---
/okapi/filters/abstractmarkup/src/main/java/net/sf/okapi/filters/abstractmarkup/AbstractMarkupFilter.java
Wed Dec 7 14:05:48 2011
+++
/okapi/filters/abstractmarkup/src/main/java/net/sf/okapi/filters/abstractmarkup/AbstractMarkupFilter.java
Sun Mar 4 19:12:38 2012
@@ -37,6 +37,7 @@
import net.htmlparser.jericho.CharacterEntityReference;
import net.htmlparser.jericho.CharacterReference;
import net.htmlparser.jericho.Config;
+import net.htmlparser.jericho.Element;
import net.htmlparser.jericho.EndTag;
import net.htmlparser.jericho.EndTagType;
import net.htmlparser.jericho.LoggerProvider;
@@ -436,7 +437,7 @@
protected void preProcess(Segment segment) {
boolean isInsideTextRun = false;
if (segment instanceof Tag) {
- isInsideTextRun = getConfig().getElementRuleType(((Tag)
segment).getName()) == RULE_TYPE.INLINE_ELEMENT;
+ isInsideTextRun = getConfig().getElementRuleTypeCandidate(((Tag)
segment).getName()) == RULE_TYPE.INLINE_ELEMENT;
}
// add buffered whitespace to the current translatable text
@@ -768,7 +769,7 @@
}
protected void updateStartTagRuleState(String tag, RULE_TYPE ruleType,
String idValue) {
- RULE_TYPE r = getConfig().getElementRuleType(tag);
+ RULE_TYPE r = getConfig().getElementRuleTypeCandidate(tag);
switch (r) {
case INLINE_EXCLUDED_ELEMENT:
case INLINE_ELEMENT:
@@ -802,7 +803,7 @@
}
protected RULE_TYPE updateEndTagRuleState(EndTag endTag) {
- RULE_TYPE ruleType = getConfig().getElementRuleType(endTag.getName());
+ RULE_TYPE ruleType =
getConfig().getElementRuleTypeCandidate(endTag.getName());
RuleType currentState = null;
switch (ruleType) {
@@ -906,7 +907,20 @@
switch (ruleType) {
case INLINE_EXCLUDED_ELEMENT:
- eventBuilder.endCode(endTag.toString());
+ // only end code if there is one and it matches the start code
+ Code currentCode = eventBuilder.getCurrentCode();
+ String e = "";
+ if (currentCode != null) {
+ // parse the start tag
+ Source source = new Source(currentCode.getData());
+ List<Element> es = source.getAllElements();
+ if (!es.isEmpty()) {
+ e = es.get(0).getName();
+ }
+ if (e.equals(endTag.toString())) {
+ eventBuilder.endCode(endTag.toString());
+ }
+ }
break;
case INLINE_ELEMENT:
// check to see if we are inside a inline run that is excluded
=======================================
---
/okapi/filters/abstractmarkup/src/main/java/net/sf/okapi/filters/yaml/TaggedFilterConfiguration.java
Mon Sep 26 07:26:36 2011
+++
/okapi/filters/abstractmarkup/src/main/java/net/sf/okapi/filters/yaml/TaggedFilterConfiguration.java
Sun Mar 4 19:12:38 2012
@@ -65,6 +65,7 @@
* attached to both elements and attributes. More than one conditional
rules are evaluated as OR expressions. For
* example, "type=button" OR "type=default".
*/
+@SuppressWarnings({ "unchecked", "rawtypes" })
public class TaggedFilterConfiguration {
public static final String RULETYPES = "ruleTypes";
public static final String GLOBAL_PRESERVE_WHITESPACE
= "preserve_whitespace";
@@ -126,6 +127,11 @@
*/
INLINE_EXCLUDED_ELEMENT,
/**
+ * Tag that exists inside a text run, i.e., bold, underline etc.. but
has been included based on another
+ * conditional rule. Treat as a standalone inline code
+ */
+ INLINE_INCLUDED_ELEMENT,
+ /**
* Marks the beginning of an excluded block - all content in this block
will be filtered as {@link DocumentPart}
* s
*/
@@ -286,7 +292,6 @@
return false;
}
- @SuppressWarnings("unchecked")
public boolean isRuleType(String ruleName, RULE_TYPE ruleType) {
List<Map> rules = configReader.getRules(ruleName.toLowerCase());
for (Map rule : rules) {
@@ -299,8 +304,20 @@
}
return false;
}
-
- @SuppressWarnings("unchecked")
+
+ public boolean hasDefinedInlineRule(String ruleName) {
+ Map rule = configReader.getNonRegexElementRule(ruleName);
+ if (rule == null) {
+ return false;
+ }
+
+ List<String> ruleTypes = (List<String>) rule.get("ruleTypes");
+ if (isRuleType(ruleName, RULE_TYPE.INLINE_ELEMENT, ruleTypes)) {
+ return true;
+ }
+ return false;
+ }
+
public String getElementType(Tag element) {
if (element.getTagType() == StartTagType.COMMENT) {
return Code.TYPE_COMMENT;
@@ -343,7 +360,6 @@
getAttributeRuleType(attribute.toLowerCase()));
}
- @SuppressWarnings({ "unchecked" })
private RULE_TYPE findMatchingAttributeRuleOnElementRule(String tag,
Map<String, String> attributes, String attribute) {
@@ -433,7 +449,6 @@
return type;
}
- @SuppressWarnings({ "unchecked" })
public RULE_TYPE getAttributeRuleType(String attribute) {
Map rule = configReader.getAttributeRule(attribute.toLowerCase());
if (rule != null) {
@@ -458,7 +473,6 @@
* @param elementName
* @return
*/
- @SuppressWarnings("unchecked")
private RULE_TYPE findMatchingElementOnAttributeRule(String tag, String
attribute,
Map<String, String> attributes, RULE_TYPE ruleType) {
List excludedElements;
@@ -507,21 +521,16 @@
}
public RULE_TYPE getConditionalElementRuleType(String tag, Map<String,
String> attributes) {
- RULE_TYPE type = getElementRuleType(tag.toLowerCase());
- if (type != RULE_TYPE.RULE_NOT_FOUND) {
-
- // handle case where a regex rule may override the normal rule
+ RULE_TYPE type = getElementRuleTypeCandidate(tag.toLowerCase());
+
+ if (type != RULE_TYPE.RULE_NOT_FOUND) {
if (type == RULE_TYPE.INLINE_EXCLUDED_ELEMENT) {
- if (doesElementRuleConditionApply(configReader.getElementRule(tag),
attributes) &&
- doesElementRuleConditionApply(configReader.getRegexElementRule(tag),
attributes)) {
- return RULE_TYPE.INLINE_EXCLUDED_ELEMENT;
- } else if
(doesElementRuleConditionApply(configReader.getElementRule(tag),
attributes)) {
- return RULE_TYPE.INLINE_ELEMENT;
+ if
(doesElementRuleConditionApply(configReader.getRegexElementRule(tag),
attributes)) {
+ return type;
} else {
- return RULE_TYPE.RULE_FAILED;
+ return RULE_TYPE.INLINE_ELEMENT;
}
}
-
if (doesElementRuleConditionApply(configReader.getElementRule(tag),
attributes)) {
return type;
} else {
@@ -531,8 +540,7 @@
return type;
}
- @SuppressWarnings({ "unchecked" })
- public RULE_TYPE getElementRuleType(String tag) {
+ public RULE_TYPE getElementRuleTypeCandidate(String tag) {
Map rule = configReader.getElementRule(tag.toLowerCase());
if (rule != null) {
List<String> ruleTypes = (List<String>) rule.get("ruleTypes");
@@ -638,7 +646,6 @@
}
}
- @SuppressWarnings({ "unchecked" })
private boolean applyConditions(List condition, Map<String, String>
attributes) {
String conditionalAttribute = null;
conditionalAttribute = (String) condition.get(0);
@@ -709,7 +716,6 @@
}
}
- @SuppressWarnings({ "unchecked" })
private boolean doesElementRuleConditionApply(Map elementRule,
Map<String, String> attributes) {
List conditions = (List) elementRule.get(CONDITIONS);
if (conditions != null) {
@@ -719,9 +725,11 @@
return true;
}
- @SuppressWarnings("unchecked")
private boolean doesAttributeRuleConditionApply(Map attributeRule,
Map<String, String> attributes) {
+ if (attributeRule == null) {
+ return false;
+ }
List conditions = (List) attributeRule.get(CONDITIONS);
if (conditions != null) {
return applyConditions(conditions, attributes);
@@ -730,7 +738,6 @@
return true;
}
- @SuppressWarnings("unchecked")
public boolean isPreserveWhitespaceCondition(String attribute,
Map<String, String> attributes) {
Map attributeRule = configReader.getAttributeRule(attribute);
if (doesAttributeRuleConditionApply(attributeRule, attributes)) {
@@ -742,7 +749,6 @@
return false;
}
- @SuppressWarnings("unchecked")
public boolean isDefaultWhitespaceCondition(String attribute, Map<String,
String> attributes) {
Map attributeRule = configReader.getAttributeRule(attribute);
if (doesAttributeRuleConditionApply(attributeRule, attributes)) {
=======================================
---
/okapi/filters/abstractmarkup/src/main/java/net/sf/okapi/filters/yaml/YamlConfigurationReader.java
Mon Sep 26 07:26:36 2011
+++
/okapi/filters/abstractmarkup/src/main/java/net/sf/okapi/filters/yaml/YamlConfigurationReader.java
Sun Mar 4 19:12:38 2012
@@ -36,6 +36,7 @@
import org.yaml.snakeyaml.Yaml;
+@SuppressWarnings({ "unchecked", "rawtypes" })
public class YamlConfigurationReader {
private static final String REGEX_META_CHARS_REGEX = "[\\(\\[\\{\\^\\$\\|
\\]\\}\\)\\?\\*\\+]+";
private static final Pattern REGEX_META_CHARS_PATTERN =
Pattern.compile(REGEX_META_CHARS_REGEX);
@@ -61,14 +62,12 @@
/**
* Default Tagged Configuration
*/
- @SuppressWarnings("unchecked")
public YamlConfigurationReader() {
yaml = new Yaml();
config = (Map) yaml.load("collapse_whitespace: false\nassumeWellformed:
true");
initialize();
}
- @SuppressWarnings("unchecked")
public YamlConfigurationReader(URL configurationPathAsResource) {
try {
yaml = new Yaml();
@@ -81,7 +80,6 @@
}
}
- @SuppressWarnings("unchecked")
public YamlConfigurationReader(File configurationFile) {
try {
yaml = new Yaml();
@@ -92,14 +90,12 @@
}
}
- @SuppressWarnings("unchecked")
public YamlConfigurationReader(String configurationScript) {
yaml = new Yaml();
config = (Map) yaml.load(configurationScript);
initialize();
}
- @SuppressWarnings("unchecked")
private void initialize() {
elementRules = new HashMap<String, Object>();
attributeRules = new HashMap<String, Object>();
@@ -125,7 +121,6 @@
return yaml.dump(config);
}
- @SuppressWarnings("unchecked")
/**
* Find element or attribute rules
*/
@@ -143,7 +138,6 @@
return rules;
}
- @SuppressWarnings("unchecked")
/*
* Find element rules only (including regex)
*/
@@ -162,7 +156,15 @@
return rule;
}
- @SuppressWarnings("unchecked")
+ /**
+ * Non regex element rules only
+ * @param ruleName rule name (aka tag name)
+ * @return true if there is a matched non-regex rule
+ */
+ public Map getNonRegexElementRule(String ruleName) {
+ return (Map)elementRules.get(ruleName);
+ }
+
/*
* Find regex element rules only
*/
@@ -180,7 +182,6 @@
return rule;
}
- @SuppressWarnings("unchecked")
/*
* Find attribute rules only (including regex)
*/
@@ -199,7 +200,6 @@
return rule;
}
- @SuppressWarnings("unchecked")
/*
* Find attribute rules only (including regex)
*/
@@ -230,12 +230,10 @@
config.put(property, value);
}
- @SuppressWarnings("unchecked")
public void addElementRule(String ruleName, Map rule) {
elementRules.putAll(rule);
}
- @SuppressWarnings("unchecked")
public void addAttributeRule(String ruleName, Map rule) {
attributeRules.putAll(rule);
}
=======================================
---
/okapi/filters/html/src/main/java/net/sf/okapi/filters/html/HtmlFilter.java
Sat Mar 3 14:21:13 2012
+++
/okapi/filters/html/src/main/java/net/sf/okapi/filters/html/HtmlFilter.java
Sun Mar 4 19:12:38 2012
@@ -141,8 +141,8 @@
// We just hit a tag that could close the current TextUnit
final Tag tag = (Tag) segment;
boolean inlineTag = false;
- if (getConfig().getElementRuleType(tag.getName()) ==
RULE_TYPE.INLINE_ELEMENT
- || getConfig().getElementRuleType(tag.getName()) ==
RULE_TYPE.INLINE_ELEMENT
+ if (getConfig().getElementRuleTypeCandidate(tag.getName()) ==
RULE_TYPE.INLINE_ELEMENT
+ || getConfig().getElementRuleTypeCandidate(tag.getName()) ==
RULE_TYPE.INLINE_EXCLUDED_ELEMENT
|| (getEventBuilder().isInsideTextRun() && (tag
.getTagType() == StartTagType.COMMENT || tag
.getTagType() == StartTagType.XML_PROCESSING_INSTRUCTION)))
@@ -160,7 +160,7 @@
* Overridden to support non-wellformed (unbalanced tag exceptions in
HTML)
*/
protected RULE_TYPE updateEndTagRuleState(EndTag endTag) {
- RULE_TYPE ruleType = getConfig().getElementRuleType(endTag.getName());
+ RULE_TYPE ruleType =
getConfig().getElementRuleTypeCandidate(endTag.getName());
RuleType currentState = null;
switch (ruleType) {
@@ -168,7 +168,7 @@
case INLINE_ELEMENT:
try {
currentState = getRuleState().popInlineRule();
- ruleType = currentState.ruleType;
+ ruleType = currentState.ruleType;
} catch (EmptyStackException e) {
// empty stack means the inline tags are not wellformed.
// assume the tag is a valid inline tag - even if
@@ -213,7 +213,7 @@
// if the end tag doesn't match with what is on the stack then
// assume the default (non-conditional) rule
if (!currentState.ruleName.equalsIgnoreCase(endTag.getName())) {
- ruleType = getConfig().getElementRuleType(endTag.getName());
+ ruleType = getConfig().getElementRuleTypeCandidate(endTag.getName());
String character = Integer.toString(endTag.getBegin());
LOGGER.log(Level.FINE, "End tag " + endTag.getName()
=======================================
---
/okapi/filters/html/src/main/resources/net/sf/okapi/filters/html/nonwellformedConfiguration.yml
Sat Mar 3 14:21:13 2012
+++
/okapi/filters/html/src/main/resources/net/sf/okapi/filters/html/nonwellformedConfiguration.yml
Sun Mar 4 19:12:38 2012
@@ -352,7 +352,7 @@
# Excluded elements
'.*':
- ruleTypes: [EXCLUDE, INLINE]
+ ruleTypes: [EXCLUDE]
conditions: [translate, EQUALS, 'no']
style:
=======================================
---
/okapi/filters/html/src/main/resources/net/sf/okapi/filters/html/wellformedConfiguration.yml
Sat Mar 3 14:21:13 2012
+++
/okapi/filters/html/src/main/resources/net/sf/okapi/filters/html/wellformedConfiguration.yml
Sun Mar 4 19:12:38 2012
@@ -376,7 +376,7 @@
# Excluded elements
'.*':
- ruleTypes: [EXCLUDE, INLINE]
+ ruleTypes: [EXCLUDE]
conditions: [translate, EQUALS, 'no']
style:
=======================================
---
/okapi/filters/html/src/test/java/net/sf/okapi/filters/html/HtmlConfigurationTest.java
Thu Jul 1 11:37:33 2010
+++
/okapi/filters/html/src/test/java/net/sf/okapi/filters/html/HtmlConfigurationTest.java
Sun Mar 4 19:12:38 2012
@@ -45,17 +45,12 @@
.getResource("/net/sf/okapi/filters/html/nonwellformedConfiguration.yml");
TaggedFilterConfiguration rules = new TaggedFilterConfiguration(url);
assertTrue(rules.isRuleType("title",
TaggedFilterConfiguration.RULE_TYPE.ATTRIBUTE_TRANS));
- assertEquals(rules.getElementRuleType("title"),
- TaggedFilterConfiguration.RULE_TYPE.TEXT_UNIT_ELEMENT);
- assertEquals(rules.getElementRuleType("abbr"),
- TaggedFilterConfiguration.RULE_TYPE.INLINE_ELEMENT);
- assertEquals(rules.getElementRuleType("area"),
- TaggedFilterConfiguration.RULE_TYPE.ATTRIBUTES_ONLY);
- assertEquals(rules.getElementRuleType("script"),
- TaggedFilterConfiguration.RULE_TYPE.EXCLUDED_ELEMENT);
+ assertEquals(TaggedFilterConfiguration.RULE_TYPE.TEXT_UNIT_ELEMENT,
rules.getElementRuleTypeCandidate("title"));
+
assertEquals(TaggedFilterConfiguration.RULE_TYPE.INLINE_EXCLUDED_ELEMENT,
rules.getElementRuleTypeCandidate("abbr"));
+ assertEquals(TaggedFilterConfiguration.RULE_TYPE.ATTRIBUTES_ONLY,
rules.getElementRuleTypeCandidate("area"));
+ assertEquals(TaggedFilterConfiguration.RULE_TYPE.EXCLUDED_ELEMENT,
rules.getElementRuleTypeCandidate("script"));
assertTrue(rules.isRuleType("pre",
TaggedFilterConfiguration.RULE_TYPE.PRESERVE_WHITESPACE));
- assertEquals(rules.getElementRuleType("meta"),
- TaggedFilterConfiguration.RULE_TYPE.ATTRIBUTES_ONLY);
+ assertEquals(TaggedFilterConfiguration.RULE_TYPE.ATTRIBUTES_ONLY,
rules.getElementRuleTypeCandidate("meta"));
}
@Test
@@ -92,7 +87,7 @@
TaggedFilterConfiguration rules = new TaggedFilterConfiguration(url);
assertTrue(rules.isRuleType("pre",
TaggedFilterConfiguration.RULE_TYPE.PRESERVE_WHITESPACE));
- assertEquals(rules.getElementRuleType("style"),
+ assertEquals(rules.getElementRuleTypeCandidate("style"),
TaggedFilterConfiguration.RULE_TYPE.EXCLUDED_ELEMENT);
assertTrue(rules.isRuleType("pre",
TaggedFilterConfiguration.RULE_TYPE.PRESERVE_WHITESPACE));
assertFalse(rules.isRuleType("stylesheet",
=======================================
---
/okapi/filters/openxml/src/main/java/net/sf/okapi/filters/openxml/ExcelAnalyzer.java
Wed Jun 30 14:58:07 2010
+++
/okapi/filters/openxml/src/main/java/net/sf/okapi/filters/openxml/ExcelAnalyzer.java
Sun Mar 4 19:12:38 2012
@@ -107,7 +107,7 @@
if (segment instanceof Tag)
{
final Tag tag = (Tag) segment;
- if
(parameters.getTaggedConfig().getElementRuleType(tag.getName()).equals("ATTRIBUTES_ONLY"))
+ if
(parameters.getTaggedConfig().getElementRuleTypeCandidate(tag.getName()).equals("ATTRIBUTES_ONLY"))
{
if (tag.getName().equals("dimension"))
{
@@ -213,7 +213,7 @@
{
final Tag tag = (Tag) segment;
// if
(parameters.getTaggedConfig().getMainRuleType(tag.getName()).equals("ATTRIBUTES_ONLY"))
- if (tfc.getElementRuleType(tag.getName()) ==
RULE_TYPE.ATTRIBUTES_ONLY)
+ if (tfc.getElementRuleTypeCandidate(tag.getName()) ==
RULE_TYPE.ATTRIBUTES_ONLY)
{
if (tag.getName().equals("color"))
{
@@ -270,7 +270,7 @@
{
final Tag tag = (Tag) segment;
sTagName = tag.getName();
- rtRuleType = tfc.getElementRuleType(sTagName);
+ rtRuleType = tfc.getElementRuleTypeCandidate(sTagName);
if (tag.getTagType() == StartTagType.NORMAL ||
tag.getTagType() == StartTagType.UNREGISTERED)
// only if it's a start tag
@@ -377,7 +377,7 @@
{
final Tag tag = (Tag) segment;
sTagName = tag.getName();
- rtRuleType = tfc.getElementRuleType(sTagName);
+ rtRuleType = tfc.getElementRuleTypeCandidate(sTagName);
if (rtRuleType == RULE_TYPE.INLINE_ELEMENT)
{
if (tag.getName().equals("sst"))
=======================================
---
/okapi/filters/openxml/src/main/java/net/sf/okapi/filters/openxml/OpenXMLContentFilter.java
Sun Apr 10 06:06:50 2011
+++
/okapi/filters/openxml/src/main/java/net/sf/okapi/filters/openxml/OpenXMLContentFilter.java
Sun Mar 4 19:12:38 2012
@@ -959,7 +959,7 @@
if (getRuleState().isExludedState()) {
addToDocumentPart(sTagString);
// process these tag types to update parser state
- switch (getConfig().getElementRuleType(sTagName)) {
+ switch (getConfig().getElementRuleTypeCandidate(sTagName)) {
// DWH 1-23-09
case EXCLUDED_ELEMENT:
getRuleState().pushExcludedRule(sTagName);
@@ -973,7 +973,7 @@
}
return;
}
- switch (getConfig().getElementRuleType(sTagName)) {
+ switch (getConfig().getElementRuleTypeCandidate(sTagName)) {
// DWH 1-23-09
case INLINE_ELEMENT:
if (canStartNewTextUnit()) {
@@ -1224,7 +1224,7 @@
if (getRuleState().isExludedState()) {
addToDocumentPart(sTagString); // DWH 7-16-09
// process these tag types to update parser state
- switch (getConfig().getElementRuleType(sTagName)) {
+ switch (getConfig().getElementRuleTypeCandidate(sTagName)) {
// DWH 1-23-09
case EXCLUDED_ELEMENT:
getRuleState().popExcludedIncludedRule();
@@ -1239,7 +1239,7 @@
return;
}
- if (bInTextBox &&
getConfig().getElementRuleType(sTagName)!=RULE_TYPE.GROUP_ELEMENT)
+ if (bInTextBox &&
getConfig().getElementRuleTypeCandidate(sTagName)!=RULE_TYPE.GROUP_ELEMENT)
{
if (sTagName.equals("w:txbxcontent")) // DWH 10-22-09 so this won't be
an inline code
sEndTxbxContent = sTagString;
@@ -1254,7 +1254,7 @@
bInPowerpointEndPara = false;
return;
}
- switch (getConfig().getElementRuleType(sTagName)) {
+ switch (getConfig().getElementRuleTypeCandidate(sTagName)) {
// DWH 1-23-09
case INLINE_ELEMENT:
if (canStartNewTextUnit())
=======================================
---
/okapi/filters/openxml/src/test/java/net/sf/okapi/filters/openxml/OpenXMLConfigurationTest.java
Mon Dec 12 16:17:51 2011
+++
/okapi/filters/openxml/src/test/java/net/sf/okapi/filters/openxml/OpenXMLConfigurationTest.java
Sun Mar 4 19:12:38 2012
@@ -51,8 +51,8 @@
public void defaultConfiguration() {
URL url =
OpenXMLConfigurationTest.class.getResource("/net/sf/okapi/filters/openxml/wordConfiguration.yml");
TaggedFilterConfiguration rules = new TaggedFilterConfiguration(url);
- assertEquals(rules.getElementRuleType("w:p"),
TaggedFilterConfiguration.RULE_TYPE.TEXT_UNIT_ELEMENT);
- assertEquals(rules.getElementRuleType("wp:docpr"),
TaggedFilterConfiguration.RULE_TYPE.ATTRIBUTES_ONLY);
+ assertEquals(rules.getElementRuleTypeCandidate("w:p"),
TaggedFilterConfiguration.RULE_TYPE.TEXT_UNIT_ELEMENT);
+ assertEquals(rules.getElementRuleTypeCandidate("wp:docpr"),
TaggedFilterConfiguration.RULE_TYPE.ATTRIBUTES_ONLY);
Map<String, String> attributes = new HashMap<String, String>();
assertTrue(rules.isTranslatableAttribute("wp:docpr", "name",
attributes));
@@ -79,11 +79,11 @@
url =
OpenXMLConfigurationTest.class.getResource("/net/sf/okapi/filters/openxml/excelCommentConfiguration.yml");
rules = new TaggedFilterConfiguration(url);
- assertEquals(rules.getElementRuleType("t"),
TaggedFilterConfiguration.RULE_TYPE.TEXT_MARKER_ELEMENT);
+ assertEquals(rules.getElementRuleTypeCandidate("t"),
TaggedFilterConfiguration.RULE_TYPE.TEXT_MARKER_ELEMENT);
url =
OpenXMLConfigurationTest.class.getResource("/net/sf/okapi/filters/openxml/powerpointConfiguration.yml");
rules = new TaggedFilterConfiguration(url);
- assertEquals(rules.getElementRuleType("a:p"),
TaggedFilterConfiguration.RULE_TYPE.TEXT_UNIT_ELEMENT);
+ assertEquals(rules.getElementRuleTypeCandidate("a:p"),
TaggedFilterConfiguration.RULE_TYPE.TEXT_UNIT_ELEMENT);
attributes = new HashMap<String, String>();
attributes.put("w:val", "content-language");
assertTrue(rules.isWritableLocalizableAttribute("a:rpr", "lang",
attributes));